Changeset 17328 in josm for trunk

Timestamp:

2020-11-21T14:33:36+01:00 (4 years ago)

Author:

stoecker

Message:

special handling for recent ELI WMS_URL switches

File:

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

trunk/scripts/SyncEditorLayerIndex.java

@@ -539 +539 @@
     }
 
+    // catch reordered arguments and switches to WMS version 1.3.0
+    String unifyWMS(String url) {
+        String x[] = url.replaceAll("(?i)VERSION=[0-9.]+", "VERSION=x").replaceAll("(?i)SRS=", "CRS=").split("\\?");
+        String a[] = x[1].split("&");
+        Arrays.sort(a);
+        url = x[0]+"?"+String.join("&",a);
+        return url;
+    }
+
     void checkInOneButNotTheOther() {
         List<String> le = new LinkedList<>(eliUrls.keySet());
@@ -570 +579 @@
 
                         if (ide.equals(idj) && Objects.equals(getType(j), getType(e))) {
-                            myprintln("* URL for id "+idj+" differs ("+urle+"): "+getDescription(j));
+                            if(getType(j).equals("wms") && unifyWMS(urle).equals(unifyWMS(urlj))) {
+                              myprintln("# WMS-URL for id "+idj+" modified: "+getDescription(j));
+                            } else {
+                              myprintln("* URL for id "+idj+" differs ("+urle+"): "+getDescription(j));
+                            }
                             le.remove(urle);
                             lj.remove(urlj);