Changeset 2230

Timestamp:

02/16/07 14:08:01 (2 years ago)

Author:

sderle

Message:

Pull up r2181:r2229 to 2.3 branch. Includes fixes for:

#429 fix panning for odd size viewport
#478 Double clicking overview map expand/contract button zooms in Safari
#484 conflict between _addButton of MouseToolbar and PanZoom
#485 null pointer exception on CTRL+F5 in IE for WMS.Untiled
#486 add a few sanity checks to overview map
#489 requires tag incorrect in OverviewMap.js
#498 overviewmap: rectangle has minimum height in IE

Files:

• branches/openlayers/2.3/lib/OpenLayers/Control/OverviewMap.js (modified) (7 diffs)
• branches/openlayers/2.3/lib/OpenLayers/Control/PanZoom.js (modified) (1 diff)
• branches/openlayers/2.3/lib/OpenLayers/Layer.js (modified) (4 diffs)
• branches/openlayers/2.3/lib/OpenLayers/Layer/WMS/Untiled.js (modified) (4 diffs)
• branches/openlayers/2.3/lib/OpenLayers/Util.js (modified) (1 diff)
• branches/openlayers/2.3/tests/grid_inittiles.html (copied) (copied from trunk/openlayers/tests/grid_inittiles.html)

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

@@ -7 +7 @@
- */
-
-// @require: OpenLayers/Control.js
-
-/** 
-
-
+
+
+
+
-OpenLayers.Control.OverviewMap = OpenLayers.Class.create();
-
@@ -107 +107 @@
-        this.extentRectangle.style.position = 'absolute';
-        this.extentRectangle.style.zIndex = 1000;  //HACK
+        this.extentRectangle.style.overflow = 'hidden';
-        this.extentRectangle.style.backgroundImage = 'url(' +
-                                        OpenLayers.Util.getImagesLocation() +
@@ -163 +164 @@
-                          'click', 
-                          this.maximizeControl.bindAsEventListener(this));
+            OpenLayers.Event.observe(this.maximizeDiv,
+                          'dblclick',
+                          function(e) {
+                              OpenLayers.Event.stop(e);
+                          });
-            this.div.appendChild(this.maximizeDiv);
-    
@@ -178 +184 @@
-                          'click', 
-                          this.minimizeControl.bindAsEventListener(this));
-
+
+
+
+
+
-            this.div.appendChild(this.minimizeDiv);
-            
@@ -419 +429 @@
-        // as the base layer for the main map.  This should be made more robust.
-        if(this.map.units != 'degrees') {
-map.getProjection() != this.ovmap.getProjection(
+ovmap.getProjection() && (this.map.getProjection() != this.ovmap.getProjection()
-                alert('The overview map only works when it is in the same projection as the main map');
-            }
-        }
-        var pxBounds = this.getRectBoundsFromMapBounds(this.map.getExtent());
-
+
+
+
-    },
-    
@@ -480 +492 @@
-        var leftBottomPx = this.getOverviewPxFromLonLat(leftBottomLonLat);
-        var rightTopPx = this.getOverviewPxFromLonLat(rightTopLonLat);
-
-
+
+
+
+
+
+
-    },
-
@@ -531 +547 @@
-        var res  = this.ovmap.getResolution();
-        var extent = this.ovmap.getExtent();
-
-
-
-
+
+
+
+
+
+
+
-    },
-

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

@@ -86 +86 @@
-
-        btn.onmousedown = this.buttonDown.bindAsEventListener(btn);
+        btn.onmouseup = this.doubleClick.bindAsEventListener(btn);
-        btn.ondblclick  = this.doubleClick.bindAsEventListener(btn);
-        btn.onclick  = this.doubleClick.bindAsEventListener(btn);
-        btn.action = id;
-        btn.map = this.map;

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

@@ -18 +18 @@
-    /** @type DOMElement */
-    div: null,
+
+    /** supported application event types
+     * 
+     * @type Array */
+    EVENT_TYPES: [ 
+        "loadstart", "loadend", "loadcancel"],
+
+    /** @type OpenLayers.Events */
+    events: null,
-
-    /** This variable is set when the layer is added to the map, via the 
@@ -122 +131 @@
-            this.div.id = this.id;
-        }
+
+        this.events = new OpenLayers.Events(this, this.div, this.EVENT_TYPES);
-    },
-    
@@ -136 +147 @@
-        this.div = null;
-        this.options = null;
+        this.events = null;
-    },
-    
@@ -509 +521 @@
-            var res  = this.map.getResolution();
-        
-Math.ceil
-Math.ceil
+
+
-            
-            lonlat = new OpenLayers.LonLat(center.lon + delta_x * res ,

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

@@ -31 +31 @@
-    /** @type OpenLayers.Tile.Image */
-    tile: null,
-
+
+
+
+
-
-    /**
@@ -64 +67 @@
-     */
-    destroy: function() {
-
-
+
+
+
+
-        OpenLayers.Layer.HTTPRequest.prototype.destroy.apply(this, arguments);
-    },
@@ -109 +114 @@
-     */
-    moveTo:function(bounds, zoomChanged, dragging) {
+        if (!this.doneLoading) {
+            this.events.triggerEvent("loadcancel"); 
+            this.doneLoading = true; 
+        }
-        OpenLayers.Layer.HTTPRequest.prototype.moveTo.apply(this,arguments);
-        
@@ -156 +165 @@
-            }
-
+            this.events.triggerEvent("loadstart");
+            this.doneLoading = false;
-            if (!this.tile) {
-                this.tile = new OpenLayers.Tile.Image(this, pos, tileBounds, 
-                                                     url, tileSize);
-                this.tile.draw();
+                var onload = function() { 
+                    this.doneLoading = true; 
+                    this.events.triggerEvent("loadend"); 
+                }
+                OpenLayers.Event.observe(this.tile.imgDiv, 'load',
+                                         onload.bindAsEventListener(this));
-            } else {
-                this.tile.moveTo(tileBounds, pos);

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

@@ -322 +322 @@
-    var div = OpenLayers.Util.createDiv();
-    var img = OpenLayers.Util.createImage(null, null, null, null, null, null, 
-
+null, 
-    div.appendChild(img);
-