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

Timestamp:

2015-05-10T13:27:54+02:00 (9 years ago)

Author:

bastiK

Message:

applied #10454 - Mapbox "empty" tile (imagery with zoom level > 17) (patch by wiktorn)

Location:

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

Files:

• ImageryInfo.java (modified) (21 diffs)
• ImageryLayerInfo.java (modified) (1 diff)
• TMSCachedTileLoaderJob.java (modified) (6 diffs)

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

@@ -10 +10 @@
 import java.util.Collections;
 import java.util.List;
+import java.util.Map;
 import java.util.Objects;
 import java.util.TreeSet;
@@ -21 +22 @@
 import org.openstreetmap.gui.jmapviewer.tilesources.AbstractTileSource;
 import org.openstreetmap.gui.jmapviewer.tilesources.OsmTileSource.Mapnik;
+import org.openstreetmap.gui.jmapviewer.tilesources.TileSourceInfo;
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.Bounds;
@@ -35 +37 @@
  * @author Frederik Ramm
  */
-public class ImageryInfo implements Comparable<ImageryInfo>, Attributed {
+public class ImageryInfo extends TileSourceInfo implements Comparable<ImageryInfo>, Attributed {
 
     /**
@@ -53 +55 @@
         /** A WMS endpoint entry only stores the WMS server info, without layer, which are chosen later by the user. **/
         WMS_ENDPOINT("wms_endpoint");
+
 
         private final String typeString;
@@ -151 +154 @@
     }
 
-    /** name of the imagery entry (gets translated by josm usually) */
-    private String name;
+
     /** original name of the imagery entry in case of translation call, for multiple languages English when possible */
     private String origName;
     /** (original) language of the translated name entry */
     private String langName;
-    /** id for this imagery entry, optional at the moment */
-    private String id;
-    /** URL of the imagery service */
-    private String url = null;
     /** whether this is a entry activated by default or not */
     private boolean defaultEntry = false;
@@ -199 +197 @@
     private String icon;
     // when adding a field, also adapt the ImageryInfo(ImageryInfo) constructor
+    private Map<String, String> noTileHeaders;
 
     /**
@@ -225 +224 @@
         @pref String icon;
         @pref String description;
+        @pref Map<String, String> noTileHeaders;
 
         /**
@@ -278 +278 @@
                 projections = val.toString();
             }
+            if (i.noTileHeaders != null && !i.noTileHeaders.isEmpty()) {
+                noTileHeaders = i.noTileHeaders;
+            }
         }
 
@@ -295 +298 @@
      */
     public ImageryInfo() {
+        super();
     }
 
@@ -302 +306 @@
      */
     public ImageryInfo(String name) {
-        this.name=name;
+        super(name);
     }
 
@@ -311 +315 @@
      */
     public ImageryInfo(String name, String url) {
-        this.name=name;
+        this(name);
         setExtendedUrl(url);
     }
@@ -322 +326 @@
      */
     public ImageryInfo(String name, String url, String eulaAcceptanceRequired) {
-        this.name=name;
+        this(name);
         setExtendedUrl(url);
         this.eulaAcceptanceRequired = eulaAcceptanceRequired;
@@ -337 +341 @@
      */
     public ImageryInfo(String name, String url, String type, String eulaAcceptanceRequired, String cookies) {
-        this.name=name;
+        this(name);
         setExtendedUrl(url);
         ImageryType t = ImageryType.fromString(type);
@@ -347 +351 @@
             throw new IllegalArgumentException("unknown type: "+type);
         }
+    }
+
+    public ImageryInfo(String name, String url, String type, String eulaAcceptanceRequired, String cookies, String id) {
+        this(name, url, type, eulaAcceptanceRequired, cookies);
+        setId(id);
     }
 
@@ -390 +399 @@
         countryCode = e.country_code;
         icon = e.icon;
+        if (e.noTileHeaders != null) {
+            noTileHeaders = e.noTileHeaders;
+        }
     }
 
@@ -688 +700 @@
      * @return The entry name
      */
+    @Override
     public String getName() {
         return this.name;
@@ -759 +772 @@
      * @return The entry URL
      */
+    @Override
     public String getUrl() {
         return this.url;
@@ -791 +805 @@
      * @return the cookie data part
      */
+    @Override
     public String getCookies() {
         return this.cookies;
@@ -803 +818 @@
      * @return The maximum zoom level
      */
+    @Override
     public int getMaxZoom() {
         return this.defaultMaxZoom;
@@ -811 +827 @@
      * @return The minimum zoom level
      */
+    @Override
     public int getMinZoom() {
         return this.defaultMinZoom;
@@ -1026 +1043 @@
         return capabilities != null && capabilities.isOnImageryBlacklist(this.url);
     }
+
+    public void setNoTileHeaders(Map<String, String> noTileHeaders) {
+       this.noTileHeaders = noTileHeaders;
+    }
+
+    @Override
+    public Map<String, String> getNoTileHeaders() {
+        return noTileHeaders;
+    }
 }

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

@@ -149 +149 @@
         Collection<String> newKnownDefaults = new TreeSet<>(knownDefaults);
         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) {
+                for (ImageryInfo i: layers) {
+                    if (isSimilar(def,  i)) {
+                        i.setNoTileHeaders(def.getNoTileHeaders());
+                        changed = true;
+                    }
+                }
+            }
+
             if (def.isDefaultEntry()) {
                 boolean isKnownDefault = false;

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

@@ -6 +6 @@
 import java.net.URL;
 import java.util.HashSet;
+import java.util.List;
 import java.util.Map;
 import java.util.Set;
@@ -27 +28 @@
 import org.openstreetmap.josm.data.cache.BufferedImageCacheEntry;
 import org.openstreetmap.josm.data.cache.CacheEntry;
+import org.openstreetmap.josm.data.cache.CacheEntryAttributes;
 import org.openstreetmap.josm.data.cache.ICachedLoaderListener;
 import org.openstreetmap.josm.data.cache.JCSCachedTileLoaderJob;
@@ -194 +196 @@
             byte[] content = cacheData.getContent();
             try {
-                return content != null  || cacheData.getImage() != null || cacheAsEmpty();
+                return content != null  || cacheData.getImage() != null || isNoTileAtZoom();
             } catch (IOException e) {
                 log.log(Level.WARNING, "JCS TMS - error loading from cache for tile {0}: {1}", new Object[] {tile.getKey(), e.getMessage()});
@@ -203 +205 @@
 
     private boolean isNoTileAtZoom() {
+        if (attributes == null) {
+            log.warning("Cache attributes are null");
+        }
         return attributes != null && attributes.isNoTileAtZoom();
     }
 
     @Override
-    protected boolean cacheAsEmpty() {
-        return isNoTileAtZoom();
+    protected boolean cacheAsEmpty(Map<String, List<String>> headers, int statusCode, byte[] content) {
+        if (tile.getTileSource().isNoTileAtZoom(headers, statusCode, content)) {
+            attributes.setNoTileAtZoom(true);
+            return true;
+        }
+        return false;
     }
 
@@ -242 +251 @@
 
     @Override
-    public void loadingFinished(CacheEntry object, LoadResult result) {
+    public void loadingFinished(CacheEntry object, CacheEntryAttributes attributes, LoadResult result) {
+        this.attributes = attributes; // as we might get notification from other object than our selfs, pass attributes along
         Set<TileLoaderListener> listeners;
         synchronized (inProgress) {
@@ -316 +326 @@
     @Override
     protected boolean handleNotFound() {
-        tile.setError("No tile at this zoom level");
-        tile.putValue("tile-info", "no-tile");
-        return true;
+        if (tile.getSource().isNoTileAtZoom(null, 404, null)) {
+            tile.setError("No tile at this zoom level");
+            tile.putValue("tile-info", "no-tile");
+            return true;
+        }
+        return false;
     }