Changeset 35978 in osm for applications/editors/josm/plugins/turnlanes/src

Timestamp:

2022-06-15T20:10:48+02:00 (3 years ago)

Author:

taylor.smock

Message:

See #22115: Extract methods from LatLon into ILatLon where they are generally applicable

This uses the extracted methods where possible, and removes unnecessary
Node#getCoor calls.

Location:

applications/editors/josm/plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes

Files:

• gui/GuiContainer.java (modified) (2 diffs)
• model/Route.java (modified) (1 diff)

applications/editors/josm/plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/gui/GuiContainer.java

@@ -18 +18 @@
 
 import org.openstreetmap.josm.data.coor.EastNorth;
-import org.openstreetmap.josm.data.coor.LatLon;
+import org.openstreetmap.josm.data.coor.ILatLon;
 import org.openstreetmap.josm.data.projection.ProjectionRegistry;
 import org.openstreetmap.josm.plugins.turnlanes.model.Junction;
@@ -53 +53 @@
         final Point2D origin = avgOrigin(locs(mc.getPrimaryJunctions()));
 
-        final LatLon originCoor = ProjectionRegistry.getProjection().eastNorth2latlon(new EastNorth(origin.getX(), origin.getY()));
-        final LatLon relCoor = ProjectionRegistry.getProjection().eastNorth2latlon(
+        final ILatLon originCoor = ProjectionRegistry.getProjection().eastNorth2latlon(new EastNorth(origin.getX(), origin.getY()));
+        final ILatLon relCoor = ProjectionRegistry.getProjection().eastNorth2latlon(
                 new EastNorth(origin.getX() + 1, origin.getY() + 1));
 

applications/editors/josm/plugins/turnlanes/src/org/openstreetmap/josm/plugins/turnlanes/model/Route.java

@@ -52 +52 @@
             Node last = nodes.get(0);
             for (Node n : nodes.subList(1, nodes.size())) {
-                length += last.getCoor().greatCircleDistance(n.getCoor());
+                length += last.greatCircleDistance(n);
                 last = n;
             }