Skip to content
This repository has been archived by the owner on Nov 1, 2023. It is now read-only.

Commit

Permalink
Fix offset rendering
Browse files Browse the repository at this point in the history 
Signed-off-by: Taylor Smock <[email protected]>
  • Loading branch information
@tsmock
tsmock committed Dec 29, 2022
1 parent 116fc30 commit 402a45a
Showing 1 changed file with 45 additions and 25 deletions.
70 changes: 45 additions & 25 deletions src/main/java/org/openstreetmap/josm/plugins/mapillary/gui/layer/MapillaryLayer.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -356,7 +356,8 @@ private void paintWithLock(final Graphics2D g, final MapView mv, final Bounds bo
for (INode imageAbs : images) {
if (imageAbs.isVisible() && MapillaryImageUtils.isImage(imageAbs)
&& !MapillaryImageUtils.equals(this.image, imageAbs)
&& !Objects.equals(MapillaryImageUtils.getSequenceKey(imageAbs), sequenceKey)) {
&& !Objects.equals(MapillaryImageUtils.getSequenceKey(imageAbs), sequenceKey)
&& imageAbs != selectedImage) {
drawImageMarker(originalTransform, selectedImage, g, imageAbs, distPer100Pixel, false);
}
}
Expand All @@ -367,12 +368,15 @@ private void paintWithLock(final Graphics2D g, final MapView mv, final Bounds bo
.map(IWay.class::cast).collect(Collectors.toSet())) {
drawSequence(g, mv, way, selectedImage);
for (INode n : way.getNodes()) {
drawImageMarker(originalTransform, selectedImage, g, n, distPer100Pixel, false);
if (n != selectedImage) {
drawImageMarker(originalTransform, selectedImage, g, n, distPer100Pixel, false);
}
}
}
// Paint selected images last. Not particularly worried about painting too much, since most people don't
// select thousands of images.
drawImageMarker(originalTransform, selectedImage, g, selectedImage, distPer100Pixel, true);
drawImageMarker(originalTransform, selectedImage, g, selectedImage, distPer100Pixel,
OffsetUtils.getOffset(selectedImage) != 0);
}
} else {
new MapillaryMapRenderer(g, mv).render(this.getData(), false, box);
Expand Down Expand Up @@ -464,16 +468,6 @@ private void drawImageMarker(final AffineTransform originalTransform, final INod
.trace("An image was not painted due to a high zoom level, and not being the selected image/sequence");
return;
}
final ILatLon drawnCoordinates;
if (offset) {
drawnCoordinates = OffsetUtils.getOffsetLocation(img);
} else {
drawnCoordinates = img;
}
final Point p = drawnCoordinates instanceof INode
// INode implementations may optimize getEastNorth, so prefer that where possible.
? MainApplication.getMap().mapView.getPoint(((INode) drawnCoordinates).getEastNorth())
: MainApplication.getMap().mapView.getPoint(drawnCoordinates);
if (MapillaryImageUtils.getSequenceKey(selectedImg) != null && !Objects
.equals(MapillaryImageUtils.getSequenceKey(selectedImg), MapillaryImageUtils.getSequenceKey(img))) {
g.setComposite(fadeComposite);
Expand All @@ -496,6 +490,40 @@ private void drawImageMarker(final AffineTransform originalTransform, final INod
}
directionC = getAgedColor(img, MapillaryColorScheme.SEQ_UNSELECTED);
}
MapView mv = MainApplication.getMap().mapView;

final Point p = mv.getPoint(img.getEastNorth());
paintDirectionIndicator(g, directionC, img, originalTransform, p, i);
this.paintHighlight(g, img, selectedImg);

if (offset && selectedImg == img) {
final ILatLon drawnCoordinates = OffsetUtils.getOffsetLocation(img);
final Point offsetP = drawnCoordinates instanceof INode
// INode implementations may optimize getEastNorth, so prefer that where possible.
? mv.getPoint(((INode) drawnCoordinates).getEastNorth())
: mv.getPoint(drawnCoordinates);
paintDirectionIndicator(g, directionC, img, originalTransform, offsetP, i);
g.setTransform(originalTransform);
paintOffsetLine(g, offsetP, drawnCoordinates, img, true);
}

// TODO get the following working
/*
* if (img instanceof Detections && !((Detections) img).getDetections().isEmpty()) {
* TRAFFIC_SIGN_SIZE = (int) (ImageProvider.ImageSizes.MAP.getAdjustedWidth() / 1.5);
* YIELD_SIGN = new ImageProvider(IMAGE_SPRITE_DIR,
* "sign-detection").setMaxSize(TRAFFIC_SIGN_SIZE).get().getImage()
* g.drawImage(YIELD_SIGN, (int) (p.getX() - TRAFFIC_SIGN_SIZE / 3d), (int) (p.getY() - TRAFFIC_SIGN_SIZE / 3d),
* null);
* }
*/

g.setComposite(originalComposite);
g.setTransform(originalTransform);
}

private static void paintDirectionIndicator(Graphics2D g, Color directionC, INode img,
AffineTransform originalTransform, Point p, Image i) {
// Paint direction indicator
g.setColor(directionC);
if (MapillaryImageUtils.IS_PANORAMIC.test(img)) {
Expand Down Expand Up @@ -533,25 +561,19 @@ private void drawImageMarker(final AffineTransform originalTransform, final INod
g.drawImage(i, p.x, p.y, null);
g.setTransform(translate);
}
}

private void paintHighlight(Graphics2D g, INode img, INode selectedImg) {
// Paint highlight for selected or highlighted images
if (getData().getHighlighted().contains(img.getPrimitiveId())
|| (selectedImg != null && selectedImg.equals(img))) {
g.setColor(Color.WHITE);
g.setStroke(new BasicStroke(2));
g.drawOval(-IMG_MARKER_RADIUS, -IMG_MARKER_RADIUS, 2 * IMG_MARKER_RADIUS, 2 * IMG_MARKER_RADIUS);
}
// TODO get the following working
/*
* if (img instanceof Detections && !((Detections) img).getDetections().isEmpty()) {
* TRAFFIC_SIGN_SIZE = (int) (ImageProvider.ImageSizes.MAP.getAdjustedWidth() / 1.5);
* YIELD_SIGN = new ImageProvider(IMAGE_SPRITE_DIR,
* "sign-detection").setMaxSize(TRAFFIC_SIGN_SIZE).get().getImage()
* g.drawImage(YIELD_SIGN, (int) (p.getX() - TRAFFIC_SIGN_SIZE / 3d), (int) (p.getY() - TRAFFIC_SIGN_SIZE / 3d),
* null);
* }
*/
}

private static void paintOffsetLine(Graphics2D g, Point p, ILatLon drawnCoordinates, ILatLon img, boolean offset) {
// Draw a line to the original location
if (offset && (Double.compare(drawnCoordinates.lat(), img.lat()) != 0
|| Double.compare(drawnCoordinates.lon(), img.lon()) != 0)) {
Expand All @@ -565,8 +587,6 @@ private void drawImageMarker(final AffineTransform originalTransform, final INod
g.setColor(MapillaryColorScheme.SEQ_IMPORTED_HIGHLIGHTED);
g.fillOval(p.x - radius, p.y - radius, 2 * radius, 2 * radius);
}
g.setComposite(originalComposite);
g.setTransform(originalTransform);
}

private static Point2D getOriginalCentroid(Image i) {
Expand Down

0 comments on commit 402a45a

Please sign in to comment.