Changeset 13997 in josm for trunk

Timestamp:

2018-07-03T19:46:22+02:00 (6 years ago)

Author:

stoecker

Message:

see #16448 - dont skip zoomlevels for WMS mirrors totally

File:

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

trunk/scripts/SyncEditorLayerIndex.groovy

@@ -492 +492 @@
             Integer eMinZoom = getMinZoom(e)
             Integer jMinZoom = getMinZoom(j)
+            /* dont warn for entries copied from the base of the mirror */
+            if(eMinZoom == null && "wms".equals(getType(j)) && j.getName() =~ / mirror/)
+                jMinZoom = null;
             if (eMinZoom != jMinZoom  && !(eMinZoom == 0 && jMinZoom == null)) {
                 myprintln "* Minzoom differs (${eMinZoom} != ${jMinZoom}): ${getDescription(j)}"
@@ -497 +500 @@
             Integer eMaxZoom = getMaxZoom(e)
             Integer jMaxZoom = getMaxZoom(j)
+            /* dont warn for entries copied from the base of the mirror */
+            if(eMaxZoom == null && "wms".equals(getType(j)) && j.getName() =~ / mirror/)
+                jMaxZoom = null;
             if (eMaxZoom != jMaxZoom) {
                 myprintln "* Maxzoom differs (${eMaxZoom} != ${jMaxZoom}): ${getDescription(j)}"
@@ -1019 +1025 @@
     static Integer getMinZoom(Object e) {
         if (e instanceof ImageryInfo) {
-            if("wms".equals(getType(e)) && e.getName() =~ / mirror/)
-                return null
             int mz = e.getMinZoom()
             return mz == 0 ? null : mz
@@ -1031 +1035 @@
     static Integer getMaxZoom(Object e) {
         if (e instanceof ImageryInfo) {
-            if("wms".equals(getType(e)) && e.getName() =~ / mirror/)
-                return null
             int mz = e.getMaxZoom()
             return mz == 0 ? null : mz