Changeset 32022 in osm for applications

Timestamp:

2016-01-24T15:12:38+01:00 (9 years ago)

Author:

stoecker

Message:

see #josm12425 - fix handling of equal no tile headers with different values

Location:

applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/tilesources

Files:

• AbstractTMSTileSource.java (modified) (4 diffs)
• TileSourceInfo.java (modified) (4 diffs)

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

@@ -28 +28 @@
     protected String baseUrl;
     protected String id;
-    private final Map<String, String> noTileHeaders;
-    private final Map<String, String> noTileChecksums;
+    private final Map<String, List<String> > noTileHeaders;
+    private final Map<String, List<String> > noTileChecksums;
     private final Map<String, String> metadataHeaders;
     protected int tileSize;
@@ -212 +212 @@
     public boolean isNoTileAtZoom(Map<String, List<String>> headers, int statusCode, byte[] content) {
         if (noTileHeaders != null && headers != null) {
-            for (Entry<String, String> searchEntry: noTileHeaders.entrySet()) {
+            for (Entry<String, List<String>> searchEntry: noTileHeaders.entrySet()) {
                 List<String> headerVals = headers.get(searchEntry.getKey());
                 if (headerVals != null) {
                     for (String headerValue: headerVals) {
-                        if (headerValue.matches(searchEntry.getValue())) {
-                            return true;
+                        for (String val: searchEntry.getValue()) {
+                            if (headerValue.matches(val)) {
+                                return true;
+                            }
                         }
                     }
@@ -224 +226 @@
         }
         if (noTileChecksums != null) {
-            for (Entry<String, String> searchEntry: noTileChecksums.entrySet()) {
+            for (Entry<String, List<String>> searchEntry: noTileChecksums.entrySet()) {
                 MessageDigest md = null;
                 try {
@@ -242 +244 @@
                     hexChars[j++] = (char)(vn + (vn >= 10 ? 'a'-10 : '0'));
                 }
-                if (new String(hexChars).equalsIgnoreCase(searchEntry.getValue())) {
-                    return true;
+                for (String val: searchEntry.getValue()) {
+                    if (new String(hexChars).equalsIgnoreCase(val)) {
+                        return true;
+                    }
                 }
             }

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

@@ -2 +2 @@
 package org.openstreetmap.gui.jmapviewer.tilesources;
 
+import java.util.List;
 import java.util.Map;
 
@@ -22 +23 @@
 
     /** headers meaning, that there is no tile at this zoom level */
-    protected Map<String, String> noTileHeaders;
+    protected Map<String, List<String>> noTileHeaders;
 
     /** checksum of empty tiles */
-    protected Map<String, String> noTileChecksums;
+    protected Map<String, List<String>> noTileChecksums;
 
     /** minimum zoom level supported by the tile source */
@@ -99 +100 @@
      * Request header information for empty tiles for servers delivering such tile types
      * @return map of headers, that when set, means that this is "no tile at this zoom level" situation
+     * @since 32022
      */
-    public Map<String, String> getNoTileHeaders() {
+    public Map<String, List<String>> getNoTileHeaders() {
         return noTileHeaders;
     }
@@ -107 +109 @@
      * Checkusm for empty tiles for servers delivering such tile types
      * @return map of checksums, that when detected, means that this is "no tile at this zoom level" situation
-     * @since 32021
+     * @since 32022
      */
-    public Map<String, String> getNoTileChecksums() {
+    public Map<String, List<String>> getNoTileChecksums() {
         return noTileChecksums;
     }