Changeset 13518 in josm for trunk

Timestamp:

2018-03-11T22:35:49+01:00 (7 years ago)

Author:

stoecker

Message:

don't issue error for http/https switches in JOSM

File:

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

trunk/scripts/SyncEditorLayerIndex.groovy

@@ -334 +334 @@
     List inOneButNotTheOther(Map m1, Map m2, String code, String https) {
         def l = []
-        for (def url : m1.keySet()) {
+        def k = new LinkedList<String>(m1.keySet())
+        for (def url : k) {
             if (!m2.containsKey(url)) {
                 String urlhttps = url.replace("http:","https:")
@@ -345 +346 @@
                 {
                     l += https+" Missing https: "+getDescription(m1.get(url))
+                    m1.put(urlhttps, m1.get(url))
+                    m1.remove(url)
                 }
             }
@@ -521 +524 @@
                     myprintln "- Missing JOSM attribution URL (${et}): ${getDescription(j)}"
                 } else if (et) {
-                    myprintln "* Attribution URL differs ('${et}' != '${jt}'): ${getDescription(j)}"
+                    def ethttps = et.replace("http:","https:")
+                    if(jt.equals(ethttps)) {
+                        myprintln "+ Attribution URL differs ('${et}' != '${jt}'): ${getDescription(j)}"
+                    } else {
+                        myprintln "* Attribution URL differs ('${et}' != '${jt}'): ${getDescription(j)}"
+                    }
                 } else if (!options.nomissingeli) {
                     myprintln "+ Missing ELI attribution URL ('${jt}'): ${getDescription(j)}"