Changeset 1254 in josm

Timestamp:

11.01.2009 20:11:07 (3 years ago)

Author:

ulfl

Message:

mappaint major performance improvements:

• cache mappaint style and isArea information in OsmPrimitive
• don't call alreadyDrawn.contains() - seems that ends up in n^{2 searches}

Location:

trunk/src/org/openstreetmap/josm

Files:

• data/osm/OsmPrimitive.java (modified) (5 diffs)
• data/osm/visitor/MapPaintVisitor.java (modified) (16 diffs)
• io/OsmReader.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java

@@ -19 +19 @@
 import org.openstreetmap.josm.tools.DateParser;
 import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.gui.mappaint.ElemStyle;
 
 
@@ -139 +140 @@
     private static Collection<String> directionKeys = null;
 
+        
+    /* mappaint style cache */
+    public ElemStyle mappaintStyle = null;
+    public boolean isMappaintArea = false;
+        
     /**
      * Implementation of the visitor scheme. Subclasses have to call the correct
@@ -214 +220 @@
         checkTagged();
         checkDirectionTagged();
+        mappaintStyle = null;
     }
     /**
@@ -226 +233 @@
         checkTagged();
         checkDirectionTagged();
+        mappaintStyle = null;
     }
 
@@ -262 +270 @@
         tagged = osm.tagged;
         incomplete = osm.incomplete;
+        mappaintStyle = null;
     }
 

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

@@ -53 +53 @@
     protected Collection<OsmPrimitive> alreadyDrawn;
     protected Collection<Way> alreadyDrawnAreas;
+    protected Boolean useStyleCache;
+    
+    protected int profilerVisibleNodes;
+    protected int profilerVisibleWays;
+    protected int profilerVisibleAreas;
 
     protected boolean isZoomOk(ElemStyle e) {
@@ -67 +72 @@
         // XXX - do we need a Preference setting for this (if things vary widely)?
         return !(circum >= e.maxScale / 22 || circum < e.minScale / 22);
+    }
+
+    public ElemStyle getPrimitiveStyle(OsmPrimitive osm) {
+        if(!useStyleCache)
+            return (styles != null) ? (IconElemStyle)styles.get(osm) : null;
+
+        if(osm.mappaintStyle == null) {
+            osm.mappaintStyle =  styles.get(osm);
+            osm.isMappaintArea = styles.isArea(osm);
+        }
+        return osm.mappaintStyle;
+    }
+
+    public boolean isPrimitiveArea(OsmPrimitive osm) {
+        if(!useStyleCache)
+            return styles.isArea((Way)osm);
+
+        if(osm.mappaintStyle == null) {
+            osm.mappaintStyle = styles.get(osm);
+            osm.isMappaintArea = styles.isArea(osm);
+        }
+        return osm.isMappaintArea;
     }
 
@@ -80 +107 @@
         if ((!selectedCall && n.selected) || (p.x < 0) || (p.y < 0)
         || (p.x > nc.getWidth()) || (p.y > nc.getHeight())) return;
-
-        IconElemStyle nodeStyle = styles != null ? (IconElemStyle)styles.get(n) : null;
+        
+        profilerVisibleNodes++;
+        
+        IconElemStyle nodeStyle = (IconElemStyle)getPrimitiveStyle(n);
         if (nodeStyle != null && isZoomOk(nodeStyle))
             drawNode(n, nodeStyle.icon, nodeStyle.annotate, n.selected);
@@ -104 +133 @@
         if(!isPolygonVisible(polygon))
             return;
-
-        ElemStyle wayStyle = styles != null ? styles.get(w) : null;
+            
+        ElemStyle wayStyle = getPrimitiveStyle(w);
 
         if(!isZoomOk(wayStyle))
             return;
 
-        LineElemStyle l = null;
-        Color areacolor = untaggedColor;
-        if(wayStyle!=null)
-        {
-            if(wayStyle instanceof LineElemStyle)
-                l = (LineElemStyle)wayStyle;
-            else if (wayStyle instanceof AreaElemStyle)
-            {
-                areacolor = ((AreaElemStyle)wayStyle).color;
-                l = ((AreaElemStyle)wayStyle).line;
-                if (fillAreas)
-                    drawArea(polygon, w.selected ? selectedColor : areacolor);
-            }
-        }
-
-        drawWay(w, l, areacolor, w.selected);
+        if(wayStyle==null)
+        {
+            // way without style
+            profilerVisibleWays++;
+            drawWay(w, null, untaggedColor, w.selected);
+        }
+        else if(wayStyle instanceof LineElemStyle)
+        {
+            // way with line style
+            profilerVisibleWays++;
+            drawWay(w, (LineElemStyle)wayStyle, untaggedColor, w.selected);
+        }
+        else if (wayStyle instanceof AreaElemStyle)
+        {
+            // way with area style
+            if (fillAreas)
+            {
+                profilerVisibleAreas++;
+                drawArea(polygon, w.selected ? selectedColor : ((AreaElemStyle)wayStyle).color);
+            }
+            drawWay(w, ((AreaElemStyle)wayStyle).line, ((AreaElemStyle)wayStyle).color, w.selected);
+        }
     }
 
@@ -785 +820 @@
 
         boolean profiler = Main.pref.getBoolean("mappaint.profiler",false);
+        useStyleCache = Main.pref.getBoolean("mappaint.cache",true);
+        fillAreas = Main.pref.getBoolean("mappaint.fillareas", true);
+        fillAlpha = Math.min(255, Math.max(0, Integer.valueOf(Main.pref.getInteger("mappaint.fillalpha", 50))));
+
         long profilerStart = java.lang.System.currentTimeMillis();
         long profilerLast = profilerStart;
         int profilerN;
         if(profiler)
-        {
-            System.out.println("Mappaint Profiler");
-        }
+            System.out.println("Mappaint Profiler (" +
+                (useStyleCache ? "cache=true, " : "cache=false, ") +
+                (fillAreas ? "fillareas=true, " : "fillareas=false, ") +
+                "fillalpha=" + fillAlpha + "%)");
 
         getSettings(virtual);
         useRealWidth = Main.pref.getBoolean("mappaint.useRealWidth",false);
         zoomLevelDisplay = Main.pref.getBoolean("mappaint.zoomLevelDisplay",false);
-        fillAreas = Main.pref.getBoolean("mappaint.fillareas", true);
-        fillAlpha = Math.min(255, Math.max(0, Integer.valueOf(Main.pref.getInteger("mappaint.fillalpha", 50))));
         circum = Main.map.mapView.getScale()*100*Main.proj.scaleFactor()*40041455; // circumference of the earth in meter
         styles = MapPaintStyles.getStyles().getStyleSet();
@@ -808 +846 @@
         alreadyDrawnAreas = new LinkedList<Way>();
         selectedCall = false;
+        
+        profilerVisibleNodes = 0;
+        profilerVisibleWays = 0;
+        profilerVisibleAreas = 0;
 
         if(profiler)
@@ -831 +873 @@
             if(profiler)
             {
-                System.out.format("Relations: %4dms, n=%d\n", (java.lang.System.currentTimeMillis()-profilerLast), profilerN);
+                System.out.format("Relations: %4dms, n=%5d\n", (java.lang.System.currentTimeMillis()-profilerLast), profilerN);
                 profilerLast = java.lang.System.currentTimeMillis();
             }
@@ -839 +881 @@
             for (final Way osm : data.ways)
             {
-                if (!osm.incomplete && !osm.deleted && !alreadyDrawn.contains(osm))
-                {
-                    if(styles.isArea((Way)osm) && !alreadyDrawnAreas.contains(osm))
+                //if (!osm.incomplete && !osm.deleted && !alreadyDrawn.contains(osm))
+                if (!osm.incomplete && !osm.deleted)
+                {
+                    //if(styles.isArea((Way)osm) && !alreadyDrawnAreas.contains(osm))
+                    if(isPrimitiveArea(osm))
                     {
                         osm.visit(this);
@@ -853 +897 @@
             if(profiler)
             {
-                System.out.format("Areas    : %4dms, n=%d\n",  (java.lang.System.currentTimeMillis()-profilerLast), profilerN);
+                System.out.format("Areas    : %4dms, n=%5d, visible=%d\n",
+                    (java.lang.System.currentTimeMillis()-profilerLast), profilerN, profilerVisibleAreas);
                 profilerLast = java.lang.System.currentTimeMillis();
             }
@@ -868 +913 @@
             if(profiler)
             {
-                System.out.format("Ways     : %4dms, n=%d\n", (java.lang.System.currentTimeMillis()-profilerLast), profilerN);
+                System.out.format("Ways     : %4dms, n=%5d, visible=%d\n",
+                    (java.lang.System.currentTimeMillis()-profilerLast), profilerN, profilerVisibleWays);
                 profilerLast = java.lang.System.currentTimeMillis();
             }
@@ -885 +931 @@
             if(profiler)
             {
-                System.out.format("Ways     : %4dms, n=%d\n", (java.lang.System.currentTimeMillis()-profilerLast), profilerN);
+                System.out.format("Ways     : %4dms, n=%5d, visible=%d\n", 
+                    (java.lang.System.currentTimeMillis()-profilerLast), profilerN, profilerVisibleWays);
                 profilerLast = java.lang.System.currentTimeMillis();
             }
@@ -895 +942 @@
         for (final OsmPrimitive osm : data.getSelected()) {
             if (!osm.incomplete && !osm.deleted
-            && !(osm instanceof Node) && !alreadyDrawn.contains(osm))
+            //&& !(osm instanceof Node) && !alreadyDrawn.contains(osm))
+            && !(osm instanceof Node))
             {
                 osm.visit(this);
@@ -904 +952 @@
         if(profiler)
         {
-            System.out.format("Selected : %4dms, n=%d\n", (java.lang.System.currentTimeMillis()-profilerLast), profilerN);
+            System.out.format("Selected : %4dms, n=%5d\n", (java.lang.System.currentTimeMillis()-profilerLast), profilerN);
             profilerLast = java.lang.System.currentTimeMillis();
         }
@@ -910 +958 @@
         /*** DISPLAY CACHED SEGMENTS (WAYS) NOW ***/
         displaySegments();
-        /*System.out.println("display segments " + (java.lang.System.currentTimeMillis()-profilerLast) + "ms");
-        profilerLast = java.lang.System.currentTimeMillis();*/
+        /*if(profiler)
+        {
+            System.out.format("DS       : %4dms\n", (java.lang.System.currentTimeMillis()-profilerLast));
+            profilerLast = java.lang.System.currentTimeMillis();
+        }*/
 
         /*** NODES ***/
         profilerN = 0;
         for (final OsmPrimitive osm : data.nodes)
-            if (!osm.incomplete && !osm.deleted && !alreadyDrawn.contains(osm))
+            //if (!osm.incomplete && !osm.deleted && !alreadyDrawn.contains(osm))
+            if (!osm.incomplete && !osm.deleted)
             {
                 osm.visit(this);
@@ -924 +976 @@
         if(profiler)
         {
-            System.out.format("Nodes    : %4dms, n=%d\n", (java.lang.System.currentTimeMillis()-profilerLast), profilerN);
+            System.out.format("Nodes    : %4dms, n=%5d, visible=%d\n",
+                (java.lang.System.currentTimeMillis()-profilerLast), profilerN, profilerVisibleNodes);
             profilerLast = java.lang.System.currentTimeMillis();
         }
@@ -944 +997 @@
             if(profiler)
             {
-                System.out.format("Virtual  : %4dms, n=%d\n", (java.lang.System.currentTimeMillis()-profilerLast), profilerN);
+                System.out.format("Virtual  : %4dms, n=%5d\n", (java.lang.System.currentTimeMillis()-profilerLast), profilerN);
                 profilerLast = java.lang.System.currentTimeMillis();
             }
 
             displaySegments(null);
-            /*System.out.println("display segments virtual " + (java.lang.System.currentTimeMillis()-profilerLast) + "ms");
-            profilerLast = java.lang.System.currentTimeMillis();*/
+            /*if(profiler)
+            {
+                System.out.format("VirtualDS: %4dms\n", (java.lang.System.currentTimeMillis()-profilerLast));
+                profilerLast = java.lang.System.currentTimeMillis();
+            }*/
         }
 

trunk/src/org/openstreetmap/josm/io/OsmReader.java

@@ -98 +98 @@
                osm.checkTagged();
                osm.checkDirectionTagged();
+               osm.mappaintStyle = null;
           }
      }