Changeset 4228

Timestamp:

09/11/07 23:26:35 (1 year ago)

Author:

euzuro

Message:

make sure permalink updates itself when layers change name/visibility or when a baselayer switch is made. (Closes #359)

Files:

• trunk/openlayers/lib/OpenLayers/Control/Permalink.js (modified) (2 diffs)
• trunk/openlayers/tests/Control/test_Permalink.html (modified) (2 diffs)

trunk/openlayers/lib/OpenLayers/Control/Permalink.js

@@ -94 +94 @@
-        }
-        this.map.events.register('moveend', this, this.updateLink);
+        this.map.events.register('changelayer', this, this.updateLink);
+        this.map.events.register('changebaselayer', this, this.updateLink);
-        return this.div;
-    },
@@ -102 +104 @@
-    updateLink: function() {
-        var center = this.map.getCenter();
+        
+        // Map not initialized yet. Break out of this function.
+        if (!center) { 
+            return; 
+        }
+        
-        var zoom = "zoom=" + this.map.getZoom(); 
-        var lat = "lat=" + Math.round(center.lat*100000)/100000;

trunk/openlayers/tests/Control/test_Permalink.html

@@ -11 +11 @@
-        t.eq( control.displayClass,  "olControlPermalink", "displayClass is correct" );
-    }
+    function test_Control_Permalink_uncentered (t) {
+        t.plan( 1 );
+    
+        control = new OpenLayers.Control.Permalink('permalink');
+        map = new OpenLayers.Map('map');
+        map.addControl(control);
+        map.events.triggerEvent("changelayer", {});
+        t.ok(true, "permalink didn't bomb out.");
+    }   
-    function test_02_Control_Permalink_updateLinks (t) {
-2
+3
-    
-        control = new OpenLayers.Control.Permalink('permalink');
@@ -19 +28 @@
-        layer = new OpenLayers.Layer.WMS('Test Layer', "http://octo.metacarta.com/cgi-bin/mapserv", {map: '/mapdata/vmap_wms.map', layers: 'basic', format: 'image/jpeg'});
-        map.addLayer(layer);
+        layer = new OpenLayers.Layer.WMS('Test Layer', "http://octo.metacarta.com/cgi-bin/mapserv", {map: '/mapdata/vmap_wms.map', layers: 'basic', format: 'image/jpeg'}, {'isBaseLayer': false});
+        map.addLayer(layer);
+        layer.setVisibility(true);
-        if (!map.getCenter())  map.zoomToMaxExtent();
-        map.addControl(control);
-        map.pan(5, 0);
-
+
+
+
+
+
-    }
-    function test_03_Control_Permalink_updateLinksBase (t) {