Changeset 5349 in josm for trunk/src/org

Timestamp:

2012-07-19T00:05:11+02:00 (12 years ago)

Author:

Don-vip

Message:

see #7847 - Allow to reset Node coordinates to null (this is needed when merging a node in version A with its deleted visible version B)

File:

• trunk/src/org/openstreetmap/josm/data/osm/Node.java (modified) (2 diffs)

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

@@ -34 +34 @@
     @Override
     public final void setCoor(LatLon coor) {
-        if(coor != null){
-            updateCoor(coor, null);
-        }
+        updateCoor(coor, null);
     }
 
     @Override
     public final void setEastNorth(EastNorth eastNorth) {
-        if(eastNorth != null) {
-            updateCoor(null, eastNorth);
-        }
+        updateCoor(null, eastNorth);
     }
 
@@ -113 +109 @@
             this.east = eastNorth.east();
             this.north = eastNorth.north();
-        } else
-            throw new IllegalArgumentException();
+        } else {
+            this.lat = Double.NaN;
+            this.lon = Double.NaN;
+            invalidateEastNorthCache();
+        }
     }