Ticket #1043: zoomer.TRUNK.3.patch

tests/test_Layer.html

@@ -158 +158 @@
-
-    function test_06_Layer_getZoomForResolution(t) {
-
-6
+8
-
-        var layer = new OpenLayers.Layer('Test Layer');
-            
@@ -166 +166 @@
-        layer.resolutions = [128, 64, 32, 16, 8, 4, 2];
-        
-        t.eq(layer.getZoomForResolution(200), 0, "zoom all the way out");
-        t.eq(layer.getZoomForResolution(65), 1, "index closest to 65");
-        t.eq(layer.getZoomForResolution(63), 1, "index closest to 63");
-        t.eq(layer.getZoomForResolution(25), 2, "zoom in middle");
-        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) {

tests/Control/test_OverviewMap.html

@@ -43 +43 @@
-        var overviewZoom = control.ovmap.getZoom();
-        t.eq(overviewCenter.lon, -71, "Overviewmap center lon correct");
-        t.eq(overviewCenter.lat, 42, "Overviewmap center lat correct");
-9
+8
-        
-        control.mapDivClick({'xy':new OpenLayers.Pixel(5,5)});
-        
-        // There are box model issues that keep browsers from giving us
-        // identical results here.  Test the normalized difference against
-        // a tolerance instead of testing equality.
-        function normalizedDiff(a, b) {
-            return Math.abs((a - b) / (a + b));
-        }
-        var tolerance = 1e-4;
-        
-        var cent = map.getCenter();
-
-
-
-
+
+
-
-        control.rectMouseDown({'xy':new OpenLayers.Pixel(5,5), 'which':1});
-        control.rectMouseMove({'xy':new OpenLayers.Pixel(15,15), 'which':1});
-        control.rectMouseUp({'xy':new OpenLayers.Pixel(15,15), 'which':1});
-        
-        var cent = map.getCenter();
-
-
-
-
+
+
-        
-        map.setCenter(new OpenLayers.LonLat(0,0), 0);
-        var overviewCenter = control.ovmap.getCenter();

tests/Layer/test_WrapDateLine.html

@@ -131 +131 @@
-        var m = new OpenLayers.Map('map');
-        m.addLayer(layer);
-        m.zoomToMaxExtent();
-0%2C9
-270%2C90%2C36
-90%2C270%2C0%2C36
+-90%2C18
+450%2C180%2C63
+180%2C450%2C0%2C63
-
-    }
-    function test_Layer_WrapDateLine_KaMap (t) {
@@ -146 +146 @@
-        var m = new OpenLayers.Map('map');
-        m.addLayer(layer);
-        m.zoomToMaxExtent();
-110735960.6
-110735960.6
-110735960.6
+221471921.
+221471921.
+221471921.
-    }
-    function test_Layer_WrapDateLine_WMS_Overlay (t) {
-        t.plan( 3 );
@@ -163 +163 @@
-        var m = new OpenLayers.Map('map');
-        m.addLayers([baselayer,layer]);
-        m.zoomToMaxExtent();
-270%2C90%2C36
-90%2C270%2C0%2C36
-0%2C9
+450%2C180%2C63
+180%2C450%2C0%2C63
+-90%2C18
-    }
-
-  </script>

tests/Layer/test_TileCache.html

@@ -78 +78 @@
-
-        bounds = new OpenLayers.Bounds(10,10,12,12);
-        zoom = layer.getZoomForExtent(bounds);
-        /**
-         * ideal resolution: 2 map units / 500px = 0.004
-         * layer.resolutions = [0.703125, 0.3515625, 0.17578125,
-         *                      0.087890625, 0.0439453125, 0.02197265625,
-         *                      0.010986328125, 0.0054931640625, 0.00274658203125,
-         *                      0.001373291015625, 0.0006866455078125, 0.00034332275390625,
-         *                      0.000171661376953125, 0.0000858306884765625, 0.00004291534423828125,
-         *                      0.000021457672119140625]
-         *
-         * So, we expect a zoom of 8 because it is the closest resolution.
-         */
-        t.eq( zoom, 8, "getZoomForExtent() returns correct value");
-
+        t.eq( zoom, 7, "getZoomForExtent() returns correct value");
+
-        bounds = new OpenLayers.Bounds(10,10,100,100);
-        zoom = layer.getZoomForExtent(bounds);
-        /**
-         * ideal resolution: 90 map units / 500px = 0.18
-         * So, we expect a zoom of 2 because it is the closest.
-         */
-
-2
+1
-    }   
-
-

tests/Layer/test_Grid.html

@@ -150 +150 @@
-        bounds = new OpenLayers.Bounds(10,10,12,12);
-        zoom = layer.getZoomForExtent(bounds);
-
-
-
-
-
-
-
-
-
-
-
-
+
-
-        bounds = new OpenLayers.Bounds(10,10,100,100);
-        zoom = layer.getZoomForExtent(bounds);
-
-
-
-
-
-
+
-    }   
-    
-    function test_07_Layer_Grid_moveTo(t) {
@@ -555 +541 @@
-        map.zoomToMaxExtent();
-        map.zoomIn();
-        var bounds = layer.getTileBounds(new OpenLayers.Pixel(200,200));
-90,
+180,-9
-        map.pan(200,0);
-        var bounds = layer.getTileBounds(new OpenLayers.Pixel(200,200));
-0,9
+-90,18
-    }
-
-    function test_Layer_Grid_moveTo_buffer_calculation (t) {

tests/Layer/test_KaMap.html

@@ -128 +128 @@
-        bounds = new OpenLayers.Bounds(10,10,12,12);
-        zoom = layer.getZoomForExtent(bounds);
-
-
-
-
-
-
-
-
-
-
-
-
+
-
-        bounds = new OpenLayers.Bounds(10,10,100,100);
-        zoom = layer.getZoomForExtent(bounds);
-
-
-
-
-
-
+
-    }   
-    
-    function test_06_Layer_kaMap_mergeNewParams (t) {
@@ -250 +236 @@
-        map.zoomToMaxExtent();
-        map.zoomIn();
-        var bounds = layer.getTileBounds(new OpenLayers.Pixel(200,200));
-90,0,0,9
+180,0,0,18
-        map.pan(200,0);
-        var bounds = layer.getTileBounds(new OpenLayers.Pixel(200,200));
-90,9
+180,18
-    }
-
-    function test_99_Layer_KaMap_destroy (t) {

tests/Layer/test_TMS.html

@@ -77 +77 @@
-
-        bounds = new OpenLayers.Bounds(10,10,12,12);
-        zoom = layer.getZoomForExtent(bounds);
-        /**
-         * ideal resolution: 2 map units / 500px = 0.004
-         * layer.resolutions = [1.40625, 0.703125, 0.3515625, 0.17578125,
-         *                      0.087890625, 0.0439453125, 0.02197265625,
-         *                      0.010986328125, 0.0054931640625, 0.00274658203125,
-         *                      0.001373291015625, 0.0006866455078125, 0.00034332275390625,
-         *                      0.000171661376953125, 0.0000858306884765625, 0.00004291534423828125]
-         *
-         * So, we expect a zoom of 9 because it is the closest resolution.
-         */
-        
-        t.eq( zoom, 9, "getZoomForExtent() returns correct value");
-
+        t.eq( zoom, 8, "getZoomForExtent() returns correct value");
+
-        bounds = new OpenLayers.Bounds(10,10,100,100);
-        zoom = layer.getZoomForExtent(bounds);
-
-
-
-
-
+
+
-    }   
-
-

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 that does 
+     *     not exactly contain the entire extent.
+     *     Default is false.
-     *
-     * Returns:
-     * {Integer} The index of the zoomLevel (entry in the resolutions array) 
-
-
-
+
+
+
+
-     */
-
+, closest
-        var viewSize = this.map.getSize();
-        var idealResolution = Math.max( extent.getWidth()  / viewSize.w,
-                                        extent.getHeight() / viewSize.h );
-
-
+, closest
-    },
-    
-    /** 
@@ -759 +764 @@
-
-    /**
-     * APIMethod: getZoomForResolution
-     * Get the index for the closest resolution in the layers resolutions array.
-     * 
-     * Parameters:
-
+
+
+
+
+
+
+
+
-     * 
-     * Returns:
-     * {Integer} The index of the zoomLevel (entry in the resolutions array) 
-
+
+
-     */
-
-zoom, 
+, closest
+
-        var minDiff = Number.POSITIVE_INFINITY;
-
-
-
-
+
+
+
+
+
+
-                minDiff = diff;
-
-
+
+
+
+
-            }
-        }
-zoom
+Math.max(0, i-1)
-    },
-    
-    /**

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);
-                    }
-                }
@@ -1367 +1367 @@
-     * 
-     * Parameters: 
-     * bounds - {<OpenLayers.Bounds>}
+     * closest - {Boolean} Find the zoom level that most closely fits the 
+     *     specified bounds. Note that this may result in a zoom that does 
+     *     not exactly contain the entire extent.
+     *     Default is false.
-     * 
-     * Returns:
-     * {Integer} A suitable zoom level for the specified bounds.
-     *           If no baselayer is set, returns null.
-     */
-
+, closest
-        var zoom = null;
-        if (this.baseLayer != null) {
-
+, closest
-        }
-        return zoom;
-    },
@@ -1385 +1389 @@
-     * 
-     * Parameter:
-     * 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} A suitable zoom level for the specified resolution.
-     *           If no baselayer is set, returns null.
-     */
-
+, closest
-        var zoom = null;
-        if (this.baseLayer != null) {
-
+, closest
-        }
-        return zoom;
-    },