Changeset 17745 in josm for trunk/src

Timestamp:

2021-04-11T12:35:17+02:00 (4 years ago)

Author:

simon04

Message:

fix #20739 - MapCSS: evaluate class on current and on default layer

File:

• trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/ConditionFactory.java (modified) (1 diff)

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

@@ -690 +690 @@
         @Override
         public boolean applies(Environment env) {
-            Cascade cascade = env.getCascade();
+            return Environment.DEFAULT_LAYER.equals(env.layer)
+                    ? applies(env, env.layer)
+                    : applies(env, env.layer) || applies(env, Environment.DEFAULT_LAYER);
+        }
+
+        private boolean applies(Environment env, String layer) {
+            Cascade cascade = env.getCascade(layer);
             return cascade != null && (not ^ cascade.containsKey(id));
         }