Changeset 11965 in josm for trunk

Timestamp:

2017-04-21T12:43:49+02:00 (8 years ago)

Author:

stoecker

Message:

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

Location:

trunk

Files:

• build.xml (modified) (4 diffs)
• scripts/SyncEditorLayerIndex.groovy (modified) (4 diffs)

trunk/build.xml

@@ -701 +701 @@
         <echo message="Checking editor imagery difference"/>
         <groovy src="scripts/SyncEditorLayerIndex.groovy" classpath="${dist.dir}/josm-custom.jar">
-                <arg value="-noskip"/>
+                <arg value="-noeli"/>
                 <arg value="-p"/>
-                <arg value="eli.imagery.xml"/>
+                <arg value="imagery_eliout.imagery.xml"/>
                 <arg value="-q"/>
-                <arg value="josm.imagery.xml"/>
+                <arg value="imagery_josmout.imagery.xml"/>
         </groovy>
     </target>
@@ -713 +713 @@
             <arg value="https://josm.openstreetmap.de/maps"/>
             <arg value="-O"/>
-            <arg value="maps.xml"/>
+            <arg value="imagery_josm.imagery.xml"/>
             <arg value="--unlink"/>
         </exec>
@@ -719 +719 @@
             <arg value="https://josm.openstreetmap.de/wiki/ImageryCompareIgnores?format=txt"/>
             <arg value="-O"/>
-            <arg value="maps_ignores.txt"/>
+            <arg value="imagery_josm.ignores.txt"/>
             <arg value="--unlink"/>
         </exec>
@@ -725 +725 @@
             <arg value="https://raw.githubusercontent.com/osmlab/editor-layer-index/gh-pages/imagery.geojson"/>
             <arg value="-O"/>
-            <arg value="imagery.geojson"/>
+            <arg value="imagery_eli.geojson"/>
             <arg value="--unlink"/>
         </exec>

trunk/scripts/SyncEditorLayerIndex.groovy

@@ -35 +35 @@
     def josmMirrors = new HashMap<String, ImageryInfo>()
 
-    static String eliInputFile = 'imagery.geojson'
-    static String josmInputFile = 'maps.xml'
-    static String ignoreInputFile = 'maps_ignores.txt'
+    static String eliInputFile = 'imagery_eli.geojson'
+    static String josmInputFile = 'imagery_josm.imagery.xml'
+    static String ignoreInputFile = 'imagery_josm.ignores.txt'
     static FileWriter outputFile = null
     static BufferedWriter outputStream = null
@@ -90 +90 @@
         cli.p(longOpt:'elixml', args:1, argName:"elixml", "ELI entries for use in JOSM as XML file (incomplete)")
         cli.q(longOpt:'josmxml', args:1, argName:"josmxml", "JOSM entries reoutput as XML file (incomplete)")
-        cli.m(longOpt:'nomissingeli', argName:"nomissingeli", "don't show missing editor layer index entries")
+        cli.m(longOpt:'noeli', argName:"noeli", "don't show output for ELI problems")
         cli.h(longOpt:'help', "show this help")
         options = cli.parse(args)
@@ -152 +152 @@
             String color = s.startsWith("***") ? "black" : ((s.startsWith("+ ") || s.startsWith("+++ ELI")) ? "blue" : "red")
             s = "<pre style=\"margin:3px;color:"+color+"\">"+s.replaceAll("&","&amp;").replaceAll("<","&lt;").replaceAll(">","&gt;")+"</pre>"
+        }
+        if ((s.startsWith("+ ") || s.startsWith("+++ ELI")) && options.noeli) {
+            return
         }
         myprintlnfinal(s)
@@ -283 +286 @@
         }
 
-        if (options.nomissingeli)
-            return
         def l2 = inOneButNotTheOther(josmUrls, eliUrls)
         myprintln "*** URLs found in JOSM but not in ELI (${l2.size()}): ***"