Changeset 11792 in josm for trunk/src/org/openstreetmap

Timestamp:

2017-03-29T22:50:22+02:00 (8 years ago)

Author:

bastiK

Message:

fixed #14590 - WMTS: Show layer title, not layer identifier in layer selection dialog

Location:

trunk/src/org/openstreetmap/josm/data/imagery

Files:

• GetCapabilitiesParseHelper.java (modified) (1 diff)
• WMTSTileSource.java (modified) (15 diffs)

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

@@ -64 +64 @@
     static final QName QN_OWS_OPERATIONS_METADATA = new QName(OWS_NS_URL, "OperationsMetadata");
     static final QName QN_OWS_SUPPORTED_CRS       = new QName(OWS_NS_URL, "SupportedCRS");
+    static final QName QN_OWS_TITLE               = new QName(OWS_NS_URL, "Title");
     static final QName QN_OWS_VALUE               = new QName(OWS_NS_URL, "Value");
     // CHECKSTYLE.ON: SingleSpaceSeparator

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

@@ -144 +144 @@
     private static class Layer {
         private String format;
-        private String name;
+        private String identifier;
+        private String title;
         private TileMatrixSet tileMatrixSet;
         private String baseUrl;
@@ -153 +154 @@
             Objects.requireNonNull(l);
             format = l.format;
-            name = l.name;
+            identifier = l.identifier;
+            title = l.title;
             baseUrl = l.baseUrl;
             style = l.style;
@@ -160 +162 @@
 
         Layer() {
+        }
+
+        /**
+         * Get title of the layer for user display.
+         *
+         * This is either the content of the Title element (if available) or
+         * the layer identifier (as fallback)
+         * @return title of the layer for user display
+         */
+        public String getUserTitle() {
+            return title != null ? title : identifier;
         }
     }
@@ -179 +192 @@
                                 return SelectLayerDialog.this.layers.get(rowIndex).getValue()
                                         .stream()
-                                        .map(x -> x.name)
+                                        .map(x -> x.getUserTitle())
                                         .collect(Collectors.joining(", ")); //this should be only one
                             case 1:
@@ -231 +244 @@
             }
             Layer selectedLayer = layers.get(index).getValue().get(0);
-            return new WMTSDefaultLayer(selectedLayer.name, selectedLayer.tileMatrixSet.identifier);
+            return new WMTSDefaultLayer(selectedLayer.identifier, selectedLayer.tileMatrixSet.identifier);
         }
     }
@@ -269 +282 @@
      */
     public DefaultLayer userSelectLayer() {
-        Map<String, List<Layer>> layerByName = layers.stream().collect(
-                Collectors.groupingBy(x -> x.name));
-        if (layerByName.size() == 1) { // only one layer
-            List<Layer> ls = layerByName.entrySet().iterator().next().getValue()
+        Map<String, List<Layer>> layerById = layers.stream().collect(
+                Collectors.groupingBy(x -> x.identifier));
+        if (layerById.size() == 1) { // only one layer
+            List<Layer> ls = layerById.entrySet().iterator().next().getValue()
                     .stream().filter(
                             u -> u.tileMatrixSet.crs.equals(Main.getProjection().toCode()))
@@ -279 +292 @@
                 // only one tile matrix set with matching projection - no point in asking
                 Layer selectedLayer = ls.get(0);
-                return new WMTSDefaultLayer(selectedLayer.name, selectedLayer.tileMatrixSet.identifier);
+                return new WMTSDefaultLayer(selectedLayer.identifier, selectedLayer.tileMatrixSet.identifier);
             }
         }
@@ -304 +317 @@
     private static List<Entry<String, List<Layer>>> groupLayersByNameAndTileMatrixSet(Collection<Layer> layers) {
         Map<String, List<Layer>> layerByName = layers.stream().collect(
-                Collectors.groupingBy(x -> x.name + '\u001c' + x.tileMatrixSet.identifier));
+                Collectors.groupingBy(x -> x.identifier + '\u001c' + x.tileMatrixSet.identifier));
         return layerByName.entrySet().stream().sorted(Map.Entry.comparingByKey()).collect(Collectors.toList());
     }
@@ -412 +425 @@
                         }
                     } else if (GetCapabilitiesParseHelper.QN_OWS_IDENTIFIER.equals(reader.getName())) {
-                        layer.name = reader.getElementText();
+                        layer.identifier = reader.getElementText();
+                    } else if (GetCapabilitiesParseHelper.QN_OWS_TITLE.equals(reader.getName())) {
+                        layer.title = reader.getElementText();
                     } else if (QN_RESOURCE_URL.equals(reader.getName()) &&
                             "tile".equals(reader.getAttributeValue("", "resourceType"))) {
@@ -444 +459 @@
             // no format found - it's mandatory parameter - can't use this layer
             Main.warn(tr("Can''t use layer {0} because no supported formats where found. Layer is available in formats: {1}",
-                    layer.name,
+                    layer.getUserTitle(),
                     String.join(", ", unsupportedFormats)));
             return null;
@@ -581 +596 @@
         // so we will not ask the user again to chose the layer, if he just changes projection
         Collection<Layer> candidates = getLayers(
-                currentLayer != null ? new WMTSDefaultLayer(currentLayer.name, currentLayer.tileMatrixSet.identifier) : defaultLayer,
+                currentLayer != null ? new WMTSDefaultLayer(currentLayer.identifier, currentLayer.tileMatrixSet.identifier) : defaultLayer,
                 proj.toCode());
 
@@ -602 +617 @@
         } 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(", ")),
+                    candidates.stream().map(x -> x.getUserTitle() + ": " + x.tileMatrixSet.identifier).collect(Collectors.joining(", ")),
                     proj.toCode(),
-                    currentLayer != null ? currentLayer.name : defaultLayer
+                    currentLayer != null ? currentLayer.getUserTitle() : defaultLayer
                     );
         }
@@ -621 +636 @@
             for (Layer layer: this.layers) {
                 if ((searchLayer == null || (// if it's null, then accept all layers
-                        searchLayer.getLayerName().equals(layer.name)))
+                        searchLayer.getLayerName().equals(layer.identifier)))
                         && (projectionCode == null || // if it's null, then accept any projection
                         projectionCode.equals(layer.tileMatrixSet.crs))) {
@@ -673 +688 @@
         }
 
-        return url.replaceAll("\\{layer\\}", this.currentLayer.name)
+        return url.replaceAll("\\{layer\\}", this.currentLayer.identifier)
                 .replaceAll("\\{format\\}", this.currentLayer.format)
                 .replaceAll("\\{TileMatrixSet\\}", this.currentTileMatrixSet.identifier)
@@ -845 +860 @@
         } else {
             for (Layer layer: this.layers) {
-                if (currentLayer.name.equals(layer.name)) {
+                if (currentLayer.identifier.equals(layer.identifier)) {
                     ret.add(layer.tileMatrixSet.crs);
                 }