Changeset 11411 in josm for trunk

Timestamp:

2016-12-22T09:13:02+01:00 (7 years ago)

Author:

stoecker

Message:

see #12706 - improve shape difference display, ignore shapes equivalent to bounds

File:

• trunk/scripts/SyncEditorImageryIndex.groovy (modified) (3 diffs)

trunk/scripts/SyncEditorImageryIndex.groovy

@@ -350 +350 @@
             }
             def j = josmUrls.get(url)
-            if(!s.equals(getShapes(j))) {
-                myprintln " Different shapes: ${getDescription(j)}"
+            def js = getShapes(j)
+            if(!s.equals(js)) {
+                if(!s.size()) {
+                    myprintln " No EII shape: ${getDescription(j)}"
+                } else if(!js.size()) {
+                    myprintln " No JOSM shape: ${getDescription(j)}"
+                } else {
+                    myprintln " Different shapes: ${getDescription(j)}"
+                }
             }
         }
@@ -369 +376 @@
     static List<Shape> getShapes(Object e) {
         if (e instanceof ImageryInfo) {
-          def bounds = e.getBounds();
-          if(bounds != null) {
-            return bounds.getShapes();
-          }
-          return []
+            def bounds = e.getBounds();
+            if(bounds != null) {
+                return bounds.getShapes();
+            }
+            return []
         }
         def ex = e.get("extent")
@@ -389 +396 @@
                     l.add(s)
                 }
+                if (l.size() == 1 && l[0].getPoints().size() == 5) {
+                    return [] // ignore a bounds equivalent shape
+                }
                 return l
             }