Changeset 9888 in josm for trunk

Timestamp:

2016-02-27T16:43:05+01:00 (8 years ago)

Author:

wiktorn

Message:

Properly handle situation, when Style tag doesn't contain Identifier.

See: #12573

File:

• trunk/src/org/openstreetmap/josm/data/imagery/WMTSTileSource.java (modified) (1 diff)

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

@@ -385 +385 @@
                         layer.baseUrl = reader.getAttributeValue("", "template");
                     } else if (new QName(WMTS_NS_URL, "Style").equals(reader.getName()) &&
-                            "true".equals(reader.getAttributeValue("", "isDefault")) &&
-                            moveReaderToTag(reader, new QName[] {new QName(OWS_NS_URL, "Identifier")})) {
-                        layer.style = reader.getElementText();
+                            "true".equals(reader.getAttributeValue("", "isDefault"))) {
                         tagStack.push(reader.getName()); // keep tagStack in sync
+                        if (moveReaderToTag(reader, new QName[] {new QName(OWS_NS_URL, "Identifier")})) {
+                            layer.style = reader.getElementText();
+                        }
                     } else if (new QName(WMTS_NS_URL, "TileMatrixSetLink").equals(reader.getName())) {
                         layer.tileMatrixSetLinks.add(praseTileMatrixSetLink(reader));