Changeset 4184 in josm for trunk/src/org

Timestamp:

2011-06-29T17:16:03+02:00 (13 years ago)

Author:

stoecker

Message:

improve projection handling for WMS

Location:

trunk/src/org/openstreetmap/josm

Files:

• gui/layer/WMSLayer.java (modified) (1 diff)
• io/imagery/WMSGrabber.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/gui/layer/WMSLayer.java

@@ -927 +927 @@
             res += p;
         }
-        return tr("Supported projections are: {1}", res);
+        return tr("Supported projections are: {0}", res);
     }
 }

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

@@ -78 +78 @@
         try
         {
-            Matcher m = Pattern.compile(".*srs=([a-z0-9:]+).*").matcher(baseURL.toUpperCase());
+            Matcher m = Pattern.compile(".*SRS=([a-z0-9:]+).*", Pattern.CASE_INSENSITIVE).matcher(baseURL.toUpperCase());
             if(m.matches())
             {
@@ -112 +112 @@
 
         if (urlWithPatterns) {
-            str = str.replaceAll("\\{proj\\}", myProj)
+            str = str.replaceAll("\\{proj(\\([^})]+\\))?\\}", myProj)
             .replaceAll("\\{bbox\\}", bbox)
             .replaceAll("\\{w\\}", latLonFormat.format(w))
@@ -138 +138 @@
         try
         {
-            Matcher m = Pattern.compile(".*srs=([a-z0-9:]+).*").matcher(baseURL.toUpperCase());
+            Matcher m = Pattern.compile(".*\\{PROJ\\(([^)}]+)\\)\\}.*").matcher(baseURL.toUpperCase());
             if(m.matches())
             {
-                serverProjections.add(m.group(1));
-                if(m.group(1).equals("EPSG:4326"))
+                boolean hasepsg = false;
+                for(String p : m.group(1).split(","))
+                {
+                    serverProjections.add(p);
+                    if(p.equals("EPSG:4326"))
+                        hasepsg = true;
+                }
+                if(hasepsg && !serverProjections.contains(new Mercator().toCode()))
                     serverProjections.add(new Mercator().toCode());
             }
-            /* TODO: here should be an "else" code checking server capabilities */
+            else
+            {
+                m = Pattern.compile(".*SRS=([a-z0-9:]+).*", Pattern.CASE_INSENSITIVE).matcher(baseURL.toUpperCase());
+                if(m.matches())
+                {
+                    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)