Changeset 3307 in josm for trunk/src

Timestamp:

2010-06-04T09:08:56+02:00 (14 years ago)

Author:

stoecker

Message:

see #5078 - untagged ways are drawn with multipolygon style again, removed broken option to skip style cache

File:

• trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java (modified) (10 diffs)

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

@@ -55 +55 @@
     private double circum;
     private double dist;
-    private boolean useStyleCache;
     private static int paintid = 0;
     private EastNorth minEN;
@@ -74 +73 @@
     }
 
-    public ElemStyle getPrimitiveStyle(OsmPrimitive osm) {
-        if(!useStyleCache)
-            return ((styles != null) ? styles.get(osm) : null);
-
-        if(osm.mappaintStyle == null && styles != null) {
-            osm.mappaintStyle = styles.get(osm);
-            if(osm instanceof Way) {
-                ((Way)osm).isMappaintArea = styles.isArea(osm);
-            }
-        }
-
-        if (osm.mappaintStyle == null && osm instanceof Node) {
-            osm.mappaintStyle = SimpleNodeElemStyle.INSTANCE;
-        }
-
-        if (osm.mappaintStyle == null && osm instanceof Way) {
-            osm.mappaintStyle = LineElemStyle.UNTAGGED_WAY;
-        }
-
+    public ElemStyle getPrimitiveStyle(OsmPrimitive osm, boolean nodefault) {
+        if(osm.mappaintStyle == null)
+        {
+            if(styles != null) {
+                osm.mappaintStyle = styles.get(osm);
+                if(osm instanceof Way) {
+                    ((Way)osm).isMappaintArea = styles.isArea(osm);
+                }
+            }
+            if (osm.mappaintStyle == null) {
+                if(osm instanceof Node)
+                    osm.mappaintStyle = SimpleNodeElemStyle.INSTANCE;
+                else if (osm instanceof Way)
+                    osm.mappaintStyle = LineElemStyle.UNTAGGED_WAY;
+            }
+        }
+        if(nodefault && osm.mappaintStyle == LineElemStyle.UNTAGGED_WAY)
+            return null;
         return osm.mappaintStyle;
     }
 
     public IconElemStyle getPrimitiveNodeStyle(OsmPrimitive osm) {
-        if(!useStyleCache)
-            return (styles != null) ? styles.getIcon(osm) : null;
-
-            if(osm.mappaintStyle == null && styles != null) {
-                osm.mappaintStyle = styles.getIcon(osm);
-            }
-
-            return (IconElemStyle)osm.mappaintStyle;
+        if(osm.mappaintStyle == null && styles != null)
+            osm.mappaintStyle = styles.getIcon(osm);
+
+        return (IconElemStyle)osm.mappaintStyle;
     }
 
     public boolean isPrimitiveArea(Way osm) {
-        if(!useStyleCache)
-            return styles.isArea(osm);
-
         if(osm.mappaintStyle == null && styles != null) {
             osm.mappaintStyle = styles.get(osm);
@@ -126 +117 @@
             return;
 
-        ElemStyle nodeStyle = getPrimitiveStyle(n);
+        ElemStyle nodeStyle = getPrimitiveStyle(n, false);
 
         if (isZoomOk(nodeStyle)) {
@@ -169 +160 @@
             return;
 
-        ElemStyle wayStyle = getPrimitiveStyle(w);
+        ElemStyle wayStyle = getPrimitiveStyle(w, false);
 
         if(!isZoomOk(wayStyle))
@@ -237 +228 @@
                 if (m.isWay() && m.getMember().isDrawable())
                 {
-                    drawSelectedMember(m.getMember(), styles != null ? getPrimitiveStyle(m.getMember())
+                    drawSelectedMember(m.getMember(), styles != null ? getPrimitiveStyle(m.getMember(), false)
                             : null, true, true);
                 }
@@ -470 +461 @@
         multipolygon.load(r);
 
-        ElemStyle wayStyle = getPrimitiveStyle(r);
+        ElemStyle wayStyle = getPrimitiveStyle(r, false);
 
         // If area style was not found for relation then use style of ways
@@ -508 +499 @@
             for (Way wInner : multipolygon.getInnerWays())
             {
-                ElemStyle innerStyle = getPrimitiveStyle(wInner);
+                ElemStyle innerStyle = getPrimitiveStyle(wInner, true);
                 if(innerStyle == null)
                 {
@@ -539 +530 @@
             for (Way wOuter : multipolygon.getOuterWays())
             {
-                ElemStyle outerStyle = getPrimitiveStyle(wOuter);
+                ElemStyle outerStyle = getPrimitiveStyle(wOuter, true);
                 if(outerStyle == null)
                 {
@@ -648 +639 @@
         ++paintid;
 
-        useStyleCache = Main.pref.getBoolean("mappaint.cache", true);
         int fillAreas = Main.pref.getInteger("mappaint.fillareas", 10000000);
         LatLon ll1 = nc.getLatLon(0, 0);
@@ -734 +724 @@
                         for (RelationMember m : r.getMembers()) {
                             if (m.isNode() && m.getMember().isDrawable()) {
-                                drawSelectedMember(m.getMember(), styles != null ? getPrimitiveStyle(m.getMember()) : null, true, true);
+                                drawSelectedMember(m.getMember(), styles != null ? getPrimitiveStyle(m.getMember(), false) : null, true, true);
                             }
                         }