Changeset 3934 in josm for trunk/src/org/openstreetmap/josm/data/imagery

Timestamp:

2011-02-26T00:35:10+01:00 (13 years ago)

Author:

framm

Message:

Changed the way in which JOSM handles imagery layer blacklisting. Instead
of a hard-coded list of Google URLs, we now parse the server's
/api/capabilities response which is expected to look like this:

<osm version="0.6" generator="OpenStreetMap server">

<api>

<version minimum="0.6" maximum="0.6"/>
<area maximum="0.25"/>
<tracepoints per_page="5000"/>
<waynodes maximum="2000"/>
<changesets maximum_elements="50000"/>
<timeout seconds="300"/>

</api>
<policy>

<imagery>

<blacklist regex=".*\.google\.com/.*"/>
<blacklist regex=".*209\.85\.2\d\d.*"/>
<blacklist regex=".*209\.85\.1[3-9]\d.*"/>
<blacklist regex=".*209\.85\.12[89].*"/>

</imagery>

</policy>

</osm>

JOSM will now try to establish an API connection when started, so that
it knows about blacklisted layers. It will also re-read the list when
the URL is changed in the preferences, and if any prohibited layers are
active they will be removed.

For an interim period, JOSM still uses the four regular expressions
listed above whenever the server API URL is *.openstreetmap.org and
the API does not send any blacklist entries. It is expected that the
API will soon return proper blacklist entries.

Things that could be improved:

1. Establish a general listener system where components can register

their interest in a change of the configured OSM server. Currently
we have to plug through to the gui layer (Main.main.mapView) from
the base comms layer (OsmApi) which is ugly.

2. Establish a new class of blacklist which works by IP number and not

just regular expression, so that you can say "any host name that resolves
to this IP is blacklisted".

3. Track all layers that were used in editing a data set, and refuse

uploading if the upload URL bans any of these layers.

File:

• trunk/src/org/openstreetmap/josm/data/imagery/ImageryInfo.java (modified) (5 diffs)

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

@@ -4 +4 @@
 import java.util.ArrayList;
 import java.util.Collection;
+
+import org.openstreetmap.josm.io.OsmApi;
 
 /**
@@ -27 +29 @@
         }
     }
-
-    private final static String[] BLACKLIST_REGEXES = {
-        // These entries are for Google tile servers (names and IPV4 numbers)
-        ".*\\.google\\.com/.*",
-        ".*209\\.85\\.2\\d\\d.*",
-        ".*209\\.85\\.1[3-9]\\d.*",
-        ".*209\\.85\\.12[89].*"
-    };
 
     String name;
@@ -43 +37 @@
     double pixelPerDegree = 0.0;
     int maxZoom = 0;
-    private boolean blacklisted = false;
 
     public ImageryInfo(String name) {
@@ -173 +166 @@
     public void setUrl(String url) {
 
-        // determine if URL is on blacklist and flag accordingly.
-        blacklisted = false;
-        for (String blacklistRegex : BLACKLIST_REGEXES) {
-            if (url.matches(blacklistRegex)) {
-                blacklisted = true;
-                System.err.println("layer '" + name + "' uses blacklisted URL");
-                break;
-            }
-        }
-
         for (ImageryType type : ImageryType.values()) {
             if (url.startsWith(type.getUrlString() + ":")) {
@@ -252 +235 @@
     }
 
+    /**
+     * Returns true if this layer's URL is matched by one of the regular
+     * expressions kept by the current OsmApi instance.
+     */
     public boolean isBlacklisted() {
-        return blacklisted;
+        return OsmApi.getOsmApi().getCapabilities().isOnImageryBlacklist(this.url);
     }
 }