From: Frédéric Perrin <fred@fperrin.net>
Date: Sun, 30 Dec 2018 13:56:13 +0000 (+0000)
Subject: Never overzoom when initially opening a track
X-Git-Tag: v19.2.fp1~3^2~1
X-Git-Url: http://gitweb.fperrin.net/?p=GpsPrune.git;a=commitdiff_plain;h=9d2aa8bcc659a240952be61223719190f238f57b

Never overzoom when initially opening a track
---

diff --git a/src/tim/prune/gui/map/MapCanvas.java b/src/tim/prune/gui/map/MapCanvas.java
index aa25dbc..429fcdc 100644
--- a/src/tim/prune/gui/map/MapCanvas.java
+++ b/src/tim/prune/gui/map/MapCanvas.java
@@ -345,8 +345,11 @@ public class MapCanvas extends JPanel implements MouseListener, MouseMotionListe
 			MapUtils.getXFromLongitude(_lonRange.getMaximum()));
 		_yRange = new DoubleRange(MapUtils.getYFromLatitude(_latRange.getMinimum()),
 			MapUtils.getYFromLatitude(_latRange.getMaximum()));
-		_mapPosition.zoomToXY(_xRange.getMinimum(), _xRange.getMaximum(), _yRange.getMinimum(), _yRange.getMaximum(),
-			getWidth(), getHeight());
+		_mapPosition.zoomToXY(
+		        _xRange.getMinimum(), _xRange.getMaximum(),
+			_yRange.getMinimum(), _yRange.getMaximum(),
+			getWidth(), getHeight(),
+			_tileManager.getMaxZoomLevel());
 	}
 
 
diff --git a/src/tim/prune/gui/map/MapPosition.java b/src/tim/prune/gui/map/MapPosition.java
index 25f05fc..71ab6cd 100644
--- a/src/tim/prune/gui/map/MapPosition.java
+++ b/src/tim/prune/gui/map/MapPosition.java
@@ -30,14 +30,14 @@ public class MapPosition
 	 * @param inWidth width of display
 	 * @param inHeight height of display
 	 */
-	public void zoomToXY(double inMinX, double inMaxX, double inMinY, double inMaxY, int inWidth, int inHeight)
+	public void zoomToXY(double inMinX, double inMaxX, double inMinY, double inMaxY, int inWidth, int inHeight, int maxZoom)
 	{
 		// System.out.println("Zooming to " + inMinX + ", " + inMaxX + ", " + inMinY + ", " + inMaxY + "; width=" + inWidth + ", height=" + inHeight);
 		double diffX = Math.abs(inMaxX - inMinX);
 		double diffY = Math.abs(inMaxY - inMinY);
 		// Find out what zoom level to go to
 		int requiredZoom = -1;
-		for (int currZoom = MAX_ZOOM; currZoom >= 2; currZoom--)
+		for (int currZoom = maxZoom; currZoom >= 2; currZoom--)
 		{
 			if (transformToPixels(diffX, currZoom) < inWidth
 				&& transformToPixels(diffY, currZoom) < inHeight)
diff --git a/src/tim/prune/gui/map/MapTileManager.java b/src/tim/prune/gui/map/MapTileManager.java
index f7370c5..d1e0047 100644
--- a/src/tim/prune/gui/map/MapTileManager.java
+++ b/src/tim/prune/gui/map/MapTileManager.java
@@ -70,10 +70,19 @@ public class MapTileManager implements ImageObserver
 	 * @return true if zoom is too high for tiles
 	 */
 	public boolean isOverzoomed()
+	{
+		return _zoom > getMaxZoomLevel();
+	}
+
+	/**
+	 * @return the maximum useable zoom level for tiles
+	 */
+	public int getMaxZoomLevel()
 	{
 		// Ask current map source what maximum zoom is
 		int maxZoom = (_mapSource == null?0:_mapSource.getMaxZoomLevel());
-		return (_zoom > maxZoom);
+		return maxZoom;
+
 	}
 
 	/**