Changeset 9095 in josm for trunk

Timestamp:

2015-12-09T15:45:35+01:00 (9 years ago)

Author:

wiktorn

Message:

Fix 12168.

• added testcase for bug #12168. I removed all but one layers from the GetCapabilities document to avoid showing dialog
• added case, that when ResourceURL is provided, but no OperationsMetadata information are present - to assume REST transfer mode
• added ignore-case paramter for {style} replacement, as some servers use lowercase name, and some capitalized versions

Closes #12168

Location:

trunk

Files:

• src/org/openstreetmap/josm/data/imagery/WMTSTileSource.java (modified) (3 diffs)
• test/data/wmts/bug12168-WMTSCapabilities.xml (added)
• test/unit/org/openstreetmap/josm/data/imagery/WMTSTileSourceTest.java (modified) (2 diffs)

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

@@ -59 +59 @@
     private static final String PATTERN_HEADER  = "\\{header\\(([^,]+),([^}]+)\\)\\}";
 
-    private static final String URL_GET_ENCODING_PARAMS = "SERVICE=WMTS&REQUEST=GetTile&VERSION=1.0.0&LAYER={layer}&STYLE={Style}&"
+    private static final String URL_GET_ENCODING_PARAMS = "SERVICE=WMTS&REQUEST=GetTile&VERSION=1.0.0&LAYER={layer}&STYLE={style}&"
             + "FORMAT={format}&tileMatrixSet={TileMatrixSet}&tileMatrix={TileMatrix}&tileRow={TileRow}&tileCol={TileCol}";
 
@@ -648 +648 @@
         }
 
-        switch (transferMode) {
-        case KVP:
-            url = baseUrl + URL_GET_ENCODING_PARAMS;
-            break;
-        case REST:
+        if (currentLayer.baseUrl != null && transferMode == null) {
             url = currentLayer.baseUrl;
-            break;
-        default:
-            url = "";
-            break;
+        } else {
+            switch (transferMode) {
+            case KVP:
+                url = baseUrl + URL_GET_ENCODING_PARAMS;
+                break;
+            case REST:
+                url = currentLayer.baseUrl;
+                break;
+            default:
+                url = "";
+                break;
+            }
         }
 
@@ -672 +676 @@
                 .replaceAll("\\{TileRow\\}", Integer.toString(tiley))
                 .replaceAll("\\{TileCol\\}", Integer.toString(tilex))
-                .replaceAll("\\{Style\\}", this.currentLayer.style);
+                .replaceAll("(?i)\\{style\\}", this.currentLayer.style);
     }
 

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

@@ -30 +30 @@
     private ImageryInfo testImageryWALLONIE = getImagery("test/data/wmts/WMTSCapabilities-Wallonie.xml");
     private ImageryInfo testImageryOntario = getImagery("test/data/wmts/WMTSCapabilities-Ontario.xml");
+    private ImageryInfo testImagery12168 = getImagery("test/data/wmts/bug12168-WMTSCapabilities.xml");
     private ImageryInfo testLotsOfLayers = getImagery("test/data/wmts/getCapabilities-lots-of-layers.xml");
 
@@ -210 +211 @@
     }
 
+    @Test
+    public void test12168() throws IOException {
+        Main.setProjection(Projections.getProjectionByCode("EPSG:3857"));
+        WMTSTileSource testSource = new WMTSTileSource(testImagery12168);
+        testSource.initProjection(Main.getProjection());
+        assertEquals(
+                "http://www.ngi.be/cartoweb/1.0.0/topo/default/3857/7/1/1.png",
+                testSource.getTileUrl(1,  1,  1));
+    }
+
+
     // XXX: disabled as this needs user action
     //@Test