Changeset 13600 in osm for applications/editors

Timestamp:

2009-02-08T17:05:17+01:00 (16 years ago)

Author:

stoecker

Message:

added support for projection

Location:

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

Files:

• WMSGrabber.java (modified) (4 diffs)
• WMSLayer.java (modified) (1 diff)

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

@@ -1 +1 @@
 package wmsplugin;
+
+import static org.openstreetmap.josm.tools.I18n.tr;
 
 import java.awt.image.BufferedImage;
@@ -14 +16 @@
 import java.text.NumberFormat;
 import java.util.Locale;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
 
 import javax.imageio.ImageIO;
+import javax.swing.JOptionPane;
 
 import org.openstreetmap.josm.Main;
@@ -26 +31 @@
 public class WMSGrabber extends Grabber {
     protected String baseURL;
+    private static Boolean shownWarning = false;
 
     WMSGrabber(String baseURL, Bounds b, Projection proj,
@@ -71 +77 @@
             + latLonFormat.format(e) + ","
             + latLonFormat.format(n)
+            + getProjection(baseURL, false)
             + "&width=" + wi + "&height=" + ht;
         return new URL(str.replace(" ", "%20"));
+    }
+
+    static public String getProjection(String baseURL, Boolean warn)
+    {
+        String projname = Main.proj.toCode();
+        if(projname.equals("EPSG:3785")) // don't use mercator code
+            projname = "EPSG:4326";
+        String res = "";
+        try
+        {
+            Matcher m = Pattern.compile(".*srs=([a-z0-9:]+).*").matcher(baseURL.toLowerCase());
+            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.\n",
+                    m.group(1), projname));
+                }
+            }
+            else
+                res ="&srs="+projname;
+        }
+        catch(Exception e)
+        {
+        }
+        return res;
     }
 

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

@@ -78 +78 @@
         initializeImages();
         this.baseURL = baseURL;
+        WMSGrabber.getProjection(baseURL, true);
         mv = Main.map.mapView;
         getPPD();