Ticket #1043: zoomer.3.patch

tests/test_Layer.html

@@ -158 +158 @@
-
-    function test_06_Layer_getZoomForResolution(t) {
-
-4
+8
-
-        var layer = new OpenLayers.Layer('Test Layer');
-            
@@ -170 +170 @@
-        t.eq(layer.getZoomForResolution(3), 5, "zoom allmost all the way in");
-        t.eq(layer.getZoomForResolution(1), 6, "zoom  all the way in");
-
+        t.eq(layer.getZoomForResolution(65), 0, "smallest containing res");
+        t.eq(layer.getZoomForResolution(63), 1, "smallest containing res");
+
+        t.eq(layer.getZoomForResolution(65, true), 1, "closest res");
+        t.eq(layer.getZoomForResolution(63, true), 1, "closest res");
+
-    }
-    
-    function test_07_Layer_redraw(t) {

lib/OpenLayers/Layer.js

@@ -730 +730 @@
-     * 
-     * Parameters:
-     * bounds - {<OpenLayers.Bounds>}
+     * closest - {Boolean} Find the zoom level that corresponds to the absolute 
+     *     closest for the given extent, which may result in a zoom whose 
+     *     that does not exactly contain the entire extent.
+     *     Default is false.
-     *
-     * Returns:
-     * {Integer} The index of the zoomLevel (entry in the resolutions array) 
-that still contains the passed-in extent. We do this by calculating
-the ideal resolution for the given exteng (based on the map size)
-and then find the smallest resolution that is greater than this
-ideal resolution
+for the passed-in extent. We do this by calculating the ideal 
+resolution for the given extent (based on the map size) and then 
+calling getZoomForResolution(), passing along the 'closest'
+parameter
-     */
-
+, closest
-        var viewSize = this.map.getSize();
-        var idealResolution = Math.max( extent.getWidth()  / viewSize.w,
-                                        extent.getHeight() / viewSize.h );
-
-
+, closest
-    },
-    
-    /** 
@@ -763 +767 @@
-     * 
-     * Parameters:
-     * resolution - {Float}
+     * closest - {Boolean} Find the zoom level that corresponds to the absolute 
+     *     closest resolution, which may result in a zoom whose corresponding
+     *     resolution is actually smaller than we would have desired (if this
+     *     is being called from a getZoomForExtent() call, then this means that
+     *     the returned zoom index might not actually contain the entire 
+     *     extent specified... but it'll be close).
+     *     Default is false.
-     * 
-     * Returns:
-     * {Integer} The index of the zoomLevel (entry in the resolutions array) 
-is the smallest resolution that is greater than the passed-in
-resolu
+corresponds to the best fit resolution given the passed in 
+value and the 'closest' specifica
-     */
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-            }
-        }
-(i - 
+Math.max(0, i-
-    },
-    
-    /**

lib/OpenLayers/Map.js

@@ -711 +711 @@
-                        // simply set center but force zoom change
-                        this.setCenter(
-                            center,
-
+, true
-                            false, true
-                        );
-                    } else {
-                        // zoom to oldExtent *and* force zoom change
-                        this.setCenter(oldExtent.getCenterLonLat(), 
-
+, true
-                                       false, true);
-                    }
-                }