Changeset 1629 in josm for trunk/src

Timestamp:

2009-05-30T17:24:29+02:00 (16 years ago)

Author:

stoecker

Message:

close #2426 - now mappaint handles area types which require closed ways (e.g. cliff) correctly

Location:

trunk/src/org/openstreetmap/josm

Files:

• data/osm/visitor/MapPaintVisitor.java (modified) (4 diffs)
• gui/mappaint/AreaElemStyle.java (modified) (2 diffs)
• gui/mappaint/ElemStyleHandler.java (modified) (3 diffs)

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

@@ -223 +223 @@
         else if (wayStyle instanceof AreaElemStyle)
         {
+            AreaElemStyle areaStyle = (AreaElemStyle) wayStyle;
             /* way with area style */
             //if(!profilerOmitDraw)
             //{
-            if (fillAreas > dist)
+            if (fillAreas > dist && (!areaStyle.closed || w.isClosed()))
             {
             //    profilerVisibleAreas++;
-                drawArea(w, w.selected ? selectedColor : ((AreaElemStyle)wayStyle).color);
+                drawArea(w, w.selected ? selectedColor : areaStyle.color);
                 if(!w.isClosed())
                     w.putError(tr("Area style way is not closed."), true);
             }
-            drawWay(w, ((AreaElemStyle)wayStyle).line, ((AreaElemStyle)wayStyle).color, w.selected);
+            drawWay(w, areaStyle.line, areaStyle.color, w.selected);
             //}
         }
@@ -456 +457 @@
             if(style instanceof AreaElemStyle)
             {
-                drawWay((Way)osm, ((AreaElemStyle)style).line, selectedColor, true);
-                if(area)
-                    drawArea((Way)osm, areaselected ? selectedColor
-                    : ((AreaElemStyle)style).color);
+                Way way = (Way)osm;
+                AreaElemStyle areaStyle = (AreaElemStyle)style;
+                drawWay(way, areaStyle.line, selectedColor, true);
+                if(area && (!areaStyle.closed || way.isClosed()))
+                    drawArea(way, areaselected ? selectedColor : areaStyle.color);
             }
             else
@@ -907 +909 @@
                         inner.add(p);
                     }
+                    public boolean isClosed()
+                    {
+                        return (poly.npoints >= 3
+                        && poly.xpoints[0] == poly.xpoints[poly.npoints-1]
+                        && poly.ypoints[0] == poly.ypoints[poly.npoints-1]);
+                    }
                     public Polygon get()
                     {
@@ -967 +975 @@
                     o.addInner(polygon);
                 }
+                AreaElemStyle areaStyle = (AreaElemStyle)wayStyle;
                 for (PolyData pd : poly)
                 {
-                    if(isPolygonVisible(pd.get()))
-                    {
-                        drawAreaPolygon(pd.get(), (pd.way.selected || r.selected) ? selectedColor
-                        : ((AreaElemStyle)wayStyle).color);
+                    Polygon p = pd.get();
+                    if(isPolygonVisible(p) && (!areaStyle.closed || pd.isClosed()))
+                    {
+                        drawAreaPolygon(p, (pd.way.selected || r.selected) ? selectedColor
+                        : areaStyle.color);
                         visible = true;
                     }

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

@@ -5 +5 @@
 {
     public Color color;
+    public boolean closed;
     public LineElemStyle line = null;
 
     public AreaElemStyle (AreaElemStyle a, long maxScale, long minScale) {
         this.color = a.color;
+        this.closed = a.closed;
         this.priority = a.priority;
         this.maxScale = maxScale;
@@ -17 +19 @@
     {
         this.color = a.color;
+        this.closed = a.closed;
         this.priority = a.priority;
         this.maxScale = a.maxScale;

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

@@ -73 +73 @@
         System.out.println(styleName + " (" + rule.key + "=" + rule.value + "): " + message);
     }
-    
+
     private void startElementLine(String qName, Attributes atts, LineElemStyle line) {
         for (int count=0; count<atts.getLength(); count++)
@@ -110 +110 @@
                     if(dashed) {
                         line.dashed = 9;
-                    }                
+                    }
                 }
             } else if (atts.getQName(count).equals("dashedcolour"))
@@ -194 +194 @@
                     if (atts.getQName(count).equals("colour"))
                         rule.area.color=convertColor(atts.getValue(count));
+                    else if (atts.getQName(count).equals("closed"))
+                        rule.area.closed=Boolean.parseBoolean(atts.getValue(count));
                     else if(atts.getQName(count).equals("priority"))
                         rule.area.priority = Integer.parseInt(atts.getValue(count));