Changeset 35322 in osm

Timestamp:

2020-02-15T15:55:39+01:00 (5 years ago)

Author:

donvip

Message:

see #josm18440 - define a pattern used only for compatibility with older JOSM clients. To remove end of 2020, with an update of JOSM wiki

File:

• applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/tilesources/TemplatedTMSTileSource.java (modified) (3 diffs)

applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/tilesources/TemplatedTMSTileSource.java

@@ -52 +52 @@
     private static final Pattern PATTERN_API_KEY = Pattern.compile("\\{apiKey\\}");
     private static final Pattern PATTERN_PARAM  = Pattern.compile("\\{((?:\\d+-)?z(?:oom)?(:?[+-]\\d+)?|x|y|!y|-y|switch:([^}]+))\\}");
+
+    /**
+     * Pattern used only for compatibility with older JOSM clients. To remove end of 2020, with an update of JOSM wiki
+     * @deprecated to remove end of 2020
+     */
+    @Deprecated
+    private static final Pattern PATTERN_API_KEY_COMPATIBILITY = Pattern.compile("_apiKey_");
     // CHECKSTYLE.ON: SingleSpaceSeparator
 
@@ -71 +78 @@
     }
 
-    private void replacePattern(Pattern p, BiConsumer<Matcher, StringBuffer> replaceAction) {
-        StringBuffer output = new StringBuffer();
-        Matcher m = p.matcher(baseUrl);
-        while (m.find()) {
-            replaceAction.accept(m, output);
+    private void replacePattern(BiConsumer<Matcher, StringBuffer> replaceAction, Pattern... patterns) {
+        for (Pattern p : patterns) {
+            StringBuffer output = new StringBuffer();
+            Matcher m = p.matcher(baseUrl);
+            while (m.find()) {
+                replaceAction.accept(m, output);
+            }
+            m.appendTail(output);
+            baseUrl = output.toString();
         }
-        m.appendTail(output);
-        baseUrl = output.toString();
     }
 
@@ -89 +98 @@
         }
         // Capturing group pattern on header values
-        replacePattern(PATTERN_HEADER, (matcher, output) -> {
+        replacePattern((matcher, output) -> {
             headers.put(matcher.group(1), matcher.group(2));
             matcher.appendReplacement(output, "");
-        });
+        }, PATTERN_HEADER);
         // Capturing group pattern on API key values
-        replacePattern(PATTERN_API_KEY, (matcher, output) -> {
-            try {
-                matcher.appendReplacement(output, FeatureAdapter.retrieveApiKey(imageryId));
-            } catch (IOException e) {
-                throw new IllegalArgumentException(e);
-            }
-        });
+        if (imageryId != null) {
+            replacePattern((matcher, output) -> {
+                try {
+                    matcher.appendReplacement(output, FeatureAdapter.retrieveApiKey(imageryId));
+                } catch (IOException e) {
+                    throw new IllegalArgumentException(e);
+                }
+            }, PATTERN_API_KEY, PATTERN_API_KEY_COMPATIBILITY);
+        }
         // Capturing group pattern on zoom values
         m = PATTERN_ZOOM.matcher(baseUrl);