Changeset 4240 in josm for trunk/src/org/openstreetmap/josm/io/imagery

Timestamp:

2011-07-14T12:48:27+02:00 (13 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)

Location:

trunk/src/org/openstreetmap/josm/io/imagery

Files:

• ImageryReader.java (added)
• OsmosnimkiOffsetServer.java (modified) (2 diffs)
• WMSGrabber.java (modified) (4 diffs)

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

@@ -26 +26 @@
     public boolean isLayerSupported(ImageryInfo info) {
         try {
-            URL url = new URL(this.url + "action=CheckAvailability&id=" + URLEncoder.encode(info.getFullUrl(), "UTF-8"));
+            URL url = new URL(this.url + "action=CheckAvailability&id=" + URLEncoder.encode(info.getUrl(), "UTF-8"));
             System.out.println(tr("Querying offset availability: {0}", url));
             final BufferedReader rdr = new BufferedReader(new InputStreamReader(url.openConnection().getInputStream(), "UTF-8"));
@@ -42 +42 @@
         LatLon ll = Main.getProjection().eastNorth2latlon(en);
         try {
-            URL url = new URL(this.url + "action=GetOffsetForPoint&lat=" + ll.lat() + "&lon=" + ll.lon() + "&id=" + URLEncoder.encode(info.getFullUrl(), "UTF-8"));
+            URL url = new URL(this.url + "action=GetOffsetForPoint&lat=" + ll.lat() + "&lon=" + ll.lon() + "&id=" + URLEncoder.encode(info.getUrl(), "UTF-8"));
             System.out.println(tr("Querying offset: {0}", url.toString()));
             final BufferedReader rdr = new BufferedReader(new InputStreamReader(url.openConnection().getInputStream(), "UTF-8"));

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

@@ -19 +19 @@
 import java.text.NumberFormat;
 import java.util.ArrayList;
+import java.util.List;
 import java.util.Map.Entry;
 import java.util.Locale;
@@ -47 +48 @@
     protected String baseURL;
     private final boolean urlWithPatterns;
+    private List<String> serverProjections;
     private Map<String, String> props = new HashMap<String, String>();
 
@@ -52 +54 @@
         super(mv, layer);
         this.baseURL = layer.getInfo().getUrl();
+        this.serverProjections = layer.getServerProjections();
         /* URL containing placeholders? */
         urlWithPatterns = ImageryInfo.isUrlWithPatterns(baseURL);
@@ -139 +142 @@
         } else {
             str += "bbox=" + bbox
-            + srs
-            + "&width=" + wi + "&height=" + ht;
+                    + srs
+                    + "&width=" + wi + "&height=" + ht;
             if (!(baseURL.endsWith("&") || baseURL.endsWith("?"))) {
                 System.out.println(tr("Warning: The base URL ''{0}'' for a WMS service doesn't have a trailing '&' or a trailing '?'.", baseURL));