Changeset 17665 in josm for trunk

Timestamp:

2021-03-25T21:32:02+01:00 (4 years ago)

Author:

simon04

Message:

see #18074 - Revert "Duplicate Node: detect errors caused by different rounding in JOSM and on OSM server"

This reverts commit r17624.

Location:

trunk

Files:

• src/org/openstreetmap/josm/data/validation/tests/DuplicateNode.java (modified) (2 diffs)
• test/unit/org/openstreetmap/josm/data/validation/tests/DuplicateNodeTest.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/data/validation/tests/DuplicateNode.java

@@ -43 +43 @@
     protected static class NodeHash implements Hash<Object, Object> {
 
-        /**
-         * Rounding on OSM server and via {@link LatLon#roundToOsmPrecision} sometimes differs in the last digit by 1.
-         * Thus, for the duplicate node test, we reduce the precision by one to find errors before uploading.
-         * @see LatLon#MAX_SERVER_INV_PRECISION
-         */
-        private final double precision =
-                1 / Config.getPref().getDouble("validator.duplicatenodes.precision", LatLon.MAX_SERVER_PRECISION * 10);
+        private final double precision = Config.getPref().getDouble("validator.duplicatenodes.precision", 0.);
 
         /**
@@ -55 +49 @@
          * @see LatLon#roundToOsmPrecision
          */
-        protected LatLon roundCoord(LatLon coor) {
+        private LatLon roundCoord(LatLon coor) {
             return new LatLon(
-                    Math.round(coor.lat() * precision) / precision,
-                    Math.round(coor.lon() * precision) / precision
+                    Math.round(coor.lat() / precision) * precision,
+                    Math.round(coor.lon() / precision) * precision
                     );
         }
 
         @SuppressWarnings("unchecked")
-        private LatLon getLatLon(Object o) {
+        protected LatLon getLatLon(Object o) {
             if (o instanceof Node) {
                 LatLon coor = ((Node) o).getCoor();

trunk/test/unit/org/openstreetmap/josm/data/validation/tests/DuplicateNodeTest.java

@@ -7 +7 @@
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
+import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.RegisterExtension;
@@ -183 +184 @@
      */
     @Test
+    @Disabled("fix #18074") // FIXME, see #18074
     void testServerPrecision() {
         DuplicateNode.NodeHash nodeHash = new DuplicateNode.NodeHash();
@@ -198 +200 @@
         assertEquals(new LatLon(-23.5110828, -46.4892643), a.getCoor().getRoundedToOsmPrecision());
         assertEquals(new LatLon(-23.5110829, -46.4892643), b.getCoor().getRoundedToOsmPrecision());
-        assertEquals(new LatLon(-23.511083, -46.489264), nodeHash.roundCoord(a.getCoor()));
-        assertEquals(new LatLon(-23.511083, -46.489264), nodeHash.roundCoord(b.getCoor()));
+        assertEquals(new LatLon(-23.511083, -46.489264), nodeHash.getLatLon(a));
+        assertEquals(new LatLon(-23.511083, -46.489264), nodeHash.getLatLon(b));
         performTest(DuplicateNode.DUPLICATE_NODE, ds, false);
     }