Changeset 18378 in josm for trunk/src/org

Timestamp:

2022-02-09T22:40:12+01:00 (3 years ago)

Author:

taylor.smock

Message:

see #21850: Fix calls to JOSM server where not apikey is needed

File:

• trunk/src/org/openstreetmap/josm/data/imagery/ImageryPatterns.java (modified) (1 diff)

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

@@ -93 +93 @@
     static String handleApiKeyTemplate(final String id, final String url) {
         if (id != null && url != null) {
-            try {
-                final String apiKey = FeatureAdapter.retrieveApiKey(id);
-                return PATTERN_API_KEY.matcher(url).replaceAll(apiKey);
-            } catch (IOException | NullPointerException e) {
-                // Match rough behavior in JMapViewer TemplatedTMSTileSource, but with better error message.
-                throw new IllegalArgumentException(tr("Could not retrieve API key for imagery with id={0}. Cannot add layer.", id), e);
+            final Matcher matcher = PATTERN_API_KEY.matcher(url);
+            if (matcher.matches()) {
+                try {
+                    final String apiKey = FeatureAdapter.retrieveApiKey(id);
+                    return matcher.replaceAll(apiKey);
+                } catch (IOException | NullPointerException e) {
+                    // Match rough behavior in JMapViewer TemplatedTMSTileSource, but with better error message.
+                    throw new IllegalArgumentException(tr("Could not retrieve API key for imagery with id={0}. Cannot add layer.", id), e);
+                }
             }
         }