Changeset 7074 in josm for trunk/src/org/openstreetmap

Timestamp:

2014-05-08T00:01:11+02:00 (11 years ago)

Author:

bastiK

Message:

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

File:

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

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

@@ -52 +52 @@
     public final List<MapCSSRule> relationRules = new ArrayList<>();
     public final List<MapCSSRule> multipolygonRules = new ArrayList<>();
+    public final List<MapCSSRule> canvasRules = new ArrayList<>();
     
     private Color backgroundColorOverride;
@@ -86 +87 @@
         relationRules.clear();
         multipolygonRules.clear();
+        canvasRules.clear();
         try (InputStream in = getSourceInputStream()) {
             try {
@@ -144 +146 @@
                     multipolygonRules.add(optRule);
                     break;
+                case "canvas":
+                    canvasRules.add(r);
             }
         }
@@ -235 +239 @@
             if (((Relation) osm).isMultipolygon()) {
                 matchingRules = multipolygonRules;
+            } else if (osm.hasKey("#canvas")) {
+                matchingRules = canvasRules;
             } else {
                 matchingRules = relationRules;