Changeset 1695 in josm for trunk/src

Timestamp:

2009-06-27T00:28:57+02:00 (15 years ago)

Author:

stoecker

Message:

fix #2767 - some area-style-ways are not displayed properly

Location:

trunk/src/org/openstreetmap/josm

Files:

• data/osm/visitor/MapPaintVisitor.java (modified) (3 diffs)
• gui/mappaint/ElemStyles.java (modified) (8 diffs)

trunk/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java

@@ -227 +227 @@
             //if(!profilerOmitDraw)
             //{
-            if (fillAreas > dist && (!areaStyle.closed || w.isClosed()))
+            if (fillAreas > dist)
             {
             //    profilerVisibleAreas++;
@@ -460 +460 @@
                 AreaElemStyle areaStyle = (AreaElemStyle)style;
                 drawWay(way, areaStyle.line, selectedColor, true);
-                if(area && (!areaStyle.closed || way.isClosed()))
+                if(area)
                     drawArea(way, areaselected ? selectedColor : areaStyle.color);
             }
@@ -979 +979 @@
                 {
                     Polygon p = pd.get();
-                    if(isPolygonVisible(p) && (!areaStyle.closed || pd.isClosed()))
+                    if(isPolygonVisible(p))
                     {
                         drawAreaPolygon(p, (pd.way.selected || r.selected) ? selectedColor

trunk/src/org/openstreetmap/josm/gui/mappaint/ElemStyles.java

@@ -11 +11 @@
 import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.data.osm.OsmUtils;
+import org.openstreetmap.josm.data.osm.Way;
 import org.openstreetmap.josm.Main;
 
@@ -54 +55 @@
             return ret;
         }
-        private ElemStyle get(Map<String, String> keys)
+        private ElemStyle get(Map<String, String> keys, boolean noclosed)
         {
             AreaElemStyle retArea = null;
@@ -68 +69 @@
                 LineElemStyle styleLine;
                 String idx = "n" + key + "=" + val;
-                if((styleArea = areas.get(idx)) != null && (retArea == null || styleArea.priority > retArea.priority))
+                if((styleArea = areas.get(idx)) != null && (retArea == null
+                || styleArea.priority > retArea.priority) && (!noclosed || !styleArea.closed))
                     retArea = styleArea;
                 if((styleLine = lines.get(idx)) != null && (retLine == null || styleLine.priority > retLine.priority))
@@ -78 +80 @@
                     over.put(idx, styleLine);
                 idx = "b" + key + "=" + OsmUtils.getNamedOsmBoolean(val);
-                if((styleArea = areas.get(idx)) != null && (retArea == null || styleArea.priority > retArea.priority))
+                if((styleArea = areas.get(idx)) != null && (retArea == null
+                || styleArea.priority > retArea.priority) && (!noclosed || !styleArea.closed))
                     retArea = styleArea;
                 if((styleLine = lines.get(idx)) != null && (retLine == null || styleLine.priority > retLine.priority))
@@ -88 +91 @@
                     over.put(idx, styleLine);
                 idx = "x" + key;
-                if((styleArea = areas.get(idx)) != null && (retArea == null || styleArea.priority > retArea.priority))
+                if((styleArea = areas.get(idx)) != null && (retArea == null
+                || styleArea.priority > retArea.priority) && (!noclosed || !styleArea.closed))
                     retArea = styleArea;
                 if((styleLine = lines.get(idx)) != null && (retLine == null || styleLine.priority > retLine.priority))
@@ -118 +122 @@
         {
             return (osm.keys == null) ? null :
-            ((osm instanceof Node) ? getNode(osm.keys) : get(osm.keys));
+            ((osm instanceof Node) ? getNode(osm.keys) : get(osm.keys,
+            osm instanceof Way && !((Way)osm).isClosed()));
         }
 
@@ -130 +135 @@
             if(o.keys != null && !(o instanceof Node))
             {
+                boolean noclosed = o instanceof Way && !((Way)o).isClosed();
                 Iterator<String> iterator = o.keys.keySet().iterator();
                 while(iterator.hasNext())
@@ -135 +141 @@
                     String key = iterator.next();
                     String val = o.keys.get(key);
-                    if(areas.containsKey("n" + key + "=" + val)
-                    || areas.containsKey("b" + key + "=" + OsmUtils.getNamedOsmBoolean(val))
-                    || areas.containsKey("x" + key))
+                    AreaElemStyle s = areas.get("n" + key + "=" + val);
+                    if(s == null || (s.closed && noclosed))
+                        s = areas.get("b" + key + "=" + OsmUtils.getNamedOsmBoolean(val));
+                    if(s == null || (s.closed && noclosed))
+                        s = areas.get("x" + key);
+                    if(s != null && !(s.closed && noclosed))
                         return true;
                 }