Changeset 8775 in josm for trunk/src/org/openstreetmap

Timestamp:

2015-09-21T21:45:50+02:00 (9 years ago)

Author:

simon04

Message:

fix #8170 - MapCSS: add functions parent_tags(key) and join_list(sep, list)

The method parent_tags(key) returns all parent's values for key as a list ordered by a natural ordering.
The method join_list(sep, list) joins the elements of list to one string separated by sep.

File:

• trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/ExpressionFactory.java (modified) (4 diffs)

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

@@ -16 +16 @@
 import java.util.Collections;
 import java.util.List;
+import java.util.TreeSet;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
@@ -31 +32 @@
 import org.openstreetmap.josm.gui.util.RotationAngle;
 import org.openstreetmap.josm.io.XmlWriter;
+import org.openstreetmap.josm.tools.AlphanumComparator;
 import org.openstreetmap.josm.tools.ColorHelper;
 import org.openstreetmap.josm.tools.Geometry;
@@ -375 +377 @@
 
         /**
+         * Joins a list of {@code values} into a single string with fields separated by {@code separator}.
+         * @param separator the separator
+         * @param values collection of objects
+         * @return assembled string
+         * @see Utils#join
+         */
+        public static String join_list(final String separator, final List<String> values) {
+            return Utils.join(separator, values);
+        }
+
+        /**
          * Returns the value of the property {@code key}, e.g., {@code prop("width")}.
          * @param env the environment
@@ -444 +457 @@
             }
             return env.parent.get(key);
+        }
+
+        /**
+         * Gets a list of all non-null values of the key {@code key} from the object's parent(s).
+         *
+         * The values are sorted according to {@link AlphanumComparator}.
+         * @param env the environment
+         * @param key the OSM key
+         * @return a list of non-null values of the key {@code key} from the object's parent(s)
+         */
+        public static List<String> parent_tags(final Environment env, String key) {
+            if (env.parent == null) {
+                if (env.osm != null) {
+                    final Collection<String> tags = new TreeSet<>(AlphanumComparator.getInstance());
+                    // we don't have a matched parent, so just search all referrers
+                    for (OsmPrimitive parent : env.osm.getReferrers()) {
+                        String value = parent.get(key);
+                        if (value != null) {
+                            tags.add(value);
+                        }
+                    }
+                    return new ArrayList<>(tags);
+                }
+                return Collections.emptyList();
+            }
+            return Collections.singletonList(env.parent.get(key));
         }