Changeset 17824 in josm


Ignore:
Timestamp:
2021-04-26T19:31:05+02:00 (3 years ago)
Author:
simon04
Message:

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

This reverts commit r17745

Location:
trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed

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

    r17799 r17824  
    691691        @Override
    692692        public boolean applies(Environment env) {
    693             return Environment.DEFAULT_LAYER.equals(env.layer)
    694                     ? applies(env, env.layer)
    695                     : applies(env, env.layer) || applies(env, Environment.DEFAULT_LAYER);
    696         }
    697 
    698         private boolean applies(Environment env, String layer) {
    699             Cascade cascade = env.getCascade(layer);
     693            Cascade cascade = env.getCascade();
    700694            return cascade != null && (not ^ cascade.containsKey(id));
    701695        }

  • trunk/test/unit/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSParserTest.java

    r17800 r17824  
    132132    @ValueSource(strings = {
    133133            "way[railway][bridge=yes]::bridges { z-index: 1; casting-width: 4; casing-color: #797979 }",
    134             "way[bridge=yes]::bridges { set .bridge }\nway[railway].bridge::bridges { z-index: 1; casting-width: 4; casing-color: #797979 }",
    135             "way[bridge=yes] { set .bridge }\nway[railway].bridge::bridges { z-index: 1; casting-width: 4; casing-color: #797979 }"
     134            "way[bridge=yes]::bridges { set .bridge }\nway[railway].bridge::bridges { z-index: 1; casting-width: 4; casing-color: #797979 }"
    136135    })
    137136    void testLayerMatching(String cssString) {
Note: See TracChangeset for help on using the changeset viewer.