Changeset 17113 in josm

Timestamp:

2020-10-08T16:18:33+02:00 (4 years ago)

Author:

GerdP

Message:

fix #19895: TagChecker cannot cope with read-only datasets.
Use different method to create clones for special case where we test agains deprecated.mapcss rules

File:

• trunk/src/org/openstreetmap/josm/data/validation/tests/TagChecker.java (modified) (4 diffs)

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

@@ -39 +39 @@
 import org.openstreetmap.josm.command.SequenceCommand;
 import org.openstreetmap.josm.data.osm.AbstractPrimitive;
-import org.openstreetmap.josm.data.osm.Node;
+import org.openstreetmap.josm.data.osm.DataSet;
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.data.osm.OsmUtils;
@@ -46 +46 @@
 import org.openstreetmap.josm.data.osm.TagMap;
 import org.openstreetmap.josm.data.osm.Tagged;
-import org.openstreetmap.josm.data.osm.Way;
+import org.openstreetmap.josm.data.osm.visitor.MergeSourceBuildingVisitor;
 import org.openstreetmap.josm.data.preferences.sources.ValidatorPrefHelper;
 import org.openstreetmap.josm.data.validation.OsmValidator;
@@ -972 +972 @@
 
         int unchangedDeprecated = countDeprecated(p);
+
+        // see #19895: create deep clone. This complex method works even with locked files
+        MergeSourceBuildingVisitor builder = new MergeSourceBuildingVisitor(p.getDataSet());
+        p.accept(builder);
+        DataSet clonedDs = builder.build();
+        OsmPrimitive clone = clonedDs.getPrimitiveById(p.getPrimitiveId());
+
         Iterator<String> iter = fixVals.iterator();
-        OsmPrimitive clone;
-        if (p instanceof Node) {
-            clone = new Node((Node) p);
-        } else if (p instanceof Way) {
-            clone = new Way((Way) p);
-        } else if (p instanceof Relation) {
-            clone = new Relation((Relation) p);
-        } else {
-            return; // should not happen
-        }
         while (iter.hasNext()) {
             clone.put(key, iter.next());
@@ -989 +986 @@
         }
     }
+
 
     private int countDeprecated(OsmPrimitive p) {