Changeset 12514 in josm for trunk/src/org/openstreetmap/josm/gui/mappaint

Timestamp:

2017-07-26T01:23:23+02:00 (7 years ago)

Author:

Don-vip

Message:

see #15035 - add new at(lat,lon) MapCSS selector function

File:

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

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

@@ -1034 +1034 @@
             return !inside(env, codes);
         }
+
+        /**
+         * Determines if the object centroid lies at given lat/lon coordinates.
+         * @param env the environment
+         * @param lat latitude
+         * @param lon longitude
+         * @return {@code true} if the object centroid lies at given lat/lon coordinates
+         * @since 12514
+         */
+        public static boolean at(Environment env, double lat, double lon) { // NO_UCD (unused code)
+            return new LatLon(lat, lon).equalsEpsilon(center(env));
+        }
     }
 
@@ -1308 +1320 @@
             StringBuilder b = new StringBuilder("ParameterFunction~");
             b.append(m.getName()).append('(');
-            for (int i = 0; i < args.size(); ++i) {
+            for (int i = 0; i < expectedParameterTypes.length; ++i) {
                 if (i > 0) b.append(',');
-                b.append(expectedParameterTypes[i]).append(' ').append(args.get(i));
+                b.append(expectedParameterTypes[i]);
+                if (!needsEnvironment) {
+                    b.append(' ').append(args.get(i));
+                } else if (i > 0) {
+                    b.append(' ').append(args.get(i-1));
+                }
             }
             b.append(')');