Changeset 13517 in josm

Timestamp:

2018-03-11T22:26:23+01:00 (7 years ago)

Author:

stoecker

Message:

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

File:

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

trunk/scripts/SyncEditorLayerIndex.groovy

@@ -332 +332 @@
     }
 
-    List inOneButNotTheOther(Map m1, Map m2) {
+    List inOneButNotTheOther(Map m1, Map m2, String code, String https) {
         def l = []
         for (def url : m1.keySet()) {
             if (!m2.containsKey(url)) {
-                def name = getName(m1.get(url))
-                l += "  "+getDescription(m1.get(url))
+                String urlhttps = url.replace("http:","https:")
+                if(!https || !m2.containsKey(urlhttps))
+                {
+                    def name = getName(m1.get(url))
+                    l += code+"  "+getDescription(m1.get(url))
+                }
+                else
+                {
+                    l += https+" Missing https: "+getDescription(m1.get(url))
+                }
             }
         }
@@ -344 +352 @@
 
     void checkInOneButNotTheOther() {
-        def l1 = inOneButNotTheOther(eliUrls, josmUrls)
+        def l1 = inOneButNotTheOther(eliUrls, josmUrls, "-", "+")
         myprintln "*** URLs found in ELI but not in JOSM (${l1.size()}): ***"
         if (!l1.isEmpty()) {
             for (def l : l1) {
-                myprintln "-" + l
-            }
-        }
-
-        def l2 = inOneButNotTheOther(josmUrls, eliUrls)
+                myprintln l
+            }
+        }
+
+        def l2 = inOneButNotTheOther(josmUrls, eliUrls, "+", "")
         myprintln "*** URLs found in JOSM but not in ELI (${l2.size()}): ***"
         if (!l2.isEmpty()) {
             for (def l : l2) {
-                myprintln "+" + l
+                myprintln l
             }
         }