X-Git-Url: https://gitweb.fperrin.net/?p=GpsPrune.git;a=blobdiff_plain;f=tim%2Fprune%2Fgui%2Fmap%2FMapPosition.java;h=d035f10bb3f8bd74ddff6959e13e2a20bfdd1c36;hp=73c7ed922fe52ea7f0597aa2d75020af9255a1bf;hb=54b9d8bc8f0025ccf97a67d9dd217ef1f9cf082f;hpb=52bf9e8686c916be37a26a0b75340393d4478b05 diff --git a/tim/prune/gui/map/MapPosition.java b/tim/prune/gui/map/MapPosition.java index 73c7ed9..d035f10 100644 --- a/tim/prune/gui/map/MapPosition.java +++ b/tim/prune/gui/map/MapPosition.java @@ -13,10 +13,12 @@ public class MapPosition /** y position (scale depends on zoom) */ private long _yPosition = 0L; - /** Zoom level, from 2 to 15 */ + /** Zoom level, from 2 to max */ private int _zoom = 12; /** Factor to zoom by, 2 to the power of zoom */ private int _zoomFactor = 1 << _zoom; + /** Maximum zoom level */ + private static final int MAX_ZOOM = 21; /** @@ -35,7 +37,7 @@ public class MapPosition double diffY = Math.abs(inMaxY - inMinY); // Find out what zoom level to go to int requiredZoom = -1; - for (int currZoom = 15; currZoom >= 2; currZoom--) + for (int currZoom = MAX_ZOOM; currZoom >= 2; currZoom--) { if (transformToPixels(diffX, currZoom) < inWidth && transformToPixels(diffY, currZoom) < inHeight) @@ -69,7 +71,7 @@ public class MapPosition // Find out what zoom level to go to int requiredZoom = -1; int multFactor = 0; - for (int currZoom = 16; currZoom >= _zoom; currZoom--) + for (int currZoom = MAX_ZOOM; currZoom >= _zoom; currZoom--) { multFactor = 1 << (currZoom - _zoom); if ((diffX * multFactor) < inWidth && (diffY * multFactor) < inHeight) @@ -227,7 +229,7 @@ public class MapPosition */ public void zoomIn() { - if (_zoom < 16) + if (_zoom < MAX_ZOOM) { _zoom++; _zoomFactor = 1 << _zoom;