Changeset 13527 in josm

Timestamp:

2018-03-14T18:55:03+01:00 (7 years ago)

Author:

stoecker

Message:

cleanup new WMS checks a bit

File:

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

trunk/scripts/SyncEditorLayerIndex.groovy

@@ -663 +663 @@
         myprintln "*** Miscellaneous checks: ***"
         def josmIds = new HashMap<String, ImageryInfo>()
+        def all = Projections.getAllProjectionCodes()
+        def oldproj = new HashMap<String, String>()
+        oldproj.put("EPSG:3785", "EPSG:3857")
+        oldproj.put("EPSG:102100", "EPSG:3857")
+        oldproj.put("EPSG:102113", "EPSG:3857")
+        oldproj.put("EPSG:900913", "EPGS:3857")
         for (def url : josmUrls.keySet()) {
             def j = josmUrls.get(url)
@@ -670 +676 @@
                     myprintln "* WMS without projections: ${getDescription(j)}"
                 } else {
-                    def all = Projections.getAllProjectionCodes();
-                    def unsupported = new LinkedList<String>();
+                    def unsupported = new LinkedList<String>()
+                    def old = new LinkedList<String>()
                     for (def p : getProjections(j)) {
                         if("CRS:84".equals(p)) {
@@ -677 +683 @@
                                 myprintln "! CRS:84 without WMS 1.3: ${getDescription(j)}"
                             }
+                        } else if(oldproj.containsKey(p)) {
+                            old.add(p)
                         } else if(!all.contains(p)) {
                             unsupported.add(p)
@@ -682 +690 @@
                     }
                     if (unsupported) {
-                        def s = String.join(" ", unsupported)
-                        myprintln "! Projections ${s} not supported by JOSM (maybe Obsolete code): ${getDescription(j)}"
+                        def s = String.join(", ", unsupported)
+                        myprintln "! Projections ${s} not supported by JOSM: ${getDescription(j)}"
+                    }
+                    for (def o : old) {
+                        myprintln "! Projections ${o} is an old unsupported code and has been replaced by ${oldproj.get(o)}: ${getDescription(j)}"
                     }
                 }