Index: trunk/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java
===================================================================
--- trunk/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java	(revision 1271)
+++ trunk/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java	(revision 1272)
@@ -121,6 +121,4 @@
         }
         n.mappaintVisibleCode = 0;
-
-        profilerVisibleNodes++;
 
         IconElemStyle nodeStyle = (IconElemStyle)getPrimitiveStyle(n);
@@ -753,4 +751,7 @@
         Point p = nc.getPoint(n.eastNorth);
         if ((p.x < 0) || (p.y < 0) || (p.x > nc.getWidth()) || (p.y > nc.getHeight())) return;
+
+        profilerVisibleNodes++;
+
         int w = icon.getIconWidth(), h=icon.getIconHeight();
         icon.paintIcon ( Main.map.mapView, g, p.x-w/2, p.y-h/2 );
@@ -846,4 +847,7 @@
                     || (p.y > nc.getHeight()))
                 return;
+
+            profilerVisibleNodes++;
+
             g.setColor(color);
             if (fill) {
@@ -868,10 +872,10 @@
     }
 
-    public void getColors()
+    /*public void getColors()
     {
         super.getColors();
         untaggedColor = Main.pref.getColor(marktr("untagged"),Color.GRAY);
         textColor = Main.pref.getColor (marktr("text"), Color.WHITE);
-    }
+    }*/
 
     // Shows areas before non-areas
@@ -944,5 +948,5 @@
             if(profiler)
             {
-                System.out.format("Relations: %4dms, calls=%5d\n", (java.lang.System.currentTimeMillis()-profilerLast), profilerN);
+                System.out.format("Relations: %4dms, calls=%7d\n", (java.lang.System.currentTimeMillis()-profilerLast), profilerN);
                 profilerLast = java.lang.System.currentTimeMillis();
             }
@@ -966,5 +970,5 @@
             if(profiler)
             {
-                System.out.format("Areas    : %4dms, calls=%5d, visible=%d\n",
+                System.out.format("Areas    : %4dms, calls=%7d, visible=%d\n",
                     (java.lang.System.currentTimeMillis()-profilerLast), profilerN, profilerVisibleAreas);
                 profilerLast = java.lang.System.currentTimeMillis();
@@ -982,5 +986,5 @@
             if(profiler)
             {
-                System.out.format("Ways     : %4dms, calls=%5d, visible=%d\n",
+                System.out.format("Ways     : %4dms, calls=%7d, visible=%d\n",
                     (java.lang.System.currentTimeMillis()-profilerLast), profilerN, profilerVisibleWays);
                 profilerLast = java.lang.System.currentTimeMillis();
@@ -1001,5 +1005,5 @@
             if(profiler)
             {
-                System.out.format("Ways     : %4dms, calls=%5d, visible=%d\n",
+                System.out.format("Ways     : %4dms, calls=%7d, visible=%d\n",
                     (java.lang.System.currentTimeMillis()-profilerLast), profilerN, profilerVisibleWays);
                 profilerLast = java.lang.System.currentTimeMillis();
@@ -1021,5 +1025,5 @@
         if(profiler)
         {
-            System.out.format("Selected : %4dms, calls=%5d\n", (java.lang.System.currentTimeMillis()-profilerLast), profilerN);
+            System.out.format("Selected : %4dms, calls=%7d\n", (java.lang.System.currentTimeMillis()-profilerLast), profilerN);
             profilerLast = java.lang.System.currentTimeMillis();
         }
@@ -1045,5 +1049,5 @@
         if(profiler)
         {
-            System.out.format("Nodes    : %4dms, calls=%5d, visible=%d\n",
+            System.out.format("Nodes    : %4dms, calls=%7d, visible=%d\n",
                 (java.lang.System.currentTimeMillis()-profilerLast), profilerN, profilerVisibleNodes);
             profilerLast = java.lang.System.currentTimeMillis();
@@ -1067,5 +1071,5 @@
             if(profiler)
             {
-                System.out.format("Virtual  : %4dms, calls=%5d\n", (java.lang.System.currentTimeMillis()-profilerLast), profilerN);
+                System.out.format("Virtual  : %4dms, calls=%7d\n", (java.lang.System.currentTimeMillis()-profilerLast), profilerN);
                 profilerLast = java.lang.System.currentTimeMillis();
             }
@@ -1081,5 +1085,5 @@
         if(profiler)
         {
-            System.out.format("Segments :         calls=%5d, visible=%d\n", profilerSegments, profilerVisibleSegments);
+            System.out.format("Segments :         calls=%7d, visible=%d\n", profilerSegments, profilerVisibleSegments);
             System.out.format("All      : %4dms\n", (profilerLast-profilerStart));
         }