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

Timestamp:

2017-03-29T20:31:33+02:00 (7 years ago)

Author:

bastiK

Message:

WMTS: fix case with multiple tilesets per projection and layer (regression from [11788]), see #7427, see #10623)

File:

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

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

@@ -25 +25 @@
 import java.util.TreeSet;
 import java.util.concurrent.ConcurrentHashMap;
+import java.util.function.Predicate;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
@@ -578 +579 @@
                 proj.toCode());
 
+        if (candidates.size() > 1 && defaultLayer != null) {
+            candidates = candidates.stream()
+                    .filter(t -> t.tileMatrixSet.identifier.equals(defaultLayer.getTileMatrixSet()))
+                    .collect(Collectors.toList());
+        }
         if (candidates.size() == 1) {
             Layer newLayer = candidates.iterator().next();