Changeset 1240 in josm for trunk/src/org/openstreetmap/josm/data

Timestamp:

2009-01-11T11:20:44+01:00 (15 years ago)

Author:

stoecker

Message:

cleanup style handling

File:

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

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

@@ -47 +47 @@
     protected Stroke currentStroke = null;
     protected Font orderFont;
-    protected ElemStyles styles;
+    protected ElemStyles.StyleSet styles;
     protected double circum;
     protected String regionalNameOrder[];
@@ -78 +78 @@
         // check, if the node is visible at all
         Point p = nc.getPoint(n.eastNorth);
-        if ((p.x < 0) || (p.y < 0) || (p.x > nc.getWidth()) || (p.y > nc.getHeight())) return;
-
-        IconElemStyle nodeStyle = (IconElemStyle)styles.get(n);
+        if ((!selectedCall && n.selected) || (p.x < 0) || (p.y < 0)
+        || (p.x > nc.getWidth()) || (p.y > nc.getHeight())) return;
+
+        IconElemStyle nodeStyle = styles != null ? (IconElemStyle)styles.get(n) : null;
         if (nodeStyle != null && isZoomOk(nodeStyle))
             drawNode(n, nodeStyle.icon, nodeStyle.annotate, n.selected);
@@ -96 +97 @@
      */
     public void visit(Way w) {
-        if(w.nodes.size() < 2)
+        if(w.nodes.size() < 2 && (!selectedCall && w.selected))
             return;
 
@@ -104 +105 @@
             return;
 
-        ElemStyle wayStyle = styles.get(w);
+        ElemStyle wayStyle = styles != null ? styles.get(w) : null;
 
         if(!isZoomOk(wayStyle))
@@ -322 +323 @@
                 /* nodes drawn on second call */
                 if(!(m.member instanceof Node))
-                    drawSelected(m.member, styles.get(m.member), true, true);
+                    drawSelected(m.member, styles != null ? styles.get(m.member)
+                    : null, true, true);
                 alreadyDrawn.add(m.member);
             }
@@ -368 +370 @@
                     && m.member instanceof Node)
                     {
-                        drawSelected(m.member, styles.get(m.member), true, true);
+                        drawSelected(m.member, styles != null ? styles.get(m.member) : null, true, true);
                         alreadyDrawn.add(m.member);
                     }
@@ -420 +422 @@
                             outer.add(w);
                         else if(r.selected)
-                            drawSelected(m.member, styles.get(m.member), true, true);
+                            drawSelected(m.member, styles != null ? styles.get(m.member) : null, true, true);
                     }
                 }
@@ -432 +434 @@
         }
 
-        ElemStyle wayStyle = styles.get(r);
+        ElemStyle wayStyle = styles != null ? styles.get(r) : null;
         /* find one wayStyle, prefer the style from Relation or take the first
         one of outer rings */
-        if(wayStyle == null || !(wayStyle instanceof AreaElemStyle))
+        if(styles != null && (wayStyle == null || !(wayStyle instanceof AreaElemStyle)))
         {
             for (Way w : outer)
@@ -779 +781 @@
     }
 
-    // NW 111106 Overridden from SimplePaintVisitor in josm-1.4-nw1
     // Shows areas before non-areas
     public void visitAll(DataSet data, Boolean virtual) {
@@ -798 +799 @@
         fillAlpha = Math.min(255, Math.max(0, Integer.valueOf(Main.pref.getInteger("mappaint.fillalpha", 50))));
         circum = Main.map.mapView.getScale()*100*Main.proj.scaleFactor()*40041455; // circumference of the earth in meter
-        styles = MapPaintStyles.getStyles();
+        styles = MapPaintStyles.getStyles().getStyleSet();
         drawMultipolygon = Main.pref.getBoolean("mappaint.multipolygon",false);
         orderFont = new Font(Main.pref.get("mappaint.font","Helvetica"), Font.PLAIN, Main.pref.getInteger("mappaint.fontsize", 8));
@@ -808 +809 @@
         selectedCall = false;
 
-        // update the style name, just in case the user changed it in the meantime
-        styles.updateStyleName();
-
         if(profiler)
         {
@@ -817 +815 @@
         }
 
-        if (fillAreas && styles.hasAreas()) {
+        if (fillAreas && styles != null && styles.hasAreas()) {
             Collection<Way> noAreaWays = new LinkedList<Way>();