Changeset 2852

Timestamp:

03/22/07 13:47:40 (2 years ago)

Author:

euzuro

Message:

final fix for #410

Files:

• trunk/openlayers/lib/OpenLayers/Layer/HTTPRequest.js (modified) (6 diffs)
• trunk/openlayers/tests/Layer/test_HTTPRequest.html (modified) (2 diffs)
• trunk/openlayers/tests/Layer/test_WMS.html (modified) (1 diff)

trunk/openlayers/lib/OpenLayers/Layer/HTTPRequest.js

@@ -13 +13 @@
-  OpenLayers.Class.inherit( OpenLayers.Layer, {
-
-
+
+
+
+
+
+
+
+
+
+
+
-    url: null,
-
-    /** Hashtable of key/value parameters
+     * 
-     * @type Object */
-    params: null,
@@ -33 +44 @@
-     * 
-     * @param {String} name
-
+Array(String) or 
-     * @param {Object} params
-     * @param {Object} options Hashtable of extra options to tag onto the layer
@@ -92 +103 @@
-    
-    /**
+     * selectUrl() implements the standard floating-point multiplicative
+     * hash function described by Knuth, and hashes the contents of the 
+     * given param string into a float between 0 and 1. This float is then
+     * scaled to the size of the provided urls array, and used to select
+     * a URL.
+     *
-     * @param {String} paramString
-     * @param {Array(String)} urls
+     * 
+     * @returns An entry from the urls array, deterministically selected based
+     *           on the paramString.
+     * @type String
+     * 
-     */
-    selectUrl: function(paramString, urls) {
-        var product = 1;
-        for (var i = 0; i < paramString.length; i++) { 
-(Math.sqrt(5) - 1) / Math.sqrt(3);
+this.URL_HASH_FACTOR; 
-            product -= Math.floor(product); 
-        }
@@ -112 +134 @@
-     *        "server?key1=value1&key2=value2&key3=value3"
-     * 
+     * WARNING: The altUrl parameter is deprecated and will be removed in 3.0.
+     *
-     * @param {Object} newParams
-     * @param {String} altUrl Use this as the url instead of the layer's url
+     *   
-     * 
-     * @type String
-     */
-    getFullRequestString:function(newParams, altUrl) {
-
-use layer's url unless altUrl passed in
-(altUrl == null) ? this.url : altU
+
+if not altUrl passed in, use layer's url
+altUrl || this.u
-        
-        // create a new params hashtable with all the layer params and the 
@@ -126 +151 @@
-        var allParams = OpenLayers.Util.extend(new Object(), this.params);
-        allParams = OpenLayers.Util.extend(allParams, newParams);
+        var paramsString = OpenLayers.Util.getParameterString(allParams);
+        
+        // if url is not a string, it should be an array of strings, 
+        // in which case we will deterministically select one of them in 
+        // order to evenly distribute requests to different urls.
+        //
+        if (url instanceof Array) {
+            url = this.selectUrl(paramsString, url);
+        }   
+ 
-        // ignore parameters that are already in the url search string
-        var urlParams = 
@@ -134 +169 @@
-            }
-        }
-
-
-
-
-
-
-
-
+
-        
-        // requestString always starts with url

trunk/openlayers/tests/Layer/test_HTTPRequest.html

@@ -159 +159 @@
-        layer = new OpenLayers.Layer.HTTPRequest(name, tUrl, tParams, null);
-        str = layer.getFullRequestString();
-0
-f
-1] + '?' + OpenLayers.Util.getParameterString(OpenLayers.Util.extend(tParams,{'a':'f
+1
+b
+0] + '?' + OpenLayers.Util.getParameterString(OpenLayers.Util.extend(tParams,{'a':'b
-
-    }
@@ -171 +171 @@
-
-        urls = ["wms1", "wms2", "wms3", "wms4"]; 
-4
-3
+3
+1
-        t.eq( layer.selectUrl("bbox=0,90,180,0",   urls), "wms1", "selectUrl(-90,180) returns 1" ); 
-2
+4
-    }
-

trunk/openlayers/tests/Layer/test_WMS.html

@@ -214 +214 @@
-        map.addLayer(wmslayer);
-        map.setCenter(new OpenLayers.LonLat(0,0), 5);
-
+
+
-        t.eq( tile.bounds.left, -22.5, "left side matches" ); 
-        t.eq( tile.bounds.right, -11.25, "top side matches" );