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

Timestamp:

2022-06-13T19:51:10+02:00 (3 years ago)

Author:

Don-vip

Message:

see #22104 - fix deprecation warnings

Location:

applications/editors/josm/plugins/terracer

Files:

• build.xml (modified) (1 diff)
• src/org/openstreetmap/josm/plugins/terracer/TerracerAction.java (modified) (3 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="18207"/>
+    <property name="plugin.main.version" value="18464"/>
     <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

@@ -32 +32 @@
 import org.openstreetmap.josm.command.SequenceCommand;
 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;
@@ -217 +219 @@
             // Don't open the dialog
             try {
-                terraceBuilding(outline, init, street, associatedStreet, 0, null, null, 0, 
+                terraceBuilding(outline, init, street, associatedStreet, 0, null, null, 0,
                         housenumbers, streetname, associatedStreet != null, false, "yes");
             } catch (UserCancelException ex) {
@@ -778 +780 @@
     private Node interpolateNode(Node a, Node b, double f) {
         Node n = new Node(a.getEastNorth().interpolate(b.getEastNorth(), f));
-        if (n.getCoor().equalsEpsilon(a.getCoor()))
+        LatLon latLon = n.getCoor();
+                if (latLon.equalsEpsilon(a.getCoor(), ILatLon.MAX_SERVER_PRECISION))
             return a;
-        if (n.getCoor().equalsEpsilon(b.getCoor()))
+        if (latLon.equalsEpsilon(b.getCoor(), ILatLon.MAX_SERVER_PRECISION))
             return b;
         return n;