Changeset 22941 in osm for applications

Timestamp:

2010-09-02T13:51:19+02:00 (14 years ago)

Author:

yellowbkpk

Message:

Should be handling all of the available projections and subprojections now.

File:

• applications/editors/josm/plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java (modified) (9 diffs)

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

@@ -18 +18 @@
 import java.net.URL;
 import java.net.URLConnection;
-import java.util.HashMap;
+import java.util.HashSet;
 import java.util.Iterator;
 import java.util.LinkedList;
 import java.util.List;
-import java.util.Map;
+import java.util.Set;
 
 import javax.swing.JButton;
@@ -46 +46 @@
 import org.openstreetmap.josm.data.Bounds;
 import org.openstreetmap.josm.data.projection.Projection;
+import org.openstreetmap.josm.data.projection.ProjectionSubPrefs;
 import org.openstreetmap.josm.gui.bbox.SlippyMapBBoxChooser;
 import org.openstreetmap.josm.tools.GBC;
@@ -55 +56 @@
 import org.xml.sax.SAXException;
 
+
 public class AddWMSLayerPanel extends JPanel {
     private List<LayerDetails> selectedLayers;
@@ -68 +70 @@
 
     private boolean previouslyShownUnsupportedCrsError = false;
-
-    private static final Map<String, Projection> supportedProjections = new HashMap<String, Projection>();
-    static {
-        for (Projection proj : Projection.allProjections) {
-            supportedProjections.put(proj.toCode().trim().toUpperCase(), proj);
-        }
-    }
 
     public AddWMSLayerPanel() {
@@ -280 +275 @@
         Element capabilityElem = getChild(document.getDocumentElement(), "Capability");
         List<Element> children = getChildren(capabilityElem, "Layer");
-        List<LayerDetails> layers = parseLayers(children);
+        List<LayerDetails> layers = parseLayers(children, new HashSet<String>());
 
         updateTreeList(layers);
@@ -298 +293 @@
     }
 
-    private List<LayerDetails> parseLayers(List<Element> children) {
+    private List<LayerDetails> parseLayers(List<Element> children, Set<String> parentCrs) {
         List<LayerDetails> details = new LinkedList<LayerDetails>();
         for (Element element : children) {
-            details.add(parseLayer(element));
+            details.add(parseLayer(element, parentCrs));
         }
         return details;
     }
 
-    private LayerDetails parseLayer(Element element) {
+    private LayerDetails parseLayer(Element element, Set<String> parentCrs) {
         String name = getChildContent(element, "Title", null, null);
         String ident = getChildContent(element, "Name", null, null);
 
-        boolean josmSupportsThisLayer = false;
-        List<String> crsList = new LinkedList<String>();
+        // The set of supported CRS/SRS for this layer
+        Set<String> crsList = new HashSet<String>();
+        // ...including this layer's already-parsed parent projections
+        crsList.addAll(parentCrs);
+
+        // Parse the CRS/SRS pulled out of this layer's XML element
         // I think CRS and SRS are the same at this point
         List<Element> crsChildren = getChildren(element, "CRS");
@@ -320 +319 @@
                 String upperCase = crs.trim().toUpperCase();
                 crsList.add(upperCase);
-                josmSupportsThisLayer |= supportedProjections.containsKey(upperCase);
-            }
+            }
+        }
+
+        // Check to see if any of the specified projections are supported by JOSM
+        boolean josmSupportsThisLayer = false;
+        for (String crs : crsList) {
+            josmSupportsThisLayer |= isProjSupported(crs);
         }
 
@@ -346 +350 @@
 
         List<Element> layerChildren = getChildren(element, "Layer");
-        List<LayerDetails> childLayers = parseLayers(layerChildren);
+        List<LayerDetails> childLayers = parseLayers(layerChildren, crsList);
 
         return new LayerDetails(name, ident, crsList, josmSupportsThisLayer, bounds, childLayers);
+    }
+
+    private boolean isProjSupported(String crs) {
+        for (Projection proj : Projection.allProjections) {
+            if (proj instanceof ProjectionSubPrefs) {
+                return ((ProjectionSubPrefs) proj).getPreferencesFromCode(crs) == null;
+            } else {
+                return proj.toCode().equals(crs);
+            }
+        }
+        return false;
     }
 
@@ -417 +432 @@
         private String name;
         private String ident;
-        private List<String> crsList;
+        private Set<String> crsList;
         private List<LayerDetails> children;
         private Bounds bounds;
         private boolean supported;
 
-        public LayerDetails(String name, String ident, List<String> crsList,
+        public LayerDetails(String name, String ident, Set<String> crsList,
                 boolean supportedLayer, Bounds bounds,
                 List<LayerDetails> childLayers) {