Changeset 17824 in josm for trunk/src/org

Timestamp:

2021-04-26T19:31:05+02:00 (4 years ago)

Author:

simon04

Message:

see #20739 - Revert "MapCSS: evaluate class on current and on default layer"

This reverts commit r17745

File:

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

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

@@ -691 +691 @@
         @Override
         public boolean applies(Environment env) {
-            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);
+            Cascade cascade = env.getCascade();
             return cascade != null && (not ^ cascade.containsKey(id));
         }