Ticket #359: permalink.2.patch

tests/Control/test_Permalink.html

@@ -10 +10 @@
-        t.ok( control instanceof OpenLayers.Control.Permalink, "new OpenLayers.Control returns object" );
-        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) {
-        t.plan( 2 );
-    
-        control = new OpenLayers.Control.Permalink('permalink');
-        t.ok( control instanceof OpenLayers.Control.Permalink, "new OpenLayers.Control returns object" );
-        map = new OpenLayers.Map('map');
-        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);
-if (/MSIE/.test(navigator.userAgent)) {
-    t.eq(OpenLayers.Util.getElement('permalink').href, "?lat=0&lon=1.75781&zoom=2&layers=B", "Panning sets permalink");
-} else {
-    t.eq(OpenLayers.Util.getElement('permalink').href, location+"?lat=0&lon=1.75781&zoom=2&layers=B", "Panning sets permalink");
-}
+t.ok(OpenLayers.Util.isEquivalentUrl(OpenLayers.Util.getElement('permalink').href, location+"?lat=0&lon=1.75781&zoom=2&layers=BT"), 'pan sets permalink');
+
+map.layers[1].setVisibility(false);
+
+t.ok(OpenLayers.Util.isEquivalentUrl(OpenLayers.Util.getElement('permalink').href, location+"?lat=0&lon=1.75781&zoom=2&layers=BF"), 'setVisibility sets permalink');
-    }
-    function test_03_Control_Permalink_updateLinksBase (t) {
-        t.plan( 2 );

lib/OpenLayers/Control/Permalink.js

@@ -96 +96 @@
-            this.div.appendChild(this.element);
-        }
-        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;
-    },
-   
@@ -104 +106 @@
-     */
-    updateLink: function() {
-        var center = this.map.getCenter();
+        
+        // Map not initialized yet. Return null.
+        if (!center) { return null; }
+        
-        var zoom = "zoom=" + this.map.getZoom(); 
-        var lat = "lat=" + Math.round(center.lat*100000)/100000;
-        var lon = "lon=" + Math.round(center.lon*100000)/100000;