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

Timestamp:

2009-06-06T13:38:32+02:00 (15 years ago)

Author:

stoecker

Message:

fix #2302 - patch by jttt - some code cleanup for better encapsulation

Location:

trunk/src/org/openstreetmap/josm/data

Files:

• conflict/PositionConflict.java (modified) (1 diff)
• osm/Node.java (modified) (3 diffs)

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

@@ -23 +23 @@
     @Override public void apply(OsmPrimitive target, OsmPrimitive other) {
         if (target instanceof Node) {
-            ((Node)target).coor = ((Node)other).coor;
-            ((Node)target).eastNorth = ((Node)other).eastNorth;
+            ((Node)target).setEastNorth(((Node)other).eastNorth);
             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

@@ -5 +5 @@
 
 import org.openstreetmap.josm.Main;
+import org.openstreetmap.josm.data.coor.EastNorth;
 import org.openstreetmap.josm.data.coor.LatLon;
-import org.openstreetmap.josm.data.coor.EastNorth;
 import org.openstreetmap.josm.data.coor.LatLon.CoordinateFormat;
 import org.openstreetmap.josm.data.osm.visitor.Visitor;
@@ -20 +20 @@
     public LatLon coor;
     public volatile EastNorth eastNorth;
-
+        
+    public void setCoor(LatLon coor) {
+        this.coor = coor;
+        this.eastNorth = Main.proj.latlon2eastNorth(coor); 
+    }
+        
+    public void setEastNorth(EastNorth eastNorth) {
+       this.eastNorth = eastNorth;
+       this.coor = Main.proj.eastNorth2latlon(eastNorth);
+    }
+    
+    public void setEastNorth(double east, double north) {
+        this.setEastNorth(new EastNorth(east, north));
+    }
+    
     private static CoordinateFormat mCord;
 
@@ -47 +61 @@
 
     public Node(LatLon latlon) {
-        this.coor = latlon;
-        eastNorth = Main.proj.latlon2eastNorth(latlon);
+        setCoor(latlon);
     }