Ticket #18085: 18085.patch

src/org/openstreetmap/josm/gui/mappaint/mapcss/Functions.java

@@ -571 +571 @@
     }
 
     /**
+     * Get unique values
+     * @param values A list of values that may have duplicates
+     * @return A list with no duplicates
+     * @since xxx
+     */
+    public static List<String> uniq(String... values) {
+        return uniq_list(Arrays.asList(values));
+    }
+
+    /**
+     * Get unique values
+     * @param values A list of values that may have duplicates
+     * @return A list with no duplicates
+     * @since xxx
+     */
+    public static List<String> uniq_list(List<String> values) {
+        return values.stream().distinct().collect(Collectors.toList());
+    }
+
+    /**
      * Returns the role of current object in parent relation, or role of child if current object is a relation.
      * @param env the environment
      * @return role of current object in parent relation, or role of child if current object is a relation

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

@@ -465 +465 @@
     }
 
     @Test
+    public void testUniqueValues() throws Exception {
+        assertEquals(Arrays.asList(new String[] {"alpha", "beta"}),
+                Functions.uniq("alpha", "alpha", "alpha", "beta"));
+        assertEquals(Arrays.asList(new String[] {"one", "two", "three"}),
+                Functions.uniq_list(Arrays.asList(new String[] {"one", "one", "two", "two", "two", "three"})));
+    }
+
+    @Test
     public void testCountRoles() throws Exception {
         DataSet ds = new DataSet();
         Way way1 = TestUtils.newWay("highway=residential name=1",