Changeset 35421 in osm for applications

Timestamp:

2020-04-11T08:43:09+02:00 (5 years ago)

Author:

simon04

Message:

TemplatedTMSTileSource: extract getRandomPart

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

@@ -157 +157 @@
                 break;
             case "switch:":
-                replacement = randomParts[rand.nextInt(randomParts.length)];
+                replacement = getRandomPart(randomParts);
                 break;
             default:
@@ -164 +164 @@
                     replacement = Integer.toString((inverse_zoom ? -1 * zoom : zoom) + zoom_offset);
                 } else if (PATTERN_SWITCH.matcher("{" + matcher.group(1) + "}").matches()) {
-                    replacement = randomParts[rand.nextInt(randomParts.length)];
+                    replacement = getRandomPart(randomParts);
                 } else {
                     replacement = '{' + matcher.group(1) + '}';
@@ -173 +173 @@
         matcher.appendTail(url);
         return url.toString().replace(" ", "%20");
+    }
+
+    protected String getRandomPart(final String[] parts) {
+        return parts[rand.nextInt(parts.length)];
     }