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

Timestamp:

2009-07-08T15:26:12+02:00 (17 years ago)

Author:

stoecker

Message:

close #2874 (NPE), improved external style handling

Location:

trunk/src/org/openstreetmap/josm/data

Files:

• coor/CachedLatLon.java (modified) (1 diff)
• osm/Node.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/data/coor/CachedLatLon.java

@@ -16 +16 @@
         super(coor.lat(), coor.lon());
         proj = null;
+    }
+
+    public CachedLatLon(EastNorth eastNorth) {
+        super(Main.proj.eastNorth2latlon(eastNorth));
+        proj = Main.proj;
+        this.eastNorth = eastNorth;
     }
 

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

@@ -37 +37 @@
 
     public final void setEastNorth(EastNorth eastNorth) {
-        coor.setEastNorth(eastNorth);
+        if(eastNorth != null)
+        {
+            if(coor != null)
+                coor.setEastNorth(eastNorth);
+            else
+                coor = new CachedLatLon(eastNorth);
+        }
     }
 
     public final EastNorth getEastNorth() {
-        return coor.getEastNorth();
+        return coor != null ? coor.getEastNorth() : null;
     }