Changeset 11612 in josm for trunk

Timestamp:

2017-02-25T14:07:17+01:00 (7 years ago)

Author:

stoecker

Message:

add dates with open timespan

Location:

trunk

Files:

• data/maps.xsd (modified) (1 diff)
• scripts/SyncEditorLayerIndex.groovy (modified) (3 diffs)

trunk/data/maps.xsd

@@ -660 +660 @@
                                                         <!-- A base64-encoded image that is displayed as menu/toolbar icon -->
                                                         <xs:element name="icon" minOccurs="0" maxOccurs="1" type="xs:string" />
-                                                        <!-- Date in form YYYY-MM-DD;YYYY-MM-DD (each element after first year is optional -->
+                                                        <!-- Date in form YYYY-MM-DD;YYYY-MM-DD (each element after first year is optional, a single - marks an unknown or open timespan like -;2015) -->
                                                         <xs:element name="date" minOccurs="0" maxOccurs="1" type="xs:string" />
                                                         <xs:element name="mirror" minOccurs="0">

trunk/scripts/SyncEditorLayerIndex.groovy

@@ -307 +307 @@
         /*myprintln "*** Same URL, but different dates: ***"
         for (def url : eliUrls.keySet()) {
-            def e = eliUrls.get(url)
+            def ed = getDate(eliUrls.get(url))
             if (!josmUrls.containsKey(url)) continue
             def j = josmUrls.get(url)
-            if (!getDate(e).equals(getDate(j))) {
-                myprintln "* Date differs ('${getDate(e)}' != '${getDate(j)}'): ${getDescription(j)}"
+            def jd = getDate(j)
+            // The forms 2015;- or -;2015 or 2015;2015 are handled equal to 2015
+            String ef = ed.replaceAll("\\A-;","").replaceAll(";-\\z","").replaceAll("\\A([0-9-]+);\\1\\z","\$1");
+            if (!ed.equals(jd) && !ef.equals(jd)) {
+                String t = "'${ed}'";
+                if (!ed.equals(ef)) {
+                    t += "or '${ef}'";
+                }
+                myprintln "* Date differs (${t} != '${jd}'): ${getDescription(j)}"
             }
         }*/
@@ -409 +416 @@
             def d = getDate(j)
             if(!d.isEmpty()) {
-                def reg = (d =~ /^(\d\d\d\d)(-(\d\d)(-(\d\d))?)?(;(\d\d\d\d)(-(\d\d)(-(\d\d))?)?)?/)
+                def reg = (d =~ /^(-|(\d\d\d\d)(-(\d\d)(-(\d\d))?)?)(;(-|(\d\d\d\d)(-(\d\d)(-(\d\d))?)?))?/)
                 if(reg == null || reg.count != 1) {
                     myprintln "* JOSM-Date '${d}' is strange: ${getDescription(j)}"
                 } else {
                     try {
-                        def first = verifyDate(reg[0][1],reg[0][3],reg[0][5]);
-                        def second = verifyDate(reg[0][7],reg[0][9],reg[0][11]);
+                        def first = verifyDate(reg[0][2],reg[0][4],reg[0][6]);
+                        def second = verifyDate(reg[0][9],reg[0][11],reg[0][13]);
                         if(second.compareTo(first) < 0) {
                             myprintln "* JOSM-Date '${d}' is strange (second earlier than first): ${getDescription(j)}"
@@ -464 +471 @@
             return start+";"+end
         else if(!start.isEmpty())
-            return start
-        else
-            return end
+            return start+";-"
+        else if(!end.isEmpty())
+            return "-;"+end
+        return "";
     }
     static Date verifyDate(String year, String month, String day) {