Changeset 19446 in josm

Timestamp:

2025-11-13T08:25:40+01:00 (6 weeks ago)

Author:

GerdP

Message:

fix #24485: DataIntegrityProblemException: Primitive cannot be modified in read-only dataset

• create copies of nodes before adding them to a temporary way. This should also fix a memory leak.

Location:

trunk

Files:

• src/org/openstreetmap/josm/tools/Geometry.java (modified) (1 diff)
• test/unit/org/openstreetmap/josm/tools/GeometryTest.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/tools/Geometry.java

@@ -1563 +1563 @@
         for (Pair<Node, Node> nodes : way.getNodePairs(false)) {
             Way tWay = new Way();
-            tWay.addNode(nodes.a);
-            tWay.addNode(nodes.b);
+            tWay.addNode(new Node(nodes.a));
+            tWay.addNode(new Node(nodes.b));
             double distance = getDistance(tWay, primitive);
             if (distance < lowestDistance) {

trunk/test/unit/org/openstreetmap/josm/tools/GeometryTest.java

@@ -37 +37 @@
 import org.openstreetmap.josm.data.osm.RelationMember;
 import org.openstreetmap.josm.data.osm.Way;
+import org.openstreetmap.josm.data.osm.WaySegment;
 import org.openstreetmap.josm.data.osm.search.SearchCompiler;
 import org.openstreetmap.josm.data.projection.Projection;
@@ -636 +637 @@
         assertTrue(new EastNorth(0, 0).equalsEpsilon(centroid3, 1e-9));
     }
+
+    /**
+     * A non-regression test for an issue found in #24485
+     * Test of {@link Geometry#getClosestWaySegment} method when DataSet is read-only.
+     */
+    @Test
+    void testNonRegression24485() {
+        Node node1 = new Node(new LatLon(0, 0));
+        Node node2 = new Node(new LatLon(0, 1));
+        Node node3 = new Node(new LatLon(0.3, 0.5));
+        Node node4 = new Node(new LatLon(0.1, 0));
+        Way way1 = TestUtils.newWay("", node1, node2, node3, node4);
+
+        DataSet ds = new DataSet();
+        way1.getNodes().forEach(n -> ds.addPrimitive(n));
+        ds.addPrimitive(way1);
+        ds.lock();
+        WaySegment closestSegment = Geometry.getClosestWaySegment(way1, new Node(new LatLon(0, 0.5)));
+        ds.unlock();
+        Way closestSegmentWay = closestSegment.toWay();
+        assertTrue(closestSegmentWay.containsNode(node1));
+        assertTrue(closestSegmentWay.containsNode(node2));
+    }
+
 }