Changeset 1564 in osm for utils/josm/plugins/mappaint/src

Timestamp:

2006-11-11T11:50:19+01:00 (18 years ago)

Author:

nick

Message:

Areas drawn before ways; landsat move mode belongs to buttongroup; now requires josm-1.4-nw1

File:

• utils/josm/plugins/mappaint/src/mappaint/MapPaintVisitor.java (modified) (5 diffs)

utils/josm/plugins/mappaint/src/mappaint/MapPaintVisitor.java

@@ -14 +14 @@
 import org.openstreetmap.josm.data.osm.Segment;
 import org.openstreetmap.josm.data.osm.Way;
+import org.openstreetmap.josm.data.osm.DataSet;
+import org.openstreetmap.josm.data.osm.OsmPrimitive;
 import org.openstreetmap.josm.data.osm.visitor.SimplePaintVisitor;
 
@@ -50 +52 @@
          */
         @Override public void visit(Segment ls) {
-                drawSegment(ls, Color.GRAY);
+                drawSegment(ls, getPreferencesColor("untagged",Color.GRAY));
         }
 
@@ -59 +61 @@
         // Altered from SimplePaintVisitor
         @Override public void visit(Way w) {
-                Color colour = Color.GRAY;
+                Color colour = getPreferencesColor("untagged",Color.GRAY);
                 int width=1;
                 boolean area=false;
@@ -126 +128 @@
                 if (name!=null)
                 {
-                        g.setColor(Color.WHITE);
+                        g.setColor( getPreferencesColor ("text", Color.WHITE));
                         g.setFont (new Font("Helvetica", Font.PLAIN, 8));
                         g.drawString (name, p.x+w/2+2, p.y+h/2+2);
@@ -179 +181 @@
         }
 
+        // NW 111106 Overridden from SimplePaintVisitor in josm-1.4-nw1
+        // Shows areas before non-areas
+        public void visitAll(DataSet data) {
+
+                for (final OsmPrimitive osm : data.segments)
+                        if (!osm.deleted)
+                                osm.visit(this);
+
+                for (final OsmPrimitive osm : data.ways) {
+                        if(!osm.deleted && MapPaintPlugin.elemStyles.isArea(osm))
+                                osm.visit(this);
+                }
+
+                for (final OsmPrimitive osm : data.ways) {
+                        if(!osm.deleted && !MapPaintPlugin.elemStyles.isArea(osm))
+                                osm.visit(this);
+                }
+
+                for (final OsmPrimitive osm : data.nodes)
+                        if (!osm.deleted)
+                                osm.visit(this);
+
+                for (final OsmPrimitive osm : data.getSelected())
+                        if (!osm.deleted)
+                                osm.visit(this);
+        }
 }