Changeset 17862 in josm for trunk/src/org/openstreetmap/josm/data/imagery/ImageryInfo.java

Timestamp:

2021-05-06T17:39:27+02:00 (5 years ago)

Author:

simon04

Message:

fix #17177 - Add support for Mapbox Vector Tile (patch by taylor.smock)

Signed-off-by: Taylor Smock <tsmock@…>

File:

• trunk/src/org/openstreetmap/josm/data/imagery/ImageryInfo.java (modified) (3 diffs)

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

@@ -62 +62 @@
         WMS_ENDPOINT("wms_endpoint"),
         /** WMTS stores GetCapabilities URL. Does not store any information about the layer **/
-        WMTS("wmts");
+        WMTS("wmts"),
+        /** Mapbox Vector Tiles entry*/
+        MVT("mvt");
 
         private final String typeString;
@@ -655 +657 @@
         defaultMinZoom = 0;
         for (ImageryType type : ImageryType.values()) {
-            Matcher m = Pattern.compile(type.getTypeString()+"(?:\\[(?:(\\d+)[,-])?(\\d+)\\])?:(.*)").matcher(url);
+            Matcher m = Pattern.compile(type.getTypeString()+"(?:\\[(?:(\\d+)[,-])?(\\d+)])?:(.*)").matcher(url);
             if (m.matches()) {
                 this.url = m.group(3);
@@ -670 +672 @@
 
         if (serverProjections.isEmpty()) {
-            Matcher m = Pattern.compile(".*\\{PROJ\\(([^)}]+)\\)\\}.*").matcher(url.toUpperCase(Locale.ENGLISH));
+            Matcher m = Pattern.compile(".*\\{PROJ\\(([^)}]+)\\)}.*").matcher(url.toUpperCase(Locale.ENGLISH));
             if (m.matches()) {
                 setServerProjections(Arrays.asList(m.group(1).split(",", -1)));