Changeset 13879 in josm for trunk/src

Timestamp:

2018-05-31T10:02:31+02:00 (6 years ago)

Author:

wiktorn

Message:

Add layer name/title to WMTS layers when user selects layer

see: #15988

Location:

trunk/src/org/openstreetmap/josm

Files:

• actions/AddImageryLayerAction.java (modified) (2 diffs)
• data/imagery/WMTSTileSource.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/actions/AddImageryLayerAction.java

@@ -11 +11 @@
 import java.io.IOException;
 import java.net.MalformedURLException;
-import java.util.ArrayList;
 import java.util.Collection;
+import java.util.Collections;
 import java.util.List;
 import java.util.stream.Collectors;
@@ -104 +104 @@
                 // specify which layer to use
                 if (info.getDefaultLayers() == null || info.getDefaultLayers().isEmpty()) {
-                    DefaultLayer layerId = new WMTSTileSource(info).userSelectLayer();
+                    WMTSTileSource tileSource = new WMTSTileSource(info);
+                    DefaultLayer layerId = tileSource.userSelectLayer();
                     if (layerId != null) {
                         ImageryInfo copy = new ImageryInfo(info);
-                        List<DefaultLayer> defaultLayers = new ArrayList<>(1);
-                        defaultLayers.add(layerId);
-                        copy.setDefaultLayers(defaultLayers);
+                        copy.setDefaultLayers(Collections.singletonList(layerId));
+                        String layerName = tileSource.getLayers().stream()
+                                .filter(x -> x.getIdentifier().equals(layerId.getLayerName()))
+                                .map(x -> x.getUserTitle())
+                                .findFirst()
+                                .orElse("");
+                        copy.setName(copy.getName() + ": " + layerName);
                         return copy;
                     }

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

@@ -1108 +1108 @@
         return tileProjection != null ? tileProjection.toCode() : null;
     }
+
+    /**
+     * Layers that can be used with this tile source
+     * @return unmodifiable collection of layers available in this tile source
+     * @since 13879
+     */
+    public Collection<Layer> getLayers() {
+        return Collections.unmodifiableCollection(layers);
+    }
 }