Changeset 13536 in josm for trunk/src/org/openstreetmap/josm/io/CachedFile.java

Timestamp:

2018-03-17T17:01:12+01:00 (6 years ago)

Author:

stoecker

Message:

add possibility to change map ids (see #14655), add overlay flag for imagery

File:

• trunk/src/org/openstreetmap/josm/io/CachedFile.java (modified) (8 diffs)

trunk/src/org/openstreetmap/josm/io/CachedFile.java

@@ -75 +75 @@
     protected File cacheFile;
     protected boolean initialized;
+    protected String parameter;
 
     public static final long DEFAULT_MAXTIME = -1L;
@@ -173 +174 @@
     }
 
+    /**
+     * Sets additional URL parameter (used e.g. for maps)
+     * @param parameter the URL parameter
+     * @since 13536
+     */
+    public void setParam(String parameter) {
+        this.parameter = parameter;
+    }
+
     public String getName() {
+        if(parameter != null)
+            return name.replaceAll("%<(.*)>", "");
         return name;
     }
@@ -284 +296 @@
         }
         if (cacheFile == null)
-            throw new IOException("Unable to get cache file for "+name);
+            throw new IOException("Unable to get cache file for "+getName());
         return cacheFile;
     }
@@ -298 +310 @@
      * @param extension  the extension of the file we're looking for
      * @param namepart the name part
-     * @return The zip entry path of the matching file. Null if this cached file
+     * @return The zip entry path of the matching file. <code>null</code> if this cached file
      * doesn't represent a zip file or if there was no matching
      * file in the ZIP file.
@@ -312 +324 @@
      * @param extension  the extension of the file we're looking for
      * @param namepart the name part
-     * @return InputStream to the matching file. Null if this cached file
+     * @return InputStream to the matching file. <code>null</code> if this cached file
      * doesn't represent a zip file or if there was no matching
      * file in the ZIP file.
@@ -380 +392 @@
             url = new URL(name);
             if (!"file".equals(url.getProtocol())) {
-                String prefKey = getPrefKey(url, destDir);
+                String prefKey = getPrefKey(url, destDir, null);
                 List<String> localPath = new ArrayList<>(Config.getPref().getList(prefKey));
                 if (localPath.size() == 2) {
@@ -403 +415 @@
      * @return Preference key
      */
-    private static String getPrefKey(URL url, String destDir) {
+    private static String getPrefKey(URL url, String destDir, String parameter) {
         StringBuilder prefKey = new StringBuilder("mirror.");
         if (destDir != null) {
             prefKey.append(destDir).append('.');
         }
-        prefKey.append(url.toString());
+        if (parameter != null) {
+            prefKey.append(url.toString().replaceAll("%<(.*)>", ""));
+        } else {
+            prefKey.append(url.toString());
+        }
         return prefKey.toString().replaceAll("=", "_");
     }
 
     private File checkLocal(URL url) throws IOException {
-        String prefKey = getPrefKey(url, destDir);
+        String prefKey = getPrefKey(url, destDir, parameter);
         String urlStr = url.toExternalForm();
+        if (parameter != null)
+            urlStr = urlStr.replaceAll("%<(.*)>", "");
         long age = 0L;
         long maxAgeMillis = maxAge;
@@ -460 +478 @@
         }
 
+        if(parameter != null) {
+            String u = url.toExternalForm();
+            String uc;
+            if("".equals(parameter)) {
+                uc = u.replaceAll("%<(.*)>", "");
+            } else {
+                uc = u.replaceAll("%<(.*)>", "$1"+parameter);
+            }
+            if(!uc.equals(u))
+                url = new URL(uc);
+        }
+
         String a = urlStr.replaceAll("[^A-Za-z0-9_.-]", "_");
         String localPath = "mirror_" + a;