Changeset 18076 in josm for trunk

Timestamp:

2021-07-19T22:55:31+02:00 (3 years ago)

Author:

Don-vip

Message:

see #2760 - revert r18075 - causes nodes to remain after deletion of converted ways

Location:

trunk/src/org/openstreetmap/josm

Files:

• data/osm/AbstractPrimitive.java (modified) (2 diffs)
• gui/layer/gpx/ConvertToDataLayerAction.java (modified) (2 diffs)

trunk/src/org/openstreetmap/josm/data/osm/AbstractPrimitive.java

@@ -23 +23 @@
 import java.util.stream.Stream;
 
+import org.openstreetmap.josm.data.gpx.GpxConstants;
 import org.openstreetmap.josm.spi.preferences.Config;
 import org.openstreetmap.josm.tools.Utils;
@@ -798 +799 @@
             List<String> l = new LinkedList<>(Arrays.asList(
                 "source", "source_ref", "source:", "comment",
-                "watch", "watch:", "description", "attribution"));
+                "watch", "watch:", "description", "attribution", GpxConstants.GPX_PREFIX));
             l.addAll(getDiscardableKeys());
             l.addAll(getWorkInProgressKeys());

trunk/src/org/openstreetmap/josm/gui/layer/gpx/ConvertToDataLayerAction.java

@@ -17 +17 @@
 
 import org.openstreetmap.josm.actions.SimplifyWayAction;
-import org.openstreetmap.josm.data.gpx.GpxConstants;
-import org.openstreetmap.josm.data.osm.AbstractPrimitive;
 import org.openstreetmap.josm.data.osm.DataSet;
 import org.openstreetmap.josm.data.osm.Way;
@@ -72 +70 @@
             double err = SimplifyWayAction.askSimplifyWays(ways, tr("Would you like to simplify the ways in the converted layer?"), true);
             if (err > 0) {
-                try {
-                    // Consider the GPX tags uninteresting temporarily, to make sure it doesn't prevent simplification to remove nodes
-                    AbstractPrimitive.getUninterestingKeys().add(GpxConstants.GPX_PREFIX);
-                    SimplifyWayAction.simplifyWays(ways, err);
-                } finally {
-                    AbstractPrimitive.getUninterestingKeys().remove(GpxConstants.GPX_PREFIX);
-                }
+                SimplifyWayAction.simplifyWays(ways, err);
             }
             final OsmDataLayer osmLayer = new OsmDataLayer(ds, tr("Converted from: {0}", layer.getName()), null);