Changeset 11400 in osm for applications/editors/josm/plugins/wmsplugin/src

Timestamp:

2008-10-22T16:38:56+02:00 (16 years ago)

Author:

stoecker

Message:

some fixes

Location:

applications/editors/josm/plugins/wmsplugin/src/wmsplugin

Files:

• WMSGrabber.java (modified) (1 diff)
• YAHOOGrabber.java (modified) (2 diffs)

applications/editors/josm/plugins/wmsplugin/src/wmsplugin/WMSGrabber.java

@@ -63 +63 @@
         protected URL getURL(double w, double s,double e,double n,
                         int wi, int ht) throws MalformedURLException {
-                String str = baseURL + "&bbox="
+                String str = baseURL;
+                if(!str.endsWith("?"))
+                        str += "&";
+                str += "bbox="
                         + latLonFormat.format(w) + ","
                         + latLonFormat.format(s) + ","

applications/editors/josm/plugins/wmsplugin/src/wmsplugin/YAHOOGrabber.java

@@ -6 +6 @@
 import java.awt.Image;
 import java.net.URL;
+import java.io.IOException;
+import java.text.MessageFormat;
 import java.util.ArrayList;
-import java.io.IOException;
-
 import java.util.StringTokenizer;
 
@@ -32 +32 @@
         protected BufferedImage grab(URL url) throws IOException {
                 ArrayList<String> cmdParams = new ArrayList<String>();
-                
-                StringTokenizer st = new StringTokenizer(tr(browserCmd, url.toString()));
-                while( st.hasMoreTokens() ) 
+                String urlstring = url.toExternalForm();
+                // work around a problem in URL removing 2 slashes
+                if(!urlstring.startsWith("file:///"))
+                        urlstring = urlstring.replaceFirst("file:", "file://");
+                StringTokenizer st = new StringTokenizer(MessageFormat.format(browserCmd, urlstring));
+                while( st.hasMoreTokens() )
                         cmdParams.add(st.nextToken());