Changeset 3817 in josm for trunk/src/org/openstreetmap/josm/gui/mappaint/StyleSource.java

Timestamp:

2011-01-25T18:11:54+01:00 (13 years ago)

Author:

bastiK

Message:

make turn restriction rendering work again

File:

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

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

@@ -67 +67 @@
     }
 
-    public ElemStyle get(OsmPrimitive primitive, boolean noclosed, AreaElemStyle area, LineElemStyle line) {
+    /**
+     * @param closed The primitive is a closed way or we pretend it is closed.
+     *  This is useful for multipolygon relations and outer ways of untagged
+     *  multipolygon relations.
+     */
+    public ElemStyle get(OsmPrimitive primitive, boolean closed, AreaElemStyle area, LineElemStyle line) {
         String lineIdx = null;
         HashMap<String, LineElemStyle> overlayMap = new HashMap<String, LineElemStyle>();
@@ -75 +80 @@
             LineElemStyle styleLine;
             String idx = "n" + key + "=" + val;
-            if ((styleArea = areas.get(idx)) != null && (area == null || styleArea.priority >= area.priority) && (!noclosed || !styleArea.closed)) {
+            if ((styleArea = areas.get(idx)) != null && (area == null || styleArea.priority >= area.priority) && (closed || !styleArea.closed)) {
                 area = styleArea;
             }
@@ -86 +91 @@
             }
             idx = "b" + key + "=" + OsmUtils.getNamedOsmBoolean(val);
-            if ((styleArea = areas.get(idx)) != null && (area == null || styleArea.priority >= area.priority) && (!noclosed || !styleArea.closed)) {
+            if ((styleArea = areas.get(idx)) != null && (area == null || styleArea.priority >= area.priority) && (closed || !styleArea.closed)) {
                 area = styleArea;
             }
@@ -97 +102 @@
             }
             idx = "x" + key;
-            if ((styleArea = areas.get(idx)) != null && (area == null || styleArea.priority >= area.priority) && (!noclosed || !styleArea.closed)) {
+            if ((styleArea = areas.get(idx)) != null && (area == null || styleArea.priority >= area.priority) && (closed || !styleArea.closed)) {
                 area = styleArea;
             }
@@ -109 +114 @@
         }
         for (AreaElemStyle s : areasList) {
-            if ((area == null || s.priority >= area.priority) && (!noclosed || !s.closed) && s.check(primitive)) {
+            if ((area == null || s.priority >= area.priority) && (closed || !s.closed) && s.check(primitive)) {
                 area = s;
             }