Changeset 17586 in josm

Timestamp:

2021-03-18T01:49:08+01:00 (5 years ago)

Author:

simon04

Message:

see #20613 - Use Tagged.keys() and Tagged.visitKeys()

Location:

trunk

Files:

• src/org/openstreetmap/josm/actions/JoinAreasAction.java (modified) (2 diffs)
• src/org/openstreetmap/josm/gui/layer/gpx/ConvertFromGpxLayerAction.java (modified) (2 diffs)
• test/unit/org/openstreetmap/josm/data/osm/OsmUtilsTest.java (modified) (1 diff)
• test/unit/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSParserTest.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/actions/JoinAreasAction.java

@@ -35 +35 @@
 import org.openstreetmap.josm.data.UndoRedoHandler;
 import org.openstreetmap.josm.data.coor.EastNorth;
+import org.openstreetmap.josm.data.osm.AbstractPrimitive;
 import org.openstreetmap.josm.data.osm.DataSet;
 import org.openstreetmap.josm.data.osm.Node;
@@ -1713 +1714 @@
     private void stripTags(Collection<Way> ways) {
         Map<String, String> tagsToRemove = new HashMap<>();
-        ways.stream().flatMap(w -> w.keySet().stream()).forEach(k -> tagsToRemove.put(k, null));
+        ways.stream().flatMap(AbstractPrimitive::keys).forEach(k -> tagsToRemove.put(k, null));
         if (tagsToRemove.isEmpty())
             return;

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

@@ -174 +174 @@
     public DataSet filterDataSet(DataSet ds, List<String> listPos) {
         for (OsmPrimitive p : ds.getPrimitives(p -> p instanceof Node || p instanceof Way)) {
-            for (String key : p.keySet()) {
+            p.visitKeys((primitive, key, value) -> {
                 String listkey;
                 if (listPos != null && key.startsWith(GpxConstants.GPX_PREFIX)) {
@@ -182 +182 @@
                 }
                 if (listPos == null || !listPos.contains(listkey)) {
-                   p.put(key, null);
-                }
-            }
+                    p.put(key, null);
+                }
+            });
         }
         return ds;

trunk/test/unit/org/openstreetmap/josm/data/osm/OsmUtilsTest.java

@@ -36 +36 @@
         final OsmPrimitive p = OsmUtils.createPrimitive("way name=Foo railway=rail");
         assertTrue(p instanceof Way);
-        assertEquals(2, p.keySet().size());
+        assertEquals(2, p.getKeys().size());
         assertEquals("Foo", p.get("name"));
         assertEquals("rail", p.get("railway"));

trunk/test/unit/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSParserTest.java

@@ -280 +280 @@
 
         tagRegex(way1, "way[ref][count(tag_regex(\"ref\")) > 1] {}", new Boolean[] {true, false, false, true, false});
-        way1.keySet().forEach(key -> way1.put(key, null));
+        way1.visitKeys((primitive, key, value) -> way1.put(key, null));
         way1.put("old_ref", "A1");
         way1.put("ref", "A2");