Changeset 9864 in josm for trunk/src/org/openstreetmap

Timestamp:

2016-02-23T21:42:07+01:00 (9 years ago)

Author:

wiktorn

Message:

Add WKID (Well Known ID) pattern to WMS url templates.

Patch by: slodki

Closes: #11687

File:

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

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

@@ -48 +48 @@
     private static final Pattern PATTERN_HEADER  = Pattern.compile("\\{header\\(([^,]+),([^}]+)\\)\\}");
     private static final Pattern PATTERN_PROJ    = Pattern.compile("\\{proj\\}");
+    private static final Pattern PATTERN_WKID    = Pattern.compile("\\{wkid\\}");
     private static final Pattern PATTERN_BBOX    = Pattern.compile("\\{bbox\\}");
     private static final Pattern PATTERN_W       = Pattern.compile("\\{w\\}");
@@ -60 +61 @@
 
     private static final Pattern[] ALL_PATTERNS = {
-        PATTERN_HEADER, PATTERN_PROJ, PATTERN_BBOX, PATTERN_W, PATTERN_S, PATTERN_E, PATTERN_N, PATTERN_WIDTH, PATTERN_HEIGHT
+        PATTERN_HEADER, PATTERN_PROJ, PATTERN_WKID, PATTERN_BBOX, PATTERN_W, PATTERN_S, PATTERN_E, PATTERN_N, PATTERN_WIDTH, PATTERN_HEIGHT
     };
 
@@ -200 +201 @@
                 replacement = myProjCode;
                 break;
+            case "wkid":
+                replacement = myProjCode.startsWith("EPSG:") ? myProjCode.substring(5) : myProjCode;
+                break;
             case "bbox":
                 replacement = bbox;