Changeset 9902 in josm for trunk

Timestamp:

2016-02-29T21:25:53+01:00 (8 years ago)

Author:

wiktorn

Message:

Final fix for #12573 - WMTS getCapabilities parser error.

Unit tests for case in #12573 and some edge case. Fix for edge case.

Closes: #12573

Location:

trunk

Files:

• src/org/openstreetmap/josm/data/imagery/WMTSTileSource.java (modified) (1 diff)
• test/data/wmts/bug12573-wmts-identifier.xml (added)
• test/data/wmts/bug12573-wmts-missing-style-identifier.xml (added)
• test/unit/org/openstreetmap/josm/data/imagery/WMTSTileSourceTest.java (modified) (2 diffs)

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

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

trunk/test/unit/org/openstreetmap/josm/data/imagery/WMTSTileSourceTest.java

@@ -33 +33 @@
     private ImageryInfo testImagery12168 = getImagery(TestUtils.getTestDataRoot() + "wmts/bug12168-WMTSCapabilities.xml");
     private ImageryInfo testLotsOfLayers = getImagery(TestUtils.getTestDataRoot() + "wmts/getCapabilities-lots-of-layers.xml");
+    private ImageryInfo testDuplicateTags = getImagery(TestUtils.getTestDataRoot() + "wmts/bug12573-wmts-identifier.xml");
+    private ImageryInfo testMissingStyleIdentifer = getImagery(TestUtils.getTestDataRoot() + "wmts/bug12573-wmts-missing-style-identifier.xml");
 
     /**
@@ -243 +245 @@
     }
 
+    @Test
+    public void testPraserForDuplicateTags() throws Exception {
+        Main.setProjection(Projections.getProjectionByCode("EPSG:3857"));
+        WMTSTileSource testSource = new WMTSTileSource(testDuplicateTags);
+        testSource.initProjection(Main.getProjection());
+        assertEquals(
+                "http://tile.informatievlaanderen.be/ws/raadpleegdiensten/wmts?SERVICE=WMTS&REQUEST=GetTile&VERSION=1.0.0&LAYER=grb_bsk&"
+                        + "STYLE=&FORMAT=image/png&tileMatrixSet=GoogleMapsVL&tileMatrix=1&tileRow=1&tileCol=1",
+                testSource.getTileUrl(1, 1, 1)
+                );
+    }
+
+    @Test
+    public void testPraserForMissingStyleIdentifier() throws Exception {
+        Main.setProjection(Projections.getProjectionByCode("EPSG:3857"));
+        WMTSTileSource testSource = new WMTSTileSource(testMissingStyleIdentifer);
+        testSource.initProjection(Main.getProjection());
+    }
+
     private void verifyTile(LatLon expected, WMTSTileSource source, int x, int y, int z) {
         LatLon ll = new LatLon(source.tileXYToLatLon(x, y, z));