Index: /trunk/src/org/openstreetmap/josm/actions/AddImageryLayerAction.java =================================================================== --- /trunk/src/org/openstreetmap/josm/actions/AddImageryLayerAction.java (revision 11215) +++ /trunk/src/org/openstreetmap/josm/actions/AddImageryLayerAction.java (revision 11216) @@ -11,4 +11,6 @@ import java.io.IOException; import java.net.MalformedURLException; +import java.util.ArrayList; +import java.util.Collection; import java.util.HashSet; import java.util.List; @@ -23,4 +25,5 @@ import org.openstreetmap.josm.data.imagery.ImageryInfo; import org.openstreetmap.josm.data.imagery.ImageryInfo.ImageryType; +import org.openstreetmap.josm.data.imagery.WMTSTileSource; import org.openstreetmap.josm.gui.ExtendedDialog; import org.openstreetmap.josm.gui.layer.AlignImageryPanel; @@ -31,4 +34,5 @@ import org.openstreetmap.josm.io.imagery.WMSImagery.LayerDetails; import org.openstreetmap.josm.io.imagery.WMSImagery.WMSGetCapabilitiesException; +import org.openstreetmap.josm.tools.CheckParameterUtil; import org.openstreetmap.josm.tools.GBC; import org.openstreetmap.josm.tools.ImageProvider; @@ -64,72 +68,31 @@ } - @Override - public void actionPerformed(ActionEvent e) { - if (!isEnabled()) return; + /** + * Converts general ImageryInfo to specific one, that does not need any user action to initialize + * see: https://josm.openstreetmap.de/ticket/13868 + * @param info + * @return + */ + private ImageryInfo convertImagery(ImageryInfo info) { try { - final ImageryInfo infoToAdd = ImageryType.WMS_ENDPOINT.equals(info.getImageryType()) - ? getWMSLayerInfo() : info; - if (infoToAdd != null) { - Main.getLayerManager().addLayer(ImageryLayer.create(infoToAdd)); - AlignImageryPanel.addNagPanelIfNeeded(infoToAdd); + switch(info.getImageryType()) { + case WMS_ENDPOINT: + // convert to WMS type + return getWMSLayerInfo(); + case WMTS: + // specify which layer to use + String layerId = new WMTSTileSource(info).userSelectLayer(); + if (layerId != null) { + ImageryInfo copy = new ImageryInfo(info); + Collection defaultLayers = new ArrayList<>(1); + defaultLayers.add(layerId); + copy.setDefaultLayers(defaultLayers); + return copy; + } + // layer not selected - refuse to add + return null; + default: + return info; } - } catch (IllegalArgumentException ex) { - if (ex.getMessage() == null || ex.getMessage().isEmpty() || GraphicsEnvironment.isHeadless()) { - throw ex; - } else { - JOptionPane.showMessageDialog(Main.parent, - ex.getMessage(), tr("Error"), - JOptionPane.ERROR_MESSAGE); - } - } - } - - protected ImageryInfo getWMSLayerInfo() { - try { - assert ImageryType.WMS_ENDPOINT.equals(info.getImageryType()); - final WMSImagery wms = new WMSImagery(); - wms.attemptGetCapabilities(info.getUrl()); - - final WMSLayerTree tree = new WMSLayerTree(); - tree.updateTree(wms); - List wmsFormats = wms.getFormats(); - final JComboBox formats = new JComboBox<>(wmsFormats.toArray(new String[wmsFormats.size()])); - formats.setSelectedItem(wms.getPreferredFormats()); - formats.setToolTipText(tr("Select image format for WMS layer")); - - if (!GraphicsEnvironment.isHeadless()) { - if (1 != new ExtendedDialog(Main.parent, tr("Select WMS layers"), new String[]{tr("Add layers"), tr("Cancel")}) { { - final JScrollPane scrollPane = new JScrollPane(tree.getLayerTree()); - scrollPane.setPreferredSize(new Dimension(400, 400)); - final JPanel panel = new JPanel(new GridBagLayout()); - panel.add(scrollPane, GBC.eol().fill()); - panel.add(formats, GBC.eol().fill(GBC.HORIZONTAL)); - setContent(panel); - } }.showDialog().getValue()) { - return null; - } - } - - final String url = wms.buildGetMapUrl( - tree.getSelectedLayers(), (String) formats.getSelectedItem()); - Set supportedCrs = new HashSet<>(); - boolean first = true; - StringBuilder layersString = new StringBuilder(); - for (LayerDetails layer: tree.getSelectedLayers()) { - if (first) { - supportedCrs.addAll(layer.getProjections()); - first = false; - } - layersString.append(layer.name); - layersString.append(", "); - supportedCrs.retainAll(layer.getProjections()); - } - - ImageryInfo ret = new ImageryInfo(info.getName(), url, "wms", info.getEulaAcceptanceRequired(), info.getCookies()); - if (layersString.length() > 2) { - ret.setName(ret.getName() + ' ' + layersString.substring(0, layersString.length() - 2)); - } - ret.setServerProjections(supportedCrs); - return ret; } catch (MalformedURLException ex) { if (!GraphicsEnvironment.isHeadless()) { @@ -155,4 +118,73 @@ @Override + public void actionPerformed(ActionEvent e) { + if (!isEnabled()) return; + try { + final ImageryInfo infoToAdd = convertImagery(info); + if (infoToAdd != null) { + Main.getLayerManager().addLayer(ImageryLayer.create(infoToAdd)); + AlignImageryPanel.addNagPanelIfNeeded(infoToAdd); + } + } catch (IllegalArgumentException ex) { + if (ex.getMessage() == null || ex.getMessage().isEmpty() || GraphicsEnvironment.isHeadless()) { + throw ex; + } else { + JOptionPane.showMessageDialog(Main.parent, + ex.getMessage(), tr("Error"), + JOptionPane.ERROR_MESSAGE); + } + } + } + + protected ImageryInfo getWMSLayerInfo() throws IOException, WMSGetCapabilitiesException { + CheckParameterUtil.ensureThat(ImageryType.WMS_ENDPOINT.equals(info.getImageryType()), "wms_endpoint imagery type expected"); + + final WMSImagery wms = new WMSImagery(); + wms.attemptGetCapabilities(info.getUrl()); + + final WMSLayerTree tree = new WMSLayerTree(); + tree.updateTree(wms); + List wmsFormats = wms.getFormats(); + final JComboBox formats = new JComboBox<>(wmsFormats.toArray(new String[wmsFormats.size()])); + formats.setSelectedItem(wms.getPreferredFormats()); + formats.setToolTipText(tr("Select image format for WMS layer")); + + if (!GraphicsEnvironment.isHeadless()) { + if (1 != new ExtendedDialog(Main.parent, tr("Select WMS layers"), new String[]{tr("Add layers"), tr("Cancel")}) { { + final JScrollPane scrollPane = new JScrollPane(tree.getLayerTree()); + scrollPane.setPreferredSize(new Dimension(400, 400)); + final JPanel panel = new JPanel(new GridBagLayout()); + panel.add(scrollPane, GBC.eol().fill()); + panel.add(formats, GBC.eol().fill(GBC.HORIZONTAL)); + setContent(panel); + } }.showDialog().getValue()) { + return null; + } + } + + final String url = wms.buildGetMapUrl( + tree.getSelectedLayers(), (String) formats.getSelectedItem()); + Set supportedCrs = new HashSet<>(); + boolean first = true; + StringBuilder layersString = new StringBuilder(); + for (LayerDetails layer: tree.getSelectedLayers()) { + if (first) { + supportedCrs.addAll(layer.getProjections()); + first = false; + } + layersString.append(layer.name); + layersString.append(", "); + supportedCrs.retainAll(layer.getProjections()); + } + + ImageryInfo ret = new ImageryInfo(info.getName(), url, "wms", info.getEulaAcceptanceRequired(), info.getCookies()); + if (layersString.length() > 2) { + ret.setName(ret.getName() + ' ' + layersString.substring(0, layersString.length() - 2)); + } + ret.setServerProjections(supportedCrs); + return ret; + } + + @Override protected void updateEnabledState() { if (info.isBlacklisted()) { Index: /trunk/src/org/openstreetmap/josm/data/imagery/ImageryInfo.java =================================================================== --- /trunk/src/org/openstreetmap/josm/data/imagery/ImageryInfo.java (revision 11215) +++ /trunk/src/org/openstreetmap/josm/data/imagery/ImageryInfo.java (revision 11216) @@ -17,4 +17,5 @@ import java.util.regex.Matcher; import java.util.regex.Pattern; +import java.util.stream.Collectors; import javax.swing.ImageIcon; @@ -193,4 +194,6 @@ private boolean isGeoreferenceValid; private boolean isEpsg4326To3857Supported; + /** which layers should be activated by default on layer addition. **/ + private Collection defaultLayers = Collections.emptyList(); // when adding a field, also adapt the ImageryInfo(ImageryInfo) // and ImageryInfo(ImageryPreferenceEntry) constructor, equals method, and ImageryPreferenceEntry @@ -227,4 +230,6 @@ @pref boolean valid_georeference; @pref boolean supports_epsg_4326_to_3857_conversion; + // TODO: disabled until change of layers is implemented + // @pref String default_layers; /** @@ -271,14 +276,5 @@ } } - if (!i.serverProjections.isEmpty()) { - StringBuilder val = new StringBuilder(); - for (String p : i.serverProjections) { - if (val.length() > 0) { - val.append(','); - } - val.append(p); - } - projections = val.toString(); - } + projections = i.serverProjections.stream().collect(Collectors.joining(",")); if (i.noTileHeaders != null && !i.noTileHeaders.isEmpty()) { noTileHeaders = new MultiMap<>(i.noTileHeaders); @@ -297,4 +293,6 @@ valid_georeference = i.isGeoreferenceValid(); supports_epsg_4326_to_3857_conversion = i.isEpsg4326To3857Supported(); + // TODO disabled until change of layers is implemented + // default_layers = i.defaultLayers.stream().collect(Collectors.joining(",")); } @@ -423,4 +421,6 @@ isEpsg4326To3857Supported = e.supports_epsg_4326_to_3857_conversion; isGeoreferenceValid = e.valid_georeference; + // TODO disabled until change of layers is implemented + // defaultLayers = Arrays.asList(e.default_layers.split(",")); } @@ -454,4 +454,5 @@ this.isEpsg4326To3857Supported = i.isEpsg4326To3857Supported; this.isGeoreferenceValid = i.isGeoreferenceValid; + this.defaultLayers = i.defaultLayers; } @@ -497,5 +498,6 @@ Objects.equals(this.noTileHeaders, other.noTileHeaders) && Objects.equals(this.noTileChecksums, other.noTileChecksums) && - Objects.equals(this.metadataHeaders, other.metadataHeaders); + Objects.equals(this.metadataHeaders, other.metadataHeaders) && + Objects.equals(this.defaultLayers, other.defaultLayers); } @@ -1147,3 +1149,21 @@ return l; } + + /** + * Returns default layers that should be shown for this Imagery (if at all supported by imagery provider) + * If no layer is set to default and there is more than one imagery available, then user will be asked to choose the layer + * to work on + * @return Collection of the layer names + */ + public Collection getDefaultLayers() { + return defaultLayers; + } + + /** + * Sets the default layers that user will work with + * @param layers + */ + public void setDefaultLayers(Collection layers) { + this.defaultLayers = layers; + } } Index: /trunk/src/org/openstreetmap/josm/data/imagery/WMTSTileSource.java =================================================================== --- /trunk/src/org/openstreetmap/josm/data/imagery/WMTSTileSource.java (revision 11215) +++ /trunk/src/org/openstreetmap/josm/data/imagery/WMTSTileSource.java (revision 11216) @@ -16,4 +16,5 @@ import java.util.List; import java.util.Map; +import java.util.Map.Entry; import java.util.Set; import java.util.SortedSet; @@ -23,4 +24,5 @@ import java.util.regex.Matcher; import java.util.regex.Pattern; +import java.util.stream.Collectors; import javax.swing.JPanel; @@ -159,10 +161,10 @@ private static final class SelectLayerDialog extends ExtendedDialog { - private final transient Layer[] layers; + private final transient List>> layers; private final JTable list; SelectLayerDialog(Collection layers) { super(Main.parent, tr("Select WMTS layer"), new String[]{tr("Add layers"), tr("Cancel")}); - this.layers = layers.toArray(new Layer[layers.size()]); + this.layers = groupLayersByName(layers); //getLayersTable(layers, Main.getProjection()) this.list = new JTable( @@ -172,9 +174,15 @@ switch (columnIndex) { case 0: - return SelectLayerDialog.this.layers[rowIndex].name; + return SelectLayerDialog.this.layers.get(rowIndex).getKey(); case 1: - return SelectLayerDialog.this.layers[rowIndex].tileMatrixSet.crs; + return SelectLayerDialog.this.layers.get(rowIndex).getValue() + .stream() + .map(x -> x.tileMatrixSet.crs) + .collect(Collectors.joining(", ")); case 2: - return SelectLayerDialog.this.layers[rowIndex].tileMatrixSet.identifier; + return SelectLayerDialog.this.layers.get(rowIndex).getValue() + .stream() + .map(x -> x.tileMatrixSet.identifier) + .collect(Collectors.joining(", ")); default: throw new IllegalArgumentException(); @@ -184,5 +192,5 @@ @Override public int getRowCount() { - return SelectLayerDialog.this.layers.length; + return SelectLayerDialog.this.layers.size(); } @@ -216,10 +224,15 @@ } - public Layer getSelectedLayer() { + private List>> groupLayersByName(Collection layers) { + Map> layerByName = layers.stream().collect(Collectors.groupingBy(x -> x.name)); + return layerByName.entrySet().stream().sorted(Map.Entry.comparingByKey()).collect(Collectors.toList()); + } + + public String getSelectedLayer() { int index = list.getSelectedRow(); if (index < 0) { return null; //nothing selected } - return layers[index]; + return layers.get(index).getKey(); } } @@ -234,4 +247,6 @@ private ScaleList nativeScaleList; + private String defaultLayer; + /** * Creates a tile source based on imagery info @@ -242,25 +257,29 @@ public WMTSTileSource(ImageryInfo info) throws IOException { super(info); + CheckParameterUtil.ensureThat(info.getDefaultLayers().size() < 2, "At most 1 default layer for WMTS is supported"); + this.baseUrl = GetCapabilitiesParseHelper.normalizeCapabilitiesUrl(handleTemplate(info.getUrl())); this.layers = getCapabilities(); + this.defaultLayer = info.getDefaultLayers().isEmpty() ? null : info.getDefaultLayers().iterator().next(); if (this.layers.isEmpty()) throw new IllegalArgumentException(tr("No layers defined by getCapabilities document: {0}", info.getUrl())); } - private static Layer userSelectLayer(Collection layers) { - if (layers.size() == 1) - return layers.iterator().next(); - Layer ret = null; + /** + * Creates a dialog based on this tile source with all available layers and returns the name of selected layer + * @return Name of selected layer + */ + public String userSelectLayer() { + Collection layerNames = layers.stream().map(x -> x.name).collect(Collectors.toSet()); + + // if there is only one layer name no point in asking + if (layerNames.size() == 1) + return layerNames.iterator().next(); final SelectLayerDialog layerSelection = new SelectLayerDialog(layers); if (layerSelection.showDialog().getValue() == 1) { - ret = layerSelection.getSelectedLayer(); - // TODO: save layer information into ImageryInfo / ImageryPreferences? - } - if (ret == null) { - // user canceled operation or did not choose any layer - throw new IllegalArgumentException(tr("No layer selected")); - } - return ret; + return layerSelection.getSelectedLayer(); + } + return null; } @@ -536,7 +555,8 @@ // getLayers will return only layers matching the name, if the user already choose the layer // so we will not ask the user again to chose the layer, if he just changes projection - Collection candidates = getLayers(currentLayer != null ? currentLayer.name : null, proj.toCode()); - if (!candidates.isEmpty()) { - Layer newLayer = userSelectLayer(candidates); + Collection candidates = getLayers(currentLayer != null ? currentLayer.name : defaultLayer, proj.toCode()); + if (candidates.size() == 1) { + + Layer newLayer = candidates.iterator().next(); if (newLayer != null) { this.currentTileMatrixSet = newLayer.tileMatrixSet; @@ -548,4 +568,10 @@ this.nativeScaleList = new ScaleList(scales); } + } else if (candidates.size() > 1) { + Main.warn("More than one layer WMTS available: {0} for projection {1} and name {2}. Do not know which to process", + candidates.stream().map(x -> x.name + ": " + x.tileMatrixSet.identifier).collect(Collectors.joining(", ")), + proj.toCode(), + currentLayer != null ? currentLayer.name : defaultLayer + ); } this.crsScale = getTileSize() * 0.28e-03 / proj.getMetersPerUnit();