Changeset 4381

Timestamp:

09/18/07 20:23:26 (1 year ago)

Author:

tschaub

Message:

New behavior for layer.getZoomForResolution. This method now returns the index of the resolution closest to the passed in resolution - making for fewer unwanted resolution changes, and a generally happier populace (see #990).

Files:

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

trunk/openlayers/lib/OpenLayers/Layer.js

@@ -737 +737 @@
-     *     that still contains the passed-in extent. We do this by calculating
-     *     the ideal resolution for the given exteng (based on the map size)
-
-
+
-     */
-    getZoomForExtent: function(extent) {
@@ -762 +761 @@
-    /**
-     * APIMethod: getZoomForResolution
-
-
-
+
+
+
+
-     * 
-     * Returns:
-     * {Integer} The index of the zoomLevel (entry in the resolutions array) 
-
-
+
-     */
-    getZoomForResolution: function(resolution) {
-
-
-
+
+
+
+
+
+
+
+
-                break;
-            }
-        }
-(i - 1)
+zoom
-    },
-    

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

trunk/openlayers/tests/Layer/test_Grid.html

@@ -151 +151 @@
-        zoom = layer.getZoomForExtent(bounds);
-
-
+
+
+
+
+
+
+
+
+
+
+
-
-        bounds = new OpenLayers.Bounds(10,10,100,100);
-        zoom = layer.getZoomForExtent(bounds);
-
-
+
+
+
+
+
-    }   
-    
@@ -542 +556 @@
-        map.zoomIn();
-        var bounds = layer.getTileBounds(new OpenLayers.Pixel(200,200));
-180,-9
+90,
-        map.pan(200,0);
-        var bounds = layer.getTileBounds(new OpenLayers.Pixel(200,200));
--90,18
+0,9
-    }
-

trunk/openlayers/tests/Layer/test_KaMap.html

@@ -129 +129 @@
-        zoom = layer.getZoomForExtent(bounds);
-
-
+
+
+
+
+
+
+
+
+
+
+
-
-        bounds = new OpenLayers.Bounds(10,10,100,100);
-        zoom = layer.getZoomForExtent(bounds);
-
-
+
+
+
+
+
-    }   
-    
@@ -237 +251 @@
-        map.zoomIn();
-        var bounds = layer.getTileBounds(new OpenLayers.Pixel(200,200));
-180,0,0,18
+90,0,0,9
-        map.pan(200,0);
-        var bounds = layer.getTileBounds(new OpenLayers.Pixel(200,200));
-180,18
+90,9
-    }
-

trunk/openlayers/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);
-
-
+
+
+
+
+
-    }   
-

trunk/openlayers/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.
+         */
-
-1
+2
-    }   
-

trunk/openlayers/tests/Layer/test_WrapDateLine.html

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

trunk/openlayers/tests/test_Layer.html

@@ -156 +156 @@
-    function test_06_Layer_getZoomForResolution(t) {
-
-4
+6
-
-        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");