Changeset 8418 in josm for trunk/src/org/openstreetmap/josm/data/imagery

Timestamp:

2015-05-23T00:46:21+02:00 (9 years ago)

Author:

wiktorn

Message:

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

Location:

trunk/src/org/openstreetmap/josm/data/imagery

Files:

• ImageryInfo.java (modified) (7 diffs)
• ImageryLayerInfo.java (modified) (2 diffs)
• TMSCachedTileLoaderJob.java (modified) (4 diffs)

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

@@ -198 +198 @@
     /** icon used in menu */
     private String icon;
-    // when adding a field, also adapt the ImageryInfo(ImageryInfo) constructor
-    private Map<String, String> noTileHeaders;
+    // when adding a field, also adapt the ImageryInfo(ImageryInfo) constructor, equals method, and ImageryPreferenceEntry
 
     /**
@@ -228 +227 @@
         @pref Map<String, String> noTileHeaders;
         @pref int tileSize = OsmMercator.DEFAUL_TILE_SIZE;
+        @pref Map<String, String> metadataHeaders;
 
         /**
@@ -285 +285 @@
             }
 
+            if (i.metadataHeaders != null && !i.metadataHeaders.isEmpty()) {
+                metadataHeaders = i.metadataHeaders;
+            }
+
             tileSize = i.getTileSize();
         }
@@ -408 +412 @@
         }
         setTileSize(e.tileSize);
+        metadataHeaders = e.metadataHeaders;
     }
 
@@ -436 +441 @@
         this.icon = i.icon;
         this.description = i.description;
+        this.noTileHeaders = i.noTileHeaders;
+        this.metadataHeaders = i.metadataHeaders;
     }
 
@@ -465 +472 @@
             return false;
         }
-        if (!Objects.equals(this.name, other.name)) {
-            return false;
-        }
-        if (!Objects.equals(this.id, other.id)) {
-            return false;
-        }
-        if (!Objects.equals(this.url, other.url)) {
-            return false;
-        }
-        if (!Objects.equals(this.cookies, other.cookies)) {
-            return false;
-        }
-        if (!Objects.equals(this.eulaAcceptanceRequired, other.eulaAcceptanceRequired)) {
-            return false;
-        }
-        if (this.imageryType != other.imageryType) {
-            return false;
-        }
-        if (this.defaultMaxZoom != other.defaultMaxZoom) {
-            return false;
-        }
-        if (this.defaultMinZoom != other.defaultMinZoom) {
-            return false;
-        }
-        if (!Objects.equals(this.bounds, other.bounds)) {
-            return false;
-        }
-        if (!Objects.equals(this.serverProjections, other.serverProjections)) {
-            return false;
-        }
-        if (!Objects.equals(this.attributionText, other.attributionText)) {
-            return false;
-        }
-        if (!Objects.equals(this.attributionLinkURL, other.attributionLinkURL)) {
-            return false;
-        }
-        if (!Objects.equals(this.attributionImage, other.attributionImage)) {
-            return false;
-        }
-        if (!Objects.equals(this.attributionImageURL, other.attributionImageURL)) {
-            return false;
-        }
-        if (!Objects.equals(this.termsOfUseText, other.termsOfUseText)) {
-            return false;
-        }
-        if (!Objects.equals(this.termsOfUseURL, other.termsOfUseURL)) {
-            return false;
-        }
-        if (!Objects.equals(this.countryCode, other.countryCode)) {
-            return false;
-        }
-        if (!Objects.equals(this.icon, other.icon)) {
-            return false;
-        }
-        if (!Objects.equals(this.description, other.description)) {
-            return false;
-        }
-        return true;
+
+        return
+                Objects.equals(this.name, other.name) &&
+                Objects.equals(this.id, other.id) &&
+                Objects.equals(this.url, other.url) &&
+                Objects.equals(this.cookies, other.cookies) &&
+                Objects.equals(this.eulaAcceptanceRequired, other.eulaAcceptanceRequired) &&
+                Objects.equals(this.imageryType, other.imageryType) &&
+                Objects.equals(this.defaultMaxZoom, other.defaultMaxZoom) &&
+                Objects.equals(this.defaultMinZoom, other.defaultMinZoom) &&
+                Objects.equals(this.bounds, other.bounds) &&
+                Objects.equals(this.serverProjections, other.serverProjections) &&
+                Objects.equals(this.attributionText, other.attributionText) &&
+                Objects.equals(this.attributionLinkURL, other.attributionLinkURL) &&
+                Objects.equals(this.attributionImageURL, other.attributionImageURL) &&
+                Objects.equals(this.attributionImage, other.attributionImage) &&
+                Objects.equals(this.termsOfUseText, other.termsOfUseText) &&
+                Objects.equals(this.termsOfUseURL, other.termsOfUseURL) &&
+                Objects.equals(this.countryCode, other.countryCode) &&
+                Objects.equals(this.icon, other.icon) &&
+                Objects.equals(this.description, other.description) &&
+                Objects.equals(this.noTileHeaders, other.noTileHeaders) &&
+                Objects.equals(this.metadataHeaders, other.metadataHeaders);
     }
 
@@ -1058 +1030 @@
         return noTileHeaders;
     }
+
+    public void setMetadataHeaders(Map<String, String> metadataHeaders) {
+        this.metadataHeaders = metadataHeaders;
+    }
 }

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

@@ -150 +150 @@
         for (ImageryInfo def : defaultLayers) {
             // temporary migration code, so all user preferences will get updated with new settings from JOSM site (can be removed ~Dez. 2015)
-            if (def.getNoTileHeaders() != null || def.getTileSize() > 0) {
+            if (def.getNoTileHeaders() != null || def.getTileSize() > 0 || def.getMetadataHeaders() != null ) {
                 for (ImageryInfo i: layers) {
                     if (isSimilar(def,  i)) {
@@ -158 +158 @@
                         if (def.getTileSize() > 0) {
                             i.setTileSize(def.getTileSize());
+                        }
+                        if (def.getMetadataHeaders() != null && def.getMetadataHeaders().size() > 0) {
+                            i.setMetadataHeaders(def.getMetadataHeaders());
                         }
                         changed = true;

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

@@ -10 +10 @@
 import java.util.List;
 import java.util.Map;
+import java.util.Map.Entry;
 import java.util.Set;
 import java.util.concurrent.ConcurrentHashMap;
@@ -133 +134 @@
     @Override
     protected boolean cacheAsEmpty(Map<String, List<String>> headers, int statusCode, byte[] content) {
+        // cacheAsEmpty is called for every successful download, so we can put
+        // metadata handling here
+        attributes.setMetadata(tile.getTileSource().getMetadata(headers));
         if (tile.getTileSource().isNoTileAtZoom(headers, statusCode, content)) {
             attributes.setNoTileAtZoom(true);
@@ -166 +170 @@
             if(!tile.isLoaded()) { //if someone else already loaded tile, skip all the handling
                 tile.finishLoading(); // whatever happened set that loading has finished
+                // set tile metadata
+                if (this.attributes != null) {
+                    for (Entry<String, String> e: this.attributes.getMetadata().entrySet()) {
+                        tile.putValue(e.getKey(), e.getValue());
+                    }
+                }
+
                 switch(result){
                 case SUCCESS:
@@ -214 +225 @@
         if (isObjectLoadable()) {
             try {
+                // set tile metadata
+                if (this.attributes != null) {
+                    for (Entry<String, String> e: this.attributes.getMetadata().entrySet()) {
+                        tile.putValue(e.getKey(), e.getValue());
+                    }
+                }
+
                 if (data != null && data.getImage() != null) {
                     tile.setImage(data.getImage());