Changeset 13518 in josm


Ignore:
Timestamp:
2018-03-11T22:35:49+01:00 (14 months ago)
Author:
stoecker
Message:

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

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/scripts/SyncEditorLayerIndex.groovy

    r13517 r13518  
    334334    List inOneButNotTheOther(Map m1, Map m2, String code, String https) {
    335335        def l = []
    336         for (def url : m1.keySet()) {
     336        def k = new LinkedList<String>(m1.keySet())
     337        for (def url : k) {
    337338            if (!m2.containsKey(url)) {
    338339                String urlhttps = url.replace("http:","https:")
     
    345346                {
    346347                    l += https+" Missing https: "+getDescription(m1.get(url))
     348                    m1.put(urlhttps, m1.get(url))
     349                    m1.remove(url)
    347350                }
    348351            }
     
    521524                    myprintln "- Missing JOSM attribution URL (${et}): ${getDescription(j)}"
    522525                } else if (et) {
    523                     myprintln "* Attribution URL differs ('${et}' != '${jt}'): ${getDescription(j)}"
     526                    def ethttps = et.replace("http:","https:")
     527                    if(jt.equals(ethttps)) {
     528                        myprintln "+ Attribution URL differs ('${et}' != '${jt}'): ${getDescription(j)}"
     529                    } else {
     530                        myprintln "* Attribution URL differs ('${et}' != '${jt}'): ${getDescription(j)}"
     531                    }
    524532                } else if (!options.nomissingeli) {
    525533                    myprintln "+ Missing ELI attribution URL ('${jt}'): ${getDescription(j)}"
Note: See TracChangeset for help on using the changeset viewer.