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

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

Files:

• gradle.properties (modified) (1 diff)
• src/org/openstreetmap/josm/plugins/streetside/StreetsideLayer.java (modified) (3 diffs)

applications/editors/josm/plugins/MicrosoftStreetside/gradle.properties

@@ -8 +8 @@
 # Minimum required JOSM version to run this plugin, choose the lowest version possible that is compatible.
 # You can check if the plugin compiles against this version by executing `./gradlew compileJava_minJosm`.
-plugin.main.version=18004
+plugin.main.version=18494
 #plugin.version=
 # Version of JOSM against which the plugin is compiled
 # Please check, if the specified version is available for download from https://josm.openstreetmap.de/download/ .
 # If not, choose the next higher number that is available, or the gradle build will break.
-plugin.compile.version=18004
+plugin.compile.version=18494
 plugin.requires=apache-commons;apache-http;utilsplugin2;javafx
 

applications/editors/josm/plugins/MicrosoftStreetside/src/org/openstreetmap/josm/plugins/streetside/StreetsideLayer.java

@@ -23 +23 @@
 import org.apache.log4j.Logger;
 import org.openstreetmap.josm.data.Bounds;
+import org.openstreetmap.josm.data.coor.ILatLon;
 import org.openstreetmap.josm.data.osm.DataSet;
 import org.openstreetmap.josm.data.osm.event.DataChangedEvent;
@@ -462 +463 @@
       .filter(img -> // Filters out images too far away from target
         img != null &&
-        img.getMovingLatLon().greatCircleDistance(target.getMovingLatLon())
+        img.getMovingLatLon().greatCircleDistance((ILatLon) target.getMovingLatLon())
           < StreetsideProperties.SEQUENCE_MAX_JUMP_DISTANCE.get()
        )
@@ -501 +502 @@
     public int compare(StreetsideAbstractImage img1, StreetsideAbstractImage img2) {
       return (int) Math.signum(
-        img1.getMovingLatLon().greatCircleDistance(target.getMovingLatLon()) -
-        img2.getMovingLatLon().greatCircleDistance(target.getMovingLatLon())
+        img1.getMovingLatLon().greatCircleDistance((ILatLon) target.getMovingLatLon()) -
+        img2.getMovingLatLon().greatCircleDistance((ILatLon) target.getMovingLatLon())
       );
     }