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

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

Files:

• build.xml (modified) (1 diff)
• src/org/openstreetmap/josm/plugins/opendata/core/io/NeptuneReader.java (modified) (3 diffs)
• src/org/openstreetmap/josm/plugins/opendata/core/io/tabular/SpreadSheetReader.java (modified) (1 diff)

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

@@ -1 +1 @@
 <?xml version="1.0" encoding="utf-8"?>
 <project name="opendata" default="dist" basedir=".">
-    <property name="plugin.main.version" value="18464"/>
+    <property name="plugin.main.version" value="18494"/>
     <property name="plugin.author" value="Don-vip"/>
     <property name="plugin.class" value="org.openstreetmap.josm.plugins.opendata.OdPlugin"/>

applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/io/NeptuneReader.java

@@ -23 +23 @@
 import javax.xml.validation.Validator;
 
+import org.openstreetmap.josm.data.coor.ILatLon;
 import org.openstreetmap.josm.data.coor.LatLon;
 import org.openstreetmap.josm.data.osm.DataSet;
@@ -239 +240 @@
     }
 
-    protected static final boolean isNullLatLon(LatLon ll) {
+    protected static boolean isNullLatLon(ILatLon ll) {
         return ll.lat() == 0.0 && ll.lon() == 0.0;
     }
@@ -362 +363 @@
             for (RelationMember member : stopArea.getMembers()) {
                 // Fix stop coordinates if needed
-                if (member.getRole().equals(OSM_PLATFORM) && isNullLatLon(member.getNode().getCoor())) {
+                if (member.getRole().equals(OSM_PLATFORM) && isNullLatLon(member.getNode())) {
                     member.getNode().setCoor(createLatLon(areaCentroid));
                 }

applications/editors/josm/plugins/opendata/src/org/openstreetmap/josm/plugins/opendata/core/io/tabular/SpreadSheetReader.java

@@ -253 +253 @@
                         firstNode = n;
                     }
-                    if (n == firstNode || n.getCoor().greatCircleDistance(firstNode.getCoor())
+                    if (n == firstNode || n.greatCircleDistance(firstNode)
                             > Config.getPref().getDouble(OdConstants.PREF_TOLERANCE, OdConstants.DEFAULT_TOLERANCE)) {
                         ds.addPrimitive(n);