Changeset 4183 in josm for trunk/src/org/openstreetmap/josm/gui/layer/WMSLayer.java

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/gui/layer/WMSLayer.java (modified) (4 diffs)

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

@@ -38 +38 @@
 import org.openstreetmap.josm.data.Preferences.PreferenceChangedListener;
 import org.openstreetmap.josm.data.ProjectionBounds;
+import org.openstreetmap.josm.data.projection.Projection;
 import org.openstreetmap.josm.data.coor.EastNorth;
 import org.openstreetmap.josm.data.imagery.GeorefImage;
@@ -107 +108 @@
     private int workingThreadCount;
     private boolean canceled;
-
+    private ArrayList<String> serverProjections = null;
 
     /** set to true if this layer uses an invalid base url */
@@ -142 +143 @@
 
         if(info.getUrl() != null) {
-            WMSGrabber.getProjection(info.getUrl(), true);
+            serverProjections = WMSGrabber.getServerProjections(info.getUrl(), true);
             startGrabberThreads();
             if(info.getImageryType() == ImageryType.WMS && !ImageryInfo.isUrlWithPatterns(info.getUrl())) {
@@ -913 +914 @@
     }
 
+    @Override
+    public boolean isProjectionSupported(Projection proj) {
+        return serverProjections == null || serverProjections.contains(proj.toCode().toUpperCase());
+    }
+
+    @Override
+    public String nameSupportedProjections() {
+        String res = "";
+        for(String p : serverProjections) {
+            if(!res.isEmpty())
+                res += ", ";
+            res += p;
+        }
+        return tr("Supported projections are: {1}", res);
+    }
 }