Changeset 11572 in josm for trunk

Timestamp:

2017-02-17T23:34:47+01:00 (7 years ago)

Author:

stoecker

Message:

fix imagery compare, add date check

Location:

trunk

Files:

• scripts/SyncEditorImageryIndex.groovy (modified) (3 diffs)
• src/org/openstreetmap/josm/data/imagery/ImageryInfo.java (modified) (2 diffs)

trunk/scripts/SyncEditorImageryIndex.groovy

@@ -211 +211 @@
             for (def m : e.getMirrors()) {
                 url = getUrl(m)
+                m.setName(m.getName().replaceAll(" mirror server( \\d+)?",""))
                 if (josmUrls.containsKey(url)) {
                     myprintln "+++ JOSM-Mirror-URL is not unique: "+url
@@ -421 +422 @@
                 josmIds.put(id, j);
             }
+            def d = getDate(j)
+            if(d != null) {
+                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]);
+                        if(second.compareTo(first) < 0) {
+                            myprintln "* JOSM-Date '${d}' is strange (second earlier than first): ${getDescription(j)}"
+                        }
+                    }
+                    catch (Exception e) {
+                        myprintln "* JOSM-Date '${d}' is strange (${e.getMessage()}): ${getDescription(j)}"
+                    }
+                }
+            }            
             def js = getShapes(j)
             if(js.size()) {
@@ -452 +471 @@
         return e.get("properties").getString("url")
     }
+    static String getDate(Object e) {
+        if (e instanceof ImageryInfo) return e.date
+        def start = e.get("properties").getString("start_date")
+        def end = e.get("properties").getString("end_date")
+        if(start != null && end != null)
+            return start+";"+end
+        else if(start != null)
+            return start
+        else
+            return end
+    }
+    static Date verifyDate(String year, String month, String day) {
+        def date
+        if(year == null)
+            date = "3000-01-01"
+        else
+            date = year + "-" + (month == null ? "01" : month) + "-" + (day == null ? "01" : day)
+        def df = new java.text.SimpleDateFormat("yyyy-MM-dd")
+        df.setLenient(false)
+        return df.parse(date)
+    }
     static String getId(Object e) {
         if (e instanceof ImageryInfo) return e.getId()

trunk/src/org/openstreetmap/josm/data/imagery/ImageryInfo.java

@@ -442 +442 @@
     public ImageryInfo(ImageryInfo i) {
         super(i.name, i.url, i.id);
+        this.origName = i.origName;
+        this.langName = i.langName;
         this.defaultEntry = i.defaultEntry;
         this.cookies = i.cookies;
@@ -1197 +1199 @@
                if (num > 1) {
                    n.name = tr("{0} mirror server {1}", n.name, num);
-                   n.origName += " mirror server " + num;
+                   if(n.origName != null) {
+                       n.origName += " mirror server " + num;
+                   }
                } else {
                    n.name = tr("{0} mirror server", n.name);
-                   n.origName += " mirror server";
+                   if(n.origName != null) {
+                       n.origName += " mirror server";
+                   }
                }
                l.add(n);