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

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

Files:

• build.xml (modified) (1 diff)
• src/org/openstreetmap/josm/plugins/fixAddresses/GuessedValueHandler.java (modified) (1 diff)
• src/org/openstreetmap/josm/plugins/fixAddresses/OsmUtils.java (modified) (3 diffs)

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

@@ -4 +4 @@
     <property name="commit.message" value="[josm_fixadresses]: Fixes #josm8336"/>
     <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
-    <property name="plugin.main.version" value="14153"/>
+    <property name="plugin.main.version" value="18494"/>
         
     <!-- Configure these properties (replace "..." accordingly).

applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/GuessedValueHandler.java

@@ -162 +162 @@
 
         if (n.hasKey(tag)) {
-            double dist = n.getCoor().greatCircleDistance(aNode.getCoor());
+            double dist = n.greatCircleDistance(aNode.getCoor());
             if (dist < minDist && dist < maxDist) {
                 minDist = dist;

applications/editors/josm/plugins/FixAddresses/src/org/openstreetmap/josm/plugins/fixAddresses/OsmUtils.java

@@ -6 +6 @@
 
 import org.openstreetmap.josm.data.Bounds;
+import org.openstreetmap.josm.data.coor.ILatLon;
 import org.openstreetmap.josm.data.coor.LatLon;
 import org.openstreetmap.josm.data.osm.Node;
@@ -45 +46 @@
 
         for (Pair<Node, Node> pair : x) {
-            LatLon ap = pair.a.getCoor();
-            LatLon bp = pair.b.getCoor();
+            ILatLon ap = pair.a;
+            ILatLon bp = pair.b;
 
             double dist = findMinimum(ap, bp, coor);
@@ -64 +65 @@
      * @return the double the minimum distance in m of the way and the node
      */
-    private static double findMinimum(LatLon a, LatLon b, LatLon c) {
+    private static double findMinimum(ILatLon a, ILatLon b, ILatLon c) {
         CheckParameterUtil.ensureParameterNotNull(c, "c");
         CheckParameterUtil.ensureParameterNotNull(b, "b");