Changeset 11975 in josm for trunk/src/org

Timestamp:

2017-04-22T18:55:26+02:00 (8 years ago)

Author:

stoecker

Message:

see #14655 - implement nearly all features in ELI sync XML output

Location:

trunk/src/org/openstreetmap/josm

Files:

• data/imagery/ImageryInfo.java (modified) (8 diffs)
• io/imagery/ImageryReader.java (modified) (2 diffs)

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

@@ -175 +175 @@
     /** Text of a text attribution displayed when using the imagery */
     private String attributionText;
-    /** Link behing the text attribution displayed when using the imagery */
+    /** Link to a reference stating the permission for OSM usage */
+    private String permissionReferenceURL;
+    /** Link behind the text attribution displayed when using the imagery */
     private String attributionLinkURL;
     /** Image of a graphical attribution displayed when using the imagery */
@@ -222 +224 @@
         @pref String attribution_text;
         @pref String attribution_url;
+        @pref String permission_reference_url;
         @pref String logo_image;
         @pref String logo_url;
@@ -265 +268 @@
             attribution_text = i.attributionText;
             attribution_url = i.attributionLinkURL;
+            permission_reference_url = i.permissionReferenceURL;
             date = i.date;
             bestMarked = i.bestMarked;
@@ -429 +433 @@
         attributionText = e.attribution_text;
         attributionLinkURL = e.attribution_url;
+        permissionReferenceURL = e.permission_reference_url;
         attributionImage = e.logo_image;
         attributionImageURL = e.logo_url;
@@ -470 +475 @@
         this.attributionText = i.attributionText;
         this.attributionLinkURL = i.attributionLinkURL;
+        this.permissionReferenceURL = i.permissionReferenceURL;
         this.attributionImage = i.attributionImage;
         this.attributionImageURL = i.attributionImageURL;
@@ -520 +526 @@
                 Objects.equals(this.attributionText, other.attributionText) &&
                 Objects.equals(this.attributionLinkURL, other.attributionLinkURL) &&
+                Objects.equals(this.permissionReferenceURL, other.permissionReferenceURL) &&
                 Objects.equals(this.attributionImageURL, other.attributionImageURL) &&
                 Objects.equals(this.attributionImage, other.attributionImage) &&
@@ -633 +640 @@
     }
 
+    /**
+     * Return the permission reference URL.
+     * @param url The url.
+     * @see #setPermissionReferenceURL()
+     * @since 11975
+     */
+    public String getPermissionReferenceURL() {
+        return permissionReferenceURL;
+    }
+
     @Override
     public Image getAttributionImage() {
@@ -691 +708 @@
     public void setAttributionLinkURL(String url) {
         attributionLinkURL = url;
+    }
+
+    /**
+     * Sets the permission reference URL.
+     * @param url The url.
+     * @see #getPermissionReferenceURL()
+     * @since 11975
+     */
+    public void setPermissionReferenceURL(String url) {
+        permissionReferenceURL = url;
     }
 

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

@@ -197 +197 @@
                         "terms-of-use-text",
                         "terms-of-use-url",
+                        "permission-ref",
                         "country-code",
                         "icon",
@@ -437 +438 @@
                     entry.setTermsOfUseText(accumulator.toString());
                     break;
+                case "permission-ref":
+                    entry.setPermissionReferenceURL(accumulator.toString());
+                    break;
                 case "terms-of-use-url":
                     entry.setTermsOfUseURL(accumulator.toString());