Ticket #11687: 11687.patch

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

@@ -47 +47 @@
 
     private static final Pattern PATTERN_HEADER  = Pattern.compile("\\{header\\(([^,]+),([^}]+)\\)\\}");
     private static final Pattern PATTERN_PROJ    = Pattern.compile("\\{proj\\}");
+    private static final Pattern PATTERN_EPSG    = Pattern.compile("\\{epsg\\}");
     private static final Pattern PATTERN_BBOX    = Pattern.compile("\\{bbox\\}");
     private static final Pattern PATTERN_W       = Pattern.compile("\\{w\\}");
     private static final Pattern PATTERN_S       = Pattern.compile("\\{s\\}");
@@ -59 +60 @@
     private static final NumberFormat latLonFormat = new DecimalFormat("###0.0000000", new DecimalFormatSymbols(Locale.US));
 
     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_EPSG, PATTERN_BBOX, PATTERN_W, PATTERN_S, PATTERN_E, PATTERN_N, PATTERN_WIDTH, PATTERN_HEIGHT
     };
 
     /*
@@ -199 +200 @@
             case "proj":
                 replacement = myProjCode;
                 break;
+            case "epsg":
+                replacement = myProjCode.startsWith("EPSG:") ? myProjCode.substring(5) : "";
+                break;
             case "bbox":
                 replacement = bbox;
                 break;