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

Timestamp:

2010-04-05T20:52:04+02:00 (14 years ago)

Author:

jttt

Message:

Added mappaint performance test

Location:

trunk/src/org/openstreetmap/josm/data/osm/visitor/paint

Files:

• MapPaintVisitor.java (modified) (5 diffs)
• MapPainter.java (modified) (1 diff)

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

@@ -17 +17 @@
 import java.util.Comparator;
 import java.util.LinkedList;
-import java.util.List;
 
 import org.openstreetmap.josm.Main;
@@ -645 +644 @@
         BBox bbox = new BBox(bounds);
         this.data = data;
+        ++paintid;
 
         useStyleCache = Main.pref.getBoolean("mappaint.cache", true);
@@ -653 +653 @@
 
         zoomLevelDisplay = Main.pref.getBoolean("mappaint.zoomLevelDisplay", false);
-        circum = Main.map.mapView.getDist100Pixel();
+        circum = nc.getDist100Pixel();
         styles = MapPaintStyles.getStyles().getStyleSet();
         drawMultipolygon = Main.pref.getBoolean("mappaint.multipolygon", true);
@@ -670 +670 @@
         data.clearErrors();
 
-        ++paintid;
 
         if (fillAreas > dist && styles != null && styles.hasAreas()) {
             Collection<Way> noAreaWays = new LinkedList<Way>();
 
-            List<Relation> relations = data.searchRelations(bbox);
             /*** RELATIONS ***/
             for (final Relation osm: data.searchRelations(bbox)) {
@@ -709 +707 @@
 
             /*** WAYS (filling disabled)  ***/
-            for (final Way way: data.getWays()) {
+            for (final Way way: data.searchWays(bbox)) {
                 if (way.isDrawable() && !data.isSelected(way)) {
                     drawWay(way, 0);

trunk/src/org/openstreetmap/josm/data/osm/visitor/paint/MapPainter.java

@@ -185 +185 @@
 
         int w = icon.getIconWidth(), h=icon.getIconHeight();
-        icon.paintIcon ( Main.map.mapView, g, p.x-w/2, p.y-h/2 );
+        icon.paintIcon ( nc, g, p.x-w/2, p.y-h/2 );
         if(name != null) {
             if (inactive || n.isDisabled()) {