Changeset 13997 in josm for trunk/scripts


Ignore:
Timestamp:
2018-07-03T19:46:22+02:00 (16 months ago)
Author:
stoecker
Message:

see #16448 - dont skip zoomlevels for WMS mirrors totally

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/scripts/SyncEditorLayerIndex.groovy

    r13961 r13997  
    492492            Integer eMinZoom = getMinZoom(e)
    493493            Integer jMinZoom = getMinZoom(j)
     494            /* dont warn for entries copied from the base of the mirror */
     495            if(eMinZoom == null && "wms".equals(getType(j)) && j.getName() =~ / mirror/)
     496                jMinZoom = null;
    494497            if (eMinZoom != jMinZoom  && !(eMinZoom == 0 && jMinZoom == null)) {
    495498                myprintln "* Minzoom differs (${eMinZoom} != ${jMinZoom}): ${getDescription(j)}"
     
    497500            Integer eMaxZoom = getMaxZoom(e)
    498501            Integer jMaxZoom = getMaxZoom(j)
     502            /* dont warn for entries copied from the base of the mirror */
     503            if(eMaxZoom == null && "wms".equals(getType(j)) && j.getName() =~ / mirror/)
     504                jMaxZoom = null;
    499505            if (eMaxZoom != jMaxZoom) {
    500506                myprintln "* Maxzoom differs (${eMaxZoom} != ${jMaxZoom}): ${getDescription(j)}"
     
    10191025    static Integer getMinZoom(Object e) {
    10201026        if (e instanceof ImageryInfo) {
    1021             if("wms".equals(getType(e)) && e.getName() =~ / mirror/)
    1022                 return null
    10231027            int mz = e.getMinZoom()
    10241028            return mz == 0 ? null : mz
     
    10311035    static Integer getMaxZoom(Object e) {
    10321036        if (e instanceof ImageryInfo) {
    1033             if("wms".equals(getType(e)) && e.getName() =~ / mirror/)
    1034                 return null
    10351037            int mz = e.getMaxZoom()
    10361038            return mz == 0 ? null : mz
Note: See TracChangeset for help on using the changeset viewer.