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

Timestamp:

2009-06-06T14:30:21+02:00 (17 years ago)

Author:

stoecker

Message:

little bit more refactoring of coordinate access - patch by jttt

Location:

trunk/src/org/openstreetmap/josm/data

Files:

• conflict/PositionConflict.java (modified) (2 diffs)
• osm/Node.java (modified) (2 diffs)
• osm/visitor/BoundingXYVisitor.java (modified) (1 diff)
• osm/visitor/MapPaintVisitor.java (modified) (10 diffs)
• osm/visitor/MergeVisitor.java (modified) (1 diff)
• osm/visitor/SimplePaintVisitor.java (modified) (5 diffs)

trunk/src/org/openstreetmap/josm/data/conflict/PositionConflict.java

@@ -10 +10 @@
 
     @Override public boolean hasConflict(OsmPrimitive key, OsmPrimitive value) {
-        return key instanceof Node && !((Node)key).coor.equals(((Node)value).coor);
+        return key instanceof Node && !((Node)key).getCoor().equals(((Node)value).getCoor());
     }
 
     @Override protected String str(OsmPrimitive osm) {
-        return osm instanceof Node ? ((Node)osm).coor.lat()+", "+((Node)osm).coor.lon() : null;
+        return osm instanceof Node ? ((Node)osm).getCoor().lat()+", "+((Node)osm).getCoor().lon() : null;
     }
 
@@ -23 +23 @@
     @Override public void apply(OsmPrimitive target, OsmPrimitive other) {
         if (target instanceof Node) {
-            ((Node)target).setEastNorth(((Node)other).eastNorth);
+            ((Node)target).setEastNorth(((Node)other).getEastNorth());
             int newversion = Math.max(target.version, other.version);
             // set version on "other" as well in case user decides to keep local

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

@@ -20 +20 @@
     public LatLon coor;
     public volatile EastNorth eastNorth;
-        
-    public void setCoor(LatLon coor) {
+
+    public final void setCoor(LatLon coor) {
         this.coor = coor;
-        this.eastNorth = Main.proj.latlon2eastNorth(coor); 
+        this.eastNorth = Main.proj.latlon2eastNorth(coor);
     }
-        
-    public void setEastNorth(EastNorth eastNorth) {
+
+    public final LatLon getCoor() {
+        return coor;
+    }
+
+    public final void setEastNorth(EastNorth eastNorth) {
        this.eastNorth = eastNorth;
        this.coor = Main.proj.eastNorth2latlon(eastNorth);
     }
-    
-    public void setEastNorth(double east, double north) {
+
+    public final void setEastNorth(double east, double north) {
         this.setEastNorth(new EastNorth(east, north));
     }
-    
+
+    public final EastNorth getEastNorth() {
+        return eastNorth;
+    }
+
     private static CoordinateFormat mCord;
 
@@ -107 +115 @@
         return name;
     }
+
 }

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

@@ -22 +22 @@
 
     public void visit(Node n) {
-        visit(n.eastNorth);
+        visit(n.getEastNorth());
     }
 

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

@@ -134 +134 @@
     public void visit(Node n) {
         /* check, if the node is visible at all */
-        if((n.eastNorth.east()  > maxEN.east() ) ||
-           (n.eastNorth.north() > maxEN.north()) ||
-           (n.eastNorth.east()  < minEN.east() ) ||
-           (n.eastNorth.north() < minEN.north()))
+        if((n.getEastNorth().east()  > maxEN.east() ) ||
+           (n.getEastNorth().north() > maxEN.north()) ||
+           (n.getEastNorth().east()  < minEN.east() ) ||
+           (n.getEastNorth().north() < minEN.north()))
         {
             n.mappaintVisibleCode = viewid;
@@ -180 +180 @@
         for (Node n : w.nodes)
         {
-            if(n.eastNorth.east() > maxx) maxx = n.eastNorth.east();
-            if(n.eastNorth.north() > maxy) maxy = n.eastNorth.north();
-            if(n.eastNorth.east() < minx) minx = n.eastNorth.east();
-            if(n.eastNorth.north() < miny) miny = n.eastNorth.north();
+            if(n.getEastNorth().east() > maxx) maxx = n.getEastNorth().east();
+            if(n.getEastNorth().north() > maxy) maxy = n.getEastNorth().north();
+            if(n.getEastNorth().east() < minx) minx = n.getEastNorth().east();
+            if(n.getEastNorth().north() < miny) miny = n.getEastNorth().north();
         }
 
@@ -650 +650 @@
         }
 
-        Point pFrom = nc.getPoint(fromNode.eastNorth);
-        Point pVia = nc.getPoint(viaNode.eastNorth);
+        Point pFrom = nc.getPoint(fromNode.getEastNorth());
+        Point pVia = nc.getPoint(viaNode.getEastNorth());
 
         //if(restrictionDebug) {
@@ -887 +887 @@
                         for (Node n : w.nodes)
                         {
-                            p = nc.getPoint(n.eastNorth);
+                            p = nc.getPoint(n.getEastNorth());
                             poly.addPoint(p.x,p.y);
                         }
@@ -941 +941 @@
                     for (Node n : wInner.nodes)
                     {
-                        Point pInner = nc.getPoint(n.eastNorth);
+                        Point pInner = nc.getPoint(n.getEastNorth());
                         polygon.addPoint(pInner.x,pInner.y);
                     }
                     if(!wInner.isClosed())
                     {
-                        Point pInner = nc.getPoint(wInner.nodes.get(0).eastNorth);
+                        Point pInner = nc.getPoint(wInner.nodes.get(0).getEastNorth());
                         polygon.addPoint(pInner.x,pInner.y);
                     }
@@ -1065 +1065 @@
         for (Node n : w.nodes)
         {
-            Point p = nc.getPoint(n.eastNorth);
+            Point p = nc.getPoint(n.getEastNorth());
             polygon.addPoint(p.x,p.y);
         }
@@ -1088 +1088 @@
 
     protected void drawNode(Node n, ImageIcon icon, boolean annotate, Boolean selected) {
-        Point p = nc.getPoint(n.eastNorth);
+        Point p = nc.getPoint(n.getEastNorth());
         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.eastNorth);
-        Point p2 = nc.getPoint(n2.eastNorth);
+        Point p1 = nc.getPoint(n1.getEastNorth());
+        Point p2 = nc.getPoint(n2.getEastNorth());
 
         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.eastNorth);
+            Point p = nc.getPoint(n.getEastNorth());
             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.eastNorth);
-        Point p2 = nc.getPoint(n2.eastNorth);
+        Point p1 = nc.getPoint(n1.getEastNorth());
+        Point p2 = nc.getPoint(n2.getEastNorth());
         drawOrderNumber(p1, p2, orderNumber);
     }

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

@@ -163 +163 @@
 
     private static boolean realMatch(Node n1, Node n2) {
-        return n1.coor.equalsEpsilon(n2.coor);
+        return n1.getCoor().equalsEpsilon(n2.getCoor());
     }
 

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().eastNorth);
+            Point lastP = nc.getPoint(it.next().getEastNorth());
             while(it.hasNext())
             {
-                Point p = nc.getPoint(it.next().eastNorth);
+                Point p = nc.getPoint(it.next().getEastNorth());
                 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().eastNorth);
+            Point lastP = nc.getPoint(it.next().getEastNorth());
             for (int orderNumber = 1; it.hasNext(); orderNumber++) {
-                Point p = nc.getPoint(it.next().eastNorth);
+                Point p = nc.getPoint(it.next().getEastNorth());
                 drawSegment(lastP, p, wayColor,
                     showOnlyHeadArrowOnly ? !it.hasNext() : showThisDirectionArrow);
@@ -352 +352 @@
 
             if (m.member instanceof Node) {
-                Point p = nc.getPoint(((Node) m.member).eastNorth);
+                Point p = nc.getPoint(((Node) m.member).getEastNorth());
                 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.eastNorth);
+                    Point p = nc.getPoint(n.getEastNorth());
                     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.eastNorth);
+            Point p = nc.getPoint(n.getEastNorth());
             if ((p.x < 0) || (p.y < 0) || (p.x > nc.getWidth())
                     || (p.y > nc.getHeight()))