Changeset 11653 in josm for trunk/src

Timestamp:

2017-03-03T21:38:29+01:00 (7 years ago)

Author:

Don-vip

Message:

fix #14437 - NPE at AbstractProjection.latlon2eastNorth with Tools => Add Node...

File:

• trunk/src/org/openstreetmap/josm/gui/dialogs/LatLonDialog.java (modified) (1 diff)

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

@@ -169 +169 @@
 
     public void setCoordinates(LatLon ll) {
-        latLonCoordinates = Optional.ofNullable(ll).orElse(LatLon.ZERO);
-        tfLatLon.setText(latLonCoordinates.latToString(CoordinateFormat.getDefaultFormat()) + ' ' +
-                         latLonCoordinates.lonToString(CoordinateFormat.getDefaultFormat()));
-        EastNorth en = Main.getProjection().latlon2eastNorth(latLonCoordinates);
+        LatLon llc = Optional.ofNullable(ll).orElse(LatLon.ZERO);
+        tfLatLon.setText(llc.latToString(CoordinateFormat.getDefaultFormat()) + ' ' +
+                         llc.lonToString(CoordinateFormat.getDefaultFormat()));
+        EastNorth en = Main.getProjection().latlon2eastNorth(llc);
         tfEastNorth.setText(Double.toString(en.east()) + ' ' + Double.toString(en.north()));
+        // Both latLonCoordinates and eastNorthCoordinates may have been reset to null if ll is out of the world
+        latLonCoordinates = llc;
+        eastNorthCoordinates = en;
         setOkEnabled(true);
     }