Changeset 13536 in josm for trunk/scripts

Timestamp:

2018-03-17T17:01:12+01:00 (7 years ago)

Author:

stoecker

Message:

add possibility to change map ids (see #14655), add overlay flag for imagery

File:

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

trunk/scripts/SyncEditorLayerIndex.groovy

@@ -272 +272 @@
         stream.write "<imagery xmlns=\"http://josm.openstreetmap.de/maps-1.0\">\n"
         for (def e : entries) {
-            def best = "eli-best".equals(getQuality(e))
-            stream.write "    <entry"+(best ? " eli-best=\"true\"" : "" )+">\n"
+            stream.write("    <entry"
+                + ("eli-best".equals(getQuality(e)) ? " eli-best=\"true\"" : "" )
+                + (getOverlay(e) ? " overlay=\"true\"" : "" )
+                + ">\n")
             stream.write "        <name>${cdata(getName(e), true)}</name>\n"
             stream.write "        <id>${getId(e)}</id>\n"
@@ -608 +610 @@
                 }
             }
+            et = getOverlay(e)
+            jt = getOverlay(j)
+            if (!et.equals(jt)) {
+                if (!jt) {
+                    myprintln "! Missing JOSM overlay flag: ${getDescription(j)}"
+                } else if (!options.nomissingeli) {
+                    myprintln "+ Missing ELI overlay flag: ${getDescription(j)}"
+                }
+            }
         }
         myprintln "*** Mismatching shapes: ***"
@@ -936 +947 @@
             && e.get("properties").getBoolean("best")) ? "eli-best" : null
     }
+    static Boolean getOverlay(Object e) {
+        if (e instanceof ImageryInfo) return e.isOverlay()
+        return (e.get("properties").containsKey("overlay")
+            && e.get("properties").getBoolean("overlay"))
+    }
     static String getIcon(Object e) {
         if (e instanceof ImageryInfo) return e.getIcon()