Changeset 17737 in josm

Timestamp:

2021-04-11T09:42:30+02:00 (4 years ago)

Author:

simon04

Message:

see #20732 - SyncEditorLayerIndex: compare coordinates with epsilon

File:

• trunk/scripts/SyncEditorLayerIndex.java (modified) (4 diffs)

trunk/scripts/SyncEditorLayerIndex.java

@@ -1037 +1037 @@
                                 Coordinate ept = ep.get(nump);
                                 Coordinate jpt = jp.get(nump);
-                                if (Math.abs(ept.getLat()-jpt.getLat()) > 0.00001 || Math.abs(ept.getLon()-jpt.getLon()) > 0.00001)
+                                if (differentCoordinate(ept.getLat(), jpt.getLat()) || differentCoordinate(ept.getLon(), jpt.getLon()))
                                     err = true;
                             }
@@ -1057 +1057 @@
                                 Coordinate ept = ep.get(nump);
                                 Coordinate jpt = jp.get(nump);
-                                if (Math.abs(ept.getLat()-jpt.getLat()) > 0.00001 || Math.abs(ept.getLon()-jpt.getLon()) > 0.00001) {
+                                if (differentCoordinate(ept.getLat(), jpt.getLat()) || differentCoordinate(ept.getLon(), jpt.getLon())) {
                                     String numtxt = Integer.toString(enums+1);
                                     if (enums != jnums) {
@@ -1091 +1091 @@
             }
         }
+    }
+
+    private boolean differentCoordinate(double v1, double v2) {
+        double epsilon = 0.00001;
+        return Math.abs(v1 - v2) > epsilon;
     }
 
@@ -1290 +1295 @@
                 }
                 ImageryBounds b = j.getBounds();
-                if (b.getMinLat() != minlat || b.getMinLon() != minlon || b.getMaxLat() != maxlat || b.getMaxLon() != maxlon) {
+                if (differentCoordinate(b.getMinLat(), minlat)
+                        || differentCoordinate(b.getMinLon(), minlon)
+                        || differentCoordinate(b.getMaxLat(), maxlat)
+                        || differentCoordinate(b.getMaxLon(), maxlon)) {
                     myprintln("* Bounds do not match shape (is "+b.getMinLat()+","+b.getMinLon()+","+b.getMaxLat()+","+b.getMaxLon()
                         + ", calculated <bounds min-lat='"+minlat+"' min-lon='"+minlon+"' max-lat='"+maxlat+"' max-lon='"+maxlon+"'>): "