Changeset 11975 in josm for trunk/src/org/openstreetmap/josm


Ignore:
Timestamp:
2017-04-22T18:55:26+02:00 (3 years ago)
Author:
stoecker
Message:

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

Location:
trunk/src/org/openstreetmap/josm
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/org/openstreetmap/josm/data/imagery/ImageryInfo.java

    r11889 r11975  
    175175    /** Text of a text attribution displayed when using the imagery */
    176176    private String attributionText;
    177     /** Link behing the text attribution displayed when using the imagery */
     177    /** Link to a reference stating the permission for OSM usage */
     178    private String permissionReferenceURL;
     179    /** Link behind the text attribution displayed when using the imagery */
    178180    private String attributionLinkURL;
    179181    /** Image of a graphical attribution displayed when using the imagery */
     
    222224        @pref String attribution_text;
    223225        @pref String attribution_url;
     226        @pref String permission_reference_url;
    224227        @pref String logo_image;
    225228        @pref String logo_url;
     
    265268            attribution_text = i.attributionText;
    266269            attribution_url = i.attributionLinkURL;
     270            permission_reference_url = i.permissionReferenceURL;
    267271            date = i.date;
    268272            bestMarked = i.bestMarked;
     
    429433        attributionText = e.attribution_text;
    430434        attributionLinkURL = e.attribution_url;
     435        permissionReferenceURL = e.permission_reference_url;
    431436        attributionImage = e.logo_image;
    432437        attributionImageURL = e.logo_url;
     
    470475        this.attributionText = i.attributionText;
    471476        this.attributionLinkURL = i.attributionLinkURL;
     477        this.permissionReferenceURL = i.permissionReferenceURL;
    472478        this.attributionImage = i.attributionImage;
    473479        this.attributionImageURL = i.attributionImageURL;
     
    520526                Objects.equals(this.attributionText, other.attributionText) &&
    521527                Objects.equals(this.attributionLinkURL, other.attributionLinkURL) &&
     528                Objects.equals(this.permissionReferenceURL, other.permissionReferenceURL) &&
    522529                Objects.equals(this.attributionImageURL, other.attributionImageURL) &&
    523530                Objects.equals(this.attributionImage, other.attributionImage) &&
     
    633640    }
    634641
     642    /**
     643     * Return the permission reference URL.
     644     * @param url The url.
     645     * @see #setPermissionReferenceURL()
     646     * @since 11975
     647     */
     648    public String getPermissionReferenceURL() {
     649        return permissionReferenceURL;
     650    }
     651
    635652    @Override
    636653    public Image getAttributionImage() {
     
    691708    public void setAttributionLinkURL(String url) {
    692709        attributionLinkURL = url;
     710    }
     711
     712    /**
     713     * Sets the permission reference URL.
     714     * @param url The url.
     715     * @see #getPermissionReferenceURL()
     716     * @since 11975
     717     */
     718    public void setPermissionReferenceURL(String url) {
     719        permissionReferenceURL = url;
    693720    }
    694721
  • trunk/src/org/openstreetmap/josm/io/imagery/ImageryReader.java

    r11913 r11975  
    197197                        "terms-of-use-text",
    198198                        "terms-of-use-url",
     199                        "permission-ref",
    199200                        "country-code",
    200201                        "icon",
     
    437438                    entry.setTermsOfUseText(accumulator.toString());
    438439                    break;
     440                case "permission-ref":
     441                    entry.setPermissionReferenceURL(accumulator.toString());
     442                    break;
    439443                case "terms-of-use-url":
    440444                    entry.setTermsOfUseURL(accumulator.toString());
Note: See TracChangeset for help on using the changeset viewer.