Changeset 30996 in osm for applications/editors/josm/plugins/seachart

Timestamp:

2015-02-15T21:08:12+01:00 (10 years ago)

Author:

malcolmh

Message:

Catch invalid nodes

Location:

applications/editors/josm/plugins/seachart/src

Files:

• s57/S57map.java (modified) (2 diffs)
• seachart/SeachartAction.java (modified) (1 diff)

applications/editors/josm/plugins/seachart/src/s57/S57map.java

@@ -757 +757 @@
                                 git.nextEdge();
                                 while (git.hasNode()) {
-                                        llon = lon;
-                                        llat = lat;
                                         node = git.next();
-                                        lat = node.lat;
-                                        lon = node.lon;
-                                        sigma += (lon * Math.sin(llat)) - (llon * Math.sin(lat));
+                                        if (node != null) {
+                                                llon = lon;
+                                                llat = lat;
+                                                lat = node.lat;
+                                                lon = node.lon;
+                                                sigma += (lon * Math.sin(llat)) - (llon * Math.sin(lat));
+                                        }
                                 }
                         }
@@ -794 +796 @@
                                                 lat = node.lat;
                                                 lon = node.lon;
-                                        } else {
+                                        } else if (node != null) {
                                                 llat = lat;
                                                 llon = lon;

applications/editors/josm/plugins/seachart/src/seachart/SeachartAction.java

@@ -149 +149 @@
                                 LatLon coor = node.getCoor();
                                 if (coor != null) {
-                                        map.addNode(node.getUniqueId(), node.getCoor().lat(), node.getCoor().lon());
+                                        map.addNode(node.getUniqueId(), coor.lat(), coor.lon());
                                         for (Entry<String, String> entry : node.getKeys().entrySet()) {
                                                 map.addTag(entry.getKey(), entry.getValue());