Changeset 17612 in josm for trunk

Timestamp:

2021-03-21T08:56:56+01:00 (4 years ago)

Author:

simon04

Message:

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

Reduce the precision used by the duplicate node test by one decimal digit

The advanced preference value validator.duplicatenodes.precision now defaults to 1e-6 (previously 1e-7).

Location:

trunk

Files:

• src/org/openstreetmap/josm/data/validation/tests/DuplicateNode.java (modified) (1 diff)
• test/unit/org/openstreetmap/josm/data/validation/tests/DuplicateNodeTest.java (modified) (1 diff)

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

@@ -41 +41 @@
 public class DuplicateNode extends Test {
 
-    private static class NodeHash implements Hash<Object, Object> {
-
-        private final double precision = Config.getPref().getDouble("validator.duplicatenodes.precision", 0.);
-
-        private LatLon roundCoord(LatLon coor) {
+    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);
+
+        /**
+         * @see LatLon#roundToOsmPrecision
+         */
+        protected 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
                     );
         }

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

@@ -178 +178 @@
 
     /**
+     * Test of "Duplicate node" validation test - server precision.
+     *
+     * Non-regression test for ticket #18074.
+     */
+    @Test
+    void testServerPrecision() {
+        DuplicateNode.NodeHash nodeHash = new DuplicateNode.NodeHash();
+        DataSet ds = new DataSet();
+
+        Node a = new Node(new LatLon(-23.51108285, -46.489264256));
+        Node b = new Node(new LatLon(-23.511082861, -46.489264251));
+        ds.addPrimitive(a);
+        ds.addPrimitive(b);
+
+        a.put("foo", "bar");
+        b.put("bar", "foo");
+
+        // on OSM server, both are: lat = -23.5110829 lon = -46.4892643
+        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()));
+        performTest(DuplicateNode.DUPLICATE_NODE, ds, false);
+    }
+
+    /**
      * Test of "Duplicate node" validation test - mixed case.
      */