Changeset 11575 in josm

Timestamp:

2017-02-18T12:34:15+01:00 (7 years ago)

Author:

stoecker

Message:

see #12313 - add best marking and show it in image preferences

Location:

trunk

Files:

• data/maps.xsd (modified) (2 diffs)
• scripts/SyncEditorImageryIndex.groovy (modified) (1 diff)
• src/org/openstreetmap/josm/data/imagery/ImageryInfo.java (modified) (8 diffs)
• src/org/openstreetmap/josm/io/imagery/ImageryReader.java (modified) (1 diff)

trunk/data/maps.xsd

@@ -661 +661 @@
                                                         <!-- 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 -->
+                                                        <xs:element name="date" minOccurs="0" maxOccurs="1" type="xs:string" />
                                                         <xs:element name="mirror" minOccurs="0">
                                                                 <xs:complexType>
@@ -703 +705 @@
                                         </xs:sequence>
                                         <xs:attribute name="last-check" type="xs:date" use="optional" />
+                                        <xs:attribute name="eli-best" type="xs:boolean" use="optional" />
                                 </xs:complexType>
                         </xs:element>

trunk/scripts/SyncEditorImageryIndex.groovy

@@ -564 +564 @@
     }
     static String getQuality(Object e) {
-        //if (e instanceof ImageryInfo) return "".equals(e.getQuality()) ? null : e.getQuality()
-        if (e instanceof ImageryInfo) return null
-        return e.get("properties").get("best") ? "best" : null
+        if (e instanceof ImageryInfo) return e.isBestMarked() ? "eli-best" : null
+        return e.get("properties").get("best") ? "eli-best" : null
     }
     static String getIcon(Object e) {

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

@@ -194 +194 @@
       */
     private String date;
+    /**
+      * marked as best in other editors
+      * @since 11575
+      */
+    private boolean bestMarked = false;
     /** mirrors of different type for this entry */
     private List<ImageryInfo> mirrors;
     /** icon used in menu */
     private String icon;
+    /** is the geo reference correct - don't offer offset handling */
     private boolean isGeoreferenceValid;
+    /** does the EPSG:4326 to mercator woraround work as expected */
     private boolean isEpsg4326To3857Supported;
     /** which layers should be activated by default on layer addition. **/
@@ -237 +244 @@
         @pref Map<String, String> metadataHeaders;
         @pref boolean valid_georeference;
+        @pref boolean bestMarked;
         @pref boolean supports_epsg_4326_to_3857_conversion;
         // TODO: disabled until change of layers is implemented
@@ -262 +270 @@
             attribution_url = i.attributionLinkURL;
             date = i.date;
+            bestMarked = i.bestMarked;
             logo_image = i.attributionImage;
             logo_url = i.attributionImageURL;
@@ -418 +427 @@
         attributionImageURL = e.logo_url;
         date = e.date;
+        bestMarked = e.bestMarked;
         termsOfUseText = e.terms_of_use_text;
         termsOfUseURL = e.terms_of_use_url;
@@ -444 +454 @@
         this.origName = i.origName;
         this.langName = i.langName;
+        this.bestMarked = i.bestMarked;
         this.defaultEntry = i.defaultEntry;
         this.cookies = i.cookies;
@@ -494 +505 @@
                 Objects.equals(this.id, other.id) &&
                 Objects.equals(this.url, other.url) &&
+                Objects.equals(this.bestMarked, other.bestMarked) &&
+                Objects.equals(this.isEpsg4326To3857Supported, other.isEpsg4326To3857Supported) &&
+                Objects.equals(this.isGeoreferenceValid, other.isGeoreferenceValid) &&
                 Objects.equals(this.cookies, other.cookies) &&
                 Objects.equals(this.eulaAcceptanceRequired, other.eulaAcceptanceRequired) &&
@@ -852 +866 @@
             html = true;
         }
+        if (bestMarked) {
+            res += "<br>" + tr("This imagery is marked as best in this region in other editors.");
+        }
         String desc = getDescription();
         if (desc != null && !desc.isEmpty()) {
@@ -1154 +1171 @@
     public void setGeoreferenceValid(boolean isGeoreferenceValid) {
         this.isGeoreferenceValid = isGeoreferenceValid;
+    }
+
+    /**
+     * Returns the status of "best" marked status in other editors.
+     * @return <code>true</code> if it is marked as best.
+     * @since 11575
+     */
+    public boolean isBestMarked() {
+        return bestMarked;
+    }
+
+    /**
+     * Sets an indicator that in other editors it is marked as best imagery
+     * @param bestMarked <code>true</code> if it is marked as best in other editors.
+     * @since 11575
+     */
+    public void setBestMarked(boolean bestMarked) {
+        this.bestMarked = bestMarked;
     }
 

trunk/src/org/openstreetmap/josm/io/imagery/ImageryReader.java

@@ -154 +154 @@
                     noTileChecksums = new MultiMap<>();
                     metadataHeaders = new HashMap<>();
+                    String best = atts.getValue("eli-best");
+                    if ("true".equals(best)) {
+                        entry.setBestMarked(true);
+                    }
                 }
                 break;