Changeset 3774 in josm for trunk/src/org/openstreetmap/josm

Timestamp:

2011-01-06T16:06:50+01:00 (13 years ago)

Author:

Upliner

Message:

Auto-detection of Bing zoomlevel, fixes #5741

File:

• trunk/src/org/openstreetmap/josm/gui/layer/TMSLayer.java (modified) (19 diffs)

trunk/src/org/openstreetmap/josm/gui/layer/TMSLayer.java

@@ -22 +22 @@
 import java.net.URISyntaxException;
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.HashSet;
@@ -111 +112 @@
         Main.map.repaint(100);
         tileRequestsOutstanding.remove(tile);
-        if (success) {
-            displayZoomLevel = tile.getZoom();
-        }
         if (debug) {
             out("tileLoadingFinished() tile: " + tile + " success: " + success);
@@ -133 +131 @@
 
     /**
-     * Actual zoom lvl. Initial zoom lvl is set to
+     * Zoomlevel at which tiles is currently downloaded.
+     * Initial zoom lvl is set to bestZoom
      */
     public int currentZoomLevel;
+    /**
+     * Optimal TMS Zoomlevel for current mapview.
+     * Works correctly only for Mercatator, so currently used only for initial zoom.
+     */
     public int bestZoomLevel;
+    /**
+     * Painting zoomlevel. Set to the currentZoomLevel when first tile at this zoomlevel is loaded.
+     */
     public int displayZoomLevel = 0;
 
     private Tile clickedTile;
     private boolean needRedraw;
+    private boolean overZoomed;
+    private boolean overZoomedFlag;
     private JPopupMenu tileOptionMenu;
     JCheckBoxMenuItem autoZoomPopup;
@@ -487 +495 @@
     }
 
+    boolean isOverZoomed() {
+        return overZoomed || overZoomedFlag;
+    }
+
     /**
      * Zoom in, go closer to map.
@@ -494 +506 @@
     public boolean zoomIncreaseAllowed()
     {
-        boolean zia = currentZoomLevel < this.getMaxZoomLvl();
+        boolean zia = currentZoomLevel < this.getMaxZoomLvl() && !isOverZoomed();
         if (debug) {
             out("zoomIncreaseAllowed(): " + zia + " " + currentZoomLevel + " vs. " + this.getMaxZoomLvl() );
@@ -719 +731 @@
         debug = true;
         for (int zoomOff : otherZooms) {
-            int zoom = currentZoomLevel + zoomOff;
+            int zoom = displayZoomLevel + zoomOff;
             if ((zoom < this.getMinZoomLvl()) ||
                     (zoom > this.getMaxZoomLvl())) {
@@ -821 +833 @@
     // The "border" tile tells us the boundaries of where we may
     // draw.  It will not be from the zoom level that is being
-    // drawn currently.  If drawing the currentZoomLevel,
+    // drawn currently.  If drawing the displayZoomLevel,
     // border is null and we draw the entire tile set.
     List<Tile> paintTileImages(Graphics g, TileSet ts, int zoom, Tile border) {
+        if (zoom <= 0) return Collections.emptyList();
         Rectangle borderRect = null;
         if (border != null) {
@@ -844 +857 @@
             }
             drawImageInside(g, img, sourceRect, borderRect);
-            if (!imageScaleRecorded && zoom == currentZoomLevel) {
+            if (!imageScaleRecorded && zoom == displayZoomLevel) {
                 lastImageScale = new Double(getImageScaling(img, sourceRect));
                 imageScaleRecorded = true;
@@ -897 +910 @@
         }
 
-        if (tile.hasError() && (displayZoomLevel == 0 || !"no-tile".equals(tile.getValue("tile-info")))) {
+        if (tile.hasError()) {
             myDrawString(g, tr("Error") + ": " + tr(tile.getErrorMessage()), p.x + 2, texty);
             texty += 1 + fontHeight;
@@ -944 +957 @@
     }
     private class TileSet {
-        int z12x0, z12x1, z12y0, z12y1;
+        int x0, x1, y0, y1;
         int zoom;
         int tileMax = -1;
@@ -961 +974 @@
             this.zoom = zoom;
 
-            z12x0 = lonToTileX(topLeft.lon(),  zoom);
-            z12y0 = latToTileY(topLeft.lat(),  zoom);
-            z12x1 = lonToTileX(botRight.lon(), zoom);
-            z12y1 = latToTileY(botRight.lat(), zoom);
-            if (z12x0 > z12x1) {
-                int tmp = z12x0;
-                z12x0 = z12x1;
-                z12x1 = tmp;
-            }
-            if (z12y0 > z12y1) {
-                int tmp = z12y0;
-                z12y0 = z12y1;
-                z12y1 = tmp;
+            x0 = lonToTileX(topLeft.lon(),  zoom);
+            y0 = latToTileY(topLeft.lat(),  zoom);
+            x1 = lonToTileX(botRight.lon(), zoom);
+            y1 = latToTileY(botRight.lat(), zoom);
+            if (x0 > x1) {
+                int tmp = x0;
+                x0 = x1;
+                x1 = tmp;
+            }
+            if (y0 > y1) {
+                int tmp = y0;
+                y0 = y1;
+                y1 = tmp;
             }
             tileMax = (int)Math.pow(2.0, zoom);
-            if (z12x0 < 0) {
-                z12x0 = 0;
-            }
-            if (z12y0 < 0) {
-                z12y0 = 0;
-            }
-            if (z12x1 > tileMax) {
-                z12x1 = tileMax;
-            }
-            if (z12y1 > tileMax) {
-                z12y1 = tileMax;
+            if (x0 < 0) {
+                x0 = 0;
+            }
+            if (y0 < 0) {
+                y0 = 0;
+            }
+            if (x1 > tileMax) {
+                x1 = tileMax;
+            }
+            if (y1 > tileMax) {
+                y1 = tileMax;
             }
         }
@@ -1003 +1016 @@
 
         double size() {
-            double x_span = z12x1 - z12x0 + 1.0;
-            double y_span = z12y1 - z12y0 + 1.0;
+            double x_span = x1 - x0 + 1.0;
+            double y_span = y1 - y0 + 1.0;
             return x_span * y_span;
         }
@@ -1023 +1036 @@
             if (this.insane())
                 return ret;
-            for (int x = z12x0; x <= z12x1; x++) {
-                for (int y = z12y0; y <= z12y1; y++) {
+            for (int x = x0; x <= x1; x++) {
+                for (int y = y0; y <= y1; y++) {
                     Tile t;
                     if (create) {
@@ -1038 +1051 @@
             return ret;
         }
+
+        int totalTiles() {
+            return (y1 - y0 + 1) * (x1 - x0 + 1);
+        }
+
         void loadAllTiles(boolean force)
         {
@@ -1089 +1107 @@
                 if (decreaseZoomLevel()) {
                     this.paint(g, mv, bounds);
-                }
-                return;
-            }
-            if (zoomIncreaseAllowed() && ts.tooSmall()) {
-                if (debug) {
-                    out("too zoomed in, (" + ts.tilesSpanned()
-                            + "), increasing zoom from " + currentZoomLevel);
-                }
-                // This is a hack.  ts.tooSmall() is proabably a bad thing, and this works
-                // around it.  If we have a very small window, the tileSet may be well
-                // less than 1 real tile wide, but that's expected.  But, this sees the
-                // tile set as too small and zooms in.  The code below that checks for
-                // pixel stretching disagrees and tries to zoom out.  Both calls recurse,
-                // hillarity ensues, and the stack overflows.
-                //
-                // This really needs to get fixed properly.  We probably shouldn't even
-                // have the tooSmall() check on tileSets.  But, this also helps the zoom
-                // converge to the correct place much faster.
-                boolean tmp = az_disable;
-                az_disable = true;
-                if (increaseZoomLevel()) {
+                    return;
+                }
+            }
+
+            // Auto-detection of Bing zoomlevel
+            if (tileSource instanceof BingAerialTileSource) {
+                List<Tile> allTiles = ts.allTiles();
+                boolean hasVisibleTiles = false;
+                boolean hasOverzoomedTiles = false;
+                boolean hasLoadingTiles = allTiles.size() < ts.totalTiles();
+                for (Tile t : allTiles) {
+                    if (t.isLoaded()) {
+                        if (!t.hasError()) {
+                            hasVisibleTiles = true;
+                        }
+                        if ("no-tile".equals(t.getValue("tile-info"))) {
+                            hasOverzoomedTiles = true;
+                        }
+                    } else {
+                        hasLoadingTiles = true;
+                    }
+                }
+                if (!hasLoadingTiles) {
+                    overZoomed = false;
+                }
+                if (!hasVisibleTiles && hasOverzoomedTiles) {
+                    overZoomed = true;
+                    if (displayZoomLevel == 0 || !hasLoadingTiles) {
+                        boolean tmp = overZoomedFlag;
+                        overZoomedFlag = true;
+                        if (decreaseZoomLevel()) {
+                            this.paint(g, mv, bounds);
+                            overZoomedFlag = tmp;
+                            return;
+                        }
+                        overZoomedFlag = tmp;
+                    }
+                } else if (hasVisibleTiles) {
+                    displayZoomLevel = currentZoomLevel;
+                }
+            } else {
+                displayZoomLevel = currentZoomLevel;
+                if (zoomIncreaseAllowed() && ts.tooSmall()) {
+                    if (debug) {
+                        out("too zoomed in, (" + ts.tilesSpanned()
+                                + "), increasing zoom from " + currentZoomLevel);
+                    }
+                    // This is a hack.  ts.tooSmall() is proabably a bad thing, and this works
+                    // around it.  If we have a very small window, the tileSet may be well
+                    // less than 1 real tile wide, but that's expected.  But, this sees the
+                    // tile set as too small and zooms in.  The code below that checks for
+                    // pixel stretching disagrees and tries to zoom out.  Both calls recurse,
+                    // hillarity ensues, and the stack overflows.
+                    //
+                    // This really needs to get fixed properly.  We probably shouldn't even
+                    // have the tooSmall() check on tileSets.  But, this also helps the zoom
+                    // converge to the correct place much faster.
+                    boolean tmp = az_disable;
+                    az_disable = true;
+                    increaseZoomLevel();
                     this.paint(g, mv, bounds);
-                }
-                az_disable = tmp;
-                return;
-            }
-        }
-
-        // Too many tiles... refuse to draw
+                    az_disable = tmp;
+                    return;
+                }
+            }
+        } else {
+            displayZoomLevel = currentZoomLevel;
+        }
+
+        // Too many tiles... refuse to download
         if (!ts.tooLarge()) {
             //out("size: " + ts.size() + " spanned: " + ts.tilesSpanned());
@@ -1123 +1182 @@
         }
 
+        if (displayZoomLevel != zoom) {
+            ts = new TileSet(topLeft, botRight, displayZoomLevel);
+        }
+
         g.setColor(Color.DARK_GRAY);
 
-        List<Tile> missedTiles = this.paintTileImages(g, ts, currentZoomLevel, null);
+        List<Tile> missedTiles = this.paintTileImages(g, ts, displayZoomLevel, null);
         int otherZooms[] = { -1, 1, -2, 2, -3, -4, -5};
         for (int zoomOffset : otherZooms) {
@@ -1134 +1197 @@
                 break;
             }
-            int newzoom = currentZoomLevel + zoomOffset;
+            int newzoom = displayZoomLevel + zoomOffset;
             if (missedTiles.size() <= 0) {
                 break;
@@ -1160 +1223 @@
         // its tiles
         for (Tile t : ts.allTiles()) {
-            this.paintTileText(ts, t, g, mv, currentZoomLevel, t);
+            this.paintTileText(ts, t, g, mv, displayZoomLevel, t);
         }
 
@@ -1225 +1288 @@
         //g.drawString("currentZoomLevel=" + currentZoomLevel, 120, 120);
         g.setColor(Color.lightGray);
-        if (ts.insane()) {
-            myDrawString(g, "zoom in to load any tiles", 120, 120);
-        } else if (ts.tooLarge()) {
-            myDrawString(g, "zoom in to load more tiles", 120, 120);
-        } else if (ts.tooSmall()) {
-            myDrawString(g, "increase zoom level to see more detail", 120, 120);
+        if (!autoZoom) {
+            if (ts.insane()) {
+                myDrawString(g, tr("zoom in to load any tiles"), 120, 120);
+            } else if (ts.tooLarge()) {
+                myDrawString(g, tr("zoom in to load more tiles"), 120, 120);
+            } else if (ts.tooSmall()) {
+                myDrawString(g, tr("increase zoom level to see more detail"), 120, 120);
+            }
+        }
+        if (isOverZoomed()) {
+            myDrawString(g, tr("No tiles at this zoom level"), 120, 120);
+        }
+        if (debug) {
+            myDrawString(g, tr("Current zoom: {0}", currentZoomLevel), 50, 140);
+            myDrawString(g, tr("Display zoom: {0}", displayZoomLevel), 50, 155);
         }
     }// end of paint method