Changeset 66

Timestamp:

05/16/06 19:46:41 (3 years ago)

Author:

sderle

Message:

Fixed zoomend event code; changed semantics of the argument to moveToNewExtent to make the argument be the *previous* zoom level. Added tests.

Files:

• trunk/openlayers/lib/OpenLayers/Map.js (modified) (7 diffs)
• trunk/openlayers/tests/test_Map.html (modified) (2 diffs)

trunk/openlayers/lib/OpenLayers/Map.js

@@ -242 +242 @@
-        }
-        this.center = latlon.copyOf();
-false
-) {
-if (this.zoom && zoom != this.zoom)
-    zoomChanged = true
+null
+ && zoom != this.zoom 
+&& zoom >= 0 && zoom <= this.getZoomLevels()) {
+zoomChanged = (this.zoom == null ? 0 : this.zoom)
-            this.zoom = zoom;
-        }
@@ -255 +255 @@
-    
-    moveToNewExtent: function (zoomChanged) {
-
+ != null
-            this.layerContainerDiv.style.left = "0px";
-            this.layerContainerDiv.style.top  = "0px";
@@ -261 +261 @@
-        var bounds = this.getExtent();
-        for (var i = 0; i < this.layers.length; i++) {
-zoomChanged
+(zoomChanged != null)
-        }
-        this.events.triggerEvent("move");
-
-
+
+
+
-    },
-
@@ -287 +288 @@
-            var oldZoom = this.zoom;
-            this.zoom = zoom;
-
-
+
-       }
-    },
@@ -304 +304 @@
-    zoomExtent: function() {
-        var fullExtent = this.getFullExtent();
-
+var oldZoom = this.zoom;
-        this.zoom = this.getZoomForExtent( fullExtent );
-        this.setCenter(
@@ -312 +312 @@
-          )
-        );
-        this.moveToNewExtent(true);
-        
-    },
-
@@ -338 +336 @@
-    defaultDblClick: function (evt) {
-        var newCenter = this.getLatLonFromPixel( evt.xy ); 
-
-
+
-    },
-

trunk/openlayers/tests/test_Map.html

@@ -55 +55 @@
-    }
-    function test_05_Map_center(t) {
-5
+4
-        map = new OpenLayers.Map($('map'));
-        map.setCenter(new OpenLayers.LatLon(1,2), 0);
-        map.zoomIn();
-        t.ok( map.getCenter() instanceof OpenLayers.LatLon, "map.getCenter returns a LatLon");
-        t.eq( map.getZoom(), 1, "map.zoom is correct after calling setCenter,zoom in");
-        t.eq( map.getCenter().lat, 1, "map center lat is correct after calling setCenter,zoom in");
@@ -65 +64 @@
-        map.zoomOut();
-        t.eq( map.getZoom(), 0, "map.zoom is correct after calling setCenter,zoom in, zoom out");
+    }
+    function test_06_Map_zoomend_event (t) {
+        t.plan(3);
+        map = new OpenLayers.Map('map');
+        map.events.register("zoomend", {count: 0}, function() { 
+            this.count++; 
+            t.ok(true, "zoomend event was triggered " + this.count + " times");
+            });
+        map.setCenter(new OpenLayers.LatLon(1,2), 0);
+        map.zoomIn();
+        map.zoomOut();
-    }
-    function test_99_Map_destroy (t) {