Changeset 11965 in josm


Ignore:
Timestamp:
2017-04-21T12:43:49+02:00 (3 days ago)
Author:
stoecker
Message:

ELI sync - unify filenames (also support loading in imagery index plugin)

Location:
trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/build.xml

    r11964 r11965  
    701701        <echo message="Checking editor imagery difference"/>
    702702        <groovy src="scripts/SyncEditorLayerIndex.groovy" classpath="${dist.dir}/josm-custom.jar">
    703                 <arg value="-noskip"/>
     703                <arg value="-noeli"/>
    704704                <arg value="-p"/>
    705                 <arg value="eli.imagery.xml"/>
     705                <arg value="imagery_eliout.imagery.xml"/>
    706706                <arg value="-q"/>
    707                 <arg value="josm.imagery.xml"/>
     707                <arg value="imagery_josmout.imagery.xml"/>
    708708        </groovy>
    709709    </target>
     
    713713            <arg value="https://josm.openstreetmap.de/maps"/>
    714714            <arg value="-O"/>
    715             <arg value="maps.xml"/>
     715            <arg value="imagery_josm.imagery.xml"/>
    716716            <arg value="--unlink"/>
    717717        </exec>
     
    719719            <arg value="https://josm.openstreetmap.de/wiki/ImageryCompareIgnores?format=txt"/>
    720720            <arg value="-O"/>
    721             <arg value="maps_ignores.txt"/>
     721            <arg value="imagery_josm.ignores.txt"/>
    722722            <arg value="--unlink"/>
    723723        </exec>
     
    725725            <arg value="https://raw.githubusercontent.com/osmlab/editor-layer-index/gh-pages/imagery.geojson"/>
    726726            <arg value="-O"/>
    727             <arg value="imagery.geojson"/>
     727            <arg value="imagery_eli.geojson"/>
    728728            <arg value="--unlink"/>
    729729        </exec>
  • trunk/scripts/SyncEditorLayerIndex.groovy

    r11964 r11965  
    3535    def josmMirrors = new HashMap<String, ImageryInfo>()
    3636
    37     static String eliInputFile = 'imagery.geojson'
    38     static String josmInputFile = 'maps.xml'
    39     static String ignoreInputFile = 'maps_ignores.txt'
     37    static String eliInputFile = 'imagery_eli.geojson'
     38    static String josmInputFile = 'imagery_josm.imagery.xml'
     39    static String ignoreInputFile = 'imagery_josm.ignores.txt'
    4040    static FileWriter outputFile = null
    4141    static BufferedWriter outputStream = null
     
    9090        cli.p(longOpt:'elixml', args:1, argName:"elixml", "ELI entries for use in JOSM as XML file (incomplete)")
    9191        cli.q(longOpt:'josmxml', args:1, argName:"josmxml", "JOSM entries reoutput as XML file (incomplete)")
    92         cli.m(longOpt:'nomissingeli', argName:"nomissingeli", "don't show missing editor layer index entries")
     92        cli.m(longOpt:'noeli', argName:"noeli", "don't show output for ELI problems")
    9393        cli.h(longOpt:'help', "show this help")
    9494        options = cli.parse(args)
     
    152152            String color = s.startsWith("***") ? "black" : ((s.startsWith("+ ") || s.startsWith("+++ ELI")) ? "blue" : "red")
    153153            s = "<pre style=\"margin:3px;color:"+color+"\">"+s.replaceAll("&","&amp;").replaceAll("<","&lt;").replaceAll(">","&gt;")+"</pre>"
     154        }
     155        if ((s.startsWith("+ ") || s.startsWith("+++ ELI")) && options.noeli) {
     156            return
    154157        }
    155158        myprintlnfinal(s)
     
    283286        }
    284287
    285         if (options.nomissingeli)
    286             return
    287288        def l2 = inOneButNotTheOther(josmUrls, eliUrls)
    288289        myprintln "*** URLs found in JOSM but not in ELI (${l2.size()}): ***"
Note: See TracChangeset for help on using the changeset viewer.