Changeset 10875 in josm for trunk/src/org/openstreetmap/josm/data/osm/visitor/paint

Timestamp:

2016-08-22T21:16:36+02:00 (8 years ago)

Author:

Don-vip

Message:

fix #13413 - Clean ImproveWayAccuracyAction, add new class MapViewPath (patch by michael2402, modified) - gsoc-core

Location:

trunk/src/org/openstreetmap/josm/data/osm/visitor/paint

Files:

• ArrowPaintHelper.java (modified) (1 diff)
• MapPath2D.java (deleted)
• StyledMapRenderer.java (modified) (4 diffs)
• WireframeMapRenderer.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/ArrowPaintHelper.java

@@ -3 +3 @@
 
 import org.openstreetmap.josm.gui.MapViewState.MapViewPoint;
+import org.openstreetmap.josm.gui.draw.MapPath2D;
 import org.openstreetmap.josm.tools.Utils;
 

trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/StyledMapRenderer.java

@@ -21 +21 @@
 import java.awt.font.TextLayout;
 import java.awt.geom.AffineTransform;
-import java.awt.geom.GeneralPath;
 import java.awt.geom.Path2D;
 import java.awt.geom.Point2D;
@@ -63 +62 @@
 import org.openstreetmap.josm.gui.MapViewState.MapViewPoint;
 import org.openstreetmap.josm.gui.NavigatableComponent;
+import org.openstreetmap.josm.gui.draw.MapPath2D;
+import org.openstreetmap.josm.gui.draw.MapViewPath;
 import org.openstreetmap.josm.gui.mappaint.ElemStyles;
 import org.openstreetmap.josm.gui.mappaint.MapPaintStyles;
@@ -1392 +1393 @@
         // only highlight the segment if the way itself is not highlighted
         if (!way.isHighlighted() && highlightWaySegments != null) {
-            GeneralPath highlightSegs = null;
+            MapViewPath highlightSegs = null;
             for (WaySegment ws : highlightWaySegments) {
                 if (ws.way != way || ws.lowerIndex < offset) {
@@ -1398 +1399 @@
                 }
                 if (highlightSegs == null) {
-                    highlightSegs = new GeneralPath();
-                }
-
-                Point2D p1 = mapState.getPointFor(ws.getFirstNode()).getInView();
-                Point2D p2 = mapState.getPointFor(ws.getSecondNode()).getInView();
-                highlightSegs.moveTo(p1.getX(), p1.getY());
-                highlightSegs.lineTo(p2.getX(), p2.getY());
+                    highlightSegs = new MapViewPath(mapState);
+                }
+
+                highlightSegs.moveTo(ws.getFirstNode());
+                highlightSegs.lineTo(ws.getSecondNode());
             }
 

trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/WireframeMapRenderer.java

@@ -30 +30 @@
 import org.openstreetmap.josm.gui.MapViewState.MapViewPoint;
 import org.openstreetmap.josm.gui.NavigatableComponent;
+import org.openstreetmap.josm.gui.draw.MapPath2D;
 
 /**