Changeset 14518 in josm for trunk

Timestamp:

2018-12-07T12:25:31+01:00 (6 years ago)

Author:

GerdP

Message:

fix #17081 correction and unit test

Location:

trunk

Files:

• src/org/openstreetmap/josm/data/osm/TagCollection.java (modified) (2 diffs)
• test/unit/org/openstreetmap/josm/data/osm/TagCollectionTest.java (modified) (1 diff)

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

@@ -123 +123 @@
         if (primitives == null || primitives.isEmpty()) return tags;
         // initialize with the first
-        //
         tags.add(TagCollection.from(primitives.iterator().next()));
 
@@ -132 +131 @@
                 continue;
             }
-            tags.add(tags.intersect(TagCollection.from(primitive)));
+            tags = tags.intersect(TagCollection.from(primitive));
+            if (tags.isEmpty())
+                break;
         }
         return tags;

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

@@ -706 +706 @@
         assertEquals("0", f.getSummedValues("k"));
     }
+
+    /**
+     * Test method for {@link TagCollection#commonToAllPrimitives(Collection)}.
+     */
+    @Test
+    public void testCommonToAllPrimitives() {
+        Tagged t1 = new Node();
+        t1.put("k1", "10");
+        t1.put("k2", "20");
+        Tagged t2 = new Node();
+        t2.put("k2", "20");
+        TagCollection c = TagCollection.commonToAllPrimitives(Arrays.asList(t1, t2));
+        assertEquals(1, c.size());
+        assertFalse(c.hasValuesFor("k1"));
+        assertTrue(c.hasValuesFor("k2"));
+        assertEquals(1, c.getValues("k2").size());
+        assertEquals("20", c.getValues("k2").iterator().next());
+    }
 }