Changeset 4551 in josm for trunk/src/org/openstreetmap

Timestamp:

2011-10-31T11:42:13+01:00 (14 years ago)

Author:

stoecker

Message:

store projections for self-added WMS entries

Location:

trunk/src/org/openstreetmap/josm/gui/preferences

Files:

• AddWMSLayerPanel.java (modified) (4 diffs)
• ImageryPreference.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/gui/preferences/AddWMSLayerPanel.java

@@ -53 +53 @@
 
 import org.openstreetmap.josm.data.Bounds;
+import org.openstreetmap.josm.data.imagery.ImageryInfo;
+import org.openstreetmap.josm.data.imagery.ImageryInfo.ImageryType;
 import org.openstreetmap.josm.data.projection.Projection;
 import org.openstreetmap.josm.data.projection.ProjectionSubPrefs;
 import org.openstreetmap.josm.data.projection.Projections;
 import org.openstreetmap.josm.gui.bbox.SlippyMapBBoxChooser;
+import org.openstreetmap.josm.gui.layer.TMSLayer;
 import org.openstreetmap.josm.tools.GBC;
 import org.w3c.dom.Document;
@@ -502 +505 @@
     }
 
-    public String getUrlName() {
-        return menuName.getText();
-    }
-
-    public String getUrl() {
-        return resultingLayerField.getText();
+    public ImageryInfo getImageryInfo() {
+        ImageryInfo info = new ImageryInfo(menuName.getText(), resultingLayerField.getText());
+        if (ImageryType.TMS.equals(info.getImageryType())) {
+            TMSLayer.checkUrl(info.getUrl());
+        } else {
+            HashSet<String> proj = new HashSet<String>();
+            for(LayerDetails l : selectedLayers)
+                proj.addAll(l.getProjections());
+            info.setServerProjections(proj);
+        }
+        return info;
     }
 
@@ -565 +573 @@
         private List<LayerDetails> children;
         private Bounds bounds;
+        private Set<String> crsList;
         private boolean supported;
 
@@ -575 +584 @@
             this.children = childLayers;
             this.bounds = bounds;
+            this.crsList = crsList;
         }
 
         public boolean isSupported() {
             return this.supported;
+        }
+
+        public Set<String> getProjections() {
+            return crsList;
         }
 

trunk/src/org/openstreetmap/josm/gui/preferences/ImageryPreference.java

@@ -628 +628 @@
                 if (answer == JOptionPane.OK_OPTION) {
                     try {
-                        ImageryInfo info = new ImageryInfo(p.getUrlName(), p.getUrl());
-                        if (ImageryType.TMS.equals(info.getImageryType())) {
-                            TMSLayer.checkUrl(info.getUrl());
-                        }
-                        model.addRow(info);
+                        model.addRow(p.getImageryInfo());
                     } catch (IllegalArgumentException ex) {
                         if (ex.getMessage() == null || ex.getMessage().isEmpty()) {