Changeset 15323 in josm

Timestamp:

2019-08-27T00:41:35+02:00 (5 years ago)

Author:

Don-vip

Message:

fix #18085 - Add method to get unique values in mapcss (patch by taylor.smock)

Location:

trunk

Files:

• src/org/openstreetmap/josm/gui/mappaint/mapcss/Functions.java (modified) (2 diffs)
• test/unit/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSParserTest.java (modified) (1 diff)

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

@@ -555 +555 @@
      * @since 15279
      */
-    public static List<String> sort(String... sortables) {
+    public static List<String> sort(String... sortables) { // NO_UCD (unused code)
         Arrays.parallelSort(sortables);
         return Arrays.asList(sortables);
@@ -566 +566 @@
      * @since 15279
      */
-    public static List<String> sort_list(List<String> sortables) {
+    public static List<String> sort_list(List<String> sortables) { // NO_UCD (unused code)
         Collections.sort(sortables);
         return sortables;
+    }
+
+    /**
+     * Get unique values
+     * @param values A list of values that may have duplicates
+     * @return A list with no duplicates
+     * @since 15323
+     */
+    public static List<String> uniq(String... values) { // NO_UCD (unused code)
+        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 15323
+     */
+    public static List<String> uniq_list(List<String> values) {
+        return values.stream().distinct().collect(Collectors.toList());
     }
 

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

@@ -466 +466 @@
 
     @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();