Changeset 13831 in josm for trunk/scripts

Timestamp:

2018-05-25T19:50:34+02:00 (6 years ago)

Author:

Don-vip

Message:

fix #16313 - NPE

File:

• trunk/scripts/SyncEditorLayerIndex.groovy (modified) (2 diffs)

trunk/scripts/SyncEditorLayerIndex.groovy

@@ -22 +22 @@
 import javax.json.JsonObject
 import javax.json.JsonReader
+import javax.json.JsonValue
 
 import org.openstreetmap.josm.Main
@@ -989 +990 @@
             return []
         }
-        if(!e.isNull("geometry")) {
-            def ex = e.get("geometry")
-            if(ex != null && !ex.isNull("coordinates")) {
-                def poly = ex.get("coordinates")
-                List<Shape> l = []
-                for(def shapes: poly) {
-                    def s = new Shape()
-                    for(def point: shapes) {
-                        def lon = point[0].toString()
-                        def lat = point[1].toString()
-                        s.addPoint(lat, lon)
-                    }
-                    l.add(s)
-                }
-                return l
-            }
+        def ex = e.get("geometry")
+        if (ex != null && !JsonValue.NULL.equals(ex) && !ex.isNull("coordinates")) {
+            def poly = ex.get("coordinates")
+            List<Shape> l = []
+            for(def shapes: poly) {
+                def s = new Shape()
+                for(def point: shapes) {
+                    def lon = point[0].toString()
+                    def lat = point[1].toString()
+                    s.addPoint(lat, lon)
+                }
+                l.add(s)
+            }
+            return l
         }
         return []