Changeset 11773 in josm for trunk/src/org

Timestamp:

2017-03-24T22:30:25+01:00 (8 years ago)

Author:

wiktorn

Message:

Fix NPE when there is no supported format for WMTS Tile Source

• generate warning when no supported format was found in GetCapabilities document
• skip layers with no supported formats

See: #14558

File:

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

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

@@ -356 +356 @@
             if (event == XMLStreamReader.START_ELEMENT) {
                 if (QN_LAYER.equals(reader.getName())) {
-                    layers.add(parseLayer(reader));
+                    Layer l = parseLayer(reader);
+                    if (l != null) {
+                        layers.add(l);
+                    }
                 }
                 if (QN_TILEMATRIXSET.equals(reader.getName())) {
@@ -387 +390 @@
         Stack<QName> tagStack = new Stack<>();
         List<String> supportedMimeTypes = Arrays.asList(ImageIO.getReaderMIMETypes());
+        Collection<String> unsupportedFormats = new ArrayList<>();
 
         for (int event = reader.getEventType();
@@ -398 +402 @@
                         if (supportedMimeTypes.contains(format)) {
                             layer.format = format;
+                        } else {
+                            unsupportedFormats.add(format);
                         }
                     } else if (GetCapabilitiesParseHelper.QN_OWS_IDENTIFIER.equals(reader.getName())) {
@@ -428 +434 @@
         if (layer.style == null) {
             layer.style = "";
+        }
+        if (layer.format == null) {
+            // 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,
+                    String.join(", ", unsupportedFormats)));
+            return null;
         }
         return layer;