Changeset 12226 in josm for trunk

Timestamp:

2017-05-22T10:37:50+02:00 (7 years ago)

Author:

stoecker

Message:

add default value to compare script

File:

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

trunk/scripts/SyncEditorLayerIndex.groovy

@@ -244 +244 @@
             if((t = getCountryCode(e)))
                 stream.write "        <country-code>$t</country-code>\n"
+            if((getDefault(e)))
+                stream.write "        <default>true</default>\n"
             stream.write maininfo(e, "        ")
             if((t = getAttributionText(e)))
@@ -369 +371 @@
         }
 
-        /*myprintln "*** Same URL, but different Id: ***"
+        myprintln "*** Same URL, but different Id: ***"
         for (def url : eliUrls.keySet()) {
             def e = eliUrls.get(url)
@@ -377 +379 @@
             def jname = getId(j)
             if (!ename.equals(jname)) {
-                myprintln "* Id differs ('${getId(e)}' != '${getId(j)}'): $url"
-            }
-        }*/
+                myprintln "+ SKIP * Id differs ('${getId(e)}' != '${getId(j)}'): $url"
+            }
+        }
 
         myprintln "*** Same URL, but different type: ***"
@@ -537 +539 @@
                 } else if (!options.nomissingeli && !getType(e).equals("tms")) {
                     myprintln "+ Missing ELI projections ('${jt}'): ${getDescription(j)}"
+                }
+            }
+
+            et = getDefault(e)
+            jt = getDefault(j)
+            if (!et.equals(jt)) {
+                if (!jt) {
+                    myprintln "* SKIP - Missing JOSM default: ${getDescription(j)}"
+                } else if (!options.nomissingeli) {
+                    myprintln "+ Missing ELI default: ${getDescription(j)}"
                 }
             }
@@ -845 +857 @@
         return false
     }
+    static Boolean getDefault(Object e) {
+        if (e instanceof ImageryInfo) return e.isDefaultEntry()
+        return e.get("properties").getBoolean("default", false)
+    }
     String getDescription(Object o) {
         def url = getUrl(o)