Changeset 3167 in josm

Timestamp:

Apr 5, 2010 8:52:04 PM (3 years ago)

Author:

jttt

Message:

Added mappaint performance test

Location:

trunk

Files:

• .classpath (modified) (2 diffs)
• data_nodist/neubrandenburg.osm (added)
• src/org/openstreetmap/josm/data/osm/visitor/paint/MapPaintVisitor.java (modified) (5 diffs)
• src/org/openstreetmap/josm/data/osm/visitor/paint/MapPainter.java (modified) (1 diff)
• test/performance (added)
• test/performance/org (added)
• test/performance/org/openstreetmap (added)
• test/performance/org/openstreetmap/josm (added)
• test/performance/org/openstreetmap/josm/data (added)
• test/performance/org/openstreetmap/josm/data/osm (added)
• test/performance/org/openstreetmap/josm/data/osm/MapPaintVisitorPeformanceTest.java (added)

trunk/.classpath

@@ -4 +4 @@
         <classpathentry kind="src" path="test/unit"/>
         <classpathentry kind="src" path="test/functional"/>
-        <classpathentry excluding="build/|dist/|src/|test/|test/build/|test/functional/|test/unit/" including="CONTRIBUTION|LICENSE|README|data/|images/|presets/|styles/" kind="src" path=""/>
+        <classpathentry excluding="build/|data_nodist/|dist/|doc/|lib/|macosx/|src/|test/|test/build/|test/functional/|test/performance/|test/unit/|tools/|utils/" kind="src" path=""/>
+        <classpathentry kind="src" path="test/performance"/>
         <classpathentry kind="lib" path="lib/metadata-extractor-2.3.1-nosun.jar"/>
         <classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/4"/>
@@ -17 +18 @@
         <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
         <classpathentry exported="true" kind="con" path="GROOVY_SUPPORT"/>
-        <classpathentry kind="lib" path="test/build"/>
         <classpathentry kind="lib" path="lib/signpost-core-1.1.jar"/>
         <classpathentry kind="output" path="bin"/>

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()) {