Changeset 1640 in josm

Timestamp:

Jun 6, 2009 2:30:21 PM (4 years ago)

Author:

stoecker

Message:

little bit more refactoring of coordinate access - patch by jttt

Location:

trunk/src/org/openstreetmap/josm

Files:

• actions/AlignInCircleAction.java (modified) (6 diffs)
• actions/AlignInLineAction.java (modified) (5 diffs)
• actions/CreateCircleAction.java (modified) (1 diff)
• actions/DistributeAction.java (modified) (4 diffs)
• actions/JoinNodeWayAction.java (modified) (1 diff)
• actions/MoveAction.java (modified) (1 diff)
• actions/OrthogonalizeAction.java (modified) (5 diffs)
• actions/PasteAction.java (modified) (2 diffs)
• actions/mapmode/DrawAction.java (modified) (7 diffs)
• actions/mapmode/ExtrudeAction.java (modified) (2 diffs)
• actions/mapmode/SelectAction.java (modified) (2 diffs)
• command/DeleteCommand.java (modified) (1 diff)
• command/MoveCommand.java (modified) (3 diffs)
• command/RotateCommand.java (modified) (1 diff)
• data/conflict/PositionConflict.java (modified) (2 diffs)
• data/osm/Node.java (modified) (2 diffs)
• data/osm/visitor/BoundingXYVisitor.java (modified) (1 diff)
• data/osm/visitor/MapPaintVisitor.java (modified) (10 diffs)
• data/osm/visitor/MergeVisitor.java (modified) (1 diff)
• data/osm/visitor/SimplePaintVisitor.java (modified) (5 diffs)
• gui/NavigatableComponent.java (modified) (5 diffs)
• gui/SelectionManager.java (modified) (3 diffs)
• gui/conflict/nodes/NodeListTableCellRenderer.java (modified) (1 diff)
• gui/conflict/relation/RelationMemberTableCellRenderer.java (modified) (1 diff)
• gui/dialogs/ConflictDialog.java (modified) (1 diff)
• gui/layer/OsmDataLayer.java (modified) (2 diffs)
• io/OsmWriter.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/actions/AlignInCircleAction.java

@@ -89 +89 @@
 
         Node n = new Node(Main.proj.eastNorth2latlon(result));
-        if (n.coor.isOutSideWorld()) {
+        if (n.getCoor().isOutSideWorld()) {
             JOptionPane.showMessageDialog(Main.parent, tr("Some of the nodes are (almost) in the line"));
             return null;
@@ -163 +163 @@
                 } else {
 
-                    center = ((Node) nodes.toArray()[way.nodes.contains(nodes.toArray()[0]) ? 1 : 0]).eastNorth;
+                    center = ((Node) nodes.toArray()[way.nodes.contains(nodes.toArray()[0]) ? 1 : 0]).getEastNorth();
                     if (nodes.size() == 2)
-                        radius = distance(((Node) nodes.toArray()[0]).eastNorth, ((Node) nodes.toArray()[1]).eastNorth);
+                        radius = distance(((Node) nodes.toArray()[0]).getEastNorth(), ((Node) nodes.toArray()[1]).getEastNorth());
                 }
                 nodes = new LinkedList<Node>();
@@ -191 +191 @@
                 n1 = n0;
                 n0 = n;
-                EastNorth cc = circumcenter(n0.eastNorth, n1.eastNorth, n2.eastNorth);
+                EastNorth cc = circumcenter(n0.getEastNorth(), n1.getEastNorth(), n2.getEastNorth());
                 if (cc == null)
                     return;
@@ -209 +209 @@
         if (radius == 0) {
             for (Node n : nodes) {
-                radius += distance(center, n.eastNorth);
+                radius += distance(center, n.getEastNorth());
             }
             radius = radius / nodes.size();
@@ -220 +220 @@
         if (regular) { // Make a regular polygon
             double angle = Math.PI * 2 / nodes.size();
-            pc = new PolarCoor(((Node) nodes.toArray()[0]).eastNorth, center, 0);
-
-            if (pc.angle > (new PolarCoor(((Node) nodes.toArray()[1]).eastNorth, center, 0).angle))
+            pc = new PolarCoor(((Node) nodes.toArray()[0]).getEastNorth(), center, 0);
+
+            if (pc.angle > (new PolarCoor(((Node) nodes.toArray()[1]).getEastNorth(), center, 0).angle))
                 angle *= -1;
 
@@ -228 +228 @@
             for (Node n : nodes) {
                 EastNorth no = pc.toEastNorth();
-                cmds.add(new MoveCommand(n, no.east() - n.eastNorth.east(), no.north() - n.eastNorth.north()));
+                cmds.add(new MoveCommand(n, no.east() - n.getEastNorth().east(), no.north() - n.getEastNorth().north()));
                 pc.angle += angle;
             }
         } else { // Move each node to that distance from the centre.
             for (Node n : nodes) {
-                pc = new PolarCoor(n.eastNorth, center, 0);
+                pc = new PolarCoor(n.getEastNorth(), center, 0);
                 pc.radius = radius;
                 EastNorth no = pc.toEastNorth();
-                cmds.add(new MoveCommand(n, no.east() - n.eastNorth.east(), no.north() - n.eastNorth.north()));
+                cmds.add(new MoveCommand(n, no.east() - n.getEastNorth().east(), no.north() - n.getEastNorth().north()));
             }
         }

trunk/src/org/openstreetmap/josm/actions/AlignInLineAction.java

@@ -71 +71 @@
             itnodes.remove(n);
             for (Node m : itnodes) {
-                double dist = Math.sqrt(n.eastNorth.distance(m.eastNorth));
+                double dist = Math.sqrt(n.getEastNorth().distance(m.getEastNorth()));
                 if (dist > distance) {
                     nodea = n;
@@ -85 +85 @@
 
         // Find out co-ords of A and B
-        double ax = nodea.eastNorth.east();
-        double ay = nodea.eastNorth.north();
-        double bx = nodeb.eastNorth.east();
-        double by = nodeb.eastNorth.north();
+        double ax = nodea.getEastNorth().east();
+        double ay = nodea.getEastNorth().north();
+        double bx = nodeb.getEastNorth().east();
+        double by = nodeb.getEastNorth().north();
 
         // A list of commands to do
@@ -96 +96 @@
         for (Node n : nodes) {
             // Get existing co-ords of node to move
-            double nx = n.eastNorth.east();
-            double ny = n.eastNorth.north();
+            double nx = n.getEastNorth().east();
+            double ny = n.getEastNorth().north();
 
             if (ax == bx) {
@@ -110 +110 @@
                 double c1 = ay - (ax * m1);
                 double m2 = (-1) / m1;
-                double c2 = n.eastNorth.north() - (n.eastNorth.east() * m2);
+                double c2 = n.getEastNorth().north() - (n.getEastNorth().east() * m2);
 
                 nx = (c2 - c1) / (m1 - m2);
@@ -117 +117 @@
 
             // Add the command to move the node to its new position.
-            cmds.add(new MoveCommand(n, nx - n.eastNorth.east(), ny - n.eastNorth.north() ));
+            cmds.add(new MoveCommand(n, nx - n.getEastNorth().east(), ny - n.getEastNorth().north() ));
         }
 

trunk/src/org/openstreetmap/josm/actions/CreateCircleAction.java

@@ -105 +105 @@
         // let's get some shorter names
         Node   n1 = ((Node)nodes.toArray()[0]);
-        double x1 = n1.eastNorth.east();
-        double y1 = n1.eastNorth.north();
+        double x1 = n1.getEastNorth().east();
+        double y1 = n1.getEastNorth().north();
         Node   n2 = ((Node)nodes.toArray()[1]);
-        double x2 = n2.eastNorth.east();
-        double y2 = n2.eastNorth.north();
+        double x2 = n2.getEastNorth().east();
+        double y2 = n2.getEastNorth().north();
         Node   n3 = ((Node)nodes.toArray()[2]);
-        double x3 = n3.eastNorth.east();
-        double y3 = n3.eastNorth.north();
+        double x3 = n3.getEastNorth().east();
+        double y3 = n3.getEastNorth().north();
 
         // calculate the center (xc/yc)

trunk/src/org/openstreetmap/josm/actions/DistributeAction.java

@@ -70 +70 @@
             itnodes.remove(n);
             for (Node m : itnodes) {
-                double dist = Math.sqrt(n.eastNorth.distance(m.eastNorth));
+                double dist = Math.sqrt(n.getEastNorth().distance(m.getEastNorth()));
                 if (dist > distance) {
                     nodea = n;
@@ -84 +84 @@
 
         // Find out co-ords of A and B
-        double ax = nodea.eastNorth.east();
-        double ay = nodea.eastNorth.north();
-        double bx = nodeb.eastNorth.east();
-        double by = nodeb.eastNorth.north();
+        double ax = nodea.getEastNorth().east();
+        double ay = nodea.getEastNorth().north();
+        double bx = nodeb.getEastNorth().east();
+        double by = nodeb.getEastNorth().north();
 
         // A list of commands to do
@@ -104 +104 @@
             distance = 0.0;
             for (Node n : nodes) {
-                double dist = Math.sqrt(nodeb.eastNorth.distance(n.eastNorth));
+                double dist = Math.sqrt(nodeb.getEastNorth().distance(n.getEastNorth()));
                 if (dist > distance) {
                     s = n;
@@ -112 +112 @@
 
             // First move the node to A's position, then move it towards B
-            double dx = ax - s.eastNorth.east() + (bx-ax)*pos/num;
-            double dy = ay - s.eastNorth.north() + (by-ay)*pos/num;
+            double dx = ax - s.getEastNorth().east() + (bx-ax)*pos/num;
+            double dy = ay - s.getEastNorth().north() + (by-ay)*pos/num;
 
             cmds.add(new MoveCommand(s, dx, dy));

trunk/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java

@@ -37 +37 @@
 
         List<WaySegment> wss = Main.map.mapView.getNearestWaySegments(
-            Main.map.mapView.getPoint(node.eastNorth));
+            Main.map.mapView.getPoint(node.getEastNorth()));
         HashMap<Way, List<Integer>> insertPoints = new HashMap<Way, List<Integer>>();
         for (WaySegment ws : wss) {

trunk/src/org/openstreetmap/josm/actions/MoveAction.java

@@ -99 +99 @@
 
         for (Node n : affectedNodes) {
-            if (n.coor.isOutSideWorld()) {
+            if (n.getCoor().isOutSideWorld()) {
                 // Revert move
                 ((MoveCommand) c).moveAgain(-distx, -disty);

trunk/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java

@@ -81 +81 @@
                 int i2 = (i1+1) % (way.nodes.size()-1);
                 int i3 = (i1+2) % (way.nodes.size()-1);
-                double angle1  =Math.abs(way.nodes.get(i1).eastNorth.heading(way.nodes.get(i2).eastNorth));
-                double angle2 = Math.abs(way.nodes.get(i2).eastNorth.heading(way.nodes.get(i3).eastNorth));
+                double angle1  =Math.abs(way.nodes.get(i1).getEastNorth().heading(way.nodes.get(i2).getEastNorth()));
+                double angle2 = Math.abs(way.nodes.get(i2).getEastNorth().heading(way.nodes.get(i3).getEastNorth()));
                 double delta = Math.abs(angle2 - angle1);
                 while(delta > Math.PI) delta -= Math.PI;
@@ -117 +117 @@
             // When selection contains two nodes, use the nodes to compute a direction
             // to align all ways to
-            align_to_heading = normalize_angle(dirnodes.get(0).eastNorth.heading(dirnodes.get(1).eastNorth));
+            align_to_heading = normalize_angle(dirnodes.get(0).getEastNorth().heading(dirnodes.get(1).getEastNorth()));
             use_dirnodes = true;
         }
@@ -131 +131 @@
             EastNorth en[] = new EastNorth[sides];
             for (int i=0; i < sides; i++) {
-                en[i] = new EastNorth(way.nodes.get(i).eastNorth.east(), way.nodes.get(i).eastNorth.north());
+                en[i] = new EastNorth(way.nodes.get(i).getEastNorth().east(), way.nodes.get(i).getEastNorth().north());
             }
 
@@ -142 +142 @@
                 double weights[] = new double[sides];
                 for (int i=0; i < sides; i++) {
-                    headings[i] = normalize_angle(way.nodes.get(i).eastNorth.heading(way.nodes.get(i+1).eastNorth));
-                    weights[i] = way.nodes.get(i).eastNorth.distance(way.nodes.get(i+1).eastNorth);
+                    headings[i] = normalize_angle(way.nodes.get(i).getEastNorth().heading(way.nodes.get(i+1).getEastNorth()));
+                    weights[i] = way.nodes.get(i).getEastNorth().distance(way.nodes.get(i+1).getEastNorth());
                 }
 
@@ -232 +232 @@
 
                 LatLon ill = Main.proj.eastNorth2latlon(intersection);
-                if (!ill.equalsEpsilon(n.coor)) {
-                    double dx = intersection.east()-n.eastNorth.east();
-                    double dy = intersection.north()-n.eastNorth.north();
+                if (!ill.equalsEpsilon(n.getCoor())) {
+                    double dx = intersection.east()-n.getEastNorth().east();
+                    double dy = intersection.north()-n.getEastNorth().north();
                     cmds.add(new MoveCommand(n, dx, dy));
                 }

trunk/src/org/openstreetmap/josm/actions/PasteAction.java

@@ -43 +43 @@
         double maxEast = -1E100, minEast = 1E100, maxNorth = -1E100, minNorth = 1E100;
         for (Node n : pasteBuffer.nodes) {
-            double east = n.eastNorth.east();
-            double north = n.eastNorth.north();
+            double east = n.getEastNorth().east();
+            double north = n.getEastNorth().north();
             if (east > maxEast) { maxEast = east; }
             if (east < minEast) { minEast = east; }
@@ -70 +70 @@
             nnew.id = 0;
             if (Main.main.editLayer() == source) {
-                nnew.setEastNorth(nnew.eastNorth.add(offsetEast, offsetNorth));
+                nnew.setEastNorth(nnew.getEastNorth().add(offsetEast, offsetNorth));
             }
             map.put(n, nnew);

trunk/src/org/openstreetmap/josm/actions/mapmode/DrawAction.java

@@ -332 +332 @@
             // no node found in clicked area
             n = new Node(Main.map.mapView.getLatLon(e.getX(), e.getY()));
-            if (n.coor.isOutSideWorld()) {
+            if (n.getCoor().isOutSideWorld()) {
                 JOptionPane.showMessageDialog(Main.parent,
                     tr("Cannot add a node outside of the world."));
@@ -647 +647 @@
             // user clicked on node
             if (selection.isEmpty()) return;
-            currentMouseEastNorth = currentMouseNode.eastNorth;
+            currentMouseEastNorth = currentMouseNode.getEastNorth();
             mouseOnExistingNode = currentMouseNode;
         } else {
@@ -690 +690 @@
         // find out the distance, in metres, between the base point and the mouse cursor
         LatLon mouseLatLon = Main.proj.eastNorth2latlon(currentMouseEastNorth);
-        distance = currentBaseNode.coor.greatCircleDistance(mouseLatLon);
-        double hdg = Math.toDegrees(currentBaseNode.coor.heading(mouseLatLon));
+        distance = currentBaseNode.getCoor().greatCircleDistance(mouseLatLon);
+        double hdg = Math.toDegrees(currentBaseNode.getCoor().heading(mouseLatLon));
         if (previousNode != null) {
-            angle = hdg - Math.toDegrees(previousNode.coor.heading(currentBaseNode.coor));
+            angle = hdg - Math.toDegrees(previousNode.getCoor().heading(currentBaseNode.getCoor()));
             if (angle < 0) angle += 360;
         }
@@ -772 +772 @@
             Iterator<Pair<Node,Node>> i = segs.iterator();
             Pair<Node,Node> seg = i.next();
-            EastNorth A = seg.a.eastNorth;
-            EastNorth B = seg.b.eastNorth;
+            EastNorth A = seg.a.getEastNorth();
+            EastNorth B = seg.b.getEastNorth();
             seg = i.next();
-            EastNorth C = seg.a.eastNorth;
-            EastNorth D = seg.b.eastNorth;
+            EastNorth C = seg.a.getEastNorth();
+            EastNorth D = seg.b.getEastNorth();
 
             double u=det(B.east() - A.east(), B.north() - A.north(), C.east() - D.east(), C.north() - D.north());
@@ -800 +800 @@
             // fall through to default action.
             // (for semi-parallel lines, intersection might be miles away!)
-            if (Main.map.mapView.getPoint(n.eastNorth).distance(Main.map.mapView.getPoint(intersection)) < snapToIntersectionThreshold) {
+            if (Main.map.mapView.getPoint(n.getEastNorth()).distance(Main.map.mapView.getPoint(intersection)) < snapToIntersectionThreshold) {
                 n.setEastNorth(intersection);
                 return;
@@ -806 +806 @@
 
         default:
-            EastNorth P = n.eastNorth;
+            EastNorth P = n.getEastNorth();
             seg = segs.iterator().next();
-            A = seg.a.eastNorth;
-            B = seg.b.eastNorth;
+            A = seg.a.getEastNorth();
+            B = seg.b.getEastNorth();
             double a = P.distanceSq(B);
             double b = P.distanceSq(A);
@@ -840 +840 @@
         g2.setStroke(new BasicStroke(3, BasicStroke.CAP_ROUND, BasicStroke.JOIN_ROUND));
         GeneralPath b = new GeneralPath();
-        Point p1=mv.getPoint(currentBaseNode.eastNorth);
+        Point p1=mv.getPoint(currentBaseNode.getEastNorth());
         Point p2=mv.getPoint(currentMouseEastNorth);
 

trunk/src/org/openstreetmap/josm/actions/mapmode/ExtrudeAction.java

@@ -155 +155 @@
             Node n2 = selectedSegment.way.nodes.get(selectedSegment.lowerIndex + 1);
 
-            EastNorth en1 = n1.eastNorth;
-            EastNorth en2 = n2.eastNorth;
+            EastNorth en1 = n1.getEastNorth();
+            EastNorth en2 = n2.getEastNorth();
             EastNorth en3 = mv.getEastNorth(mousePos.x, mousePos.y);
 
@@ -234 +234 @@
             Node n1 = selectedSegment.way.nodes.get(selectedSegment.lowerIndex);
             Node n2 = selectedSegment.way.nodes.get(selectedSegment.lowerIndex+1);
-            EastNorth en3 = n2.eastNorth.add(xoff, yoff);
+            EastNorth en3 = n2.getEastNorth().add(xoff, yoff);
             Node n3 = new Node(Main.proj.eastNorth2latlon(en3));
-            EastNorth en4 = n1.eastNorth.add(xoff, yoff);
+            EastNorth en4 = n1.getEastNorth().add(xoff, yoff);
             Node n4 = new Node(Main.proj.eastNorth2latlon(en4));
             Way wnew = new Way(selectedSegment.way);

trunk/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java

@@ -224 +224 @@
 
                 for (Node n : affectedNodes) {
-                    if (n.coor.isOutSideWorld()) {
+                    if (n.getCoor().isOutSideWorld()) {
                         // Revert move
                         ((MoveCommand) c).moveAgain(-dx, -dy);
@@ -280 +280 @@
                 {
                     Way w = (Way)osm;
-                    Point p1 = c.getPoint(w.nodes.get(nearestWS.lowerIndex).eastNorth);
-                    Point p2 = c.getPoint(w.nodes.get(nearestWS.lowerIndex+1).eastNorth);
+                    Point p1 = c.getPoint(w.nodes.get(nearestWS.lowerIndex).getEastNorth());
+                    Point p2 = c.getPoint(w.nodes.get(nearestWS.lowerIndex+1).getEastNorth());
                     if(SimplePaintVisitor.isLargeSegment(p1, p2, Main.pref.getInteger("mappaint.node.virtual-space", 70)))
                     {

trunk/src/org/openstreetmap/josm/command/DeleteCommand.java

@@ -340 +340 @@
                 if (osm instanceof Node && osm.id != 0) {
                     Node n = (Node) osm;
-                    if (!a.contains(n.coor)) {
+                    if (!a.contains(n.getCoor())) {
                         JPanel msg = new JPanel(new GridBagLayout());
                         msg.add(new JLabel(

trunk/src/org/openstreetmap/josm/command/MoveCommand.java

@@ -70 +70 @@
         for (Node n : this.objects) {
             OldState os = new OldState();
-            os.eastNorth = n.eastNorth;
-            os.latlon = n.coor;
+            os.eastNorth = n.getEastNorth();
+            os.latlon = n.getCoor();
             os.modified = n.modified;
             oldState.add(os);
@@ -87 +87 @@
     public void moveAgain(double x, double y) {
         for (Node n : objects) {
-            n.setEastNorth(n.eastNorth.add(x, y));
+            n.setEastNorth(n.getEastNorth().add(x, y));
         }
         this.x += x;
@@ -95 +95 @@
     @Override public boolean executeCommand() {
         for (Node n : objects) {
-            n.setEastNorth(n.eastNorth.add(x, y));
+            n.setEastNorth(n.getEastNorth().add(x, y));
             n.modified = true;
         }

trunk/src/org/openstreetmap/josm/command/RotateCommand.java

@@ -64 +64 @@
         for (Node n : this.objects) {
             MoveCommand.OldState os = new MoveCommand.OldState();
-            os.eastNorth = n.eastNorth;
-            os.latlon = n.coor;
+            os.eastNorth = n.getEastNorth();
+            os.latlon = n.getCoor();
             os.modified = n.modified;
             oldState.put(n, os);

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()))

trunk/src/org/openstreetmap/josm/gui/NavigatableComponent.java

@@ -158 +158 @@
             if (n.deleted || n.incomplete)
                 continue;
-            Point sp = getPoint(n.eastNorth);
+            Point sp = getPoint(n.getEastNorth());
             double dist = p.distanceSq(sp);
             if (dist < minDistanceSq) {
@@ -193 +193 @@
                 }
 
-                Point A = getPoint(lastN.eastNorth);
-                Point B = getPoint(n.eastNorth);
+                Point A = getPoint(lastN.getEastNorth());
+                Point B = getPoint(n.getEastNorth());
                 double c = A.distanceSq(B);
                 double a = p.distanceSq(B);
@@ -302 +302 @@
                     continue;
                 }
-                Point A = getPoint(lastN.eastNorth);
-                Point B = getPoint(n.eastNorth);
+                Point A = getPoint(lastN.getEastNorth());
+                Point B = getPoint(n.getEastNorth());
                 double c = A.distanceSq(B);
                 double a = p.distanceSq(B);
@@ -317 +317 @@
         for (Node n : getData().nodes) {
             if (!n.deleted && !n.incomplete
-                    && getPoint(n.eastNorth).distanceSq(p) < snapDistance) {
+                    && getPoint(n.getEastNorth()).distanceSq(p) < snapDistance) {
                 nearest.add(n);
             }
@@ -336 +336 @@
         for (Node n : getData().nodes) {
             if (!n.deleted && !n.incomplete
-                    && getPoint(n.eastNorth).distanceSq(p) < snapDistance) {
+                    && getPoint(n.getEastNorth()).distanceSq(p) < snapDistance) {
                 nearest.add(n);
             }

trunk/src/org/openstreetmap/josm/gui/SelectionManager.java

@@ -280 +280 @@
             // nodes
             for (Node n : nc.getData().nodes) {
-                if (!n.deleted && !n.incomplete && r.contains(nc.getPoint(n.eastNorth)))
+                if (!n.deleted && !n.incomplete && r.contains(nc.getPoint(n.getEastNorth())))
                     selection.add(n);
             }
@@ -290 +290 @@
                 if (alt) {
                     for (Node n : w.nodes) {
-                        if (!n.incomplete && r.contains(nc.getPoint(n.eastNorth))) {
+                        if (!n.incomplete && r.contains(nc.getPoint(n.getEastNorth()))) {
                             selection.add(w);
                             break;
@@ -298 +298 @@
                     boolean allIn = true;
                     for (Node n : w.nodes) {
-                        if (!n.incomplete && !r.contains(nc.getPoint(n.eastNorth))) {
+                        if (!n.incomplete && !r.contains(nc.getPoint(n.getEastNorth()))) {
                             allIn = false;
                             break;

trunk/src/org/openstreetmap/josm/gui/conflict/nodes/NodeListTableCellRenderer.java

@@ -65 +65 @@
         sb.append(" (");
 
-        if (node.coor != null) {
-            sb.append(COORD_FORMATTER.format(node.coor.lat()));
+        if (node.getCoor() != null) {
+            sb.append(COORD_FORMATTER.format(node.getCoor().lat()));
             sb.append(",");
-            sb.append(COORD_FORMATTER.format(node.coor.lon()));
+            sb.append(COORD_FORMATTER.format(node.getCoor().lon()));
         } else {
             sb.append("?,?");

trunk/src/org/openstreetmap/josm/gui/conflict/relation/RelationMemberTableCellRenderer.java

@@ -82 +82 @@
             Node n = (Node)primitive;
             sb.append(" (");
-            if (n.coor != null) {
-                sb.append(COORD_FORMATTER.format(n.coor.lat()));
+            if (n.getCoor() != null) {
+                sb.append(COORD_FORMATTER.format(n.getCoor().lat()));
                 sb.append(",");
-                sb.append(COORD_FORMATTER.format(n.coor.lon()));
+                sb.append(COORD_FORMATTER.format(n.getCoor().lon()));
             } else {
                 sb.append("?,?");

trunk/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java

@@ -202 +202 @@
         Visitor conflictPainter = new AbstractVisitor(){
             public void visit(Node n) {
-                Point p = nc.getPoint(n.eastNorth);
+                Point p = nc.getPoint(n.getEastNorth());
                 g.drawRect(p.x-1, p.y-1, 2, 2);
             }
             public void visit(Node n1, Node n2) {
-                Point p1 = nc.getPoint(n1.eastNorth);
-                Point p2 = nc.getPoint(n2.eastNorth);
+                Point p1 = nc.getPoint(n1.getEastNorth());
+                Point p2 = nc.getPoint(n2.getEastNorth());
                 g.drawLine(p1.x, p1.y, p2.x, p2.y);
             }

trunk/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java

@@ -427 +427 @@
                     doneNodes.add(n);
                 }
-                WayPoint wpt = new WayPoint(n.coor);                
+                WayPoint wpt = new WayPoint(n.getCoor());                
                 if (!n.isTimestampEmpty())
                 {
@@ -441 +441 @@
         for (Node n : data.nodes) {
             if (n.incomplete || n.deleted || doneNodes.contains(n)) continue;
-            WayPoint wpt = new WayPoint(n.coor);
+            WayPoint wpt = new WayPoint(n.getCoor());
             if (!n.isTimestampEmpty()) {
                 wpt.attr.put("time", DateUtils.fromDate(n.getTimestamp()));

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

@@ -98 +98 @@
         if (n.incomplete) return;
         addCommon(n, "node");
-        out.print(" lat='"+n.coor.lat()+"' lon='"+n.coor.lon()+"'");
+        out.print(" lat='"+n.getCoor().lat()+"' lon='"+n.getCoor().lon()+"'");
         if (!withBody) {
             out.println("/>");