Changeset 11216 in josm for trunk/src/org/openstreetmap/josm/data/imagery/WMTSTileSource.java

Timestamp:

2016-11-04T09:58:50+01:00 (7 years ago)

Author:

wiktorn

Message:

Move WMTS layer selection out of WMTSLayer constructor and hookUpMapView.

When user declines to choose any WMTSLayer we should just not add the layer at all instead of showing a warning & empty layer content.

This change alignes behaviour of layer between WMTS and WMS_ENDPOINT imagery sources.

This change includes some parts of Work In Progress to unify WMS and WMS_ENDPOINT sources.

Closes: #13868

File:

• trunk/src/org/openstreetmap/josm/data/imagery/WMTSTileSource.java (modified) (10 diffs)

trunk/src/org/openstreetmap/josm/data/imagery/WMTSTileSource.java

@@ -16 +16 @@
 import java.util.List;
 import java.util.Map;
+import java.util.Map.Entry;
 import java.util.Set;
 import java.util.SortedSet;
@@ -23 +24 @@
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
+import java.util.stream.Collectors;
 
 import javax.swing.JPanel;
@@ -159 +161 @@
 
     private static final class SelectLayerDialog extends ExtendedDialog {
-        private final transient Layer[] layers;
+        private final transient List<Entry<String,List<Layer>>> layers;
         private final JTable list;
 
         SelectLayerDialog(Collection<Layer> 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 +174 @@
                             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 +192 @@
                         @Override
                         public int getRowCount() {
-                            return SelectLayerDialog.this.layers.length;
+                            return SelectLayerDialog.this.layers.size();
                         }
 
@@ -216 +224 @@
         }
 
-        public Layer getSelectedLayer() {
+        private List<Entry<String, List<Layer>>> groupLayersByName(Collection<Layer> layers) {
+            Map<String, List<Layer>> 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 +247 @@
     private ScaleList nativeScaleList;
 
+    private String defaultLayer;
+
     /**
      * Creates a tile source based on imagery info
@@ -242 +257 @@
     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<Layer> 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<String> 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 +555 @@
         // 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<Layer> candidates = getLayers(currentLayer != null ? currentLayer.name : null, proj.toCode());
-        if (!candidates.isEmpty()) {
-            Layer newLayer = userSelectLayer(candidates);
+        Collection<Layer> 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 +568 @@
                 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();