Changeset 9818 in josm for trunk/src/org/openstreetmap/josm/gui/layer

Timestamp:

2016-02-17T23:27:47+01:00 (8 years ago)

Author:

wiktorn

Message:

Snap scale to mercator zoom levels.

See #12350

Patch submitted by: kolesar

Location:

trunk/src/org/openstreetmap/josm/gui/layer

Files:

• NativeScaleLayer.java (added)
• TMSLayer.java (modified) (3 diffs)
• WMTSLayer.java (modified) (5 diffs)

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

@@ -5 +5 @@
 
 import org.apache.commons.jcs.access.CacheAccess;
+import org.openstreetmap.gui.jmapviewer.OsmMercator;
 import org.openstreetmap.gui.jmapviewer.interfaces.TileLoader;
 import org.openstreetmap.gui.jmapviewer.tilesources.AbstractTMSTileSource;
@@ -29 +30 @@
  *
  */
-public class TMSLayer extends AbstractCachedTileSourceLayer {
+public class TMSLayer extends AbstractCachedTileSourceLayer implements NativeScaleLayer {
     private static final String CACHE_REGION_NAME = "TMS";
 
@@ -145 +146 @@
         return AbstractCachedTileSourceLayer.getCache(CACHE_REGION_NAME);
     }
+
+    @Override
+    public ScaleList getNativeScales() {
+        ScaleList scales = new ScaleList();
+        for (int zoom = info.getMinZoom(); zoom <= info.getMaxZoom(); zoom++) {
+            double scale = OsmMercator.EARTH_RADIUS * Math.PI * 2 / Math.pow(2, zoom) / OsmMercator.DEFAUL_TILE_SIZE;
+            scales.add(new Scale(scale));
+        }
+        return scales;
+    }
 }

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

@@ -6 +6 @@
 
 import org.apache.commons.jcs.access.CacheAccess;
-import org.openstreetmap.gui.jmapviewer.TileXY;
-import org.openstreetmap.gui.jmapviewer.interfaces.ICoordinate;
 import org.openstreetmap.gui.jmapviewer.interfaces.TileLoader;
 import org.openstreetmap.gui.jmapviewer.tilesources.AbstractTMSTileSource;
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.data.cache.BufferedImageCacheEntry;
-import org.openstreetmap.josm.data.coor.LatLon;
 import org.openstreetmap.josm.data.imagery.ImageryInfo;
 import org.openstreetmap.josm.data.imagery.ImageryInfo.ImageryType;
@@ -19 +16 @@
 import org.openstreetmap.josm.data.preferences.BooleanProperty;
 import org.openstreetmap.josm.data.projection.Projection;
-import org.openstreetmap.josm.gui.MapView;
 
 /**
@@ -28 +24 @@
  * http://www.opengeospatial.org/standards/wmts
  *
- * @author Wiktor Niesiobędzki
+ * @author Wiktor Niesiobędzki
  *
  */
-public class WMTSLayer extends AbstractCachedTileSourceLayer {
+public class WMTSLayer extends AbstractCachedTileSourceLayer implements NativeScaleLayer {
     /**
      * default setting of autozoom per layer
@@ -63 +59 @@
     }
 
-    /**
-     * @param zoom level of the tile
-     * @return how many pixels of the screen occupies one pixel of the tile
-     */
-    private double getTileToScreenRatio(int zoom) {
-         MapView mv = Main.map.mapView;
-         LatLon topLeft = mv.getLatLon(0, 0);
-         LatLon botLeft = mv.getLatLon(0, tileSource.getTileSize());
-
-         TileXY topLeftTile = tileSource.latLonToTileXY(topLeft.toCoordinate(), zoom);
-
-         ICoordinate north = tileSource.tileXYToLatLon(topLeftTile.getXIndex(), topLeftTile.getYIndex(), zoom);
-         ICoordinate south = tileSource.tileXYToLatLon(topLeftTile.getXIndex(), topLeftTile.getYIndex() + 1, zoom);
-
-         return Math.abs((north.getLat() - south.getLat()) / (topLeft.lat() - botLeft.lat()));
+    @Override
+    protected int getBestZoom() {
+        if (!Main.isDisplayingMapView()) return 0;
+        ScaleList scaleList = getNativeScales();
+        for (int i = scaleList.size()-1; i >= 0; i--) {
+            Scale scale = scaleList.get(i);
+            if (scale.scale >= Main.map.mapView.getScale()) {
+                return i;
+            }
+        }
+        return 0;
     }
 
     @Override
-    protected int getBestZoom() {
-        if (!Main.isDisplayingMapView()) return 1;
+    protected int getMaxZoomLvl() {
+        return getNativeScales().size()-1;
+    }
 
-        for (int i = getMinZoomLvl() + 1; i <= getMaxZoomLvl(); i++) {
-            double ret = getTileToScreenRatio(i);
-            if (ret < 1) {
-                return i - 1;
-            }
-        }
-        return getMaxZoomLvl();
+    @Override
+    protected int getMinZoomLvl() {
+        return 0;
     }
 
@@ -130 +119 @@
         return AbstractCachedTileSourceLayer.getCache(CACHE_REGION_NAME);
     }
+
+    @Override
+    public ScaleList getNativeScales() {
+        return ((WMTSTileSource) tileSource).getNativeScales();
+    }
 }