Index: trunk/src/org/openstreetmap/josm/actions/AddImageryLayerAction.java =================================================================== --- trunk/src/org/openstreetmap/josm/actions/AddImageryLayerAction.java (revision 5616) +++ trunk/src/org/openstreetmap/josm/actions/AddImageryLayerAction.java (revision 5617) @@ -4,13 +4,20 @@ import static org.openstreetmap.josm.tools.I18n.tr; +import java.awt.Dimension; import java.awt.event.ActionEvent; +import java.io.IOException; +import java.net.MalformedURLException; import javax.swing.Action; import javax.swing.ImageIcon; import javax.swing.JOptionPane; +import javax.swing.JScrollPane; import org.openstreetmap.josm.Main; import org.openstreetmap.josm.data.imagery.ImageryInfo; import org.openstreetmap.josm.data.imagery.ImageryInfo.ImageryType; +import org.openstreetmap.josm.gui.ExtendedDialog; import org.openstreetmap.josm.gui.actionsupport.AlignImageryPanel; import org.openstreetmap.josm.gui.layer.ImageryLayer; +import org.openstreetmap.josm.io.imagery.WMSImagery; +import org.openstreetmap.josm.gui.preferences.imagery.WMSLayerTree; import org.openstreetmap.josm.tools.ImageProvider; @@ -44,6 +51,10 @@ if (!isEnabled()) return; try { - Main.main.addLayer(ImageryLayer.create(info)); - AlignImageryPanel.addNagPanelIfNeeded(); + final ImageryInfo infoToAdd = ImageryType.WMS_ENDPOINT.equals(info.getImageryType()) + ? getWMSLayerInfo() : info; + if (infoToAdd != null) { + Main.main.addLayer(ImageryLayer.create(infoToAdd)); + AlignImageryPanel.addNagPanelIfNeeded(); + } } catch (IllegalArgumentException ex) { if (ex.getMessage() == null || ex.getMessage().isEmpty()) { @@ -55,4 +66,40 @@ } } + } + + protected ImageryInfo getWMSLayerInfo() { + try { + assert (ImageryType.WMS_ENDPOINT.equals(info.getImageryType())); + final WMSImagery wms = new WMSImagery(); + wms.attemptGetCapabilities(info.getUrl()); + + System.out.println(wms.getLayers()); + final WMSLayerTree tree = new WMSLayerTree(); + tree.updateTree(wms); + + if (1 != new ExtendedDialog(Main.parent, tr("Select WMS layers"), new String[]{tr("Add layers"), tr("Cancel")}) {{ + final JScrollPane scrollPane = new JScrollPane(tree.getLayerTree()); + setContent(scrollPane); + scrollPane.setPreferredSize(new Dimension(400, 400)); + }}.showDialog().getValue()) { + return null; + } + + String url = wms.buildGetMapUrl(tree.getSelectedLayers()); + return new ImageryInfo(info.getName(), url, "wms", info.getEulaAcceptanceRequired(), info.getCookies()); + } // exception handling from AddWMSLayerPanel.java + catch (MalformedURLException ex) { + JOptionPane.showMessageDialog(Main.parent, tr("Invalid service URL."), + tr("WMS Error"), JOptionPane.ERROR_MESSAGE); + } catch (IOException ex) { + JOptionPane.showMessageDialog(Main.parent, tr("Could not retrieve WMS layer list."), + tr("WMS Error"), JOptionPane.ERROR_MESSAGE); + } catch (WMSImagery.WMSGetCapabilitiesException ex) { + JOptionPane.showMessageDialog(Main.parent, 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(ex.getIncomingData()); + } + return null; } Index: trunk/src/org/openstreetmap/josm/data/imagery/ImageryInfo.java =================================================================== --- trunk/src/org/openstreetmap/josm/data/imagery/ImageryInfo.java (revision 5616) +++ trunk/src/org/openstreetmap/josm/data/imagery/ImageryInfo.java (revision 5617) @@ -36,5 +36,6 @@ HTML("html"), BING("bing"), - SCANEX("scanex"); + SCANEX("scanex"), + WMS_ENDPOINT("wms_endpoint"); private String urlString; Index: trunk/src/org/openstreetmap/josm/gui/preferences/imagery/AddImageryPanel.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/preferences/imagery/AddImageryPanel.java (revision 5617) +++ trunk/src/org/openstreetmap/josm/gui/preferences/imagery/AddImageryPanel.java (revision 5617) @@ -0,0 +1,24 @@ +package org.openstreetmap.josm.gui.preferences.imagery; + +import java.awt.LayoutManager; +import javax.swing.JPanel; +import org.openstreetmap.josm.data.imagery.ImageryInfo; + +public abstract class AddImageryPanel extends JPanel { + protected AddImageryPanel() { + } + + protected AddImageryPanel(boolean isDoubleBuffered) { + super(isDoubleBuffered); + } + + protected AddImageryPanel(LayoutManager layout) { + super(layout); + } + + protected AddImageryPanel(LayoutManager layout, boolean isDoubleBuffered) { + super(layout, isDoubleBuffered); + } + + abstract ImageryInfo getImageryInfo(); +} Index: trunk/src/org/openstreetmap/josm/gui/preferences/imagery/AddTMSLayerPanel.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/preferences/imagery/AddTMSLayerPanel.java (revision 5617) +++ trunk/src/org/openstreetmap/josm/gui/preferences/imagery/AddTMSLayerPanel.java (revision 5617) @@ -0,0 +1,93 @@ +// License: GPL. For details, see LICENSE file. +package org.openstreetmap.josm.gui.preferences.imagery; + +import static org.openstreetmap.josm.tools.I18n.tr; + +import java.awt.Dimension; +import java.awt.GridBagLayout; +import java.awt.event.KeyAdapter; +import java.awt.event.KeyEvent; +import java.util.Arrays; +import javax.swing.JLabel; +import javax.swing.JTextArea; +import javax.swing.JTextField; +import javax.swing.text.View; +import org.openstreetmap.josm.data.imagery.ImageryInfo; +import org.openstreetmap.josm.tools.GBC; +import org.openstreetmap.josm.tools.Utils; + +public class AddTMSLayerPanel extends AddImageryPanel { + + private final JTextArea rawUrl = new JTextArea(3, 40); + private final JTextField tmsZoom = new JTextField(); + private final JTextArea tmsUrl = new JTextArea(3, 40); + private final JTextField name = new JTextField(); + private final KeyAdapter keyAdapter = new KeyAdapter() { + @Override + public void keyReleased(KeyEvent e) { + tmsUrl.setText(buildTMSUrl()); + } + }; + + public AddTMSLayerPanel() { + super(new GridBagLayout()); + + add(new JLabel(tr("1. Enter URL")), GBC.eol()); + add(new JLabel("" + Utils.joinAsHtmlUnorderedList(Arrays.asList( + tr("{0} is replaced by tile zoom level, also supported:
" + + "offsets to the zoom level: {1} or {2}
" + + "reversed zoom level: {3}", "{zoom}", "{zoom+1}", "{zoom-1}", "{19-zoom}"), + tr("{0} is replaced by X-coordinate of the tile", "{x}"), + tr("{0} is replaced by Y-coordinate of the tile", "{y}"), + tr("{0} is replaced by {1} (Yahoo style Y coordinate)", "{!y}", "2zoom–1 – 1 – Y"), + tr("{0} is replaced by {1} (OSGeo Tile Map Service Specification style Y coordinate)", "{-y}", "2zoom – 1 – Y"), + tr("{0} is replaced by a random selection from the given comma separated list, e.g. {1}", "{switch:...}", "{switch:a,b,c}") + )) + ""), GBC.eol().fill()); + + add(rawUrl, GBC.eop().fill()); + rawUrl.setLineWrap(true); + rawUrl.addKeyListener(keyAdapter); + + add(new JLabel(tr("2. Enter maximum zoom (optional)")), GBC.eol()); + tmsZoom.addKeyListener(keyAdapter); + add(tmsZoom, GBC.eop().fill()); + + add(new JLabel(tr("3. Verify generated TMS URL")), GBC.eol()); + add(tmsUrl, GBC.eop().fill()); + tmsUrl.setLineWrap(true); + + add(new JLabel(tr("4. Enter name for this layer")), GBC.eol()); + add(name, GBC.eop().fill()); + + } + + private String sanitize(String s) { + return s.replaceAll("[\r\n]+", "").trim(); + } + + private String buildTMSUrl() { + StringBuilder a = new StringBuilder("tms"); + String z = sanitize(tmsZoom.getText()); + if (!z.isEmpty()) { + a.append("[").append(z).append("]"); + } + a.append(":"); + a.append(sanitize(rawUrl.getText())); + return a.toString(); + } + + @Override + public ImageryInfo getImageryInfo() { + return new ImageryInfo(name.getText(), tmsUrl.getText()); + } + + public static Dimension getPreferredSize(JLabel label, boolean width, int prefSize) { + + View view = (View) label.getClientProperty(javax.swing.plaf.basic.BasicHTML.propertyKey); + view.setSize(width ? prefSize : 0, width ? 0 : prefSize); + + return new java.awt.Dimension( + (int) Math.ceil(view.getPreferredSpan(View.X_AXIS)), + (int) Math.ceil(view.getPreferredSpan(View.Y_AXIS))); + } +} Index: trunk/src/org/openstreetmap/josm/gui/preferences/imagery/AddWMSLayerPanel.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/preferences/imagery/AddWMSLayerPanel.java (revision 5616) +++ trunk/src/org/openstreetmap/josm/gui/preferences/imagery/AddWMSLayerPanel.java (revision 5617) @@ -3,182 +3,106 @@ import static org.openstreetmap.josm.tools.I18n.tr; -import static org.openstreetmap.josm.tools.I18n.trc; -import java.awt.Component; -import java.awt.Cursor; import java.awt.Dimension; -import java.awt.GridBagConstraints; import java.awt.GridBagLayout; -import java.awt.HeadlessException; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; -import java.awt.event.KeyAdapter; -import java.awt.event.KeyEvent; -import java.io.BufferedReader; +import java.awt.event.ItemEvent; +import java.awt.event.ItemListener; +import java.beans.PropertyChangeEvent; +import java.beans.PropertyChangeListener; import java.io.IOException; -import java.io.InputStream; -import java.io.StringReader; import java.net.MalformedURLException; -import java.net.URL; -import java.net.URLConnection; -import java.util.HashSet; -import java.util.Iterator; -import java.util.LinkedList; -import java.util.List; -import java.util.Set; -import java.util.regex.Pattern; - import javax.swing.JButton; +import javax.swing.JCheckBox; import javax.swing.JLabel; import javax.swing.JOptionPane; -import javax.swing.JPanel; import javax.swing.JScrollPane; -import javax.swing.JTabbedPane; import javax.swing.JTextArea; import javax.swing.JTextField; -import javax.swing.JTree; -import javax.swing.event.ChangeEvent; -import javax.swing.event.ChangeListener; -import javax.swing.event.TreeSelectionEvent; -import javax.swing.event.TreeSelectionListener; -import javax.swing.tree.DefaultMutableTreeNode; -import javax.swing.tree.DefaultTreeCellRenderer; -import javax.swing.tree.DefaultTreeModel; -import javax.swing.tree.MutableTreeNode; -import javax.swing.tree.TreePath; -import javax.xml.parsers.DocumentBuilder; -import javax.xml.parsers.DocumentBuilderFactory; -import javax.xml.parsers.ParserConfigurationException; +import org.openstreetmap.josm.data.imagery.ImageryInfo; +import org.openstreetmap.josm.gui.bbox.SlippyMapBBoxChooser; +import org.openstreetmap.josm.io.imagery.WMSImagery; +import org.openstreetmap.josm.tools.GBC; -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.gui.bbox.SlippyMapBBoxChooser; -import org.openstreetmap.josm.gui.layer.TMSLayer; -import org.openstreetmap.josm.gui.preferences.projection.ProjectionChoice; -import org.openstreetmap.josm.gui.preferences.projection.ProjectionPreference; -import org.openstreetmap.josm.io.UTFInputStreamReader; -import org.openstreetmap.josm.tools.GBC; -import org.openstreetmap.josm.tools.Utils; -import org.w3c.dom.Document; -import org.w3c.dom.Element; -import org.w3c.dom.Node; -import org.w3c.dom.NodeList; -import org.xml.sax.EntityResolver; -import org.xml.sax.InputSource; -import org.xml.sax.SAXException; +public class AddWMSLayerPanel extends AddImageryPanel { - -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; - private JTextArea tmsURL; - private JTextField tmsZoom; + private final WMSImagery wms = new WMSImagery(); + private final JTextArea rawUrl = new JTextArea(3, 40); + private final JCheckBox endpoint = new JCheckBox(tr("Store WMS endpoint only, select layers at usage")); + private final WMSLayerTree tree = new WMSLayerTree(); + private final JTextArea wmsUrl = new JTextArea(3, 40); + private final JTextField name = new JTextField(); public AddWMSLayerPanel() { super(new GridBagLayout()); - add(new JLabel(tr("Menu Name")), GBC.std().insets(0,0,5,0)); - menuName = new JTextField(40); - menuName.setText(tr("Unnamed Imagery Layer")); - add(menuName, GBC.eop().insets(5,0,0,0).fill(GridBagConstraints.HORIZONTAL)); - final JTabbedPane tabbedPane = new JTabbedPane(); + add(new JLabel(tr("1. Enter service URL")), GBC.eol()); + add(rawUrl, GBC.eol().fill()); + rawUrl.setLineWrap(true); + JButton getLayers = new JButton(tr("Get layers")); + add(getLayers, GBC.eop().fill()); - final JPanel wmsFetchPanel = new JPanel(new GridBagLayout()); - tabbedPane.addTab(tr("WMS"), wmsFetchPanel); - add(tabbedPane, GBC.eop().insets(5,0,0,0).weight(1.0, 1.0).fill(GridBagConstraints.BOTH)); + add(new JLabel(tr("2. Select layers")), GBC.eol()); + add(endpoint, GBC.eol().fill()); + tree.getLayerTree().setPreferredSize(new Dimension(400, 100)); + add(new JScrollPane(tree.getLayerTree()), GBC.eol().fill()); + final JButton showBounds = new JButton(tr("Show bounds")); + showBounds.setEnabled(false); + add(new JScrollPane(showBounds), GBC.eop().fill()); - final JTextArea serviceUrlText = new JTextArea(3, 40); - serviceUrlText.setLineWrap(true); - serviceUrlText.setText("http://sample.com/wms?"); - wmsFetchPanel.add(new JLabel(tr("Service URL")), GBC.std().insets(0,0,5,0)); - JScrollPane scrollPane = new JScrollPane(serviceUrlText, - JScrollPane.VERTICAL_SCROLLBAR_AS_NEEDED, - JScrollPane.HORIZONTAL_SCROLLBAR_NEVER); - scrollPane.setMinimumSize(new Dimension(60, 60)); - wmsFetchPanel.add(scrollPane, GBC.eol().weight(1.0, 0.0).insets(5,0,0,0).fill(GridBagConstraints.HORIZONTAL)); - JButton getLayersButton = new JButton(tr("Get Layers")); - getLayersButton.addActionListener(new ActionListener() { + add(new JLabel(tr("3. Verify generated WMS URL")), GBC.eol()); + add(wmsUrl, GBC.eop().fill()); + wmsUrl.setLineWrap(true); + + add(new JLabel(tr("4. Enter name for this layer")), GBC.eol()); + add(name, GBC.eop().fill()); + + getLayers.addActionListener(new ActionListener() { @Override public void actionPerformed(ActionEvent e) { - Cursor beforeCursor = getCursor(); try { - setCursor(Cursor.getPredefinedCursor(Cursor.WAIT_CURSOR)); - attemptGetCapabilities(sanitize(serviceUrlText.getText())); - } finally { - setCursor(beforeCursor); + wms.attemptGetCapabilities(rawUrl.getText()); + tree.updateTree(wms); + } catch (MalformedURLException ex) { + JOptionPane.showMessageDialog(getParent(), tr("Invalid service URL."), + tr("WMS Error"), JOptionPane.ERROR_MESSAGE); + } catch (IOException ex) { + JOptionPane.showMessageDialog(getParent(), tr("Could not retrieve WMS layer list."), + tr("WMS Error"), JOptionPane.ERROR_MESSAGE); + } catch (WMSImagery.WMSGetCapabilitiesException ex) { + JOptionPane.showMessageDialog(getParent(), 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(ex.getIncomingData()); } } }); - 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() { - + endpoint.addItemListener(new ItemListener() { @Override - 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; - } + public void itemStateChanged(ItemEvent e) { + tree.getLayerTree().setEnabled(!endpoint.isSelected()); + showBounds.setEnabled(!endpoint.isSelected()); + wmsUrl.setEnabled(!endpoint.isSelected()); } }); - wmsFetchPanel.add(new JScrollPane(layerTree), GBC.eol().weight(1.0, 1.0).insets(5,0,0,0).fill(GridBagConstraints.BOTH)); - JPanel layerManipulationButtons = new JPanel(); - showBoundsButton = new JButton(tr("Show Bounds")); - showBoundsButton.setEnabled(false); - showBoundsButton.addActionListener(new ActionListener() { + tree.getLayerTree().addPropertyChangeListener("selectedLayers", new PropertyChangeListener() { + @Override + public void propertyChange(PropertyChangeEvent evt) { + if (wms.getServiceUrl() != null) { + wmsUrl.setText(wms.buildGetMapUrl(tree.getSelectedLayers())); + } + showBounds.setEnabled(tree.getSelectedLayers().size() == 1); + } + }); + + showBounds.addActionListener(new ActionListener() { @Override public void actionPerformed(ActionEvent e) { - if(selectedLayer.bounds != null) { + if (tree.getSelectedLayers().get(0).bounds != null) { SlippyMapBBoxChooser mapPanel = new SlippyMapBBoxChooser(); - mapPanel.setBoundingBox(selectedLayer.bounds); + mapPanel.setBoundingBox(tree.getSelectedLayers().get(0).bounds); JOptionPane.showMessageDialog(null, mapPanel, tr("Show Bounds"), JOptionPane.PLAIN_MESSAGE); } else { @@ -188,429 +112,18 @@ } }); - layerManipulationButtons.add(showBoundsButton); - wmsFetchPanel.add(layerManipulationButtons, GBC.eol().insets(0,0,5,0)); - - final JPanel tmsView = new JPanel(new GridBagLayout()); - tmsView.add(new JLabel(tr("TMS URL")), GBC.std().insets(0,0,5,0)); - tmsURL = new JTextArea(3, 40); - tmsURL.setLineWrap(true); - tmsURL.setText("http://sample.com/tms/{zoom}/{x}/{y}.jpg"); - tmsURL.addKeyListener(new KeyAdapter() { - @Override - public void keyReleased(KeyEvent e) { - resultingLayerField.setText(buildTMSUrl()); - } - }); - JScrollPane tmsUrlScrollPane = new JScrollPane(tmsURL, - JScrollPane.VERTICAL_SCROLLBAR_AS_NEEDED, - JScrollPane.HORIZONTAL_SCROLLBAR_NEVER); - tmsUrlScrollPane.setMinimumSize(new Dimension(60, 60)); - tmsView.add(tmsUrlScrollPane, GBC.eol().insets(5,0,0,0).fill(GridBagConstraints.HORIZONTAL)); - tmsView.add(new JLabel(trc("layer", "Zoom")), GBC.std().insets(0,0,5,0)); - tmsZoom = new JTextField(3); - tmsZoom.addKeyListener(new KeyAdapter() { - @Override - public void keyReleased(KeyEvent e) { - resultingLayerField.setText(buildTMSUrl()); - } - }); - tmsView.add(tmsZoom, GBC.eol().insets(5,0,0,0).fill(GridBagConstraints.HORIZONTAL)); - tmsView.add(new JLabel(), GBC.eop().weight(1.0, 1.0).fill(GridBagConstraints.BOTH)); - tabbedPane.addTab(tr("TMS"), tmsView); - - add(new JLabel(tr("Imagery URL")), GBC.std().insets(0,0,5,0)); - resultingLayerField = new JTextArea(3, 40); - resultingLayerField.setLineWrap(true); - JScrollPane bottomScrollPane = new JScrollPane(resultingLayerField, - JScrollPane.VERTICAL_SCROLLBAR_AS_NEEDED, JScrollPane.HORIZONTAL_SCROLLBAR_NEVER); - bottomScrollPane.setMinimumSize(new Dimension(60, 60)); - add(bottomScrollPane, GBC.eol().weight(1.0, 0.0).insets(5,0,0,0).fill(GridBagConstraints.HORIZONTAL)); - - tabbedPane.addChangeListener(new ChangeListener() { - @Override - public void stateChanged(ChangeEvent e) { - Component sel = tabbedPane.getSelectedComponent(); - if(tmsView == sel) { - resultingLayerField.setText(buildTMSUrl()); - } else if(wmsFetchPanel == sel) { - if(serviceUrl != null) { - resultingLayerField.setText(buildGetMapUrl()); - } - } - } - }); } - private String sanitize(String s) { - return s.replaceAll("[\r\n]+","").trim(); - } - - private String buildTMSUrl() { - StringBuilder a = new StringBuilder("tms"); - String z = sanitize(tmsZoom.getText()); - if(!z.isEmpty()) { - a.append("["+z+"]"); - } - a.append(":"); - a.append(sanitize(tmsURL.getText())); - return a.toString(); - } - - 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("&STYLES=&SRS={proj}&WIDTH={width}&HEIGHT={height}&BBOX={bbox}"); - - return a.toString(); - } - - private String commaSepLayerList() { - StringBuilder b = new StringBuilder(); - - if (selectedLayers != null) { - 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 (!Pattern.compile(".*GetCapabilities.*", Pattern.CASE_INSENSITIVE).matcher(serviceUrlStr).matches()) { - // If the url doesn't already have GetCapabilities, add it in - getCapabilitiesUrl = new URL(serviceUrlStr); - final String getCapabilitiesQuery = "VERSION=1.1.1&SERVICE=WMS&REQUEST=GetCapabilities"; - if (getCapabilitiesUrl.getQuery() == null) { - getCapabilitiesUrl = new URL(serviceUrlStr + "?" + getCapabilitiesQuery); - } else if (!getCapabilitiesUrl.getQuery().isEmpty() && !getCapabilitiesUrl.getQuery().endsWith("&")) { - getCapabilitiesUrl = new URL(serviceUrlStr + "&" + getCapabilitiesQuery); - } else { - getCapabilitiesUrl = new URL(serviceUrlStr + getCapabilitiesQuery); - } - } 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 { - System.out.println("GET "+getCapabilitiesUrl.toString()); - URLConnection openConnection = Utils.openHttpConnection(getCapabilitiesUrl); - InputStream inputStream = openConnection.getInputStream(); - BufferedReader br = new BufferedReader(UTFInputStreamReader.create(inputStream, "UTF-8")); - 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 { - //System.out.println("WMS capabilities:\n"+incomingData+"\n"); - DocumentBuilderFactory builderFactory = DocumentBuilderFactory.newInstance(); - builderFactory.setValidating(false); - builderFactory.setNamespaceAware(true); - DocumentBuilder builder = builderFactory.newDocumentBuilder(); - builder.setEntityResolver(new EntityResolver() { - @Override - 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 && !baseURL.equals(serviceUrlStr)) { - 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); + @Override + public ImageryInfo getImageryInfo() { + final ImageryInfo info; + if (endpoint.isSelected()) { + info = new ImageryInfo(name.getText(), rawUrl.getText()); + info.setImageryType(ImageryInfo.ImageryType.WMS_ENDPOINT); } 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 (ProjectionChoice pc : ProjectionPreference.getProjectionChoices()) { - if (pc.getPreferencesFromCode(crs) != null) return true; - } - return false; - } - - public ImageryInfo getImageryInfo() { - ImageryInfo info = new ImageryInfo(menuName.getText(), resultingLayerField.getText()); - if (ImageryType.TMS.equals(info.getImageryType())) { - TMSLayer.checkUrl(info.getUrl()); - } else if (selectedLayers != null) { - HashSet proj = new HashSet(); - for(LayerDetails l : selectedLayers) { - proj.addAll(l.getProjections()); - } - info.setServerProjections(proj); + info = wms.toImageryInfo(name.getText(), tree.getSelectedLayers()); + info.setUrl(wmsUrl.getText()); } return info; } - - 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; - } - - static class LayerDetails { - - private String name; - private String ident; - private List children; - private Bounds bounds; - private Set crsList; - 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; - this.crsList = crsList; - } - - public boolean isSupported() { - return this.supported; - } - - public Set getProjections() { - return crsList; - } - - @Override - public String toString() { - if(this.name == null || this.name.isEmpty()) - return this.ident; - else - return this.name; - } - - } - - static 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: trunk/src/org/openstreetmap/josm/gui/preferences/imagery/ImageryPreference.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/preferences/imagery/ImageryPreference.java (revision 5616) +++ trunk/src/org/openstreetmap/josm/gui/preferences/imagery/ImageryPreference.java (revision 5617) @@ -336,5 +336,6 @@ activeToolbar.setBorderPainted(false); activeToolbar.setOpaque(false); - activeToolbar.add(new NewEntryAction()); + activeToolbar.add(new NewEntryAction(ImageryInfo.ImageryType.WMS)); + activeToolbar.add(new NewEntryAction(ImageryInfo.ImageryType.TMS)); //activeToolbar.add(edit); TODO activeToolbar.add(remove); @@ -420,12 +421,23 @@ private class NewEntryAction extends AbstractAction { - public NewEntryAction() { - putValue(NAME, tr("New")); - putValue(SHORT_DESCRIPTION, tr("Add a new WMS/TMS entry by entering the URL")); + + private final ImageryInfo.ImageryType type; + + public NewEntryAction(ImageryInfo.ImageryType type) { + putValue(NAME, type.toString()); + putValue(SHORT_DESCRIPTION, tr("Add a new {0} entry by entering the URL", type.toString())); putValue(SMALL_ICON, ImageProvider.get("dialogs", "add")); + this.type = type; } public void actionPerformed(ActionEvent evt) { - final AddWMSLayerPanel p = new AddWMSLayerPanel(); + final AddImageryPanel p; + if (ImageryInfo.ImageryType.WMS.equals(type)) { + p = new AddWMSLayerPanel(); + } else if (ImageryInfo.ImageryType.TMS.equals(type)) { + p = new AddTMSLayerPanel(); + } else { + throw new IllegalStateException("Type " + type + " not supported"); + } GuiHelper.prepareResizeableOptionPane(p, new Dimension(250, 350)); int answer = JOptionPane.showConfirmDialog( Index: trunk/src/org/openstreetmap/josm/gui/preferences/imagery/WMSLayerTree.java =================================================================== --- trunk/src/org/openstreetmap/josm/gui/preferences/imagery/WMSLayerTree.java (revision 5617) +++ trunk/src/org/openstreetmap/josm/gui/preferences/imagery/WMSLayerTree.java (revision 5617) @@ -0,0 +1,111 @@ +package org.openstreetmap.josm.gui.preferences.imagery; + +import static org.openstreetmap.josm.tools.I18n.tr; + +import java.awt.Component; +import java.io.Serializable; +import java.util.LinkedList; +import java.util.List; +import javax.swing.JOptionPane; +import javax.swing.JTree; +import javax.swing.event.TreeSelectionEvent; +import javax.swing.event.TreeSelectionListener; +import javax.swing.tree.DefaultMutableTreeNode; +import javax.swing.tree.DefaultTreeCellRenderer; +import javax.swing.tree.DefaultTreeModel; +import javax.swing.tree.MutableTreeNode; +import javax.swing.tree.TreePath; +import org.openstreetmap.josm.io.imagery.WMSImagery; + +public class WMSLayerTree implements Serializable { + private final MutableTreeNode treeRootNode = new DefaultMutableTreeNode(); + private final DefaultTreeModel treeData = new DefaultTreeModel(treeRootNode); + private final JTree layerTree = new JTree(treeData); + private final List selectedLayers = new LinkedList(); + private boolean previouslyShownUnsupportedCrsError = false; + + public MutableTreeNode getTreeRootNode() { + return treeRootNode; + } + + public JTree getLayerTree() { + return layerTree; + } + + public List getSelectedLayers() { + return selectedLayers; + } + + public WMSLayerTree() { + layerTree.setCellRenderer(new LayerTreeCellRenderer()); + layerTree.addTreeSelectionListener(new WMSTreeSelectionListener()); + + } + + void addLayersToTreeData(MutableTreeNode parent, List layers) { + for (WMSImagery.LayerDetails layerDetails : layers) { + DefaultMutableTreeNode treeNode = new DefaultMutableTreeNode(layerDetails); + addLayersToTreeData(treeNode, layerDetails.children); + treeData.insertNodeInto(treeNode, parent, 0); + } + } + + public void updateTree(WMSImagery wms) { + treeRootNode.setUserObject(wms.getServiceUrl().getHost()); + updateTreeList(wms.getLayers()); + } + + public void updateTreeList(List layers) { + addLayersToTreeData(getTreeRootNode(), layers); + getLayerTree().expandRow(0); + getLayerTree().expandRow(1); + } + + private static 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 WMSImagery.LayerDetails) { + WMSImagery.LayerDetails layer = (WMSImagery.LayerDetails) userObject; + setEnabled(layer.isSupported()); + } + return this; + } + } + + private class WMSTreeSelectionListener implements TreeSelectionListener { + + @Override + public void valueChanged(TreeSelectionEvent e) { + TreePath[] selectionRows = layerTree.getSelectionPaths(); + if (selectionRows == null) { + return; + } + + selectedLayers.clear(); + for (TreePath i : selectionRows) { + Object userObject = ((DefaultMutableTreeNode) i.getLastPathComponent()).getUserObject(); + if (userObject instanceof WMSImagery.LayerDetails) { + WMSImagery.LayerDetails detail = (WMSImagery.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); + } + } + } + layerTree.firePropertyChange("selectedLayers", /*dummy values*/ false , true); + } + } +} Index: trunk/src/org/openstreetmap/josm/io/imagery/WMSImagery.java =================================================================== --- trunk/src/org/openstreetmap/josm/io/imagery/WMSImagery.java (revision 5617) +++ trunk/src/org/openstreetmap/josm/io/imagery/WMSImagery.java (revision 5617) @@ -0,0 +1,335 @@ +// License: GPL. For details, see LICENSE file. +package org.openstreetmap.josm.io.imagery; + +import java.awt.HeadlessException; +import java.io.BufferedReader; +import java.io.IOException; +import java.io.InputStream; +import java.io.StringReader; +import java.net.MalformedURLException; +import java.net.URL; +import java.net.URLConnection; +import java.util.Collection; +import java.util.HashSet; +import java.util.LinkedList; +import java.util.List; +import java.util.Set; +import java.util.regex.Pattern; +import javax.xml.parsers.DocumentBuilder; +import javax.xml.parsers.DocumentBuilderFactory; +import javax.xml.parsers.ParserConfigurationException; +import org.openstreetmap.josm.data.Bounds; +import org.openstreetmap.josm.data.imagery.ImageryInfo; +import org.openstreetmap.josm.gui.preferences.projection.ProjectionChoice; +import org.openstreetmap.josm.gui.preferences.projection.ProjectionPreference; +import org.openstreetmap.josm.io.UTFInputStreamReader; +import org.openstreetmap.josm.tools.Utils; +import org.w3c.dom.Document; +import org.w3c.dom.Element; +import org.w3c.dom.Node; +import org.w3c.dom.NodeList; +import org.xml.sax.EntityResolver; +import org.xml.sax.InputSource; +import org.xml.sax.SAXException; + +public class WMSImagery { + + public static class WMSGetCapabilitiesException extends Exception { + private final String incomingData; + + public WMSGetCapabilitiesException(Throwable cause, String incomingData) { + super(cause); + this.incomingData = incomingData; + } + + public String getIncomingData() { + return incomingData; + } + } + + private List layers; + private URL serviceUrl; + + public List getLayers() { + return layers; + } + + public URL getServiceUrl() { + return serviceUrl; + } + + 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(); + } + + public String buildGetMapUrl(Collection selectedLayers) { + return buildRootUrl() + + "FORMAT=image/jpeg&VERSION=1.1.1&SERVICE=WMS&REQUEST=GetMap&LAYERS=" + + Utils.join(",", Utils.transform(selectedLayers, new Utils.Function() { + @Override + public String apply(LayerDetails x) { + return x.ident; + } + })) + + "&STYLES=&SRS={proj}&WIDTH={width}&HEIGHT={height}&BBOX={bbox}"; + } + + public void attemptGetCapabilities(String serviceUrlStr) throws MalformedURLException, IOException, WMSGetCapabilitiesException { + URL getCapabilitiesUrl = null; + try { + if (!Pattern.compile(".*GetCapabilities.*", Pattern.CASE_INSENSITIVE).matcher(serviceUrlStr).matches()) { + // If the url doesn't already have GetCapabilities, add it in + getCapabilitiesUrl = new URL(serviceUrlStr); + final String getCapabilitiesQuery = "VERSION=1.1.1&SERVICE=WMS&REQUEST=GetCapabilities"; + if (getCapabilitiesUrl.getQuery() == null) { + getCapabilitiesUrl = new URL(serviceUrlStr + "?" + getCapabilitiesQuery); + } else if (!getCapabilitiesUrl.getQuery().isEmpty() && !getCapabilitiesUrl.getQuery().endsWith("&")) { + getCapabilitiesUrl = new URL(serviceUrlStr + "&" + getCapabilitiesQuery); + } else { + getCapabilitiesUrl = new URL(serviceUrlStr + getCapabilitiesQuery); + } + } 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; + } + + System.out.println("GET " + getCapabilitiesUrl.toString()); + URLConnection openConnection = Utils.openHttpConnection(getCapabilitiesUrl); + InputStream inputStream = openConnection.getInputStream(); + BufferedReader br = new BufferedReader(UTFInputStreamReader.create(inputStream, "UTF-8")); + String line; + StringBuilder ba = new StringBuilder(); + while ((line = br.readLine()) != null) { + ba.append(line); + ba.append("\n"); + } + String incomingData = ba.toString(); + + //System.out.println("WMS capabilities:\n"+incomingData+"\n"); + try { + DocumentBuilderFactory builderFactory = DocumentBuilderFactory.newInstance(); + builderFactory.setValidating(false); + builderFactory.setNamespaceAware(true); + DocumentBuilder builder = null; + builder = builderFactory.newDocumentBuilder(); + builder.setEntityResolver(new EntityResolver() { + @Override + public InputSource resolveEntity(String publicId, String systemId) throws SAXException, IOException { + System.out.println("Ignoring DTD " + publicId + ", " + systemId); + return new InputSource(new StringReader("")); + } + }); + Document document = null; + document = builder.parse(new InputSource(new StringReader(incomingData))); + + // 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 && !baseURL.equals(serviceUrlStr)) { + System.out.println("GetCapabilities specifies a different service URL: " + baseURL); + serviceUrl = new URL(baseURL); + } + } + + Element capabilityElem = getChild(document.getDocumentElement(), "Capability"); + List children = getChildren(capabilityElem, "Layer"); + layers = parseLayers(children, new HashSet()); + } catch (Exception e) { + throw new WMSGetCapabilitiesException(e, incomingData); + } + + } + + public ImageryInfo toImageryInfo(String name, Collection selectedLayers) { + ImageryInfo i = new ImageryInfo(name, buildGetMapUrl(selectedLayers)); + if (selectedLayers != null) { + HashSet proj = new HashSet(); + for (WMSImagery.LayerDetails l : selectedLayers) { + proj.addAll(l.getProjections()); + } + i.setServerProjections(proj); + } + return i; + } + + 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 (ProjectionChoice pc : ProjectionPreference.getProjectionChoices()) { + if (pc.getPreferencesFromCode(crs) != null) return true; + } + return false; + } + + 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(); + StringBuilder content = new StringBuilder(); + 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; + } + + public static class LayerDetails { + + public final String name; + public final String ident; + public final List children; + public final Bounds bounds; + public final Set crsList; + public final 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; + this.crsList = crsList; + } + + public boolean isSupported() { + return this.supported; + } + + public Set getProjections() { + return crsList; + } + + @Override + public String toString() { + if (this.name == null || this.name.isEmpty()) + return this.ident; + else + return this.name; + } + + } +}