Changeset 4240 in josm for trunk/src/org/openstreetmap/josm/data/imagery/ImageryInfo.java

Timestamp:

2011-07-14T12:48:27+02:00 (15 years ago)

Author:

bastiK

Message:

see #6532 - add support for xml imagery source format

(todo: the specified server projections aren't used properly in WMSGrabber)

File:

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

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

@@ -4 +4 @@
 import java.util.ArrayList;
 import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
@@ -42 +44 @@
     private String name;
     private String url = null;
+    private boolean defaultEntry = false;
     private String cookies = null;
     private String eulaAcceptanceRequired= null;
@@ -50 +53 @@
     private int defaultMinZoom = 0;
     private Bounds bounds = null;
+    private List<String> serverProjections;
     private String attributionText;
     private String attributionImage;
@@ -55 +59 @@
     private String termsOfUseURL;
 
+    public ImageryInfo() {
+    }
+
     public ImageryInfo(String name) {
         this.name=name;
@@ -61 +68 @@
     public ImageryInfo(String name, String url) {
         this.name=name;
-        setUrl(url);
+        setExtendedUrl(url);
     }
 
     public ImageryInfo(String name, String url, String eulaAcceptanceRequired) {
         this.name=name;
-        setUrl(url);
+        setExtendedUrl(url);
         this.eulaAcceptanceRequired = eulaAcceptanceRequired;
     }
@@ -72 +79 @@
     public ImageryInfo(String name, String url, String eulaAcceptanceRequired, String cookies) {
         this.name=name;
-        setUrl(url);
+        setExtendedUrl(url);
         this.cookies=cookies;
         this.eulaAcceptanceRequired = eulaAcceptanceRequired;
@@ -79 +86 @@
     public ImageryInfo(String name, String url, String cookies, double pixelPerDegree) {
         this.name=name;
-        setUrl(url);
+        setExtendedUrl(url);
         this.cookies=cookies;
         this.pixelPerDegree=pixelPerDegree;
@@ -87 +94 @@
         ArrayList<String> res = new ArrayList<String>();
         res.add(name);
-        res.add((url != null && !url.isEmpty()) ? getFullUrl() : null);
+        res.add((url != null && !url.isEmpty()) ? getExtendedUrl() : null);
         res.add(cookies);
         if(imageryType == ImageryType.WMS || imageryType == ImageryType.HTML) {
@@ -106 +113 @@
         this.name=array.get(0);
         if(array.size() >= 2 && !array.get(1).isEmpty()) {
-            setUrl(array.get(1));
+            setExtendedUrl(array.get(1));
         }
         if(array.size() >= 3 && !array.get(2).isEmpty()) {
@@ -178 +185 @@
     }
 
+    public void setDefaultMaxZoom(int defaultMaxZoom) {
+        this.defaultMaxZoom = defaultMaxZoom;
+    }
+
+    public void setDefaultMinZoom(int defaultMinZoom) {
+        this.defaultMinZoom = defaultMinZoom;
+    }
+    
     public void setMaxZoom(int maxZoom) {
         this.maxZoom = maxZoom;
@@ -206 +221 @@
     }
 
-    public void setUrl(String url) {
+    public void setExtendedUrl(String url) {
         CheckParameterUtil.ensureParameterNotNull(url);
         
@@ -244 +259 @@
     }
 
+    public void setUrl(String url) {
+        this.url = url;
+    }
+
+    public boolean isDefaultEntry() {
+        return defaultEntry;
+    }
+
+    public void setDefaultEntry(boolean defaultEntry) {
+        this.defaultEntry = defaultEntry;
+    }
+
     public String getCookies() {
         return this.cookies;
@@ -264 +291 @@
     }
 
-    public String getFullUrl() {
+    public void setEulaAcceptanceRequired(String eulaAcceptanceRequired) {
+        this.eulaAcceptanceRequired = eulaAcceptanceRequired;
+    }
+
+    /**
+     * Get the projections supported by the server. Only relevant for
+     * WMS-type ImageryInfo at the moment.
+     * @return null, if no projections have been specified; the list
+     * of supported projections otherwise.
+     */
+    public List<String> getServerProjections() {
+        if (serverProjections == null) return null;
+        return Collections.unmodifiableList(serverProjections);
+    }
+
+    public void setServerProjections(Collection<String> serverProjections) {
+        this.serverProjections = new ArrayList<String>(serverProjections);
+    }
+
+    public String getExtendedUrl() {
         return imageryType.getUrlString() + (defaultMaxZoom != 0
             ? "["+(defaultMinZoom != 0 ? defaultMinZoom+",":"")+defaultMaxZoom+"]" : "") + ":" + url;
@@ -331 +377 @@
     public ImageryType getImageryType() {
         return imageryType;
+    }
+
+    public void setImageryType(ImageryType imageryType) {
+        this.imageryType = imageryType;
     }