Index: applications/editors/josm/plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java =================================================================== --- applications/editors/josm/plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java (revision 23899) +++ applications/editors/josm/plugins/wmsplugin/src/wmsplugin/AddWMSLayerPanel.java (revision 23904) @@ -59,468 +59,468 @@ public class AddWMSLayerPanel extends JPanel { - private List selectedLayers; - private URL serviceUrl; - private LayerDetails selectedLayer; - - private JTextField menuName; - private JTextArea resultingLayerField; - private MutableTreeNode treeRootNode; - private DefaultTreeModel treeData; - private JTree layerTree; - private JButton showBoundsButton; - - private boolean previouslyShownUnsupportedCrsError = false; - - public AddWMSLayerPanel() { - JPanel wmsFetchPanel = new JPanel(new GridBagLayout()); - menuName = new JTextField(40); - menuName.setText(tr("Unnamed WMS Layer")); - final JTextArea serviceUrl = new JTextArea(3, 40); - serviceUrl.setLineWrap(true); - serviceUrl.setText("http://sample.com/wms?"); - wmsFetchPanel.add(new JLabel(tr("Menu Name")), GBC.std().insets(0,0,5,0)); - wmsFetchPanel.add(menuName, GBC.eop().insets(5,0,0,0).fill(GridBagConstraints.HORIZONTAL)); - wmsFetchPanel.add(new JLabel(tr("Service URL")), GBC.std().insets(0,0,5,0)); - JScrollPane scrollPane = new JScrollPane(serviceUrl, - JScrollPane.VERTICAL_SCROLLBAR_AS_NEEDED, - JScrollPane.HORIZONTAL_SCROLLBAR_NEVER); - wmsFetchPanel.add(scrollPane, GBC.eop().insets(5,0,0,0)); - JButton getLayersButton = new JButton(tr("Get Layers")); - getLayersButton.addActionListener(new ActionListener() { - public void actionPerformed(ActionEvent e) { - Cursor beforeCursor = getCursor(); - try { - setCursor(Cursor.getPredefinedCursor(Cursor.WAIT_CURSOR)); - attemptGetCapabilities(serviceUrl.getText()); - } finally { - setCursor(beforeCursor); - } - } - }); - wmsFetchPanel.add(getLayersButton, GBC.eop().anchor(GridBagConstraints.EAST)); - - treeRootNode = new DefaultMutableTreeNode(); - treeData = new DefaultTreeModel(treeRootNode); - layerTree = new JTree(treeData); - layerTree.setCellRenderer(new LayerTreeCellRenderer()); - layerTree.addTreeSelectionListener(new TreeSelectionListener() { - - public void valueChanged(TreeSelectionEvent e) { - TreePath[] selectionRows = layerTree.getSelectionPaths(); - if(selectionRows == null) { - showBoundsButton.setEnabled(false); - selectedLayer = null; - return; - } - - selectedLayers = new LinkedList(); - for (TreePath i : selectionRows) { - Object userObject = ((DefaultMutableTreeNode) i.getLastPathComponent()).getUserObject(); - if(userObject instanceof LayerDetails) { - LayerDetails detail = (LayerDetails) userObject; - if(!detail.isSupported()) { - layerTree.removeSelectionPath(i); - if(!previouslyShownUnsupportedCrsError) { - JOptionPane.showMessageDialog(null, tr("That layer does not support any of JOSM's projections,\n" + - "so you can not use it. This message will not show again."), - tr("WMS Error"), JOptionPane.ERROR_MESSAGE); - previouslyShownUnsupportedCrsError = true; - } - } else if(detail.ident != null) { - selectedLayers.add(detail); - } - } - } - - if (!selectedLayers.isEmpty()) { - resultingLayerField.setText(buildGetMapUrl()); - - if(selectedLayers.size() == 1) { - showBoundsButton.setEnabled(true); - selectedLayer = selectedLayers.get(0); - } - } else { - showBoundsButton.setEnabled(false); - selectedLayer = null; - } - } - }); - wmsFetchPanel.add(new JScrollPane(layerTree), GBC.eop().insets(5,0,0,0).fill(GridBagConstraints.HORIZONTAL)); - - JPanel layerManipulationButtons = new JPanel(); - showBoundsButton = new JButton(tr("Show Bounds")); - showBoundsButton.setEnabled(false); - showBoundsButton.addActionListener(new ActionListener() { - public void actionPerformed(ActionEvent e) { - if(selectedLayer.bounds != null) { - SlippyMapBBoxChooser mapPanel = new SlippyMapBBoxChooser(); - mapPanel.setBoundingBox(selectedLayer.bounds); - JOptionPane.showMessageDialog(null, mapPanel, tr("Show Bounds"), JOptionPane.PLAIN_MESSAGE); - } else { - JOptionPane.showMessageDialog(null, tr("No bounding box was found for this layer."), - tr("WMS Error"), JOptionPane.ERROR_MESSAGE); - } - } - }); - layerManipulationButtons.add(showBoundsButton); - - wmsFetchPanel.add(layerManipulationButtons, GBC.eol().insets(0,0,5,0)); - wmsFetchPanel.add(new JLabel(tr("WMS URL")), GBC.std().insets(0,0,5,0)); - resultingLayerField = new JTextArea(3, 40); - resultingLayerField.setLineWrap(true); - wmsFetchPanel.add(new JScrollPane(resultingLayerField, JScrollPane.VERTICAL_SCROLLBAR_AS_NEEDED, JScrollPane.HORIZONTAL_SCROLLBAR_NEVER), GBC.eop().insets(5,0,0,0).fill(GridBagConstraints.HORIZONTAL)); - - add(wmsFetchPanel); - } - - private String buildRootUrl() { - StringBuilder a = new StringBuilder(serviceUrl.getProtocol()); - a.append("://"); - a.append(serviceUrl.getHost()); - if(serviceUrl.getPort() != -1) { - a.append(":"); - a.append(serviceUrl.getPort()); - } - a.append(serviceUrl.getPath()); - a.append("?"); - if(serviceUrl.getQuery() != null) { - a.append(serviceUrl.getQuery()); - if (!serviceUrl.getQuery().isEmpty() && !serviceUrl.getQuery().endsWith("&")) { - a.append("&"); - } - } - return a.toString(); - } - - private String buildGetMapUrl() { - StringBuilder a = new StringBuilder(); - a.append(buildRootUrl()); - a.append("FORMAT=image/jpeg&VERSION=1.1.1&SERVICE=WMS&REQUEST=GetMap&Layers="); - a.append(commaSepLayerList()); - a.append("&"); - - return a.toString(); - } - - private String commaSepLayerList() { - StringBuilder b = new StringBuilder(); - - Iterator iterator = selectedLayers.iterator(); - while (iterator.hasNext()) { - LayerDetails layerDetails = iterator.next(); - b.append(layerDetails.ident); - if(iterator.hasNext()) { - b.append(","); - } - } - - return b.toString(); - } - - private void showError(String incomingData, Exception e) { - JOptionPane.showMessageDialog(this, tr("Could not parse WMS layer list."), - tr("WMS Error"), JOptionPane.ERROR_MESSAGE); - System.err.println("Could not parse WMS layer list. Incoming data:"); - System.err.println(incomingData); - e.printStackTrace(); - } - - private void attemptGetCapabilities(String serviceUrlStr) { - URL getCapabilitiesUrl = null; - try { - if (!serviceUrlStr.trim().contains("capabilities")) { - // If the url doesn't already have GetCapabilities, add it in - getCapabilitiesUrl = new URL(serviceUrlStr + "VERSION=1.1.1&SERVICE=WMS&REQUEST=GetCapabilities"); - } else { - // Otherwise assume it's a good URL and let the subsequent error - // handling systems deal with problems - getCapabilitiesUrl = new URL(serviceUrlStr); - } - serviceUrl = new URL(serviceUrlStr); - } catch (HeadlessException e) { - return; - } catch (MalformedURLException e) { - JOptionPane.showMessageDialog(this, tr("Invalid service URL."), - tr("WMS Error"), JOptionPane.ERROR_MESSAGE); - return; - } - - String incomingData; - try { - URLConnection openConnection = getCapabilitiesUrl.openConnection(); - InputStream inputStream = openConnection.getInputStream(); - BufferedReader br = new BufferedReader(new InputStreamReader(inputStream)); - String line; - StringBuilder ba = new StringBuilder(); - while((line = br.readLine()) != null) { - ba.append(line); - ba.append("\n"); - } - incomingData = ba.toString(); - } catch (IOException e) { - JOptionPane.showMessageDialog(this, tr("Could not retrieve WMS layer list."), - tr("WMS Error"), JOptionPane.ERROR_MESSAGE); - return; - } - - Document document; - try { - DocumentBuilderFactory builderFactory = DocumentBuilderFactory.newInstance(); - builderFactory.setValidating(false); - builderFactory.setNamespaceAware(true); - DocumentBuilder builder = builderFactory.newDocumentBuilder(); - builder.setEntityResolver(new EntityResolver() { - public InputSource resolveEntity(String publicId, String systemId) throws SAXException, IOException { - System.out.println("Ignoring DTD " + publicId + ", " + systemId); - return new InputSource(new StringReader("")); - } - }); - document = builder.parse(new InputSource(new StringReader(incomingData))); - } catch (ParserConfigurationException e) { - showError(incomingData, e); - return; - } catch (SAXException e) { - showError(incomingData, e); - return; - } catch (IOException e) { - showError(incomingData, e); - return; - } - - // Some WMS service URLs specify a different base URL for their GetMap service - Element child = getChild(document.getDocumentElement(), "Capability"); - child = getChild(child, "Request"); - child = getChild(child, "GetMap"); - child = getChild(child, "DCPType"); - child = getChild(child, "HTTP"); - child = getChild(child, "Get"); - child = getChild(child, "OnlineResource"); - if (child != null) { - String baseURL = child.getAttribute("xlink:href"); - if(baseURL != null) { - try { - System.out.println("GetCapabilities specifies a different service URL: " + baseURL); - serviceUrl = new URL(baseURL); - } catch (MalformedURLException e1) { - } - } - } - - try { - treeRootNode.setUserObject(getCapabilitiesUrl.getHost()); - Element capabilityElem = getChild(document.getDocumentElement(), "Capability"); - List children = getChildren(capabilityElem, "Layer"); - List layers = parseLayers(children, new HashSet()); - updateTreeList(layers); - } catch(Exception e) { - showError(incomingData, e); - return; - } - } - - private void updateTreeList(List layers) { - addLayersToTreeData(treeRootNode, layers); - layerTree.expandRow(0); - } - - private void addLayersToTreeData(MutableTreeNode parent, List layers) { - for (LayerDetails layerDetails : layers) { - DefaultMutableTreeNode treeNode = new DefaultMutableTreeNode(layerDetails); - addLayersToTreeData(treeNode, layerDetails.children); - treeData.insertNodeInto(treeNode, parent, 0); - } - } - - private List parseLayers(List children, Set parentCrs) { - List details = new LinkedList(); - for (Element element : children) { - details.add(parseLayer(element, parentCrs)); - } - return details; - } - - private LayerDetails parseLayer(Element element, Set parentCrs) { - String name = getChildContent(element, "Title", null, null); - String ident = getChildContent(element, "Name", null, null); - - // The set of supported CRS/SRS for this layer - Set crsList = new HashSet(); - // ...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 crsChildren = getChildren(element, "CRS"); - crsChildren.addAll(getChildren(element, "SRS")); - for (Element child : crsChildren) { - String crs = (String) getContent(child); - if(crs != null) { - String upperCase = crs.trim().toUpperCase(); - crsList.add(upperCase); - } - } - - // Check to see if any of the specified projections are supported by JOSM - boolean josmSupportsThisLayer = false; - for (String crs : crsList) { - josmSupportsThisLayer |= isProjSupported(crs); - } - - Bounds bounds = null; - Element bboxElem = getChild(element, "EX_GeographicBoundingBox"); - if(bboxElem != null) { - // Attempt to use EX_GeographicBoundingBox for bounding box - double left = Double.parseDouble(getChildContent(bboxElem, "westBoundLongitude", null, null)); - double top = Double.parseDouble(getChildContent(bboxElem, "northBoundLatitude", null, null)); - double right = Double.parseDouble(getChildContent(bboxElem, "eastBoundLongitude", null, null)); - double bot = Double.parseDouble(getChildContent(bboxElem, "southBoundLatitude", null, null)); - bounds = new Bounds(bot, left, top, right); - } else { - // If that's not available, try LatLonBoundingBox - bboxElem = getChild(element, "LatLonBoundingBox"); - if(bboxElem != null) { - double left = Double.parseDouble(bboxElem.getAttribute("minx")); - double top = Double.parseDouble(bboxElem.getAttribute("maxy")); - double right = Double.parseDouble(bboxElem.getAttribute("maxx")); - double bot = Double.parseDouble(bboxElem.getAttribute("miny")); - bounds = new Bounds(bot, left, top, right); - } - } - - List layerChildren = getChildren(element, "Layer"); - List 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) { - if (((ProjectionSubPrefs) proj).getPreferencesFromCode(crs) == null) { - return true; - } - } else { - if (proj.toCode().equals(crs)) { - return true; - } - } - } - return false; - } - - public String getUrlName() { - return menuName.getText(); - } - - public String getUrl() { - return resultingLayerField.getText(); - } - - public static void main(String[] args) { - JFrame f = new JFrame("Test"); - f.setContentPane(new AddWMSLayerPanel()); - f.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE); - f.pack(); - f.setVisible(true); - } - - private static String getChildContent(Element parent, String name, String missing, String empty) { - Element child = getChild(parent, name); - if (child == null) { - return missing; - } else { - String content = (String) getContent(child); - return (content != null) ? content : empty; - } - } - - private static Object getContent(Element element) { - NodeList nl = element.getChildNodes(); - StringBuffer content = new StringBuffer(); - for (int i = 0; i < nl.getLength(); i++) { - Node node = nl.item(i); - switch (node.getNodeType()) { - case Node.ELEMENT_NODE: - return node; - case Node.CDATA_SECTION_NODE: - case Node.TEXT_NODE: - content.append(node.getNodeValue()); - break; - } - } - return content.toString().trim(); - } - - private static List getChildren(Element parent, String name) { - List retVal = new LinkedList(); - for (Node child = parent.getFirstChild(); child != null; child = child.getNextSibling()) { - if (child instanceof Element && name.equals(child.getNodeName())) { - retVal.add((Element) child); - } - } - return retVal; - } - - private static Element getChild(Element parent, String name) { - if (parent == null) { - return null; - } - for (Node child = parent.getFirstChild(); child != null; child = child.getNextSibling()) { - if (child instanceof Element && name.equals(child.getNodeName())) { - return (Element) child; - } - } - return null; - } - - class LayerDetails { - - private String name; - private String ident; - private List children; - private Bounds bounds; - private boolean supported; - - public LayerDetails(String name, String ident, Set crsList, - boolean supportedLayer, Bounds bounds, - List childLayers) { - this.name = name; - this.ident = ident; - this.supported = supportedLayer; - this.children = childLayers; - this.bounds = bounds; - } - - public boolean isSupported() { - return this.supported; - } - - @Override - public String toString() { - if(this.name == null || this.name.isEmpty()) { - return this.ident; - } else { - return this.name; - } - } - - } - - class LayerTreeCellRenderer extends DefaultTreeCellRenderer { - @Override - public Component getTreeCellRendererComponent(JTree tree, Object value, - boolean sel, boolean expanded, boolean leaf, int row, - boolean hasFocus) { - super.getTreeCellRendererComponent(tree, value, sel, expanded, leaf, - row, hasFocus); - DefaultMutableTreeNode treeNode = (DefaultMutableTreeNode) value; - Object userObject = treeNode.getUserObject(); - if (userObject instanceof LayerDetails) { - LayerDetails layer = (LayerDetails) userObject; - setEnabled(layer.isSupported()); - } - return this; - } - } + private List selectedLayers; + private URL serviceUrl; + private LayerDetails selectedLayer; + + private JTextField menuName; + private JTextArea resultingLayerField; + private MutableTreeNode treeRootNode; + private DefaultTreeModel treeData; + private JTree layerTree; + private JButton showBoundsButton; + + private boolean previouslyShownUnsupportedCrsError = false; + + public AddWMSLayerPanel() { + JPanel wmsFetchPanel = new JPanel(new GridBagLayout()); + menuName = new JTextField(40); + menuName.setText(tr("Unnamed WMS Layer")); + final JTextArea serviceUrl = new JTextArea(3, 40); + serviceUrl.setLineWrap(true); + serviceUrl.setText("http://sample.com/wms?"); + wmsFetchPanel.add(new JLabel(tr("Menu Name")), GBC.std().insets(0,0,5,0)); + wmsFetchPanel.add(menuName, GBC.eop().insets(5,0,0,0).fill(GridBagConstraints.HORIZONTAL)); + wmsFetchPanel.add(new JLabel(tr("Service URL")), GBC.std().insets(0,0,5,0)); + JScrollPane scrollPane = new JScrollPane(serviceUrl, + JScrollPane.VERTICAL_SCROLLBAR_AS_NEEDED, + JScrollPane.HORIZONTAL_SCROLLBAR_NEVER); + wmsFetchPanel.add(scrollPane, GBC.eop().insets(5,0,0,0)); + JButton getLayersButton = new JButton(tr("Get Layers")); + getLayersButton.addActionListener(new ActionListener() { + public void actionPerformed(ActionEvent e) { + Cursor beforeCursor = getCursor(); + try { + setCursor(Cursor.getPredefinedCursor(Cursor.WAIT_CURSOR)); + attemptGetCapabilities(serviceUrl.getText()); + } finally { + setCursor(beforeCursor); + } + } + }); + wmsFetchPanel.add(getLayersButton, GBC.eop().anchor(GridBagConstraints.EAST)); + + treeRootNode = new DefaultMutableTreeNode(); + treeData = new DefaultTreeModel(treeRootNode); + layerTree = new JTree(treeData); + layerTree.setCellRenderer(new LayerTreeCellRenderer()); + layerTree.addTreeSelectionListener(new TreeSelectionListener() { + + public void valueChanged(TreeSelectionEvent e) { + TreePath[] selectionRows = layerTree.getSelectionPaths(); + if(selectionRows == null) { + showBoundsButton.setEnabled(false); + selectedLayer = null; + return; + } + + selectedLayers = new LinkedList(); + for (TreePath i : selectionRows) { + Object userObject = ((DefaultMutableTreeNode) i.getLastPathComponent()).getUserObject(); + if(userObject instanceof LayerDetails) { + LayerDetails detail = (LayerDetails) userObject; + if(!detail.isSupported()) { + layerTree.removeSelectionPath(i); + if(!previouslyShownUnsupportedCrsError) { + JOptionPane.showMessageDialog(null, tr("That layer does not support any of JOSM's projections,\n" + + "so you can not use it. This message will not show again."), + tr("WMS Error"), JOptionPane.ERROR_MESSAGE); + previouslyShownUnsupportedCrsError = true; + } + } else if(detail.ident != null) { + selectedLayers.add(detail); + } + } + } + + if (!selectedLayers.isEmpty()) { + resultingLayerField.setText(buildGetMapUrl()); + + if(selectedLayers.size() == 1) { + showBoundsButton.setEnabled(true); + selectedLayer = selectedLayers.get(0); + } + } else { + showBoundsButton.setEnabled(false); + selectedLayer = null; + } + } + }); + wmsFetchPanel.add(new JScrollPane(layerTree), GBC.eop().insets(5,0,0,0).fill(GridBagConstraints.HORIZONTAL)); + + JPanel layerManipulationButtons = new JPanel(); + showBoundsButton = new JButton(tr("Show Bounds")); + showBoundsButton.setEnabled(false); + showBoundsButton.addActionListener(new ActionListener() { + public void actionPerformed(ActionEvent e) { + if(selectedLayer.bounds != null) { + SlippyMapBBoxChooser mapPanel = new SlippyMapBBoxChooser(); + mapPanel.setBoundingBox(selectedLayer.bounds); + JOptionPane.showMessageDialog(null, mapPanel, tr("Show Bounds"), JOptionPane.PLAIN_MESSAGE); + } else { + JOptionPane.showMessageDialog(null, tr("No bounding box was found for this layer."), + tr("WMS Error"), JOptionPane.ERROR_MESSAGE); + } + } + }); + layerManipulationButtons.add(showBoundsButton); + + wmsFetchPanel.add(layerManipulationButtons, GBC.eol().insets(0,0,5,0)); + wmsFetchPanel.add(new JLabel(tr("WMS URL")), GBC.std().insets(0,0,5,0)); + resultingLayerField = new JTextArea(3, 40); + resultingLayerField.setLineWrap(true); + wmsFetchPanel.add(new JScrollPane(resultingLayerField, JScrollPane.VERTICAL_SCROLLBAR_AS_NEEDED, JScrollPane.HORIZONTAL_SCROLLBAR_NEVER), GBC.eop().insets(5,0,0,0).fill(GridBagConstraints.HORIZONTAL)); + + add(wmsFetchPanel); + } + + private String buildRootUrl() { + StringBuilder a = new StringBuilder(serviceUrl.getProtocol()); + a.append("://"); + a.append(serviceUrl.getHost()); + if(serviceUrl.getPort() != -1) { + a.append(":"); + a.append(serviceUrl.getPort()); + } + a.append(serviceUrl.getPath()); + a.append("?"); + if(serviceUrl.getQuery() != null) { + a.append(serviceUrl.getQuery()); + if (!serviceUrl.getQuery().isEmpty() && !serviceUrl.getQuery().endsWith("&")) { + a.append("&"); + } + } + return a.toString(); + } + + private String buildGetMapUrl() { + StringBuilder a = new StringBuilder(); + a.append(buildRootUrl()); + a.append("FORMAT=image/jpeg&VERSION=1.1.1&SERVICE=WMS&REQUEST=GetMap&Layers="); + a.append(commaSepLayerList()); + a.append("&"); + + return a.toString(); + } + + private String commaSepLayerList() { + StringBuilder b = new StringBuilder(); + + Iterator iterator = selectedLayers.iterator(); + while (iterator.hasNext()) { + LayerDetails layerDetails = iterator.next(); + b.append(layerDetails.ident); + if(iterator.hasNext()) { + b.append(","); + } + } + + return b.toString(); + } + + private void showError(String incomingData, Exception e) { + JOptionPane.showMessageDialog(this, tr("Could not parse WMS layer list."), + tr("WMS Error"), JOptionPane.ERROR_MESSAGE); + System.err.println("Could not parse WMS layer list. Incoming data:"); + System.err.println(incomingData); + e.printStackTrace(); + } + + private void attemptGetCapabilities(String serviceUrlStr) { + URL getCapabilitiesUrl = null; + try { + if (!serviceUrlStr.trim().contains("capabilities")) { + // If the url doesn't already have GetCapabilities, add it in + getCapabilitiesUrl = new URL(serviceUrlStr + "VERSION=1.1.1&SERVICE=WMS&REQUEST=GetCapabilities"); + } else { + // Otherwise assume it's a good URL and let the subsequent error + // handling systems deal with problems + getCapabilitiesUrl = new URL(serviceUrlStr); + } + serviceUrl = new URL(serviceUrlStr); + } catch (HeadlessException e) { + return; + } catch (MalformedURLException e) { + JOptionPane.showMessageDialog(this, tr("Invalid service URL."), + tr("WMS Error"), JOptionPane.ERROR_MESSAGE); + return; + } + + String incomingData; + try { + URLConnection openConnection = getCapabilitiesUrl.openConnection(); + InputStream inputStream = openConnection.getInputStream(); + BufferedReader br = new BufferedReader(new InputStreamReader(inputStream)); + String line; + StringBuilder ba = new StringBuilder(); + while((line = br.readLine()) != null) { + ba.append(line); + ba.append("\n"); + } + incomingData = ba.toString(); + } catch (IOException e) { + JOptionPane.showMessageDialog(this, tr("Could not retrieve WMS layer list."), + tr("WMS Error"), JOptionPane.ERROR_MESSAGE); + return; + } + + Document document; + try { + DocumentBuilderFactory builderFactory = DocumentBuilderFactory.newInstance(); + builderFactory.setValidating(false); + builderFactory.setNamespaceAware(true); + DocumentBuilder builder = builderFactory.newDocumentBuilder(); + builder.setEntityResolver(new EntityResolver() { + public InputSource resolveEntity(String publicId, String systemId) throws SAXException, IOException { + System.out.println("Ignoring DTD " + publicId + ", " + systemId); + return new InputSource(new StringReader("")); + } + }); + document = builder.parse(new InputSource(new StringReader(incomingData))); + } catch (ParserConfigurationException e) { + showError(incomingData, e); + return; + } catch (SAXException e) { + showError(incomingData, e); + return; + } catch (IOException e) { + showError(incomingData, e); + return; + } + + // Some WMS service URLs specify a different base URL for their GetMap service + Element child = getChild(document.getDocumentElement(), "Capability"); + child = getChild(child, "Request"); + child = getChild(child, "GetMap"); + child = getChild(child, "DCPType"); + child = getChild(child, "HTTP"); + child = getChild(child, "Get"); + child = getChild(child, "OnlineResource"); + if (child != null) { + String baseURL = child.getAttribute("xlink:href"); + if(baseURL != null) { + try { + System.out.println("GetCapabilities specifies a different service URL: " + baseURL); + serviceUrl = new URL(baseURL); + } catch (MalformedURLException e1) { + } + } + } + + try { + treeRootNode.setUserObject(getCapabilitiesUrl.getHost()); + Element capabilityElem = getChild(document.getDocumentElement(), "Capability"); + List children = getChildren(capabilityElem, "Layer"); + List layers = parseLayers(children, new HashSet()); + updateTreeList(layers); + } catch(Exception e) { + showError(incomingData, e); + return; + } + } + + private void updateTreeList(List layers) { + addLayersToTreeData(treeRootNode, layers); + layerTree.expandRow(0); + } + + private void addLayersToTreeData(MutableTreeNode parent, List layers) { + for (LayerDetails layerDetails : layers) { + DefaultMutableTreeNode treeNode = new DefaultMutableTreeNode(layerDetails); + addLayersToTreeData(treeNode, layerDetails.children); + treeData.insertNodeInto(treeNode, parent, 0); + } + } + + private List parseLayers(List children, Set parentCrs) { + List details = new LinkedList(); + for (Element element : children) { + details.add(parseLayer(element, parentCrs)); + } + return details; + } + + private LayerDetails parseLayer(Element element, Set parentCrs) { + String name = getChildContent(element, "Title", null, null); + String ident = getChildContent(element, "Name", null, null); + + // The set of supported CRS/SRS for this layer + Set crsList = new HashSet(); + // ...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 crsChildren = getChildren(element, "CRS"); + crsChildren.addAll(getChildren(element, "SRS")); + for (Element child : crsChildren) { + String crs = (String) getContent(child); + if(crs != null) { + String upperCase = crs.trim().toUpperCase(); + crsList.add(upperCase); + } + } + + // Check to see if any of the specified projections are supported by JOSM + boolean josmSupportsThisLayer = false; + for (String crs : crsList) { + josmSupportsThisLayer |= isProjSupported(crs); + } + + Bounds bounds = null; + Element bboxElem = getChild(element, "EX_GeographicBoundingBox"); + if(bboxElem != null) { + // Attempt to use EX_GeographicBoundingBox for bounding box + double left = Double.parseDouble(getChildContent(bboxElem, "westBoundLongitude", null, null)); + double top = Double.parseDouble(getChildContent(bboxElem, "northBoundLatitude", null, null)); + double right = Double.parseDouble(getChildContent(bboxElem, "eastBoundLongitude", null, null)); + double bot = Double.parseDouble(getChildContent(bboxElem, "southBoundLatitude", null, null)); + bounds = new Bounds(bot, left, top, right); + } else { + // If that's not available, try LatLonBoundingBox + bboxElem = getChild(element, "LatLonBoundingBox"); + if(bboxElem != null) { + double left = Double.parseDouble(bboxElem.getAttribute("minx")); + double top = Double.parseDouble(bboxElem.getAttribute("maxy")); + double right = Double.parseDouble(bboxElem.getAttribute("maxx")); + double bot = Double.parseDouble(bboxElem.getAttribute("miny")); + bounds = new Bounds(bot, left, top, right); + } + } + + List layerChildren = getChildren(element, "Layer"); + List 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) { + if (((ProjectionSubPrefs) proj).getPreferencesFromCode(crs) == null) { + return true; + } + } else { + if (proj.toCode().equals(crs)) { + return true; + } + } + } + return false; + } + + public String getUrlName() { + return menuName.getText(); + } + + public String getUrl() { + return resultingLayerField.getText(); + } + + public static void main(String[] args) { + JFrame f = new JFrame("Test"); + f.setContentPane(new AddWMSLayerPanel()); + f.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE); + f.pack(); + f.setVisible(true); + } + + private static String getChildContent(Element parent, String name, String missing, String empty) { + Element child = getChild(parent, name); + if (child == null) { + return missing; + } else { + String content = (String) getContent(child); + return (content != null) ? content : empty; + } + } + + private static Object getContent(Element element) { + NodeList nl = element.getChildNodes(); + StringBuffer content = new StringBuffer(); + for (int i = 0; i < nl.getLength(); i++) { + Node node = nl.item(i); + switch (node.getNodeType()) { + case Node.ELEMENT_NODE: + return node; + case Node.CDATA_SECTION_NODE: + case Node.TEXT_NODE: + content.append(node.getNodeValue()); + break; + } + } + return content.toString().trim(); + } + + private static List getChildren(Element parent, String name) { + List retVal = new LinkedList(); + for (Node child = parent.getFirstChild(); child != null; child = child.getNextSibling()) { + if (child instanceof Element && name.equals(child.getNodeName())) { + retVal.add((Element) child); + } + } + return retVal; + } + + private static Element getChild(Element parent, String name) { + if (parent == null) { + return null; + } + for (Node child = parent.getFirstChild(); child != null; child = child.getNextSibling()) { + if (child instanceof Element && name.equals(child.getNodeName())) { + return (Element) child; + } + } + return null; + } + + class LayerDetails { + + private String name; + private String ident; + private List children; + private Bounds bounds; + private boolean supported; + + public LayerDetails(String name, String ident, Set crsList, + boolean supportedLayer, Bounds bounds, + List childLayers) { + this.name = name; + this.ident = ident; + this.supported = supportedLayer; + this.children = childLayers; + this.bounds = bounds; + } + + public boolean isSupported() { + return this.supported; + } + + @Override + public String toString() { + if(this.name == null || this.name.isEmpty()) { + return this.ident; + } else { + return this.name; + } + } + + } + + class LayerTreeCellRenderer extends DefaultTreeCellRenderer { + @Override + public Component getTreeCellRendererComponent(JTree tree, Object value, + boolean sel, boolean expanded, boolean leaf, int row, + boolean hasFocus) { + super.getTreeCellRendererComponent(tree, value, sel, expanded, leaf, + row, hasFocus); + DefaultMutableTreeNode treeNode = (DefaultMutableTreeNode) value; + Object userObject = treeNode.getUserObject(); + if (userObject instanceof LayerDetails) { + LayerDetails layer = (LayerDetails) userObject; + setEnabled(layer.isSupported()); + } + return this; + } + } } Index: applications/editors/josm/plugins/wmsplugin/src/wmsplugin/WMSLayerInfo.java =================================================================== --- applications/editors/josm/plugins/wmsplugin/src/wmsplugin/WMSLayerInfo.java (revision 23899) +++ applications/editors/josm/plugins/wmsplugin/src/wmsplugin/WMSLayerInfo.java (revision 23904) @@ -21,6 +21,5 @@ ArrayList layers = new ArrayList(); ArrayList defaultLayers = new ArrayList(); - private final static String[] DEFAULT_LAYER_SITES = { - "http://svn.openstreetmap.org/applications/editors/josm/plugins/wmsplugin/sources.cfg"}; + private final static String[] DEFAULT_LAYER_SITES = { "http://josm.openstreetmap.de/maps"}; public void load() {