Changeset 16127 in josm

Timestamp:

2020-03-15T00:03:59+01:00 (5 years ago)

Author:

Don-vip

Message:

see #17285 - add privacy-policy-url

Location:

trunk

Files:

• resources/data/maps.xsd (modified) (1 diff)
• scripts/SyncEditorLayerIndex.java (modified) (4 diffs)
• src/org/openstreetmap/josm/data/imagery/ImageryInfo.java (modified) (3 diffs)
• src/org/openstreetmap/josm/io/imagery/ImageryReader.java (modified) (2 diffs)

trunk/resources/data/maps.xsd

@@ -665 +665 @@
                             <!-- The area of use, e.g. <bounds min-lat='45.7' min-lon='5.9' max-lat='55.0' max-lon='17.3'/> -->
                             <xs:element name="bounds" minOccurs="0" maxOccurs="1" type="tns:bounds" />
+                            <!-- A link to the privacy policy of the operator -->
+                            <xs:element name="privacy-policy-url" minOccurs="0" maxOccurs="1" type="xs:anyURI" />
                             <!-- Provide a source that this background can be used for OSM. A page on the OSM-wiki with additional explanation and further references is preferred, but other sources (for example the license text) can also be linked. -->
                             <xs:element name="permission-ref" minOccurs="0" maxOccurs="1" type="xs:anyURI" />

trunk/scripts/SyncEditorLayerIndex.java

@@ -442 +442 @@
             if (isNotBlank(t = getPermissionReferenceUrl(e)))
                 stream.write("        <permission-ref>"+cdata(t)+"</permission-ref>\n");
+            if (isNotBlank(t = getPrivacyPolicyUrl(e)))
+                stream.write("        <privacy-policy-url>"+cdata(t)+"</privacy-policy-url>\n");
             if ((getValidGeoreference(e)))
                 stream.write("        <valid-georeference>true</valid-georeference>\n");
@@ -757 +759 @@
 
             compareDescriptions(e, j);
+            comparePrivacyPolicyUrls(e, j);
             comparePermissionReferenceUrls(e, j);
             compareAttributionUrls(e, j);
@@ -777 +780 @@
             } else if (!optionNoEli) {
                 myprintln("+ Missing ELI description ('"+jt+"'): "+getDescription(j));
+            }
+        }
+    }
+
+    void comparePrivacyPolicyUrls(JsonObject e, ImageryInfo j) {
+        String et = getPrivacyPolicyUrl(e);
+        String jt = getPrivacyPolicyUrl(j);
+        if (!Objects.equals(et, jt)) {
+            if (isBlank(jt)) {
+                myprintln("- Missing JOSM privacy policy URL ("+et+"): "+getDescription(j));
+            } else if (isNotBlank(et)) {
+                myprintln("+ Privacy policy URL differs ('"+et+"' != '"+jt+"'): "+getDescription(j));
+            } else if (!optionNoEli) {
+                myprintln("+ Missing ELI privacy policy URL ('"+jt+"'): "+getDescription(j));
             }
         }
@@ -1449 +1466 @@
     }
 
+    static String getPrivacyPolicyUrl(Object e) {
+        if (e instanceof ImageryInfo) return ((ImageryInfo) e).getPrivacyPolicyURL();
+        return ((Map<String, JsonObject>) e).get("properties").getString("privacy_policy_url", null);
+    }
+
     static Map<String, Set<String>> getNoTileHeader(Object e) {
         if (e instanceof ImageryInfo) return ((ImageryInfo) e).getNoTileHeaders();

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

@@ -260 +260 @@
     /** Text of a text attribution displayed when using the imagery */
     private String attributionText;
+    /** Link to the privacy policy of the operator */
+    private String privacyPolicyURL;
     /** Link to a reference stating the permission for OSM usage */
     private String permissionReferenceURL;
@@ -828 +830 @@
     }
 
+    /**
+     * Return the privacy policy URL.
+     * @return The url
+     * @see #setPrivacyPolicyURL
+     * @since 16127
+     */
+    public String getPrivacyPolicyURL() {
+        return privacyPolicyURL;
+    }
+
     @Override
     public Image getAttributionImage() {
@@ -905 +917 @@
     public void setPermissionReferenceURL(String url) {
         permissionReferenceURL = url;
+    }
+
+    /**
+     * Sets the privacy policy URL.
+     * @param url The url.
+     * @see #getPrivacyPolicyURL()
+     * @since 16127
+     */
+    public void setPrivacyPolicyURL(String url) {
+        privacyPolicyURL = url;
     }
 

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

@@ -220 +220 @@
                         "terms-of-use-text",
                         "terms-of-use-url",
+                        "privacy-policy-url",
                         "permission-ref",
                         "country-code",
@@ -485 +486 @@
                     entry.setTermsOfUseText(accumulator.toString());
                     break;
+                case "privacy-policy-url":
+                    entry.setPrivacyPolicyURL(accumulator.toString());
+                    break;
                 case "permission-ref":
                     entry.setPermissionReferenceURL(accumulator.toString());