Changeset 2093

Timestamp:

12/22/06 14:03:32 (2 years ago)

Author:

crschmidt

Message:

Tests, example change, and Util addition, plus usage in Tile/Image to allow
use of relative URLs, urls with port 80 in them, etc. patch originally from
tschaub, revised by euzuro, reviewed by me.

Files:

• trunk/openlayers/examples/fullScreen.html (modified) (1 diff)
• trunk/openlayers/lib/OpenLayers/Tile/Image.js (modified) (1 diff)
• trunk/openlayers/lib/OpenLayers/Util.js (modified) (1 diff)
• trunk/openlayers/tests/test_Util.html (modified) (1 diff)

trunk/openlayers/examples/fullScreen.html

@@ -15 +15 @@
-
-            var ol_wms = new OpenLayers.Layer.WMS( "OpenLayers WMS", 
-
+:80
-
-            var jpl_wms = new OpenLayers.Layer.WMS( "NASA Global Mosaic",

trunk/openlayers/lib/OpenLayers/Tile/Image.js

@@ -148 +148 @@
-        if (this.layer) {
-            var loaded = this.layer.alpha ? this.imgDiv.firstChild.src : this.imgDiv.src;
-loaded != this.url
+!OpenLayers.Util.isEquivalentUrl(loaded, this.url)
-                this.imgDiv.style.display = "none";
-            }

trunk/openlayers/lib/OpenLayers/Util.js

@@ -710 +710 @@
-    return [valueL, valueT];
-};
+
+
+/** Test two URLs for equivalence. 
+ * 
+ * Setting 'ignoreCase' allows for case-independent comparison.
+ * 
+ * Comparison is based on: 
+ *  - Protocol
+ *  - Host (evaluated without the port)
+ *  - Port (set 'ignorePort80' to ignore "80" values)
+ *  - Hash ( set 'ignoreHash' to disable)
+ *  - Pathname (for relative <-> absolute comparison) 
+ *  - Arguments (so they can be out of order)
+ *  
+ * 
+ *
+ * @param {String} url1
+ * @param {String} url2
+ * @param {Object} options allows for customization of comparison:
+ *                         'ignoreCase' - Default is True
+ *                         'ignorePort80' - Default is True
+ *                         'ignoreHash' - Default is True
+ *
+ * @returns Whether or not the two URLs are equivalent
+ * @type Boolean
+ */
+OpenLayers.Util.isEquivalentUrl = function(url1, url2, options) {
+    options = options || new Object();
+
+    OpenLayers.Util.applyDefaults(options, {
+        ignoreCase: true,
+        ignorePort80: true,
+        ignoreHash: true
+    });
+
+    urlObj1 = OpenLayers.Util.createUrlObject(url1, options);
+    urlObj2 = OpenLayers.Util.createUrlObject(url2, options);
+
+    //compare keys (host, port, etc)
+    for(var key in urlObj1) {
+        if ( (key != "args") && (urlObj1[key] != urlObj2[key]) ) {
+            return false;
+        }
+    }
+
+    // compare search args - irrespective of order
+    for(var key in urlObj1.args) {
+        if(urlObj1.args[key] != urlObj2.args[key]) {
+            return false;
+        }
+        delete urlObj2.args[key];
+    }
+    // urlObj2 shouldn't have any args left
+    for(var key in urlObj2.args) {
+        return false;
+    }
+    
+    return true;
+};
+
+/**
+ * @private
+ *
+ * @param {String} url
+ * @param {Object} options
+ * 
+ * @returns An object with separate url, a, port, host, and args parsed out 
+ *            and ready for comparison
+ * @type Object
+ */
+OpenLayers.Util.createUrlObject = function(url, options) {
+    options = options || new Object();
+
+    var urlObject = new Object();
+  
+    if (options.ignoreCase) {
+        url = url.toLowerCase(); 
+    }
+
+    var a = document.createElement('a');
+
+    a.href = url;
+    
+  //protocol
+    urlObject.protocol = a.protocol;  
+  
+  //pathname (this part allows for relative <-> absolute comparison)
+    urlObject.pathname = a.pathname;  
+    
+  //hash
+    urlObject.hash = (options.ignoreHash) ? "" : a.hash;  
+    
+  //host (without port)
+    urlObject.host = a.host;
+    var port = a.port;
+    if (port.length <= 0) {
+        var newHostLength = urlObject.host.length - (port.length);
+        urlObject.host = urlObject.host.substring(0, newHostLength); 
+    }
+    
+  //port
+    urlObject.port = ((port == "80") && (options.ignorePort80)) ? "" : port;
+                                                                     
+  //args
+    urlObject.args = OpenLayers.Util.getArgs(a.search);
+
+    return urlObject; 
+};
+ 

trunk/openlayers/tests/test_Util.html

@@ -491 +491 @@
-        t.eq(OpenLayers.Util.getImagesLocation().substr(OpenLayers.Util.getImagesLocation().length-4,4), "img/", "ImgPath works as expected when set to ''."); 
-    }
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-  </script>
-</head>