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

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

Files:

• build.xml (modified) (1 diff)
• src/org/openstreetmap/josm/plugins/imagery_offset_db/ImageryOffsetWatcher.java (modified) (3 diffs)
• src/org/openstreetmap/josm/plugins/imagery_offset_db/OffsetDialogButton.java (modified) (4 diffs)
• src/org/openstreetmap/josm/plugins/imagery_offset_db/OffsetInfoAction.java (modified) (3 diffs)

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

@@ -5 +5 @@
     <property name="commit.message" value="Imagery Offset Database"/>
     <!-- enter the *lowest* JOSM version this plugin is currently compatible with -->
-    <property name="plugin.main.version" value="14221"/>
+    <property name="plugin.main.version" value="18494"/>
     <property name="plugin.canloadatruntime" value="true"/>
 

applications/editors/josm/plugins/imagery_offset_db/src/org/openstreetmap/josm/plugins/imagery_offset_db/ImageryOffsetWatcher.java

@@ -11 +11 @@
 import java.util.TreeMap;
 
+import org.openstreetmap.josm.data.coor.ILatLon;
 import org.openstreetmap.josm.data.coor.LatLon;
 import org.openstreetmap.josm.data.imagery.OffsetBookmark;
@@ -151 +152 @@
                 setOffsetGood(true);
             } else {
-                setOffsetGood(data.lastChecked != null && center.greatCircleDistance(data.lastChecked) <= maxDistance * 1000);
+                setOffsetGood(data.lastChecked != null && center.greatCircleDistance((ILatLon) data.lastChecked) <= maxDistance * 1000);
             }
         }
@@ -264 +265 @@
                     continue;
                 }
-                LatLon lastPos = new LatLon(dparts[0], dparts[1]);
+                ILatLon lastPos = new LatLon(dparts[0], dparts[1]);
                 if (lastPos.greatCircleDistance(ImageryOffsetTools.getMapCenter()) < Math.max(maxDistance, 3.0) * 1000) {
                     // apply offset

applications/editors/josm/plugins/imagery_offset_db/src/org/openstreetmap/josm/plugins/imagery_offset_db/OffsetDialogButton.java

@@ -26 +26 @@
 
 import org.openstreetmap.josm.data.coor.EastNorth;
+import org.openstreetmap.josm.data.coor.ILatLon;
 import org.openstreetmap.josm.data.coor.LatLon;
 import org.openstreetmap.josm.data.projection.Projection;
@@ -68 +69 @@
      */
     public void updateLocation() {
-        LatLon center = ImageryOffsetTools.getMapCenter();
+        ILatLon center = ImageryOffsetTools.getMapCenter();
         directionArrow.updateIcon(center);
         double distance = center.greatCircleDistance(offset.getPosition());
@@ -151 +152 @@
         Projection proj = ProjectionRegistry.getProjection();
         EastNorth pos = proj.latlon2eastNorth(offset.getPosition());
-        LatLon correctedCenterLL = proj.eastNorth2latlon(pos.add(-dx, -dy));
+        ILatLon correctedCenterLL = proj.eastNorth2latlon(pos.add(-dx, -dy));
         double length = correctedCenterLL.greatCircleDistance(offset.getImageryPos());
         double direction = length < 1e-2 ? 0.0 : -correctedCenterLL.bearing(offset.getImageryPos());
@@ -261 +262 @@
         }
 
-        public void updateIcon(LatLon from) {
+        public void updateIcon(ILatLon from) {
             distance = from.greatCircleDistance(to);
             direction = -to.bearing(from);

applications/editors/josm/plugins/imagery_offset_db/src/org/openstreetmap/josm/plugins/imagery_offset_db/OffsetInfoAction.java

@@ -12 +12 @@
 import javax.swing.JOptionPane;
 
+import org.openstreetmap.josm.data.coor.ILatLon;
 import org.openstreetmap.josm.gui.MainApplication;
 import org.openstreetmap.josm.tools.ImageProvider;
@@ -80 +81 @@
         StringBuilder sb = new StringBuilder();
         if (offset instanceof ImageryOffset) {
-            double odist = ((ImageryOffset) offset).getImageryPos().greatCircleDistance(offset.getPosition());
+            double odist = ((ImageryOffset) offset).getImageryPos().greatCircleDistance((ILatLon) offset.getPosition());
             if (odist < 1e-2) odist = 0.0;
             sb.append(tr("An imagery offset of {0}", ImageryOffsetTools.formatDistance(odist))).append('\n');
@@ -88 +89 @@
         }
 
-        double dist = ImageryOffsetTools.getMapCenter().greatCircleDistance(offset.getPosition());
+        double dist = ImageryOffsetTools.getMapCenter().greatCircleDistance((ILatLon) offset.getPosition());
         sb.append(dist < 50 ? tr("Determined right here") : tr("Determined {0} away",
                 ImageryOffsetTools.formatDistance(dist)));