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

Timestamp:

2009-07-03T23:15:39+02:00 (17 years ago)

Author:

stoecker

Message:

some cleanups

Location:

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

Files:

• MapPaintVisitor.java (modified) (9 diffs)
• SimplePaintVisitor.java (modified) (5 diffs)

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

@@ -650 +650 @@
         }
 
-        Point pFrom = nc.getPoint(fromNode.getEastNorth());
-        Point pVia = nc.getPoint(viaNode.getEastNorth());
+        Point pFrom = nc.getPoint(fromNode);
+        Point pVia = nc.getPoint(viaNode);
 
         //if(restrictionDebug) {
@@ -663 +663 @@
         //        toNode = toWay.nodes.get(toWay.nodes.size()-2);
         //    }
-        //    Point pTo = nc.getPoint(toNode.eastNorth);
+        //    Point pTo = nc.getPoint(toNode);
 
         //    /* debug output of interesting nodes */
@@ -887 +887 @@
                         for (Node n : w.nodes)
                         {
-                            p = nc.getPoint(n.getEastNorth());
+                            p = nc.getPoint(n);
                             poly.addPoint(p.x,p.y);
                         }
@@ -941 +941 @@
                     for (Node n : wInner.nodes)
                     {
-                        Point pInner = nc.getPoint(n.getEastNorth());
+                        Point pInner = nc.getPoint(n);
                         polygon.addPoint(pInner.x,pInner.y);
                     }
                     if(!wInner.isClosed())
                     {
-                        Point pInner = nc.getPoint(wInner.nodes.get(0).getEastNorth());
+                        Point pInner = nc.getPoint(wInner.nodes.get(0));
                         polygon.addPoint(pInner.x,pInner.y);
                     }
@@ -1065 +1065 @@
         for (Node n : w.nodes)
         {
-            Point p = nc.getPoint(n.getEastNorth());
+            Point p = nc.getPoint(n);
             polygon.addPoint(p.x,p.y);
         }
@@ -1088 +1088 @@
 
     protected void drawNode(Node n, ImageIcon icon, boolean annotate, Boolean selected) {
-        Point p = nc.getPoint(n.getEastNorth());
+        Point p = nc.getPoint(n);
         if ((p.x < 0) || (p.y < 0) || (p.x > nc.getWidth()) || (p.y > nc.getHeight())) return;
 
@@ -1130 +1130 @@
             displaySegments(col, width, dashed, dashedColor);
         }
-        Point p1 = nc.getPoint(n1.getEastNorth());
-        Point p2 = nc.getPoint(n2.getEastNorth());
+        Point p1 = nc.getPoint(n1);
+        Point p2 = nc.getPoint(n2);
 
         if (!isSegmentVisible(p1, p2)) {
@@ -1209 +1209 @@
     public void drawNode(Node n, Color color, int size, int radius, boolean fill) {
         if (isZoomOk(null) && size > 1) {
-            Point p = nc.getPoint(n.getEastNorth());
+            Point p = nc.getPoint(n);
             if ((p.x < 0) || (p.y < 0) || (p.x > nc.getWidth())
                     || (p.y > nc.getHeight()))
@@ -1456 +1456 @@
      */
     protected void drawOrderNumber(Node n1, Node n2, int orderNumber) {
-        Point p1 = nc.getPoint(n1.getEastNorth());
-        Point p2 = nc.getPoint(n2.getEastNorth());
+        Point p1 = nc.getPoint(n1);
+        Point p2 = nc.getPoint(n2);
         drawOrderNumber(p1, p2, orderNumber);
     }

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

@@ -271 +271 @@
         Iterator<Node> it = w.nodes.iterator();
         if (it.hasNext()) {
-            Point lastP = nc.getPoint(it.next().getEastNorth());
+            Point lastP = nc.getPoint(it.next());
             while(it.hasNext())
             {
-                Point p = nc.getPoint(it.next().getEastNorth());
+                Point p = nc.getPoint(it.next());
                 if(isSegmentVisible(lastP, p) && isLargeSegment(lastP, p, virtualNodeSpace))
                 {
@@ -321 +321 @@
         Iterator<Node> it = w.nodes.iterator();
         if (it.hasNext()) {
-            Point lastP = nc.getPoint(it.next().getEastNorth());
+            Point lastP = nc.getPoint(it.next());
             for (int orderNumber = 1; it.hasNext(); orderNumber++) {
-                Point p = nc.getPoint(it.next().getEastNorth());
+                Point p = nc.getPoint(it.next());
                 drawSegment(lastP, p, wayColor,
                     showOnlyHeadArrowOnly ? !it.hasNext() : showThisDirectionArrow);
@@ -352 +352 @@
 
             if (m.member instanceof Node) {
-                Point p = nc.getPoint(((Node) m.member).getEastNorth());
+                Point p = nc.getPoint((Node) m.member);
                 if (p.x < 0 || p.y < 0
                     || p.x > nc.getWidth() || p.y > nc.getHeight()) continue;
@@ -363 +363 @@
                 for (Node n : ((Way) m.member).nodes) {
                     if (n.incomplete || n.deleted) continue;
-                    Point p = nc.getPoint(n.getEastNorth());
+                    Point p = nc.getPoint(n);
                     if (first) {
                         path.moveTo(p.x, p.y);
@@ -410 +410 @@
     public void drawNode(Node n, Color color, int size, int radius, boolean fill) {
         if (size > 1) {
-            Point p = nc.getPoint(n.getEastNorth());
+            Point p = nc.getPoint(n);
             if ((p.x < 0) || (p.y < 0) || (p.x > nc.getWidth())
                     || (p.y > nc.getHeight()))