Changeset 18489 in josm for trunk

Timestamp:

2022-06-13T19:38:59+02:00 (2 years ago)

Author:

Don-vip

Message:

see #22104 - fix deprecation warnings

Location:

trunk/src/org/openstreetmap/josm/gui

Files:

• conflict/pair/properties/PropertiesMergeModel.java (modified) (2 diffs)
• mappaint/mapcss/Functions.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java

@@ -14 +14 @@
 import org.openstreetmap.josm.command.conflict.DeletedStateConflictResolveCommand;
 import org.openstreetmap.josm.data.conflict.Conflict;
+import org.openstreetmap.josm.data.coor.ILatLon;
 import org.openstreetmap.josm.data.coor.LatLon;
 import org.openstreetmap.josm.data.osm.Node;
@@ -288 +289 @@
         if (myCoords != null && theirCoords == null) return true;
         if (myCoords == null && theirCoords == null) return false;
-        return myCoords != null && !myCoords.equalsEpsilon(theirCoords);
+        return myCoords != null && !myCoords.equalsEpsilon(theirCoords, ILatLon.MAX_SERVER_PRECISION);
     }
 

trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/Functions.java

@@ -15 +15 @@
 import java.util.zip.CRC32;
 
+import org.openstreetmap.josm.data.coor.ILatLon;
 import org.openstreetmap.josm.data.coor.LatLon;
 import org.openstreetmap.josm.data.gpx.GpxDistance;
@@ -1207 +1208 @@
      */
     public static boolean at(Environment env, double lat, double lon) {
-        return new LatLon(lat, lon).equalsEpsilon(center(env));
+        return new LatLon(lat, lon).equalsEpsilon(center(env), ILatLon.MAX_SERVER_PRECISION);
     }