Changeset 2181

Timestamp:

01/22/07 18:26:32 (2 years ago)

Author:

crschmidt

Message:

Pull up patches for the following bugs from trunk:

#385: building for windows users (fix license)
#453: IE gives new DOM elements a parent with fragment node type
#454: Fix tests which are breaking in Opera
#455: Util.isEquivalentUrl broken in Opera
#463: map.setBaseLayer is a bit funky
#464: Overview Map dissappears when on permalinked page
#465: allow controls to live outside viewport (for real)
#466: HTMLDivElement is still undefined in IE7 (but

OpenLayers.Util.alphaHack() is now false)

#467: isEquivalentURL() not complete for IE
#468: Overview MapLosing Rectangle
#469: Default marker is incorrectly centered
#470: Can not use "search" property IE7
#473: Remove call to checkImgURL
#474: overview map isn't properly updated when the argparser kicks in

Files:

• branches/openlayers/2.3/build/build.py (modified) (1 diff)
• branches/openlayers/2.3/lib/OpenLayers/Control/OverviewMap.js (modified) (4 diffs)
• branches/openlayers/2.3/lib/OpenLayers/Events.js (modified) (1 diff)
• branches/openlayers/2.3/lib/OpenLayers/Map.js (modified) (4 diffs)
• branches/openlayers/2.3/lib/OpenLayers/Marker.js (modified) (1 diff)
• branches/openlayers/2.3/lib/OpenLayers/Tile/Image.js (modified) (2 diffs)
• branches/openlayers/2.3/lib/OpenLayers/Util.js (modified) (4 diffs)
• branches/openlayers/2.3/tests/test_Icon.html (modified) (1 diff)
• branches/openlayers/2.3/tests/test_Layer_EventPane.html (modified) (2 diffs)
• branches/openlayers/2.3/tests/test_Layer_WMS.html (modified) (1 diff)
• branches/openlayers/2.3/tests/test_Marker.html (modified) (2 diffs)
• branches/openlayers/2.3/tests/test_Popup.html (modified) (2 diffs)
• branches/openlayers/2.3/tests/test_Util.html (modified) (14 diffs)
• branches/openlayers/2.3/theme/default/style.css (modified) (1 diff)

branches/openlayers/2.3/build/build.py

@@ -15 +15 @@
-    outputFilename = sys.argv[2]
-
-print "Adding license file."
-merged = file("license.txt").read()
-print "Merging libraries."
-+
+
-print "Compressing."
-minimized = jsmin.jsmin(merged)
+print "Adding license file."
+minimized = file("license.txt").read() + minimized
-
-print "Writing to %s." % outputFilename

branches/openlayers/2.3/lib/OpenLayers/Control/OverviewMap.js

@@ -134 +134 @@
-        });
-        this.rectEvents = new OpenLayers.Events(this, this.extentRectangle);
-        this.rectEvents.register('mouseover', this, this.rectMouseOver);
-        this.rectEvents.register('mouseout', this, this.rectMouseOut);
-        this.rectEvents.register('mousedown', this, this.rectMouseDown);
@@ -148 +147 @@
-        // Optionally add min/max buttons if the control will go in the
-        // map viewport.
-
-
+
-            this.div.className = 'olControlOverviewMapContainer';
-            var imgLocation = OpenLayers.Util.getImagesLocation();
@@ -188 +186 @@
-            this.element.style.display = '';
-        }
-
+
+
+
-        return this.div;
-    },
@@ -200 +200 @@
-    * @param {OpenLayers.Event} evt
-    */
-    rectMouseOver: function (evt) {
-        this.extentRectangle.style.cursor = 'move';
-    },
-
-    /**
-    * @param {OpenLayers.Event} evt
-    */
-    rectMouseOut: function (evt) {
-        this.extentRectangle.style.cursor = 'default';
-        if(this.rectDragStart != null) {
-            if(this.performedRectDrag) {
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-            document.onselectstart = null;
-            this.rectDragStart = null;

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

@@ -273 +273 @@
-
-        // execute all callbacks registered for specified type
-
+
+
+
+
-        if ((listeners != null) && (listeners.length > 0)) {
-            for (var i = 0; i < listeners.length; i++) {

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

@@ -432 +432 @@
-     */
-    setBaseLayer: function(newBaseLayer, noEvent) {
-
-
-
+
+
+
+
+
+
-          
-            // is newBaseLayer an already loaded layer?
@@ -440 +443 @@
-
-                // make the old base layer invisible 
-oldB
-oldB
+this.b
+this.b
-                }
-
@@ -451 +454 @@
-                var center = this.getCenter();
-                if (center != null) {
-BaseLayer
+Extent
-                        this.setCenter(center);            
-                    } else {
-BaseLayer.getExtent()
+Extent
-                    }
-                }
@@ -481 +484 @@
-     */    
-    addControlToMap: function (control, px) {
+        // If a control doesn't have a div at this point, it belongs in the
+        // viewport.
+        control.outsideViewport = (control.div != null);
-        control.setMap(this);
-        var div = control.draw(px);
-        if (div) {
-
-
+
-                div.style.zIndex = this.Z_INDEX_BASE['Control'] +
-                                    this.controls.length;

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

@@ -127 +127 @@
-    var url = OpenLayers.Util.getImagesLocation() + "marker.png";
-    var size = new OpenLayers.Size(21, 25);
-
+
+
+
+
+
-};
-    

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

@@ -118 +118 @@
-        this.imgDiv.className = 'olTileImage';
-
-
-
+
+
+
+
-
-        OpenLayers.Event.observe( this.imgDiv, "load",
-                        this.checkImgURL.bindAsEventListener(this) );
-
+
-        this.layer.div.appendChild(this.imgDiv);
-        if(this.layer.opacity != null) {
@@ -140 +142 @@
-     * when the new URL loads in the image, or (b) we don't want to display
-     * this tile after all because its new bounds are outside our maxExtent.
+     * 
+     * This function should no longer  be neccesary with the improvements to
+     * Grid.js in OpenLayers 2.3. The lack of a good isEquivilantURL function
+     * caused problems in 2.2, but it's possible that with the improved 
+     * isEquivilant URL function, this might be neccesary at some point.
+     * 
+     * See discussion in the thread at 
+     * http://openlayers.org/pipermail/dev/2007-January/000205.html
-     *
-     * @private

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

@@ -569 +569 @@
-OpenLayers.Util.getArgs = function(url) {
-    if(url == null) {
-
-
-
-
-
+
+
+
+
-    var args = new Object();
-    pairs = query.split(/[&;]/);
@@ -748 +747 @@
-    urlObj2 = OpenLayers.Util.createUrlObject(url2, options);
-
-
+all 
-    for(var key in urlObj1) {
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    }
-
@@ -790 +814 @@
-
-    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)
@@ -809 +823 @@
-        urlObject.host = urlObject.host.substring(0, newHostLength); 
-    }
-
+
+
+
+
-  //port
-    urlObject.port = ((port == "80") && (options.ignorePort80)) ? "" : port;
-                                                                     
+  //hash
+    urlObject.hash = (options.ignoreHash) ? "" : a.hash;  
+    
-  //args
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-    return urlObject; 
-};
- 
+/**
+ * @param {String} url
+ * 
+ * @returns The string with all queryString and Hash removed
+ * @type String
+ */
+OpenLayers.Util.removeTail = function(url) {
+    var head = null;
+    
+    var qMark = url.indexOf("?");
+    var hashMark = url.indexOf("#");
+
+    if (qMark == -1) {
+        head = (hashMark != -1) ? url.substr(0,hashMark) : url;
+    } else {
+        head = (hashMark != -1) ? url.substr(0,Math.min(qMark, hashMark)) 
+                                  : url.substr(0, qMark);
+    }
+    return head;
+};

branches/openlayers/2.3/tests/test_Icon.html

@@ -25 +25 @@
-    }
-
-2
+3
-        t.plan( 2 );
-        
-        icon = new OpenLayers.Icon("a",new OpenLayers.Size(5,6));
-
-        t.ok(!icon.imageDiv.style.opacity, "default icon has no opacity");
-        
-        icon.setOpacity(0.5);
-
-
+
-    }
-

branches/openlayers/2.3/tests/test_Layer_EventPane.html

@@ -4 +4 @@
-  <script type="text/javascript"><!--
-    var isMozilla = (navigator.userAgent.indexOf("compatible") == -1);
+    var isOpera = (navigator.userAgent.indexOf("Opera") != -1);
-    var layer; 
-
@@ -57 +58 @@
-//         t.plan( 2 );    
-
-document.createEventObject
+!isMozilla || isOpera
-          t.plan(4);
-        } else {

branches/openlayers/2.3/tests/test_Layer_WMS.html

@@ -182 +182 @@
-        map.zoomToMaxExtent();
-        t.eq(tLayer.opacity, "0.5", "Opacity is set correctly");
-tLayer.div.firstChild.style.opacity, "0.5"
+parseFloat(tLayer.div.firstChild.style.opacity), 0.5
-        tLayer.setOpacity("0.6");
-        t.eq(tLayer.opacity, "0.6", "setOpacity works properly");
-tLayer.div.firstChild.style.opacity, "0.6"
+parseFloat(tLayer.div.firstChild.style.opacity), 0.6
-        var pixel = new OpenLayers.Pixel(5,6);
-        var tile = tLayer.addTile(new OpenLayers.Bounds(1,2,3,4), pixel);
-        tile.draw();
-tile.imgDiv.style.opacity, "0.6"
+parseFloat(tile.imgDiv.style.opacity), 0.6
-
-    }    

branches/openlayers/2.3/tests/test_Marker.html

@@ -46 +46 @@
-    }
-
-2
+3
-        t.plan( 2 );
-        
@@ -70 +70 @@
-        marker.setOpacity(0.5);
-
-marker.icon.imageDiv.style.opacity + "", "0.5"
+parseFloat(marker.icon.imageDiv.style.opacity), 0.5
-    }
-

branches/openlayers/2.3/tests/test_Popup.html

@@ -62 +62 @@
-        var content = "charlie";
-        var color = "red";
+        var hexColor = "#ff0000";
-        var opacity = 0.5;
-        var border = "1px solid";
@@ -90 +91 @@
-        t.eq(contentDiv.innerHTML, content, "correct content div content");              
-
-
+
+
+
-
-        if (navigator.appName.indexOf("Microsoft") == -1) {

branches/openlayers/2.3/tests/test_Util.html

@@ -68 +68 @@
-        t.eq( div.style.height, sz.h + "px", "div.style.height set correctly");    
-
-
+
+
+
+
-
-        t.eq( div.style.position, position, "div.style.positionset correctly");    
-        t.ok( (div.style.border.indexOf(border) != -1), "div.style.border set correctly");    
-        t.eq( div.style.overflow, overflow, "div.style.overflow set correctly");    
-div.style.opacity + "", opacity + "", "elem
+parseFloat(div.style.opacity), opacity, "eleme
-        var filterString = 'alpha(opacity=' + (opacity * 100) + ')';
-        t.eq( div.style.filter, filterString, "element.style.filter set correctly");
@@ -96 +99 @@
-        t.eq( div.style.border, "", "div.style.border set correctly");    
-        t.eq(div.style.overflow, "", "div.style.overflow set correctly");    
-
+e
-        t.ok( !div.style.filter, "element.style.filter set correctly");
-
@@ -117 +120 @@
-            t.ok( true, "skipping element test outside of Mozilla");
-        else
- instanceof HTMLImageElement
+.nodeName == "IMG"
-        t.eq( image.id, id, "image.id set correctly");    
-        t.eq( image.style.left, xy.x + "px", "image.style.left set correctly");    
@@ -128 +131 @@
-        t.eq( image.src, img, "image.style.backgroundImage correctly");    
-        t.eq( image.style.position, position, "image.style.position set correctly");    
-image.style.opacity+"", opacity + ""
+parseFloat(image.style.opacity), opacity
-        var filterString = 'alpha(opacity=' + (opacity * 100) + ')';
-        t.eq( image.style.filter, filterString, "element.style.filter set correctly");
@@ -138 +141 @@
-            t.ok( true, "skipping element test outside of Mozilla");
-        else
- instanceof HTMLImageElement
+.nodeName == "IMG"
-        t.ok( (image.id != ""), "image.id set to something");    
-        t.eq( image.style.left, "", "image.style.left set correctly");    
@@ -149 +152 @@
-        t.eq(image.src, "", "image.style.backgroundImage correctly");    
-        t.eq( image.style.position, "relative", "image.style.positionset correctly");    
-
+e
-        t.ok( !image.style.filter, "element.style.filter default unset");
-
@@ -212 +215 @@
-
-        t.eq( imageDiv.style.position, position, "image.style.positionset correctly");    
-imageDiv.style.opacity+"", opacity + "", "elem
+parseFloat(imageDiv.style.opacity), opacity, "eleme
-        
-        var filterString;
@@ -224 +227 @@
-
-        image = imageDiv.firstChild;
-
-        if (!isMozilla)
-            t.ok( true, "skipping element test outside of Mozilla");
-        else
- instanceof HTMLImageElement
+.nodeName == "IMG"
-        t.eq( image.id, id + "_innerImage", "image.id set correctly");    
-
@@ -294 +296 @@
-        t.ok( (element.style.border.indexOf(border) != -1), "element.style.border set correctly");    
-        t.eq( element.style.overflow, overflow, "element.style.overflow set correctly");    
-element.style.opacity+"", opacity + "", "elem
+parseFloat(element.style.opacity), opacity, "eleme
-        var filterString = 'alpha(opacity=' + (opacity * 100) + ')';
-        t.eq( element.style.filter, filterString, "element.style.filter set correctly");
@@ -314 +316 @@
-
-        OpenLayers.Util.modifyAlphaImageDiv(imageDiv, id, xy, sz, img, position, border, sizing, opacity);
-
-        if (OpenLayers.Util.alphaHack())
-            t.ok( true, "skipping element test outside of Mozilla");
-        else
- instanceof HTMLDivElement
+.nodeName == "DIV"
-
-        t.eq( imageDiv.id, id, "image.id set correctly");    
@@ -328 +329 @@
-
-        t.eq( imageDiv.style.position, position, "image.style.position set correctly");    
-imageDiv.style.opacity+"", opacity + "", "elem
+parseFloat(imageDiv.style.opacity), opacity, "eleme
-
-        
@@ -340 +341 @@
-        } else {
-            var filterString = 'alpha(opacity=' + (opacity * 100) + ')';
- instanceof HTMLImageElement
+.nodeName == "IMG"
-        }
-        t.eq( imageDiv.style.filter, filterString, "element.style.filter set correctly");
@@ -517 +518 @@
-
-        t.ok(OpenLayers.Util.isEquivalentUrl(url1, url2), "default ignorePort80 works"); 
+
-        options = {
-            'ignorePort80': false
-        }        
-
-        url1 = "http://www.openlayers.org:80";
-        url2 = "http://www.openlayers.org:50";
-
-
+, options
-
-
@@ -547 +548 @@
-
-  //PATHNAME
-
-foo.html
+?bar=now#go
+../tests/foo.html?bar=now#go
-
-        t.ok(OpenLayers.Util.isEquivalentUrl(url1, url2), "relative vs. absolute paths works"); 

branches/openlayers/2.3/theme/default/style.css

@@ -57 +57 @@
-
-.olControlOverviewMapExtentRectangle {
+   cursor: move;
-    border: 2px dotted red;
-}