Changeset 1236 in josm for trunk/src

Timestamp:

2009-01-11T00:01:00+01:00 (16 years ago)

Author:

stoecker

Message:

removed some double code

Location:

trunk/src/org/openstreetmap/josm/data/osm/visitor

Files:

• MapPaintVisitor.java (modified) (9 diffs)
• SimplePaintVisitor.java (modified) (1 diff)

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

@@ -79 +79 @@
         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 (nodeStyle != null && isZoomOk(nodeStyle))
@@ -100 +100 @@
 
         // check, if the way is visible at all
-        Polygon polygon = new Polygon();
-        for (Node n : w.nodes)
-        {
-            Point p = nc.getPoint(n.eastNorth);
-            polygon.addPoint(p.x,p.y);
-        }
+        Polygon polygon = getPolygon(w);
         if(!isPolygonVisible(polygon))
             return;
-        
+
         ElemStyle wayStyle = styles.get(w);
 
@@ -125 +120 @@
                 l = ((AreaElemStyle)wayStyle).line;
                 if (fillAreas)
-                    drawWayAsArea(w, areacolor);
+                    drawArea(polygon, w.selected ? selectedColor : areacolor);
             }
         }
@@ -342 +337 @@
                 drawWay((Way)osm, ((AreaElemStyle)style).line, selectedColor, true);
                 if(area)
-                    drawWayAsArea((Way)osm, areaselected ? selectedColor
+                    drawArea(getPolygon((Way)osm), areaselected ? selectedColor
                     : ((AreaElemStyle)style).color);
             }
@@ -580 +575 @@
                 for (PolyData pd : poly)
                 {
-                    Color color = (pd.way.selected || r.selected) ? selectedColor
-                    : ((AreaElemStyle)wayStyle).color;
-                    g.setColor(new Color( color.getRed(), color.getGreen(),
-                    color.getBlue(), fillAlpha));
-
-                    g.fillPolygon(pd.get());
+                    drawArea(pd.get(), (pd.way.selected || r.selected) ? selectedColor
+                    : ((AreaElemStyle)wayStyle).color);
                 }
             }
@@ -653 +644 @@
     }
 
-    protected void drawWayAsArea(Way w, Color color)
+    protected Polygon getPolygon(Way w)
     {
         Polygon polygon = new Polygon();
@@ -662 +653 @@
             polygon.addPoint(p.x,p.y);
         }
-
-        Color mycolor = w.selected ? selectedColor : color;
+        return polygon;
+    }
+
+    protected void drawArea(Polygon polygon, Color color)
+    {
         // set the opacity (alpha) level of the filled polygon
-        g.setColor(new Color( mycolor.getRed(), mycolor.getGreen(), mycolor.getBlue(), fillAlpha));
-
+        g.setColor(new Color(color.getRed(), color.getGreen(), color.getBlue(), fillAlpha));
         g.fillPolygon(polygon);
     }
@@ -814 +807 @@
         alreadyDrawnAreas = new LinkedList<Way>();
         selectedCall = false;
-        
+
         // update the style name, just in case the user changed it in the meantime
         styles.updateStyleName();
-        
-        if(profiler) 
+
+        if(profiler)
         {
             System.out.format("Prepare  : %4dms\n", (java.lang.System.currentTimeMillis()-profilerLast));
@@ -838 +831 @@
             }
 
-            if(profiler) 
+            if(profiler)
             {
                 System.out.format("Relations: %4dms, n=%d\n", (java.lang.System.currentTimeMillis()-profilerLast), profilerN);

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

@@ -360 +360 @@
     protected boolean isPolygonVisible(Polygon polygon) {
         Rectangle bounds = polygon.getBounds();
-                if (bounds.x > nc.getWidth()) return false;
-                else if (bounds.y > nc.getHeight()) return false;
-                else if (bounds.x + polygon.getBounds().width < 0) return false;
-                else if (bounds.y + polygon.getBounds().height < 0) return false;
-        
+        if (bounds.x > nc.getWidth()) return false;
+        else if (bounds.y > nc.getHeight()) return false;
+        else if (bounds.x + bounds.width < 0) return false;
+        else if (bounds.y + bounds.height < 0) return false;
+
         return true;
     }
-        
+
     public void setGraphics(Graphics g) {
         this.g = g;