Changeset 4087 in josm for trunk/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java

Timestamp:

2011-05-15T23:51:25+02:00 (15 years ago)

Author:

bastiK

Message:

PaintVisitor refactoring, includes hook for external MapRenderers (author: Gubaer)

File:

• trunk/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java (modified) (6 diffs)

trunk/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java

@@ -42 +42 @@
 import org.openstreetmap.josm.data.conflict.Conflict;
 import org.openstreetmap.josm.data.conflict.ConflictCollection;
-import org.openstreetmap.josm.data.coor.EastNorth;
 import org.openstreetmap.josm.data.coor.LatLon;
 import org.openstreetmap.josm.data.gpx.GpxData;
@@ -61 +60 @@
 import org.openstreetmap.josm.data.osm.visitor.AbstractVisitor;
 import org.openstreetmap.josm.data.osm.visitor.BoundingXYVisitor;
-import org.openstreetmap.josm.data.osm.visitor.paint.MapPaintVisitor;
-import org.openstreetmap.josm.data.osm.visitor.paint.PaintVisitor;
-import org.openstreetmap.josm.data.osm.visitor.paint.SimplePaintVisitor;
+import org.openstreetmap.josm.data.osm.visitor.paint.MapRendererFactory;
+import org.openstreetmap.josm.data.osm.visitor.paint.Rendering;
 import org.openstreetmap.josm.data.validation.TestError;
 import org.openstreetmap.josm.gui.HelpAwareOptionPane;
@@ -241 +239 @@
             Area a = new Area(b);
 
-            // now succesively subtract downloaded areas
-            for (DataSource src : data.dataSources) {
-                if (src.bounds != null && !src.bounds.getMin().equals(src.bounds.getMax())) {
-                    EastNorth en1 = mv.getProjection().latlon2eastNorth(src.bounds.getMin());
-                    EastNorth en2 = mv.getProjection().latlon2eastNorth(src.bounds.getMax());
-                    Point p1 = mv.getPoint(en1);
-                    Point p2 = mv.getPoint(en2);
-                    Rectangle r = new Rectangle(Math.min(p1.x, p2.x),Math.min(p1.y, p2.y),Math.abs(p2.x-p1.x),Math.abs(p2.y-p1.y));
-                    a.subtract(new Area(r));
+            // now successively subtract downloaded areas
+            for (Bounds bounds : data.getDataSourceBounds()) {
+                if (bounds.isCollapsed()) {
+                    continue;
                 }
+                Point p1 = mv.getPoint(bounds.getMin());
+                Point p2 = mv.getPoint(bounds.getMax());
+                Rectangle r = new Rectangle(Math.min(p1.x, p2.x),Math.min(p1.y, p2.y),Math.abs(p2.x-p1.x),Math.abs(p2.y-p1.y));
+                a.subtract(new Area(r));
             }
 
@@ -258 +255 @@
         }
 
-        PaintVisitor painter;
-        if (Main.pref.getBoolean("draw.wireframe")) {
-            painter = new SimplePaintVisitor();
-        } else {
-            painter = new MapPaintVisitor();
-        }
-        painter.setGraphics(g);
-        painter.setNavigatableComponent(mv);
-        painter.setInactive(inactive);
-        painter.visitAll(data, virtual, box);
+        Rendering painter = MapRendererFactory.getInstance().createActiveRenderer(g, mv, inactive);
+        painter.render(data, virtual, box);
         Main.map.conflictDialog.paintConflicts(g, mv);
     }
@@ -528 +517 @@
             }
             String name = n.get("name");
-            if (name == null)
-                continue;
+            if (name == null) {
+                continue;
+            }
             WayPoint wpt = new WayPoint(n.getCoor());
             wpt.attr.put("name", name);
@@ -538 +528 @@
             String desc = n.get("description");
             if (desc != null) {
-               wpt.attr.put("desc", desc);
-            }
+                wpt.attr.put("desc", desc);
+            }
 
             gpxData.waypoints.add(wpt);