Changeset 4087 in josm for trunk/test

Timestamp:

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

Author:

bastiK

Message:

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

Location:

trunk/test

Files:

• functional/mapcss/performance/PerformanceTest.groovy (modified) (3 diffs)
• performance/org/openstreetmap/josm/data/osm/MapPaintVisitorPerformanceTest.java (modified) (2 diffs)

trunk/test/functional/mapcss/performance/PerformanceTest.groovy

@@ -12 +12 @@
 import org.openstreetmap.josm.data.Bounds
 import org.openstreetmap.josm.data.osm.DataSet
-import org.openstreetmap.josm.data.osm.visitor.paint.MapPaintVisitor
+import org.openstreetmap.josm.data.osm.visitor.paint.StyledMapRenderer
 import org.openstreetmap.josm.gui.MainApplication
 import org.openstreetmap.josm.gui.layer.OsmDataLayer
@@ -116 +116 @@
         Graphics2D g = img.createGraphics()
         g.setClip(0,0, mv.getWidth(), mv.getHeight())
-        def visitor = new MapPaintVisitor()
+        def visitor = new StyledMapRenderer()
         visitor.setNavigatableComponent(Main.map.mapView)
         visitor.setGraphics(g)
@@ -122 +122 @@
         print "Rendering ..."
         long time = timed {
-            visitor.visitAll(ds, false, new Bounds(-90,-180,90,180))
+            visitor.render(ds, false, new Bounds(-90,-180,90,180))
         }
         println "DONE"

trunk/test/performance/org/openstreetmap/josm/data/osm/MapPaintVisitorPerformanceTest.java

@@ -10 +10 @@
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.Bounds;
-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.Rendering;
+import org.openstreetmap.josm.data.osm.visitor.paint.StyledMapRenderer;
 import org.openstreetmap.josm.data.projection.Mercator;
 import org.openstreetmap.josm.gui.NavigatableComponent;
@@ -52 +52 @@
 
     private static void test(int iterations, DataSet ds, Bounds bounds) throws Exception {
-        PaintVisitor visitor = new MapPaintVisitor();
+        Rendering visitor = new StyledMapRenderer(g,nc,false);
         nc.zoomTo(bounds);
-        visitor.setGraphics(g);
-        visitor.setNavigatableComponent(nc);
-        visitor.setInactive(false);
         for (int i=0; i<iterations; i++) {
-            visitor.visitAll(ds, true, bounds);
+            visitor.render(ds, true, bounds);
         }
     }