Changeset 15878 in josm for trunk/scripts

Timestamp:

2020-02-17T19:34:34+01:00 (4 years ago)

Author:

stoecker

Message:

see #18725 - adjust sync script output

File:

• trunk/scripts/SyncEditorLayerIndex.java (modified) (5 diffs)

trunk/scripts/SyncEditorLayerIndex.java

@@ -286 +286 @@
             return skip.get(s);
         for (Entry<String, String> str : skipStart.entrySet()) {
-            if (s.startsWith(str.getKey()))
+            if (s.startsWith(str.getKey())) {
+                skipStart.remove(str.getKey());
                 return str.getValue();
+            }
         }
         return null;
@@ -331 +333 @@
             myprintln("+++ Obsolete skip entry: " + s);
         }
+        for (String s : skipStart.keySet()) {
+            myprintln("+++ Obsolete skip entry: " + s + "...");
+        }
         if (optionXhtml) {
             myprintlnfinal("</body></html>\n");
@@ -344 +349 @@
             String url = getUrlStripped(e);
             if (url.contains("{z}")) {
-                myprintln("+++ ELI-URL uses {z} instead of {zoom}: "+url);
+                myprintln("+++ ELI-URL uses {z} instead of {zoom}: "+getDescription(e));
                 url = url.replace("{z}", "{zoom}");
             }
@@ -507 +512 @@
             String url = getUrlStripped(e);
             if (url.contains("{z}")) {
-                myprintln("+++ JOSM-URL uses {z} instead of {zoom}: "+url);
+                myprintln("+++ JOSM-URL uses {z} instead of {zoom}: "+getDescription(e));
                 url = url.replace("{z}", "{zoom}");
             }
@@ -1494 +1499 @@
             cc = "["+cc+"] ";
         }
-        String d = cc + getName(o) + " - " + getUrl(o);
+        String name = getName(o);
+        String id = getId(o);
+        String d = cc;
+        if(name != null && !name.isEmpty()) {
+            d += name;
+            if(id != null && !id.isEmpty())
+              d += " ["+id+"]";
+        }
+        else if(url != null && !url.isEmpty())
+            d += url;
         if (optionShorten) {
             if (d.length() > MAXLEN) d = d.substring(0, MAXLEN-1) + "...";