Changeset 7074 in josm


Ignore:
Timestamp:
2014-05-08T00:01:11+02:00 (6 years ago)
Author:
bastiK
Message:

fixed #9989 - mapcss canvas{default-points: false; default-lines: false;} broken

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/org/openstreetmap/josm/gui/mappaint/mapcss/MapCSSStyleSource.java

    r7064 r7074  
    5252    public final List<MapCSSRule> relationRules = new ArrayList<>();
    5353    public final List<MapCSSRule> multipolygonRules = new ArrayList<>();
     54    public final List<MapCSSRule> canvasRules = new ArrayList<>();
    5455   
    5556    private Color backgroundColorOverride;
     
    8687        relationRules.clear();
    8788        multipolygonRules.clear();
     89        canvasRules.clear();
    8890        try (InputStream in = getSourceInputStream()) {
    8991            try {
     
    144146                    multipolygonRules.add(optRule);
    145147                    break;
     148                case "canvas":
     149                    canvasRules.add(r);
    146150            }
    147151        }
     
    235239            if (((Relation) osm).isMultipolygon()) {
    236240                matchingRules = multipolygonRules;
     241            } else if (osm.hasKey("#canvas")) {
     242                matchingRules = canvasRules;
    237243            } else {
    238244                matchingRules = relationRules;
Note: See TracChangeset for help on using the changeset viewer.