Changeset 35978 in osm for applications/editors/josm/plugins/terracer

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/terracer

Files:

• build.xml (modified) (1 diff)
• src/org/openstreetmap/josm/plugins/terracer/TerracerAction.java (modified) (4 diffs)

applications/editors/josm/plugins/terracer/build.xml

@@ -2 +2 @@
 <project name="terracer" default="dist" basedir=".">
     <property name="commit.message" value="applied #j5760 (patch by robome) - Order of housenumbers not correct"/>
-    <property name="plugin.main.version" value="18464"/>
+    <property name="plugin.main.version" value="18494"/>
     <property name="plugin.author" value="Matt Amos"/>
     <property name="plugin.class" value="org.openstreetmap.josm.plugins.terracer.TerracerPlugin"/>

applications/editors/josm/plugins/terracer/src/org/openstreetmap/josm/plugins/terracer/TerracerAction.java

@@ -33 +33 @@
 import org.openstreetmap.josm.data.UndoRedoHandler;
 import org.openstreetmap.josm.data.coor.ILatLon;
-import org.openstreetmap.josm.data.coor.LatLon;
 import org.openstreetmap.josm.data.osm.DataSet;
 import org.openstreetmap.josm.data.osm.Node;
@@ -572 +571 @@
         for (int i = 0; i < pairs.size(); ++i) {
             Pair<Node, Node> p = pairs.get(i);
-            final double seg_length = p.a.getCoor().greatCircleDistance(p.b.getCoor());
+            final double seg_length = p.a.greatCircleDistance(p.b);
             if (l <= seg_length || i == pairs.size() - 1) {
                 // be generous on the last segment (numerical roudoff can lead to a small overshoot)
@@ -594 +593 @@
         double length = 0.0;
         for (Pair<Node, Node> p : w.getNodePairs(false)) {
-            length += p.a.getCoor().greatCircleDistance(p.b.getCoor());
+            length += p.a.greatCircleDistance(p.b);
         }
         return length;
@@ -687 +686 @@
         Node a = w.getNode(i);
         Node b = w.getNode((i + 1) % (w.getNodesCount() - 1));
-        return a.getCoor().greatCircleDistance(b.getCoor());
+        return a.greatCircleDistance(b);
     }