Changeset 8576 in josm for trunk/src/org/openstreetmap/josm/actions/AddImageryLayerAction.java

Timestamp:

2015-07-06T20:12:05+02:00 (9 years ago)

Author:

wiktorn

Message:

wms_endpoint now forwards information about available projection to ImageryInfo

File:

• trunk/src/org/openstreetmap/josm/actions/AddImageryLayerAction.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/actions/AddImageryLayerAction.java

@@ -10 +10 @@
 import java.io.IOException;
 import java.net.MalformedURLException;
+import java.util.HashSet;
+import java.util.Set;
 
 import javax.swing.JComboBox;
@@ -25 +27 @@
 import org.openstreetmap.josm.gui.util.GuiHelper;
 import org.openstreetmap.josm.io.imagery.WMSImagery;
+import org.openstreetmap.josm.io.imagery.WMSImagery.LayerDetails;
 import org.openstreetmap.josm.tools.GBC;
 import org.openstreetmap.josm.tools.ImageProvider;
@@ -118 +121 @@
             final String url = wms.buildGetMapUrl(
                     tree.getSelectedLayers(), (String) formats.getSelectedItem());
-            return new ImageryInfo(info.getName(), url, "wms", info.getEulaAcceptanceRequired(), info.getCookies());
+            Set<String> supportedCrs = new HashSet<>();
+            {
+                boolean first = true;
+                for(LayerDetails layer: tree.getSelectedLayers()) {
+                    if (first) {
+                        supportedCrs.addAll(layer.getProjections());
+                        first = false;
+                    }
+                    supportedCrs.retainAll(layer.getProjections());
+                }
+            }
+            ImageryInfo ret = new ImageryInfo(info.getName(), url, "wms", info.getEulaAcceptanceRequired(), info.getCookies());
+            ret.setServerProjections(supportedCrs);
+            return ret;
         } catch (MalformedURLException ex) {
             JOptionPane.showMessageDialog(Main.parent, tr("Invalid service URL."),