Ticket #6122: mapcss-concat.patch

src/org/openstreetmap/josm/gui/mappaint/LabelCompositionStrategy.java

@@ -108 +108 @@
         public String compose(OsmPrimitive primitive) {
             if (defaultLabelTag == null) return null;
             if (primitive == null) return null;
-            return primitive.get(defaultLabelTag);
+
+            String res = new String("");
+            if (defaultLabelTag.indexOf(' ') >= 0) {
+                String tags[] = defaultLabelTag.split(" ");
+                for (String tag : tags) {
+                    res += (primitive.get(tag)==null) ? tag : primitive.get(tag);
+                    res += ' ';
+                }
+            } else {
+                res = primitive.get(defaultLabelTag);
+            }
+            return res;
         }
 
         public String getDefaultLabelTag() {

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

@@ -72 +72 @@
             public Float minus(float... args) {
                 if (args.length == 0)
                     return 0f;
-                if (args.length == 1) { // unary minus
+                if (args.length == 1)
                     return -args[0];
-                }
                 float res = args[0];
                 for (int i=1; i<args.length; ++i) {
                     res -= args[i];
@@ -167 +166 @@
                 return env.osm.hasKey(key);
             }
 
+            public String concat(Object... args) {
+                String res = new String("");
+                for (Object f : args) {
+                    res += f.toString();
+                }
+                return res;
+            }
+
             public boolean not(boolean b) {
                 return !b;
             }
@@ -285 +292 @@
                 throw  new RuntimeException(ex);
             }
             for (Method m : allMethods) {
-                if (!m.getName().equals(name))
+                if (!m.getName().equals(name)) {
                     continue;
+                }
                 Class<?>[] expectedParameterTypes = m.getParameterTypes();
                 Object[] convertedArgs = new Object[expectedParameterTypes.length];
 
@@ -303 +311 @@
                     }
                     convertedArgs[0] = arrayArg;
                 } else {
-                    if (args.size() != expectedParameterTypes.length)
+                    if (args.size() != expectedParameterTypes.length) {
                         continue;
+                    }
                     for (int i=0; i<args.size(); ++i) {
                         convertedArgs[i] = Cascade.convertTo(args.get(i).evaluate(env), expectedParameterTypes[i]);
                         if (convertedArgs[i] == null)