Changeset 2234

Timestamp:

02/16/07 16:10:02 (2 years ago)

Author:

crschmidt

Message:

Pullups for 2.3:
svn merge svn.openlayers.org/trunk/openlayers/@2230 svn.openlayers.org/trunk/openlayers/@2233 svn.openlayers.org/branches/openlayers/2.3/
#480 Grid funkiness
#491 improper URL encoding of LAYERS list in WMS GetMap request
#500 layer.destroy() should remove itself from the map but not set new baselayer

Files:

• branches/openlayers/2.3/lib/OpenLayers/Layer.js (modified) (1 diff)
• branches/openlayers/2.3/lib/OpenLayers/Map.js (modified) (6 diffs)
• branches/openlayers/2.3/lib/OpenLayers/Tile/Image.js (modified) (3 diffs)
• branches/openlayers/2.3/lib/OpenLayers/Util.js (modified) (3 diffs)
• branches/openlayers/2.3/tests/grid_inittiles.html (modified) (1 diff)
• branches/openlayers/2.3/tests/test_Util.html (modified) (2 diffs)

branches/openlayers/2.3/lib/OpenLayers/Layer.js

@@ -138 +138 @@
-     * Destroy is a destructor: this is to alleviate cyclic references which
-     * the Javascript garbage cleaner can not take care of on its own.
-
-
+
+
+
+
+
+
+
+
+
-        if (this.map != null) {
-
+, setNewBaseLayer
-        }
-        this.map = null;

branches/openlayers/2.3/lib/OpenLayers/Map.js

@@ -77 +77 @@
-    /** @type int */
-    zoom: 0,    
+
+    /** Used to store a unique identifier that changes when the map view 
+     * changes. viewRequestID should be used when adding data asynchronously 
+     * to the map: viewRequestID is incremented when you initiate your 
+     * request (right now during changing of baselayers and changing of zooms). 
+     * It is stored here in the map and also in the data that will be coming 
+     * back asynchronously. Before displaying this data on request completion, 
+     * we check that the viewRequestID of the data is still the same as that 
+     * of the map. Fix for #480
+     * 
+     * @type String */
+    viewRequestID: 0,
-
-  // Options
@@ -202 +214 @@
-        if (this.layers != null) {
-            for(var i=0; i< this.layers.length; i++) {
-
+
+
+
-            } 
-            this.layers = null;
@@ -345 +359 @@
-     * 
-     * @param {OpenLayers.Layer} layer
-
-
+
+
+
+
+
+
+
-        if (layer.isFixed) {
-            this.viewPortDiv.removeChild(layer.div);
@@ -356 +375 @@
-
-        // if we removed the base layer, need to set a new one
-this.baseLayer == layer
+setNewBaseLayer && (this.baseLayer == layer)
-            this.baseLayer = null;
-            for(i=0; i < this.layers.length; i++) {
@@ -449 +468 @@
-                // set new baselayer and make it visible
-                this.baseLayer = newBaseLayer;
+                
+                // Increment viewRequestID since the baseLayer is 
+                // changing. This is used by tiles to check if they should 
+                // draw themselves.
+                this.viewRequestID++;
-                this.baseLayer.setVisibility(true, noEvent);
-
@@ -744 +768 @@
-                    this.popups[i].updatePosition();
-                }
+
+                // zoom level has changed, increment viewRequestID.
+                this.viewRequestID++;
-            }    
-            

branches/openlayers/2.3/lib/OpenLayers/Tile/Image.js

@@ -35 +35 @@
-        if ((this.imgDiv != null) && (this.imgDiv.parentNode == this.layer.div)) {
-            this.layer.div.removeChild(this.imgDiv);
+            this.imgDiv.map = null;
-        }
-        this.imgDiv = null;
@@ -53 +54 @@
-            this.initImgDiv();
-        }
+
+        this.imgDiv.viewRequestID = this.layer.map.viewRequestID;
-        
-        this.url = this.layer.getURL(this.bounds);
@@ -133 +136 @@
-                                             this.layer.opacity);
-        }
+
+        // we need this reference to check back the viewRequestID
+        this.imgDiv.map = this.layer.map;
+
-    },
-

branches/openlayers/2.3/lib/OpenLayers/Util.js

@@ -218 +218 @@
-
-OpenLayers.Util.onImageLoad = function() {
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-};
-
@@ -378 +395 @@
-*    http parameter notation. 
-*    (ex. <i>"key1=value1&key2=value2&key3=value3"</i>)
+*    If a parameter is actually a list, that parameter will then
+*    be set to a comma-seperated list of values (foo,bar) instead
+*    of being URL escaped (foo%3Abar). 
-* @type String
-*/
@@ -384 +404 @@
-    
-    for (var key in params) {
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    }
-    

branches/openlayers/2.3/tests/grid_inittiles.html

@@ -12 +12 @@
-        <!--
-        function init(){
-
+var 
-            ww = new OpenLayers.Layer.WMS( "Basic", 
-            "http://labs.metacarta.com/wms-c/Basic.py?", 

branches/openlayers/2.3/tests/test_Util.html

@@ -178 +178 @@
-
-    function test_07_Util_getParameterString(t) {
-2
+4
-
-        var params = { foo: "bar",
@@ -186 +186 @@
-        t.eq( OpenLayers.Util.getParameterString(params), "foo=bar&chicken=1.5", "getParameterString returns correctly");    
-        t.eq( OpenLayers.Util.getParameterString({'a:':'b='}), "a%3A=b%3D", "getParameterString returns correctly with non-ascii keys/values");    
+        
+
+        // Parameters which are a list should end up being a comma-seperated
+        // list of the URL encoded strings
+        var params = { foo: ["bar,baz"] };
+        t.eq( OpenLayers.Util.getParameterString(params), "foo=bar%2Cbaz", "getParameterString encodes , correctly in arrays");    
+        
+        var params = { foo: ["bar","baz,"] };
+        t.eq( OpenLayers.Util.getParameterString(params), "foo=bar,baz%2C", "getParameterString returns with list of CSVs when given a list. ");    
-    }
-