Changeset 31031 in osm for applications/editors/josm/plugins/seachart/src/s57

Timestamp:

2015-02-20T12:34:09+01:00 (10 years ago)

Author:

malcolmh

Message:

cope with missing nodes

File:

• applications/editors/josm/plugins/seachart/src/s57/S57map.java (modified) (3 diffs)

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

@@ -942 +942 @@
                                 while (git.hasNode()) {
                                         node = git.next();
-                                        if (node != null) {
-                                                llon = lon;
-                                                llat = lat;
-                                                lat = node.lat;
-                                                lon = node.lon;
-                                                sigma += (lon * Math.sin(llat)) - (llon * Math.sin(lat));
-                                        }
+                                        if (node == null) continue;
+                                        llon = lon;
+                                        llat = lat;
+                                        lat = node.lat;
+                                        lon = node.lon;
+                                        sigma += (lon * Math.sin(llat)) - (llon * Math.sin(lat));
                                 }
                         }
@@ -1009 +1008 @@
                                         while (git.hasNode()) {
                                                 Snode node = git.next();
+                                                if (node == null) continue;
                                                 lat = node.lat;
                                                 lon = node.lon;
@@ -1031 +1031 @@
                                         while (git.hasNode()) {
                                                 Snode node = git.next();
+                                                if (node == null) continue;
                                                 lat = node.lat;
                                                 lon = node.lon;