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

Timestamp:

2008-12-31T00:36:58+01:00 (17 years ago)

Author:

stoecker

Message:

fixed relation handling, applied language patches

File:

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

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

@@ -38 +38 @@
     protected boolean zoomLevelDisplay;
     protected boolean fillAreas;
+    protected boolean drawMultipolygon;
     protected int fillAlpha;
     protected Color untaggedColor;
@@ -48 +49 @@
     protected double circum;
     protected String regionalNameOrder[];
-    protected Collection<Way> alreadyDrawnWays = new LinkedList<Way>();
-    protected Collection<Way> alreadyDrawnAreas = new LinkedList<Way>();
+    protected Boolean selectedCall;
+    protected Collection<OsmPrimitive> alreadyDrawn;
+    protected Collection<Way> alreadyDrawnAreas;
 
     protected boolean isZoomOk(ElemStyle e) {
@@ -73 +75 @@
      */
     public void visit(Node n) {
-        IconElemStyle nodeStyle = styles.get(n);
+        IconElemStyle nodeStyle = (IconElemStyle)styles.get(n);
         if (nodeStyle != null && isZoomOk(nodeStyle))
-            drawNode(n, nodeStyle.icon, nodeStyle.annotate);
+            drawNode(n, nodeStyle.icon, nodeStyle.annotate, n.selected);
         else if (n.selected)
             drawNode(n, selectedColor, selectedNodeSize, selectedNodeRadius, fillSelectedNode);
@@ -114 +116 @@
         }
 
-        drawWay(w, l, areacolor);
-    }
-
-    public void drawWay(Way w, LineElemStyle l, Color color) {
+        drawWay(w, l, areacolor, w.selected);
+    }
+
+    public void drawWay(Way w, LineElemStyle l, Color color, Boolean selected) {
         // show direction arrows, if draw.segment.relevant_directions_only is not set,
         // the way is tagged with a direction key
@@ -134 +136 @@
             dashed = l.dashed;
         }
+        if(selected)
+            color = selectedColor;
         if (realWidth > 0 && useRealWidth && !showDirection)
         {
@@ -294 +298 @@
     }
 
+    public void drawSelected(OsmPrimitive osm, ElemStyle style, Boolean area,
+    Boolean areaselected)
+    {
+        if(osm instanceof Way)
+        {
+            if(style instanceof AreaElemStyle)
+            {
+                drawWay((Way)osm, ((AreaElemStyle)style).line, selectedColor, true);
+                if(area)
+                    drawWayAsArea((Way)osm, areaselected ? selectedColor
+                    : ((AreaElemStyle)style).color);
+            }
+            else
+            {
+                drawWay((Way)osm, (LineElemStyle)style, selectedColor, true);
+            }
+        }
+        else if(osm instanceof Node)
+        {
+            if(style != null && isZoomOk(style))
+                drawNode((Node)osm, ((IconElemStyle)style).icon,
+                ((IconElemStyle)style).annotate, true);
+            else
+                drawNode((Node)osm, selectedColor, selectedNodeSize, selectedNodeRadius, fillSelectedNode);
+        }
+    }
+
     public void visit(Relation r) {
         // draw multipolygon relations including their ways
-        // other relations are not (yet?) drawn.
-        if (r.incomplete) return;
-
-        if(!Main.pref.getBoolean("mappaint.multipolygon",false)) return;
-
-        if(!"multipolygon".equals(r.keys.get("type"))) return;
+        // other relations are only drawn when selected
+        if(r.selected)
+        {
+            if(selectedCall)
+            {
+                for (RelationMember m : r.members)
+                {
+                    /* second call - draw nodes */
+                    if (!m.member.incomplete && !m.member.deleted
+                    && m.member instanceof Node)
+                    {
+                        drawSelected(m.member, styles.get(m.member), true, true);
+                        alreadyDrawn.add(m.member);
+                    }
+                }
+                return;
+            }
+        }
+        Boolean isMultipolygon = "multipolygon".equals(r.keys.get("type"));
+        if (!drawMultipolygon || !isMultipolygon)
+        {
+            if(r.selected && !isMultipolygon)
+            {
+                for (RelationMember m : r.members)
+                {
+                    if (!m.member.incomplete && !m.member.deleted
+                    && !(m.member instanceof Relation))
+                    {
+                        /* nodes drawn on second call */
+                        if(!(m.member instanceof Node))
+                            drawSelected(m.member, styles.get(m.member), true, true);
+                        alreadyDrawn.add(m.member);
+                    }
+                }
+            }
+            return;
+        }
 
         Collection<Way> inner = new LinkedList<Way>();
@@ -328 +390 @@
                         if(m.role == null || m.role.length() == 0)
                             outer.add(w);
+                        else if(r.selected)
+                            drawSelected(m.member, styles.get(m.member), true, true);
                     }
                 }
                 else
                 {
+                    /* nodes drawn on second call */
 System.out.println("ERROR: Non-Way in multipolygon " + m.member);
                 }
@@ -385 +450 @@
                 for (Way w : outerclosed)
                 {
-                    Color color = w.selected ? selectedColor
+                    Color color = (w.selected || r.selected) ? selectedColor
                     : ((AreaElemStyle)wayStyle).color;
                     Polygon polygon = new Polygon();
@@ -423 +488 @@
                 {
                     if(zoomok)
+                    {
                         drawWay(wInner, ((AreaElemStyle)wayStyle).line,
-                        ((AreaElemStyle)wayStyle).color);
-                    alreadyDrawnWays.add(wInner);
-                }
-                else if(wayStyle.equals(innerStyle))
-                {
+                        ((AreaElemStyle)wayStyle).color, wInner.selected
+                        || r.selected);
+                    }
+                    alreadyDrawn.add(wInner);
+                }
+                else
+                {
+                    if(r.selected)
+                    {
+                        drawSelected(wInner, innerStyle,
+                        !wayStyle.equals(innerStyle), wInner.selected);
+                        alreadyDrawn.add(wInner);
+                    }
+                    if(wayStyle.equals(innerStyle))
+                    {
 System.out.println("WARNING: Inner waystyle equals multipolygon for way " + wInner);
-                    alreadyDrawnAreas.add(wInner);
+                        if(!r.selected)
+                            alreadyDrawnAreas.add(wInner);
+                    }
                 }
             }
@@ -439 +517 @@
                 {
                     if(zoomok)
+                    {
                         drawWay(wOuter, ((AreaElemStyle)wayStyle).line,
-                        ((AreaElemStyle)wayStyle).color);
-                    alreadyDrawnWays.add(wOuter);
+                        ((AreaElemStyle)wayStyle).color, wOuter.selected
+                        || r.selected);
+                    }
+                    alreadyDrawn.add(wOuter);
                 }
                 else
                 {
-                    if(!wayStyle.equals(outerStyle))
+                    if(outerStyle instanceof AreaElemStyle
+                    && !wayStyle.equals(outerStyle))
+                    {
 System.out.println("ERROR: Outer waystyle does not match multipolygon for way " + wOuter);
-                    alreadyDrawnAreas.add(wOuter);
+                    }
+                    if(r.selected)
+                    {
+                        drawSelected(wOuter, outerStyle, false, false);
+                        alreadyDrawn.add(wOuter);
+                    }
+//                    else if(outerStyle instanceof AreaElemStyle)
+                        alreadyDrawnAreas.add(wOuter);
                 }
             }
@@ -470 +560 @@
     }
 
-    // NEW
-    protected void drawNode(Node n, ImageIcon icon, boolean annotate) {
+    protected void drawNode(Node n, ImageIcon icon, boolean annotate, Boolean selected) {
         Point p = nc.getPoint(n.eastNorth);
         if ((p.x < 0) || (p.y < 0) || (p.x > nc.getWidth()) || (p.y > nc.getHeight())) return;
@@ -485 +574 @@
             g.setFont(defaultFont);
         }
-        if (n.selected)
+        if (selected)
         {
             g.setColor (  selectedColor );
@@ -582 +671 @@
         circum = Main.map.mapView.getScale()*100*Main.proj.scaleFactor()*40041455; // circumference of the earth in meter
         styles = MapPaintStyles.getStyles();
+        drawMultipolygon = Main.pref.getBoolean("mappaint.multipolygon",false);
         orderFont = new Font(Main.pref.get("mappaint.font","Helvetica"), Font.PLAIN, Main.pref.getInteger("mappaint.fontsize", 8));
         String currentLocale = Locale.getDefault().getLanguage();
         regionalNameOrder = Main.pref.get("mappaint.nameOrder", "name:"+currentLocale+";name;int_name").split(";");
 
+        alreadyDrawn = new LinkedList<OsmPrimitive>();
+        alreadyDrawnAreas = new LinkedList<Way>();
+        selectedCall = false;
+
         if (fillAreas && styles.hasAreas()) {
             Collection<Way> noAreaWays = new LinkedList<Way>();
@@ -591 +685 @@
             for (final Relation osm : data.relations)
             {
-                if (!osm.deleted && !osm.selected)
-                {
+                if(!osm.deleted && !osm.incomplete)
                     osm.visit(this);
-                }
             }
 
             for (final Way osm : data.ways)
             {
-                if (!osm.incomplete && !osm.deleted && !alreadyDrawnWays.contains(osm))
+                if (!osm.incomplete && !osm.deleted && !alreadyDrawn.contains(osm))
                 {
                     if(styles.isArea((Way)osm) && !alreadyDrawnAreas.contains(osm))
@@ -607 +699 @@
                 }
             }
-            // free that stuff
-            alreadyDrawnWays = null;
             alreadyDrawnAreas = null;
 
@@ -618 +708 @@
         {
             for (final OsmPrimitive osm : data.ways)
-                if (!osm.incomplete && !osm.deleted)
+                if (!osm.incomplete && !osm.deleted && !osm.selected)
                     osm.visit(this);
         }
 
-        for (final OsmPrimitive osm : data.getSelected())
-            if (!osm.incomplete && !osm.deleted){
+        selectedCall = true;
+        for (final OsmPrimitive osm : data.getSelected()) {
+            if (!osm.incomplete && !osm.deleted
+            && !(osm instanceof Node) && !alreadyDrawn.contains(osm))
                 osm.visit(this);
-            }
+        }
 
         displaySegments();
 
         for (final OsmPrimitive osm : data.nodes)
-            if (!osm.incomplete && !osm.deleted)
+            if (!osm.incomplete && !osm.deleted && !alreadyDrawn.contains(osm))
                 osm.visit(this);
+
+        alreadyDrawn = null;
 
         if (virtualNodeSize != 0)
@@ -637 +731 @@
             currentColor = nodeColor;
             for (final OsmPrimitive osm : data.ways)
-                if (!osm.deleted)
+                if (!osm.incomplete && !osm.deleted)
                     visitVirtual((Way)osm);
             displaySegments(null);