Changeset 12224 in josm

Timestamp:

2017-05-21T17:56:42+02:00 (6 years ago)

Author:

Don-vip

Message:

fix #14825 - Support WMTS Dimensions

Location:

trunk

Files:

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

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

@@ -74 +74 @@
     // CHECKSTYLE.OFF: SingleSpaceSeparator
     private static final QName QN_CONTENTS            = new QName(WMTSTileSource.WMTS_NS_URL, "Contents");
+    private static final QName QN_DEFAULT             = new QName(WMTSTileSource.WMTS_NS_URL, "Default");
+    private static final QName QN_DIMENSION           = new QName(WMTSTileSource.WMTS_NS_URL, "Dimension");
     private static final QName QN_FORMAT              = new QName(WMTSTileSource.WMTS_NS_URL, "Format");
     private static final QName QN_LAYER               = new QName(WMTSTileSource.WMTS_NS_URL, "Layer");
@@ -87 +89 @@
     private static final QName QN_TILE_HEIGHT         = new QName(WMTSTileSource.WMTS_NS_URL, "TileHeight");
     private static final QName QN_TOPLEFT_CORNER      = new QName(WMTSTileSource.WMTS_NS_URL, "TopLeftCorner");
+    private static final QName QN_VALUE               = new QName(WMTSTileSource.WMTS_NS_URL, "Value");
     // CHECKSTYLE.ON: SingleSpaceSeparator
 
@@ -142 +145 @@
             identifier = builder.identifier;
         }
-
+    }
+
+    private static class Dimension {
+        private String identifier;
+        private String defaultValue;
+        private final List<String> values = new ArrayList<>();
     }
 
@@ -153 +161 @@
         private String style;
         private final Collection<String> tileMatrixSetLinks = new ArrayList<>();
+        private final Collection<Dimension> dimensions = new ArrayList<>();
 
         Layer(Layer l) {
@@ -162 +171 @@
             style = l.style;
             tileMatrixSet = new TileMatrixSet(l.tileMatrixSet);
+            dimensions.addAll(l.dimensions);
         }
 
@@ -458 +468 @@
                             tagStack.push(reader.getName()); // keep tagStack in sync
                         }
+                    } else if (QN_DIMENSION.equals(reader.getName())) {
+                        layer.dimensions.add(parseDimension(reader));
                     } else if (QN_TILEMATRIX_SET_LINK.equals(reader.getName())) {
-                        layer.tileMatrixSetLinks.add(praseTileMatrixSetLink(reader));
+                        layer.tileMatrixSetLinks.add(parseTileMatrixSetLink(reader));
                     } else {
                         GetCapabilitiesParseHelper.moveReaderToEndCurrentTag(reader);
@@ -488 +500 @@
 
     /**
+     * Gets Dimension value. Returns when reader is on Dimension closing tag
+     *
+     * @param reader StAX reader instance
+     * @return dimension
+     * @throws XMLStreamException See {@link XMLStreamReader}
+     */
+    private static Dimension parseDimension(XMLStreamReader reader) throws XMLStreamException {
+        Dimension ret = new Dimension();
+        for (int event = reader.getEventType();
+                reader.hasNext() && !(event == XMLStreamReader.END_ELEMENT &&
+                        QN_DIMENSION.equals(reader.getName()));
+                event = reader.next()) {
+            if (event == XMLStreamReader.START_ELEMENT) {
+                if (GetCapabilitiesParseHelper.QN_OWS_IDENTIFIER.equals(reader.getName())) {
+                    ret.identifier = reader.getElementText();
+                } else if (QN_DEFAULT.equals(reader.getName())) {
+                    ret.defaultValue = reader.getElementText();
+                } else if (QN_VALUE.equals(reader.getName())) {
+                    ret.values.add(reader.getElementText());
+                }
+            }
+        }
+        return ret;
+    }
+
+    /**
      * Gets TileMatrixSetLink value. Returns when reader is on TileMatrixSetLink closing tag
      *
@@ -494 +532 @@
      * @throws XMLStreamException See {@link XMLStreamReader}
      */
-    private static String praseTileMatrixSetLink(XMLStreamReader reader) throws XMLStreamException {
+    private static String parseTileMatrixSetLink(XMLStreamReader reader) throws XMLStreamException {
         String ret = null;
         for (int event = reader.getEventType();
@@ -718 +756 @@
         }
 
-        return url.replaceAll("\\{layer\\}", this.currentLayer.identifier)
+        url = url.replaceAll("\\{layer\\}", this.currentLayer.identifier)
                 .replaceAll("\\{format\\}", this.currentLayer.format)
                 .replaceAll("\\{TileMatrixSet\\}", this.currentTileMatrixSet.identifier)
@@ -725 +763 @@
                 .replaceAll("\\{TileCol\\}", Integer.toString(tilex))
                 .replaceAll("(?i)\\{style\\}", this.currentLayer.style);
+
+        for (Dimension d : currentLayer.dimensions) {
+            url = url.replaceAll("\\{"+d.identifier+"\\}", d.defaultValue);
+        }
+
+        return url;
     }
 
@@ -935 +979 @@
     }
 
+    /**
+     * Returns the tile projection.
+     * @return the tile projection
+     */
     public Projection getTileProjection() {
         return tileProjection;

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

@@ -36 +36 @@
     private ImageryInfo testImageryWALLONIE = getImagery(TestUtils.getTestDataRoot() + "wmts/WMTSCapabilities-Wallonie.xml");
     private ImageryInfo testImageryOntario = getImagery(TestUtils.getTestDataRoot() + "wmts/WMTSCapabilities-Ontario.xml");
+    private ImageryInfo testImageryGeoAdminCh = getImagery(TestUtils.getTestDataRoot() + "wmts/WMTSCapabilities-GeoAdminCh.xml");
     private ImageryInfo testImagery12168 = getImagery(TestUtils.getTestDataRoot() + "wmts/bug12168-WMTSCapabilities.xml");
     private ImageryInfo testLotsOfLayers = getImagery(TestUtils.getTestDataRoot() + "wmts/getCapabilities-lots-of-layers.xml");
@@ -245 +246 @@
         WMTSTileSource testSource = new WMTSTileSource(testLotsOfLayers);
         testSource.initProjection(Main.getProjection());
-
     }
 
@@ -279 +279 @@
                 "http://188.253.0.155:6080/arcgis/rest/services/Mashhad_BaseMap_1/MapServer/WMTS/tile/1.0.0/Mashhad_BaseMap_1"
                         + "/default/default028mm/1/3/2",
+                testSource.getTileUrl(1, 2, 3)
+                );
+    }
+
+    /**
+     * Test WMTS dimension.
+     * @throws IOException if any I/O error occurs
+     */
+    @Test
+    public void testDimension() throws IOException {
+        Main.setProjection(Projections.getProjectionByCode("EPSG:21781"));
+        ImageryInfo info = new ImageryInfo(testImageryGeoAdminCh);
+        Collection<DefaultLayer> defaultLayers = new ArrayList<>(1);
+        defaultLayers.add(new WMTSDefaultLayer("ch.are.agglomerationen_isolierte_staedte", "21781_26"));
+        info.setDefaultLayers(defaultLayers);
+        WMTSTileSource testSource = new WMTSTileSource(info);
+        testSource.initProjection(Main.getProjection());
+        assertEquals(
+                "http://wmts.geo.admin.ch/1.0.0/ch.are.agglomerationen_isolierte_staedte/default/20140101/21781/1/3/2.png",
                 testSource.getTileUrl(1, 2, 3)
                 );