Changeset 31142 in osm

Timestamp:

2015-05-23T00:47:24+02:00 (9 years ago)

Author:

wiktorn

Message:

Add posibility to display HTTP headers in Show Tile Info dialog. Closes #josm11456

Location:

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

Files:

• Tile.java (modified) (1 diff)
• interfaces/TileSource.java (modified) (2 diffs)
• tilesources/AbstractTMSTileSource.java (modified) (4 diffs)
• tilesources/TileSourceInfo.java (modified) (4 diffs)

applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/Tile.java

@@ -336 +336 @@
 
     public Map<String,String> getMetadata() {
+        if (metadata == null) {
+            metadata = new HashMap<>();
+        }
         return metadata;
     }

applications/viewer/jmapviewer/src/org/openstreetmap/gui/jmapviewer/interfaces/TileSource.java

@@ -73 +73 @@
     /**
      * A unique id for this tile source.
-     * 
+     *
      * Unlike the name it has to be unique and has to consist only of characters
      * valid for filenames.
-     * 
+     *
      * @return the id
      */
@@ -169 +169 @@
      */
     public boolean isNoTileAtZoom(Map<String, List<String>> headers, int statusCode, byte[] content);
+
+    /**
+     * Extracts metadata about the tile based on HTTP headers
+     *
+     * @param headers HTTP headers from Tile Source server
+     * @return tile metadata
+     */
+    public Map<String, String> getMetadata(Map<String, List<String>> headers);
 }

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

@@ -3 +3 @@
 
 import java.io.IOException;
+import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -15 +16 @@
     protected String id;
     private Map<String, String> noTileHeaders;
+    private Map<String, String> metadataHeaders;
     protected int tileSize;
     protected OsmMercator osmMercator;
@@ -26 +28 @@
         this.id = info.getUrl();
         this.noTileHeaders = info.getNoTileHeaders();
+        this.metadataHeaders = info.getMetadataHeaders();
         this.tileSize = info.getTileSize();
         osmMercator = new OsmMercator(this.tileSize);
@@ -149 +152 @@
         return super.isNoTileAtZoom(headers, statusCode, content);
     }
+
+    @Override
+    public Map<String, String> getMetadata(Map<String, List<String>> headers) {
+        Map<String, String> ret = new HashMap<>();
+        if (metadataHeaders != null && headers != null) {
+            for (Entry<String, String> searchEntry: metadataHeaders.entrySet()) {
+                List<String> headerVals = headers.get(searchEntry.getKey());
+                if (headerVals != null) {
+                    for (String headerValue: headerVals) {
+                        ret.put(searchEntry.getValue(), headerValue);
+                    }
+                }
+            }
+        }
+        return ret;
+    }
 }

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

@@ -19 +19 @@
 
     /** headers meaning, that there is no tile at this zoom level */
-    protected Map<String, String> notileHeaders;
+    protected Map<String, String> noTileHeaders;
 
     /** minimum zoom level supported by the tile source */
@@ -32 +32 @@
     /** tile size of the displayed tiles */
     private int tileSize = OsmMercator.DEFAUL_TILE_SIZE;
+
+    /** mapping <header key, metadata key> */
+    protected Map<String, String> metadataHeaders;
 
     /**
@@ -82 +85 @@
      */
     public Map<String, String> getNoTileHeaders() {
-        return notileHeaders;
+        return noTileHeaders;
     }
 
@@ -127 +130 @@
         this.tileSize = tileSize;
     }
+
+    public Map<String, String> getMetadataHeaders() {
+        return metadataHeaders;
+    }
 }