Changeset 4183 in josm for trunk/src/org/openstreetmap/josm/io

Timestamp:

2011-06-29T10:06:35+02:00 (13 years ago)

Author:

stoecker

Message:

fix #6432 - projection handling for TMS and WMS

File:

• trunk/src/org/openstreetmap/josm/io/imagery/WMSGrabber.java (modified) (4 diffs)

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

@@ -18 +18 @@
 import java.text.DecimalFormatSymbols;
 import java.text.NumberFormat;
+import java.util.ArrayList;
 import java.util.Locale;
 import java.util.regex.Matcher;
@@ -73 +74 @@
             int wi, int ht) throws MalformedURLException {
         String myProj = Main.getProjection().toCode();
-        if(Main.getProjection() instanceof Mercator) // don't use mercator code directly
+        String srs = "";
+        boolean useepsg = false;
+        try
+        {
+            Matcher m = Pattern.compile(".*srs=([a-z0-9:]+).*").matcher(baseURL.toUpperCase());
+            if(m.matches())
+            {
+                if(m.group(1).equals("EPSG:4326") && Main.getProjection() instanceof Mercator)
+                    useepsg = true;
+            } else if(Main.getProjection() instanceof Mercator) {
+                useepsg = true;
+                srs ="&srs=EPSG:4326";
+            } else {
+                srs ="&srs="+myProj;
+            }
+        }
+        catch(Exception ex)
+        {
+        }
+
+        if(useepsg) // don't use mercator code directly
         {
             LatLon sw = Main.getProjection().eastNorth2latlon(new EastNorth(w, s));
@@ -101 +122 @@
         } else {
             str += "bbox=" + bbox
-            + getProjection(baseURL, false)
+            + srs
             + "&width=" + wi + "&height=" + ht;
             if (!(baseURL.endsWith("&") || baseURL.endsWith("?"))) {
@@ -112 +133 @@
     }
 
-    static public String getProjection(String baseURL, Boolean warn)
+    static public ArrayList<String> getServerProjections(String baseURL, Boolean warn)
     {
-        String projname = Main.getProjection().toCode();
-        if(Main.getProjection() instanceof Mercator) {
-            projname = "EPSG:4326";
-        }
-        String res = "";
+        ArrayList<String> serverProjections = new ArrayList<String>();
         try
         {
-            Matcher m = Pattern.compile(".*srs=([a-z0-9:]+).*").matcher(baseURL.toLowerCase());
+            Matcher m = Pattern.compile(".*srs=([a-z0-9:]+).*").matcher(baseURL.toUpperCase());
             if(m.matches())
             {
-                projname = projname.toLowerCase();
-                if(!projname.equals(m.group(1)) && warn)
-                {
-                    JOptionPane.showMessageDialog(Main.parent,
-                            tr("The projection ''{0}'' in URL and current projection ''{1}'' mismatch.\n"
-                                    + "This may lead to wrong coordinates.",
-                                    m.group(1), projname),
-                                    tr("Warning"),
-                                    JOptionPane.WARNING_MESSAGE);
-                }
-            } else {
-                res ="&srs="+projname;
-            }
+                serverProjections.add(m.group(1));
+                if(m.group(1).equals("EPSG:4326"))
+                    serverProjections.add(new Mercator().toCode());
+            }
+            /* TODO: here should be an "else" code checking server capabilities */
         }
         catch(Exception e)
         {
         }
-        return res;
+        if(serverProjections.isEmpty())
+            return null;
+        if(warn)
+        {
+            String myProj = Main.getProjection().toCode().toUpperCase();
+            if(!serverProjections.contains(myProj))
+            {
+                JOptionPane.showMessageDialog(Main.parent,
+                        tr("The projection ''{0}'' in URL and current projection ''{1}'' mismatch.\n"
+                                + "This may lead to wrong coordinates.",
+                                serverProjections.get(0), myProj),
+                                tr("Warning"),
+                                JOptionPane.WARNING_MESSAGE);
+            }
+        }
+        return serverProjections;
     }