Changeset 5144 in josm for trunk/src/org

Timestamp:

2012-03-31T19:10:28+02:00 (13 years ago)

Author:

Don-vip

Message:

fix #7338 - closed ways with area=no rendered as area

File:

• trunk/src/org/openstreetmap/josm/gui/mappaint/xml/XmlStyleSource.java (modified) (5 diffs)

trunk/src/org/openstreetmap/josm/gui/mappaint/xml/XmlStyleSource.java

@@ -166 +166 @@
         String lineIdx = null;
         HashMap<String, LinemodPrototype> overlayMap = new HashMap<String, LinemodPrototype>();
+        boolean isNotArea = OsmUtils.isFalse(primitive.get("area"));
         for (String key : primitive.keySet()) {
             String val = primitive.get(key);
@@ -172 +173 @@
             LinemodPrototype styleLinemod;
             String idx = "n" + key + "=" + val;
-            if ((styleArea = areas.get(idx)) != null && (closed || !styleArea.closed)) {
+            if ((styleArea = areas.get(idx)) != null && (closed || !styleArea.closed) && !isNotArea) {
                 p.area = update(p.area, styleArea, scale, mc);
             }
@@ -187 +188 @@
             }
             idx = "b" + key + "=" + OsmUtils.getNamedOsmBoolean(val);
-            if ((styleArea = areas.get(idx)) != null && (closed || !styleArea.closed)) {
+            if ((styleArea = areas.get(idx)) != null && (closed || !styleArea.closed) && !isNotArea) {
                 p.area = update(p.area, styleArea, scale, mc);
             }
@@ -202 +203 @@
             }
             idx = "x" + key;
-            if ((styleArea = areas.get(idx)) != null && (closed || !styleArea.closed)) {
+            if ((styleArea = areas.get(idx)) != null && (closed || !styleArea.closed) && !isNotArea) {
                 p.area = update(p.area, styleArea, scale, mc);
             }
@@ -218 +219 @@
         }
         for (AreaPrototype s : areasList) {
-            if ((closed || !s.closed) && s.check(primitive)) {
+            if ((closed || !s.closed) && !isNotArea && s.check(primitive)) {
                 p.area = update(p.area, s, scale, mc);
             }