Changeset 12242 in josm

Timestamp:

2017-05-23T21:25:30+02:00 (7 years ago)

Author:

stoecker

Message:

see #14655 - handle api keys in URL compare

File:

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

trunk/scripts/SyncEditorLayerIndex.groovy

@@ -187 +187 @@
 
         for (def e : eliEntries) {
-            def url = getUrl(e)
+            def url = getUrlStripped(e)
             if (url.contains("{z}")) {
                 myprintln "+++ ELI-URL uses {z} instead of {zoom}: "+url
@@ -305 +305 @@
 
         for (def e : josmEntries) {
-            def url = getUrl(e)
+            def url = getUrlStripped(e)
             if (url.contains("{z}")) {
                 myprintln "+++ JOSM-URL uses {z} instead of {zoom}: "+url
@@ -316 +316 @@
             }
             for (def m : e.getMirrors()) {
-                url = getUrl(m)
+                url = getUrlStripped(m)
                 m.origName = m.getOriginalName().replaceAll(" mirror server( \\d+)?","")
                 if (josmUrls.containsKey(url)) {
@@ -367 +367 @@
             def jname = getName(j).replace("'","\u2019")
             if (!ename.equals(jname)) {
-                myprintln "* Name differs ('${getName(e)}' != '${getName(j)}'): $url"
+                myprintln "* Name differs ('${getName(e)}' != '${getName(j)}'): ${getUrl(j)}"
             }
         }
@@ -379 +379 @@
             def jname = getId(j)
             if (!ename.equals(jname)) {
-                myprintln "+ SKIP * Id differs ('${getId(e)}' != '${getId(j)}'): $url"
+                myprintln "+ SKIP * Id differs ('${getId(e)}' != '${getId(j)}'): ${getUrl(j)}"
             }
         }
@@ -389 +389 @@
             def j = josmUrls.get(url)
             if (!getType(e).equals(getType(j))) {
-                myprintln "* Type differs (${getType(e)} != ${getType(j)}): ${getName(j)} - $url"
+                myprintln "* Type differs (${getType(e)} != ${getType(j)}): ${getName(j)} - ${getUrl(j)}"
             }
         }
@@ -704 +704 @@
         return e.get("properties").getString("url")
     }
+    static String getUrlStripped(Object e) {
+        return getUrl(e).replaceAll("\\?(apikey|access_token)=.*","")
+    }
     static String getDate(Object e) {
         if (e instanceof ImageryInfo) return e.date ? e.date : ""