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

Timestamp:

2011-01-28T00:49:15+01:00 (13 years ago)

Author:

framm

Message:

Add a "blacklisted" property to imagery layers; set this property from a
compiled-in list of regular expressions; disable blacklisted entries in
the Imagery menu.

Location:

trunk/src/org/openstreetmap/josm/data/imagery

Files:

• ImageryInfo.java (modified) (13 diffs)
• ImageryLayerInfo.java (modified) (3 diffs)

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

@@ -6 +6 @@
 
 /**
- * Class that stores info about a WMS server.
+ * Class that stores info about an image background layer.
  *
  * @author Frederik Ramm <frederik@remote.org>
  */
 public class ImageryInfo implements Comparable<ImageryInfo> {
+
     public enum ImageryType {
         WMS("wms"),
@@ -26 +27 @@
     }
 
+    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;
-    String url=null;
+    String url = null;
     String cookies = null;
     public final String eulaAcceptanceRequired;
@@ -33 +42 @@
     double pixelPerDegree = 0.0;
     int maxZoom = 0;
+    private boolean blacklisted = false;
 
     public ImageryInfo(String name) {
@@ -41 +51 @@
     public ImageryInfo(String name, String url) {
         this.name=name;
-        setURL(url);
+        setUrl(url);
         this.eulaAcceptanceRequired = null;
     }
@@ -47 +57 @@
     public ImageryInfo(String name, String url, String eulaAcceptanceRequired) {
         this.name=name;
-        setURL(url);
+        setUrl(url);
         this.eulaAcceptanceRequired = eulaAcceptanceRequired;
     }
@@ -53 +63 @@
     public ImageryInfo(String name, String url, String eulaAcceptanceRequired, String cookies) {
         this.name=name;
-        setURL(url);
+        setUrl(url);
         this.cookies=cookies;
         this.eulaAcceptanceRequired = eulaAcceptanceRequired;
@@ -60 +70 @@
     public ImageryInfo(String name, String url, String cookies, double pixelPerDegree) {
         this.name=name;
-        setURL(url);
+        setUrl(url);
         this.cookies=cookies;
         this.pixelPerDegree=pixelPerDegree;
@@ -71 +81 @@
         String e4 = null;
         if(url != null && !url.isEmpty()) {
-            e2 = getFullURL();
+            e2 = getFullUrl();
         }
         if(cookies != null && !cookies.isEmpty()) {
@@ -110 +120 @@
         this.name=array.get(0);
         if(array.size() >= 2) {
-            setURL(array.get(1));
+            setUrl(array.get(1));
         }
         if(array.size() >= 3) {
@@ -160 +170 @@
     }
 
-    public void setURL(String url) {
+    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() + ":")) {
@@ -182 +203 @@
     }
 
-    public String getURL() {
+    public String getUrl() {
         return this.url;
     }
@@ -198 +219 @@
     }
 
-    public String getFullURL() {
+    public String getFullUrl() {
         return imageryType.getUrlString() + ":" + url;
     }
@@ -229 +250 @@
         return url != null && url.contains("{") && url.contains("}");
     }
+
+    public boolean isBlacklisted() {
+        return blacklisted;
+    }
 }

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

@@ -20 +20 @@
 
 public class ImageryLayerInfo {
+
     public static final ImageryLayerInfo instance = new ImageryLayerInfo();
     ArrayList<ImageryInfo> layers = new ArrayList<ImageryInfo>();
     ArrayList<ImageryInfo> defaultLayers = new ArrayList<ImageryInfo>();
-    private final static String[] DEFAULT_LAYER_SITES
-    = { "http://josm.openstreetmap.de/maps"};
+
+    private final static String[] DEFAULT_LAYER_SITES = { 
+        "http://josm.openstreetmap.de/maps" 
+    };
 
     public void load() {
@@ -32 +35 @@
         for(Collection<String> c : Main.pref.getArray("imagery.layers",
                 Collections.<Collection<String>>emptySet())) {
-            layers.add(new ImageryInfo(c));
+            add(new ImageryInfo(c));
         }
 
@@ -60 +63 @@
                         String url = val[2];
                         String eulaAcceptanceRequired = null;
+
                         if (val.length == 4) {
                             // 4th parameter optional for license agreement (EULA)
                             eulaAcceptanceRequired = val[3];
                         }
+
                         defaultLayers.add(new ImageryInfo(name, url, eulaAcceptanceRequired));
 
-                        if(force) {
+                        if (force) {
                             defaultsSave.add(url);
-                            if(!defaults.contains(url)) {
-                                for(ImageryInfo i : layers) {
-                                    if ((i.getImageryType() == ImageryType.WMS && url.equals(i.getURL()))
-                                            || url.equals(i.getFullURL())) {
+                            if (!defaults.contains(url)) {
+                                for (ImageryInfo i : layers) {
+                                    if ((i.getImageryType() == ImageryType.WMS && url.equals(i.getUrl()))
+                                            || url.equals(i.getFullUrl())) {
                                         force = false;
                                     }
                                 }
-                                if(force) {
-                                    layers.add(new ImageryInfo(name, url));
+                                if (force) {
+                                    add(new ImageryInfo(name, url));
                                 }
                             }