Changeset 4795

Timestamp:

10/03/07 16:42:35 (1 year ago)

Author:

crschmidt

Message:

Pullup fix for zooms to branch. (Closes #1043) 4791:4792

Files:

• branches/openlayers/2.5/lib/OpenLayers/Layer.js (modified) (2 diffs)
• branches/openlayers/2.5/lib/OpenLayers/Map.js (modified) (5 diffs)
• branches/openlayers/2.5/tests/Control/test_OverviewMap.html (modified) (2 diffs)
• branches/openlayers/2.5/tests/Layer/test_Grid.html (modified) (2 diffs)
• branches/openlayers/2.5/tests/Layer/test_KaMap.html (modified) (2 diffs)
• branches/openlayers/2.5/tests/Layer/test_TMS.html (modified) (1 diff)
• branches/openlayers/2.5/tests/Layer/test_TileCache.html (modified) (1 diff)
• branches/openlayers/2.5/tests/Layer/test_WrapDateLine.html (modified) (3 diffs)
• branches/openlayers/2.5/tests/test_Layer.html (modified) (2 diffs)

branches/openlayers/2.5/lib/OpenLayers/Layer.js

@@ -732 +732 @@
-     * 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} The index of the zoomLevel (entry in the resolutions array) 
-
-
-
-
-
+
+
+
+
+
+
-        var viewSize = this.map.getSize();
-        var idealResolution = Math.max( extent.getWidth()  / viewSize.w,
-                                        extent.getHeight() / viewSize.h );
-
-
+, closest
-    },
-    
@@ -761 +766 @@
-    /**
-     * APIMethod: getZoomForResolution
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-     * 
-     * Returns:
-     * {Integer} The index of the zoomLevel (entry in the resolutions array) 
-
-
-
-
+
+
+
+
+
-        var minDiff = Number.POSITIVE_INFINITY;
-
-
-
-
+
+
+
+
+
+
-                minDiff = diff;
-
-
+
+
+
+
-            }
-        }
-zoom
+Math.max(0, i-1)
-    },
-    

branches/openlayers/2.5/lib/OpenLayers/Map.js

@@ -708 +708 @@
-                        // zoom to oldExtent *and* force zoom change
-                        this.setCenter(oldExtent.getCenterLonLat(), 
-
+, true
-                                       false, true);
-                    }
@@ -1357 +1357 @@
-     * 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:
@@ -1362 +1366 @@
-     *           If no baselayer is set, returns null.
-     */
-
+, closest
-        var zoom = null;
-        if (this.baseLayer != null) {
-
+, closest
-        }
-        return zoom;
@@ -1375 +1379 @@
-     * 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:
@@ -1380 +1391 @@
-     *           If no baselayer is set, returns null.
-     */
-
+, closest
-        var zoom = null;
-        if (this.baseLayer != null) {
-
+, closest
-        }
-        return zoom;

branches/openlayers/2.5/tests/Control/test_OverviewMap.html

@@ -44 +44 @@
-        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});
@@ -67 +57 @@
-        
-        var cent = map.getCenter();
-
-
-
-
+
+
-        
-        map.setCenter(new OpenLayers.LonLat(0,0), 0);

branches/openlayers/2.5/tests/Layer/test_Grid.html

@@ -151 +151 @@
-        zoom = layer.getZoomForExtent(bounds);
-
-
-
-
-
-
-
-
-
-
-
-
+
-
-        bounds = new OpenLayers.Bounds(10,10,100,100);
-        zoom = layer.getZoomForExtent(bounds);
-
-
-
-
-
-
+
-    }   
-    
@@ -556 +542 @@
-        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
-    }
-

branches/openlayers/2.5/tests/Layer/test_KaMap.html

@@ -129 +129 @@
-        zoom = layer.getZoomForExtent(bounds);
-
-
-
-
-
-
-
-
-
-
-
-
+
-
-        bounds = new OpenLayers.Bounds(10,10,100,100);
-        zoom = layer.getZoomForExtent(bounds);
-
-
-
-
-
-
+
-    }   
-    
@@ -251 +237 @@
-        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
-    }
-

branches/openlayers/2.5/tests/Layer/test_TMS.html

@@ -78 +78 @@
-        bounds = new OpenLayers.Bounds(10,10,12,12);
-        zoom = layer.getZoomForExtent(bounds);
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-
-        bounds = new OpenLayers.Bounds(10,10,100,100);
-        zoom = layer.getZoomForExtent(bounds);
-
-
-
-
-
+
+
-    }   
-

branches/openlayers/2.5/tests/Layer/test_TileCache.html

@@ -79 +79 @@
-        bounds = new OpenLayers.Bounds(10,10,12,12);
-        zoom = layer.getZoomForExtent(bounds);
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-
-        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
-    }   
-

branches/openlayers/2.5/tests/Layer/test_WrapDateLine.html

@@ -132 +132 @@
-        m.addLayer(layer);
-        m.zoomToMaxExtent();
-0%2C9
-270%2C90%2C36
-90%2C270%2C0%2C36
+-90%2C18
+450%2C180%2C63
+180%2C450%2C0%2C63
-
-    }
@@ -147 +147 @@
-        m.addLayer(layer);
-        m.zoomToMaxExtent();
-110735960.6
-110735960.6
-110735960.6
+221471921.
+221471921.
+221471921.
-    }
-    function test_Layer_WrapDateLine_WMS_Overlay (t) {
@@ -164 +164 @@
-        m.addLayers([baselayer,layer]);
-        m.zoomToMaxExtent();
-270%2C90%2C36
-90%2C270%2C0%2C36
-0%2C9
+450%2C180%2C63
+180%2C450%2C0%2C63
+-90%2C18
-    }
-

branches/openlayers/2.5/tests/test_Layer.html

@@ -156 +156 @@
-    function test_06_Layer_getZoomForResolution(t) {
-
-6
+8
-
-        var layer = new OpenLayers.Layer('Test Layer');
@@ -164 +164 @@
-        
-        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");
-
-    }