Changeset 35629 in osm for applications

Timestamp:

2020-10-29T00:14:23+01:00 (4 years ago)

Author:

simon04

Message:

EditLevel0LAction: support deleting tags

Location:

applications/editors/josm/plugins/comfort0

Files:

• src/net/simon04/comfort0/EditLevel0LAction.java (modified) (2 diffs)
• test/unit/net/simon04/comfort0/EditLevel0LActionTest.java (modified) (1 diff)

applications/editors/josm/plugins/comfort0/src/net/simon04/comfort0/EditLevel0LAction.java

@@ -30 +30 @@
 import org.openstreetmap.josm.data.osm.PrimitiveData;
 import org.openstreetmap.josm.data.osm.RelationData;
+import org.openstreetmap.josm.data.osm.TagMap;
 import org.openstreetmap.josm.data.osm.WayData;
 import org.openstreetmap.josm.gui.MainApplication;
@@ -137 +138 @@
             newInstance.load(fromLevel0L);
 
-            final boolean equalKeys = Objects.equals(newInstance.getKeys(), fromDataSet.getKeys());
-            if (!equalKeys) {
-                final ChangePropertyCommand command = new ChangePropertyCommand(Collections.singleton(fromDataSet), newInstance.getKeys());
+            final TagMap newKeys = newInstance.getKeys();
+            if (!Objects.equals(newKeys, fromDataSet.getKeys())) {
+                fromDataSet.getKeys().keySet().forEach(key ->
+                                newKeys.computeIfAbsent(key, k -> ""));
+                final ChangePropertyCommand command = new ChangePropertyCommand(Collections.singleton(fromDataSet), newKeys);
                 commands.add(command);
             }

applications/editors/josm/plugins/comfort0/test/unit/net/simon04/comfort0/EditLevel0LActionTest.java

@@ -69 +69 @@
         node.put("fixme", "delete me!");
         command = buildChangeCommand(dataSet, ChangePropertyCommand.class);
-        assertThat(command.getTags(), is(new TagMap("name", "Neu Broderstorf", "traffic_sign", "city_limit")));
+        assertThat(command.getTags(), is(new TagMap("name", "Neu Broderstorf", "traffic_sign", "city_limit", "fixme", "")));
         node.remove("fixme");