Changeset 3653 in josm for trunk/src/org/openstreetmap/josm/data/osm/visitor

Timestamp:

2010-11-14T17:54:23+01:00 (14 years ago)

Author:

bastiK

Message:

applied #5627 (patch by bilbo) - Speedup of node drawing

Location:

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

Files:

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

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

@@ -111 +111 @@
     public void drawNode(Node n) {
         /* check, if the node is visible at all */
-        if((n.getEastNorth().east()  > maxEN.east() ) ||
-                (n.getEastNorth().north() > maxEN.north()) ||
-                (n.getEastNorth().east()  < minEN.east() ) ||
-                (n.getEastNorth().north() < minEN.north()))
+        EastNorth en = n.getEastNorth();
+        if((en.east()  > maxEN.east() ) ||
+                (en.north() > maxEN.north()) ||
+                (en.east()  < minEN.east() ) ||
+                (en.north() < minEN.north()))
             return;
 

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

@@ -216 +216 @@
     public void drawNode(Node n, Color color, int size, boolean fill, String name) {
         if (size > 1) {
+            Point p = nc.getPoint(n);
+            if ((p.x < 0) || (p.y < 0) || (p.x > nc.getWidth()) || (p.y > nc.getHeight())) return;
             int radius = size / 2;
-            Point p = nc.getPoint(n);
-            if ((p.x < 0) || (p.y < 0) || (p.x > nc.getWidth())
-                    || (p.y > nc.getHeight()))
-                return;
 
             if (inactive || n.isDisabled()) {
@@ -228 +226 @@
             }
             if (fill) {
-                g.fillRect(p.x - radius, p.y - radius, size, size);
-                g.drawRect(p.x - radius, p.y - radius, size, size);
+                g.fillRect(p.x - radius, p.y - radius, size + 1, size + 1);
             } else {
                 g.drawRect(p.x - radius, p.y - radius, size, size);