Changeset 11414 in josm for trunk/scripts

Timestamp:

2016-12-22T20:28:57+01:00 (7 years ago)

Author:

stoecker

Message:

see #12706 - small cleanup

File:

• trunk/scripts/SyncEditorImageryIndex.groovy (modified) (1 diff)

trunk/scripts/SyncEditorImageryIndex.groovy

@@ -354 +354 @@
             def j = josmUrls.get(url)
             def js = getShapes(j)
-            if(!s.size() && js.size() && !options.nomissingeii) {
-                myprintln "+ No EII shape: ${getDescription(j)}"
+            if(!s.size() && js.size()) {
+                if(!options.nomissingeii) {
+                    myprintln "+ No EII shape: ${getDescription(j)}"
+                }
             } else if(!js.size() && s.size()) {
                 myprintln "- No JOSM shape: ${getDescription(j)}"
+            } else if(s.size() != js.size()) {
+                myprintln "* Different number of shapes (${s.size()} != ${js.size()}): ${getDescription(j)}"
             } else {
-                if(s.size() != js.size()) {
-                    myprintln "* Different number of shapes (${s.size()} != ${js.size()}): ${getDescription(j)}"
-                } else {
-                    for(def nums = 0; nums < s.size(); ++nums) {
-                        def ep = s[nums].getPoints()
-                        def jp = js[nums].getPoints()
-                        if(ep.size() != jp.size()) {
-                            myprintln "* Different number of points for shape ${nums+1} (${ep.size()} ! = ${jp.size()})): ${getDescription(j)}"
-                        } else {
-                            for(def nump = 0; nump < ep.size(); ++nump) {
-                                def ept = ep[nump]
-                                def jpt = jp[nump]
-                                if(Math.abs(ept.getLat()-jpt.getLat()) > 0.000001 || Math.abs(ept.getLon()-jpt.getLon()) > 0.000001) {
-                                    myprintln "* Different coordinate for point ${nump+1} of shape ${nums+1}: ${getDescription(j)}"
-                                    nump = ep.size()
-                                    num = s.size()
-                                }
+                for(def nums = 0; nums < s.size(); ++nums) {
+                    def ep = s[nums].getPoints()
+                    def jp = js[nums].getPoints()
+                    if(ep.size() != jp.size()) {
+                        myprintln "* Different number of points for shape ${nums+1} (${ep.size()} ! = ${jp.size()})): ${getDescription(j)}"
+                    } else {
+                        for(def nump = 0; nump < ep.size(); ++nump) {
+                            def ept = ep[nump]
+                            def jpt = jp[nump]
+                            if(Math.abs(ept.getLat()-jpt.getLat()) > 0.000001 || Math.abs(ept.getLon()-jpt.getLon()) > 0.000001) {
+                                myprintln "* Different coordinate for point ${nump+1} of shape ${nums+1}: ${getDescription(j)}"
+                                nump = ep.size()
+                                num = s.size()
                             }
                         }