Changeset 5982

Timestamp:

02/04/08 01:23:54 (1 year ago)

Author:

tschaub

Message:

Adding fractionalZoom property to the map. This allows zooming to an arbitrary level, making it possible to have non-discrete resolutions for layers that support it. This property should not be set to true for layers with fixed zoom levels (commercial layers or others with cached tiles). r=elemoine,crschmidt,ahocevar (closes #1243)

Files:

• trunk/openlayers/examples/fractional-zoom.html (added)
• trunk/openlayers/lib/OpenLayers/Control/Navigation.js (modified) (1 diff)
• trunk/openlayers/lib/OpenLayers/Layer.js (modified) (3 diffs)
• trunk/openlayers/lib/OpenLayers/Map.js (modified) (4 diffs)
• trunk/openlayers/tests/test_Layer.html (modified) (3 diffs)
• trunk/openlayers/tests/test_Map.html (modified) (1 diff)

trunk/openlayers/lib/OpenLayers/Control/Navigation.js

@@ -138 +138 @@
-        var deltaX  = size.w/2 - evt.xy.x;
-        var deltaY  = evt.xy.y - size.h/2;
-resolutions[newZoom]
+getResolutionForZoom(newZoom)
-        var zoomPoint = this.map.getLonLatFromPixel(evt.xy);
-        var newCenter = new OpenLayers.LonLat(

trunk/openlayers/lib/OpenLayers/Layer.js

@@ -759 +759 @@
-    getResolution: function() {
-        var zoom = this.map.getZoom();
-resolutions[zoom]
+getResolutionForZoom(zoom)
-    },
-
@@ -814 +814 @@
-
-    /**
+     * APIMethod: getResolutionForZoom
+     * 
+     * Parameter:
+     * zoom - {Float}
+     * 
+     * Returns:
+     * {Float} A suitable resolution for the specified zoom.
+     */
+    getResolutionForZoom: function(zoom) {
+        zoom = Math.max(0, Math.min(zoom, this.resolutions.length - 1));
+        var resolution;
+        if(this.map.fractionalZoom) {
+            var low = Math.floor(zoom);
+            var high = Math.ceil(zoom);
+            resolution = this.resolutions[high] +
+                ((zoom-low) * (this.resolutions[low]-this.resolutions[high]));
+        } else {
+            resolution = this.resolutions[Math.round(zoom)];
+        }
+        return resolution;
+    },
+
+    /**
-     * APIMethod: getZoomForResolution
-     * 
@@ -832 +855 @@
-     */
-    getZoomForResolution: function(resolution, closest) {
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                    break;
-                }
-
+
+
+
+
-            } else {
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-                }
-            }
-
-
+
+
+
-    },
-    

trunk/openlayers/lib/OpenLayers/Map.js

@@ -66 +66 @@
-     */
-    id: null,
+    
+    /**
+     * Property: fractionalZoom
+     * {Boolean} For a base layer that supports it, allow the map resolution
+     *     to be set to a value between one of the values in the resolutions
+     *     array.  Default is false.
+     */
+    fractionalZoom: false,
-    
-    /**
@@ -1267 +1275 @@
-                zoom = this.getZoom(); 
-            }
-
-
-
-
+
-            var extent = this.calculateBounds(lonlat, resolution); 
-            if(!this.restrictedExtent.containsBounds(extent)) {
@@ -1327 +1332 @@
-            if (zoomChanged) {
-                this.zoom = zoom;
-baseLayer.getResolution(
+getResolutionForZoom(zoom
-                // zoom level has changed, increment viewRequestID.
-                this.viewRequestID++;
@@ -1596 +1601 @@
-
-    /**
+     * APIMethod: getResolutionForZoom
+     * 
+     * Parameter:
+     * zoom - {Float}
+     * 
+     * Returns:
+     * {Float} A suitable resolution for the specified zoom.  If no baselayer
+     *     is set, returns null.
+     */
+    getResolutionForZoom: function(zoom) {
+        var resolution = null;
+        if(this.baseLayer) {
+            resolution = this.baseLayer.getResolutionForZoom(zoom);
+        }
+        return resolution;
+    },
+
+    /**
-     * APIMethod: getZoomForResolution
-     * 

trunk/openlayers/tests/test_Layer.html

@@ -177 +177 @@
-    function test_06_Layer_getZoomForResolution(t) {
-
-8
+12
-
-        var layer = new OpenLayers.Layer('Test Layer');
-
+
+
-        //make some dummy resolutions
-        layer.resolutions = [128, 64, 32, 16, 8, 4, 2];
@@ -194 +195 @@
-        t.eq(layer.getZoomForResolution(65, true), 1, "closest res");
-        t.eq(layer.getZoomForResolution(63, true), 1, "closest res");
+        
+        layer.map.fractionalZoom = true;
+        t.eq(layer.getZoomForResolution(64), 1,
+             "(fractionalZoom) correct zoom for res in array");
+        t.eq(layer.getZoomForResolution(48).toPrecision(6), (1.5).toPrecision(6),
+             "(fractionalZoom) linear scaling for res between entries");
+        t.eq(layer.getZoomForResolution(200).toPrecision(6), (0).toPrecision(6),
+             "(fractionalZoom) doesn't return zoom below zero");
+        t.eq(layer.getZoomForResolution(1).toPrecision(6), (layer.resolutions.length - 1).toPrecision(6),
+             "(fractionalZoom) doesn't return zoom above highest index");
-
-    }
@@ -302 +313 @@
-        t.ok(layer.imageSize.equals(desiredImageSize), "image size correctly calculated");
-    }
+    
+    function test_Layer_getResolution(t) {
+        t.plan(1);
+        var layer = new OpenLayers.Layer("test");
+        layer.map = {
+            getZoom: function() {return "foo";}
+        };
+        layer.getResolutionForZoom = function(zoom) {
+            t.eq(zoom, "foo", "getResolution calls getResolutionForZoom");
+        }
+        layer.getResolution();
+        layer.map = null;
+        layer.destroy();
+    }
+    
+    function test_Layer_getResolutionForZoom(t) {
+        t.plan(5);
+        var layer = new OpenLayers.Layer("test");
+        layer.map = {fractionalZoom: false};
+        layer.resolutions = ["zero", "one", "two"];
+        t.eq(layer.getResolutionForZoom(0), "zero",
+             "(fractionalZoom false) returns resolution for given index");
+        t.eq(layer.getResolutionForZoom(0.9), "one",
+             "(fractionalZoom false) returns resolution for float index");
+        
+        layer.resolutions = [2, 4, 6, 8];
+        layer.map.fractionalZoom = true;
+        t.eq(layer.getResolutionForZoom(1).toPrecision(6), (4).toPrecision(6),
+             "(fractionalZoom true) returns resolution for integer zoom");
+        t.eq(layer.getResolutionForZoom(1.5).toPrecision(6), (5).toPrecision(6),
+             "(fractionalZoom true) returns resolution for float zoom");             
+        t.eq(layer.getResolutionForZoom(3.5).toPrecision(6), (8).toPrecision(6),
+             "(fractionalZoom true) returns resolution for zoom beyond res length - 1");
+        
+    }
-
-

trunk/openlayers/tests/test_Map.html

@@ -959 +959 @@
-             "map extent not restricted with null restrictedExtent for se");
-    }
+    
+    function test_Map_getResolutionForZoom(t) {
+        t.plan(2);
+        var map = new OpenLayers.Map("map");
+        var res = map.getResolutionForZoom();
+        t.eq(res, null, "getResolutionForZoom returns null for no base layer");
+        map.fractionalZoom = true;
+        var layer = new OpenLayers.Layer("test", {isBaseLayer: true});
+        layer.getResolutionForZoom = function() {
+            t.ok(true, "getResolutionForZoom calls base layer getResolutionForZoom");
+        }
+        map.addLayer(layer);
+        var res = map.getResolutionForZoom();
+        layer.destroy();
+        map.destroy();
+    }
-
-    function test_99_Map_destroy (t) {