Changeset 1634

Timestamp:

10/05/06 23:28:53 (2 years ago)

Author:

euzuro

Message:

break permalink into two controls: permalink and argparser. make the arg parser a default control that is added to the map. furthermore, make it such that on addition to the map, the permalink will hunt through the maps controls to make sure there is an argparser control loaded, and if not it will load one itself. now we add a new parameter to the permalink suite: 'layer'. the application will now save the layer visibility information. finally, update tests so nothing breaks.

Files:

• trunk/openlayers/lib/OpenLayers.js (modified) (1 diff)
• trunk/openlayers/lib/OpenLayers/Control/ArgParser.js (copied) (copied from trunk/openlayers/lib/OpenLayers/Control/Permalink.js) (3 diffs)
• trunk/openlayers/lib/OpenLayers/Control/Permalink.js (modified) (4 diffs)
• trunk/openlayers/lib/OpenLayers/Map.js (modified) (1 diff)
• trunk/openlayers/tests/test_Control_MouseToolbar.html (modified) (1 diff)
• trunk/openlayers/tests/test_Control_PanZoom.html (modified) (1 diff)
• trunk/openlayers/tests/test_Control_Permalink.html (modified) (1 diff)

trunk/openlayers/lib/OpenLayers.js

@@ -94 +94 @@
-        "OpenLayers/Control/PanZoom.js",
-        "OpenLayers/Control/PanZoomBar.js",
+        "OpenLayers/Control/ArgParser.js",
-        "OpenLayers/Control/Permalink.js",
-        "OpenLayers/Control/Scale.js",

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

@@ -8 +8 @@
- * @requires OpenLayers/Control.js
- */
-Permalink
-Permalink
+ArgParser
+ArgParser
-  OpenLayers.Util.extend( new OpenLayers.Control(), {
-
-    /** @type DOMElement */
-    element: null,
-    
-    /** @type String */
-    base: '',
-    
-    /** @type OpenLayers.LonLat */
-    center: null,
@@ -35 +29 @@
-    initialize: function(element, base) {
-        OpenLayers.Control.prototype.initialize.apply(this, arguments);
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-        }
-    },
-
-    /**
-     * @type DOMElement
-     */    
-    draw: function() {
-        OpenLayers.Control.prototype.draw.apply(this, arguments);
-        var args = OpenLayers.Util.getArgs();
-
-        if (args.lat && args.lon) {
-            this.center = new OpenLayers.LonLat(parseFloat(args.lon),
-                                                parseFloat(args.lat));
-            if (args.zoom) {
-                this.zoom = parseInt(args.zoom);
-            }
-
-            // when we add a new baselayer to see when we can set the center
-            this.map.events.register('changebaselayer', this, this.setCenter);
-            this.setCenter();
-        }
-
-        if (args.layers) {
-            this.layers = args.layers;
-
-            // when we add a new layer, set its visibility 
-            this.map.events.register('addlayer', this, this.configureLayers);
-            this.configureLayers();
-        }
-        
-        if (!this.element) {
-            this.element = document.createElement("a");
-            this.div.style.right = "3px";
-            this.div.style.bottom = "3px";
-            this.div.style.left = "";
-            this.div.style.top = "";
-            this.div.style.display = "block";
-            this.div.style.position = "absolute";
-            this.element.style.fontSize="smaller";
-            this.element.innerHTML = "Permalink";
-            this.element.href="";
-            this.div.appendChild(this.element);
-        }
-        this.map.events.register('moveend', this, this.updateLink);
-        return this.div;
-    },
-   
-    /**
-     * 
-     */
-    updateLink: function() {
-        var center = this.map.getCenter();
-        var zoom = "zoom=" + this.map.getZoom(); 
-        var lat = "lat=" + Math.round(center.lat*100000)/100000;
-        var lon = "lon=" + Math.round(center.lon*100000)/100000;
-
-        var layers = "layers=";
-        for(var i=0; i< this.map.layers.length; i++) {
-            var layer = this.map.layers[i];
-
-            if (layer.isBaseLayer) {
-                layers += (layer == this.map.baseLayer) ? "B" : "0";
-            } else {
-                layers += (layer.getVisibility()) ? "T" : "F";           
-            }
-        }
-        var href = this.base + "?" + lat + "&" + lon + "&" + zoom + 
-                                   "&" + layers; 
-        this.element.href = href;
-    }, 
-
-    /** As soon as a baseLayer has been loaded, we center and zoom
-     *   ...and remove the handler.
@@ -146 +110 @@
-    
-    /** @final @type String */
-Permalink
+ArgParser
-});

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

@@ -17 +17 @@
-    /** @type String */
-    base: '',
-    
-    /** @type OpenLayers.LonLat */
-    center: null,
-    
-    /** @type int */
-    zoom: null,
-
-    /** @type Array */
-    layers: null,
-
-    /**
@@ -41 +32 @@
-    },
-
+    /** Set the map property for the control. 
+     * 
+     * @param {OpenLayers.Map} map
+     */
+    setMap: function(map) {
+        OpenLayers.Control.prototype.setMap.apply(this, arguments);
+
+        //make sure we have an arg parser attached
+        for(var i=0; i< this.map.controls.length; i++) {
+            var control = this.map.controls[i];
+            if (control.CLASS_NAME == "OpenLayers.Control.ArgParser") {
+                break;
+            }
+        }
+        if (i == this.map.controls.length) {
+            this.map.addControl(new OpenLayers.Control.ArgParser());       
+        }
+
+    },
+
-    /**
-     * @type DOMElement
@@ -46 +57 @@
-    draw: function() {
-        OpenLayers.Control.prototype.draw.apply(this, arguments);
-        var args = OpenLayers.Util.getArgs();
-
-        if (args.lat && args.lon) {
-            this.center = new OpenLayers.LonLat(parseFloat(args.lon),
-                                                parseFloat(args.lat));
-            if (args.zoom) {
-                this.zoom = parseInt(args.zoom);
-            }
-
-            // when we add a new baselayer to see when we can set the center
-            this.map.events.register('changebaselayer', this, this.setCenter);
-            this.setCenter();
-        }
-
-        if (args.layers) {
-            this.layers = args.layers;
-
-            // when we add a new layer, set its visibility 
-            this.map.events.register('addlayer', this, this.configureLayers);
-            this.configureLayers();
-        }
-        
-        if (!this.element) {
-            this.element = document.createElement("a");
@@ -109 +99 @@
-    }, 
-
-    /** As soon as a baseLayer has been loaded, we center and zoom
-     *   ...and remove the handler.
-     */
-    setCenter: function() {
-        
-        if (this.map.baseLayer) {
-            //dont need to listen for this one anymore
-            this.map.events.unregister('changebaselayer', this, 
-                                       this.setCenter);
-                                       
-            this.map.setCenter(this.center, this.zoom);
-        }
-    },
-
-    /** As soon as all the layers are loaded, cycle through them and 
-     *   hide or show them. 
-     */
-    configureLayers: function() {
-
-        if (this.layers.length == this.map.layers.length) { 
-            this.map.events.unregister('addlayer', this, this.configureLayers);
-
-            for(var i=0; i < this.layers.length; i++) {
-                
-                var layer = this.map.layers[i];
-                var c = this.layers.charAt(i);
-                
-                if (c == "B") {
-                    this.map.setBaseLayer(layer);
-                } else if ( (c == "T") || (c == "F") ) {
-                    layer.setVisibility(c == "T");
-                }
-            }
-        }
-    },     
-    
-    /** @final @type String */
-    CLASS_NAME: "OpenLayers.Control.Permalink"

trunk/openlayers/lib/OpenLayers/Map.js

@@ -165 +165 @@
-            if (OpenLayers.Control != null) { // running full or lite?
-                this.controls = [ new OpenLayers.Control.MouseDefaults(),
-
+
+
+
-            } else {
-                this.controls = [];

trunk/openlayers/tests/test_Control_MouseToolbar.html

@@ -18 +18 @@
-        map.addControl(control);
-        t.ok( control.map === map, "Control.map is set to the map object" );
-2
-3
-3
+3
+4
+4
-        t.eq( control.div.style.top, "6px", "Control div top located correctly by default");
-

trunk/openlayers/tests/test_Control_PanZoom.html

@@ -18 +18 @@
-        map.addControl(control);
-        t.ok( control.map === map, "Control.map is set to the map object" );
-2
-3
-3
+3
+4
+4
-        t.eq( control.div.style.top, "4px", "Control div top located correctly by default");
-

trunk/openlayers/tests/test_Control_Permalink.html

@@ -47 +47 @@
-        map = new OpenLayers.Map($('map'));
-        map.addControl(control);
-2
+3
-  }
-  // -->