Tag final 2.3 release.

git-svn-id: http://svn.openlayers.org/tags/openlayers/release-2.3@2255 dc9f47b5-9b13-0410-9fdd-eb0c1a62fdaf

build/license.txt

@@ -2,8 +2,8 @@
 
   OpenLayers.js -- OpenLayers Map Viewer Library
 
-  Copyright 2005-2006 MetaCarta, Inc., released under a modified BSD license.
+  Copyright 2005-2007 MetaCarta, Inc., released under the BSD license.
-  Please see http://svn.openlayers.org/trunk/openlayers/repository-license.txt
+  Please see http://svn.openlayers.org/trunk/openlayers/release-license.txt
   for the full text of the license.
 
   Includes compressed code under the following licenses:

lib/OpenLayers.js

@@ -1,5 +1,5 @@
-/* Copyright (c) 2006 MetaCarta, Inc., published under a modified BSD license.
+/* Copyright (c) 2006-2007 MetaCarta, Inc., published under the BSD license.
- * See http://svn.openlayers.org/trunk/openlayers/repository-license.txt 
+ * See http://svn.openlayers.org/trunk/openlayers/release-license.txt 
  * for the full text of the license. */
 
 ////

lib/OpenLayers/Ajax.js

@@ -1,5 +1,5 @@
-/* Copyright (c) 2006 MetaCarta, Inc., published under a modified BSD license.
+/* Copyright (c) 2006-2007 MetaCarta, Inc., published under the BSD license.
- * See http://svn.openlayers.org/trunk/openlayers/repository-license.txt 
+ * See http://svn.openlayers.org/trunk/openlayers/release-license.txt 
  * for the full text of the license. */
 
 

lib/OpenLayers/BaseTypes.js

@@ -1,5 +1,5 @@
-/* Copyright (c) 2006 MetaCarta, Inc., published under a modified BSD license.
+/* Copyright (c) 2006-2007 MetaCarta, Inc., published under the BSD license.
- * See http://svn.openlayers.org/trunk/openlayers/repository-license.txt 
+ * See http://svn.openlayers.org/trunk/openlayers/release-license.txt 
  * for the full text of the license. */
 
 

lib/OpenLayers/Control.js

@@ -1,5 +1,5 @@
-/* Copyright (c) 2006 MetaCarta, Inc., published under a modified BSD license.
+/* Copyright (c) 2006-2007 MetaCarta, Inc., published under the BSD license.
- * See http://svn.openlayers.org/trunk/openlayers/repository-license.txt 
+ * See http://svn.openlayers.org/trunk/openlayers/release-license.txt 
  * for the full text of the license. */
 
 

lib/OpenLayers/Control/ArgParser.js

@@ -1,5 +1,5 @@
-/* Copyright (c) 2006 MetaCarta, Inc., published under a modified BSD license.
+/* Copyright (c) 2006-2007 MetaCarta, Inc., published under the BSD license.
- * See http://svn.openlayers.org/trunk/openlayers/repository-license.txt 
+ * See http://svn.openlayers.org/trunk/openlayers/release-license.txt 
  * for the full text of the license. */
 
 

lib/OpenLayers/Control/KeyboardDefaults.js

@@ -1,5 +1,5 @@
-/* Copyright (c) 2006 MetaCarta, Inc., published under a modified BSD license.
+/* Copyright (c) 2006-2007 MetaCarta, Inc., published under the BSD license.
- * See http://svn.openlayers.org/trunk/openlayers/repository-license.txt 
+ * See http://svn.openlayers.org/trunk/openlayers/release-license.txt 
  * for the full text of the license. */
 
 

lib/OpenLayers/Control/LayerSwitcher.js

@@ -1,5 +1,5 @@
-/* Copyright (c) 2006 MetaCarta, Inc., published under a modified BSD license.
+/* Copyright (c) 2006-2007 MetaCarta, Inc., published under the BSD license.
- * See http://svn.openlayers.org/trunk/openlayers/repository-license.txt 
+ * See http://svn.openlayers.org/trunk/openlayers/release-license.txt 
  * for the full text of the license. */
 
 /** 

lib/OpenLayers/Control/MouseDefaults.js

@@ -1,5 +1,5 @@
-/* Copyright (c) 2006 MetaCarta, Inc., published under a modified BSD license.
+/* Copyright (c) 2006-2007 MetaCarta, Inc., published under the BSD license.
- * See http://svn.openlayers.org/trunk/openlayers/repository-license.txt 
+ * See http://svn.openlayers.org/trunk/openlayers/release-license.txt 
  * for the full text of the license. */
 
 

lib/OpenLayers/Control/MousePosition.js

@@ -1,5 +1,5 @@
-/* Copyright (c) 2006 MetaCarta, Inc., published under a modified BSD license.
+/* Copyright (c) 2006-2007 MetaCarta, Inc., published under the BSD license.
- * See http://svn.openlayers.org/trunk/openlayers/repository-license.txt 
+ * See http://svn.openlayers.org/trunk/openlayers/release-license.txt 
  * for the full text of the license. */
 
 

lib/OpenLayers/Control/MouseToolbar.js

@@ -1,5 +1,5 @@
-/* Copyright (c) 2006 MetaCarta, Inc., published under a modified BSD license.
+/* Copyright (c) 2006-2007 MetaCarta, Inc., published under the BSD license.
- * See http://svn.openlayers.org/trunk/openlayers/repository-license.txt 
+ * See http://svn.openlayers.org/trunk/openlayers/release-license.txt 
  * for the full text of the license. */
 
 

lib/OpenLayers/Control/OverviewMap.js

@@ -1,16 +1,16 @@
-/* Copyright (c) 2006 MetaCarta, Inc., published under a modified BSD license.
+/* Copyright (c) 2006-2007 MetaCarta, Inc., published under the BSD license.
- * See http://svn.openlayers.org/trunk/openlayers/repository-license.txt 
+ * See http://svn.openlayers.org/trunk/openlayers/release-license.txt 
  * for the full text of the license. */
 /**
  * @fileoverview Locator Map Control
  * @author Tim Schaub
  */
 
-// @require: OpenLayers/Control.js
-
 /** 
-* @class
+ * @class
-*/
+ * 
+ * @requires OpenLayers/Control.js
+ */
 OpenLayers.Control.OverviewMap = OpenLayers.Class.create();
 
 OpenLayers.Control.OverviewMap.prototype = 
@@ -106,6 +106,7 @@ OpenLayers.Control.OverviewMap.prototype =
         this.extentRectangle = document.createElement('div');
         this.extentRectangle.style.position = 'absolute';
         this.extentRectangle.style.zIndex = 1000;  //HACK
+        this.extentRectangle.style.overflow = 'hidden';
         this.extentRectangle.style.backgroundImage = 'url(' +
                                         OpenLayers.Util.getImagesLocation() +
                                         '/blank.png)';
@@ -162,6 +163,11 @@ OpenLayers.Control.OverviewMap.prototype =
             OpenLayers.Event.observe(this.maximizeDiv, 
                           'click', 
                           this.maximizeControl.bindAsEventListener(this));
+            OpenLayers.Event.observe(this.maximizeDiv,
+						  'dblclick',
+						  function(e) {
+                              OpenLayers.Event.stop(e);
+                          });
             this.div.appendChild(this.maximizeDiv);
     
             // minimize button div
@@ -177,7 +183,11 @@ OpenLayers.Control.OverviewMap.prototype =
             OpenLayers.Event.observe(this.minimizeDiv, 
                           'click', 
                           this.minimizeControl.bindAsEventListener(this));
-    
+            OpenLayers.Event.observe(this.minimizeDiv,
+						  'dblclick',
+						  function(e) {
+                              OpenLayers.Event.stop(e);
+                          });
             this.div.appendChild(this.minimizeDiv);
             
             this.minimizeControl();
@@ -418,12 +428,14 @@ OpenLayers.Control.OverviewMap.prototype =
         // The base layer for overview map needs to be in the same projection
         // as the base layer for the main map.  This should be made more robust.
         if(this.map.units != 'degrees') {
-            if(this.map.getProjection() != this.ovmap.getProjection()) {
+            if(this.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());
-        this.setRectPxBounds(pxBounds);
+        if (pxBounds) {
+          this.setRectPxBounds(pxBounds);
+        }
     },
     
     /**
@@ -479,8 +491,12 @@ OpenLayers.Control.OverviewMap.prototype =
                                                    lonLatBounds.top);
         var leftBottomPx = this.getOverviewPxFromLonLat(leftBottomLonLat);
         var rightTopPx = this.getOverviewPxFromLonLat(rightTopLonLat);
-        return new OpenLayers.Bounds(leftBottomPx.x, leftBottomPx.y,
+        var bounds = null;
-                                     rightTopPx.x, rightTopPx.y);
+        if (leftBottomPx && rightTopPx) {
+            bounds = new OpenLayers.Bounds(leftBottomPx.x, leftBottomPx.y,
+                                           rightTopPx.x, rightTopPx.y);
+        }
+        return bounds;
     },
 
     /**
@@ -530,10 +546,13 @@ OpenLayers.Control.OverviewMap.prototype =
     getOverviewPxFromLonLat: function(lonlat) {
         var res  = this.ovmap.getResolution();
         var extent = this.ovmap.getExtent();
-        return new OpenLayers.Pixel(
+        var px = null;
-                       Math.round(1/res * (lonlat.lon - extent.left)),
+        if (extent) {
-                       Math.round(1/res * (extent.top - lonlat.lat))
+            px = new OpenLayers.Pixel(
-                       );
+                        Math.round(1/res * (lonlat.lon - extent.left)),
+                        Math.round(1/res * (extent.top - lonlat.lat)));
+        } 
+        return px;
     },
 
     /** @final @type String */

lib/OpenLayers/Control/PanZoom.js

@@ -1,5 +1,5 @@
-/* Copyright (c) 2006 MetaCarta, Inc., published under a modified BSD license.
+/* Copyright (c) 2006-2007 MetaCarta, Inc., published under the BSD license.
- * See http://svn.openlayers.org/trunk/openlayers/repository-license.txt 
+ * See http://svn.openlayers.org/trunk/openlayers/release-license.txt 
  * for the full text of the license. */
 
 
@@ -85,8 +85,8 @@ OpenLayers.Control.PanZoom.prototype =
         this.div.appendChild(btn);
 
         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;
         btn.slideFactor = this.slideFactor;

lib/OpenLayers/Control/PanZoomBar.js

@@ -1,5 +1,5 @@
-/* Copyright (c) 2006 MetaCarta, Inc., published under a modified BSD license.
+/* Copyright (c) 2006-2007 MetaCarta, Inc., published under the BSD license.
- * See http://svn.openlayers.org/trunk/openlayers/repository-license.txt 
+ * See http://svn.openlayers.org/trunk/openlayers/release-license.txt 
  * for the full text of the license. */
 
 

lib/OpenLayers/Control/Permalink.js

@@ -1,5 +1,5 @@
-/* Copyright (c) 2006 MetaCarta, Inc., published under a modified BSD license.
+/* Copyright (c) 2006-2007 MetaCarta, Inc., published under the BSD license.
- * See http://svn.openlayers.org/trunk/openlayers/repository-license.txt 
+ * See http://svn.openlayers.org/trunk/openlayers/release-license.txt 
  * for the full text of the license. */
 
 

lib/OpenLayers/Control/Scale.js

@@ -1,5 +1,5 @@
-/* Copyright (c) 2006 MetaCarta, Inc., published under a modified BSD license.
+/* Copyright (c) 2006-2007 MetaCarta, Inc., published under the BSD license.
- * See http://svn.openlayers.org/trunk/openlayers/repository-license.txt 
+ * See http://svn.openlayers.org/trunk/openlayers/release-license.txt 
  * for the full text of the license. */
 
 

lib/OpenLayers/Events.js

@@ -1,5 +1,5 @@
-/* Copyright (c) 2006 MetaCarta, Inc., published under a modified BSD license.
+/* Copyright (c) 2006-2007 MetaCarta, Inc., published under the BSD license.
- * See http://svn.openlayers.org/trunk/openlayers/repository-license.txt 
+ * See http://svn.openlayers.org/trunk/openlayers/release-license.txt 
  * for the full text of the license. */
 
 

lib/OpenLayers/Feature.js

@@ -1,5 +1,5 @@
-/* Copyright (c) 2006 MetaCarta, Inc., published under a modified BSD license.
+/* Copyright (c) 2006-2007 MetaCarta, Inc., published under the BSD license.
- * See http://svn.openlayers.org/trunk/openlayers/repository-license.txt 
+ * See http://svn.openlayers.org/trunk/openlayers/release-license.txt 
  * for the full text of the license. */
 
 

lib/OpenLayers/Feature/WFS.js

@@ -1,5 +1,5 @@
-/* Copyright (c) 2006 MetaCarta, Inc., published under a modified BSD license.
+/* Copyright (c) 2006-2007 MetaCarta, Inc., published under the BSD license.
- * See http://svn.openlayers.org/trunk/openlayers/repository-license.txt 
+ * See http://svn.openlayers.org/trunk/openlayers/release-license.txt 
  * for the full text of the license. */
 
 

lib/OpenLayers/Icon.js

@@ -1,5 +1,5 @@
-/* Copyright (c) 2006 MetaCarta, Inc., published under a modified BSD license.
+/* Copyright (c) 2006-2007 MetaCarta, Inc., published under the BSD license.
- * See http://svn.openlayers.org/trunk/openlayers/repository-license.txt 
+ * See http://svn.openlayers.org/trunk/openlayers/release-license.txt 
  * for the full text of the license. */
 
 

lib/OpenLayers/Layer.js

@@ -1,5 +1,5 @@
-/* Copyright (c) 2006 MetaCarta, Inc., published under a modified BSD license.
+/* Copyright (c) 2006-2007 MetaCarta, Inc., published under the BSD license.
- * See http://svn.openlayers.org/trunk/openlayers/repository-license.txt 
+ * See http://svn.openlayers.org/trunk/openlayers/release-license.txt 
  * for the full text of the license. */
 
 
@@ -18,6 +18,15 @@ OpenLayers.Layer.prototype = {
     /** @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 
      *  accessor function setMap()
      * 
@@ -121,20 +130,30 @@ OpenLayers.Layer.prototype = {
             this.div.style.height = "100%";
             this.div.id = this.id;
         }
+
+        this.events = new OpenLayers.Events(this, this.div, this.EVENT_TYPES);
     },
     
     /**
      * Destroy is a destructor: this is to alleviate cyclic references which
      * the Javascript garbage cleaner can not take care of on its own.
+     * 
+     * @param {Boolean} setNewBaseLayer Should a new baselayer be selected when
+     *                                  this has been removed?
+     *                                  Default is true
      */
-    destroy: function() {
+    destroy: function(setNewBaseLayer) {
+        if (setNewBaseLayer == null) {
+            setNewBaseLayer = true;
+        }
         if (this.map != null) {
-            this.map.removeLayer(this);
+            this.map.removeLayer(this, setNewBaseLayer);
         }
         this.map = null;
         this.name = null;
         this.div = null;
         this.options = null;
+        this.events = null;
     },
     
    /**
@@ -508,8 +527,8 @@ OpenLayers.Layer.prototype = {
             var center = this.map.getCenter();
             var res  = this.map.getResolution();
         
-            var delta_x = viewPortPx.x - Math.ceil(size.w / 2);
+            var delta_x = viewPortPx.x - (size.w / 2);
-            var delta_y = viewPortPx.y - Math.ceil(size.h / 2);
+            var delta_y = viewPortPx.y - (size.h / 2);
             
             lonlat = new OpenLayers.LonLat(center.lon + delta_x * res ,
                                          center.lat - delta_y * res); 

lib/OpenLayers/Layer/Boxes.js

@@ -1,5 +1,5 @@
-/* Copyright (c) 2006 MetaCarta, Inc., published under a modified BSD license.
+/* Copyright (c) 2006-2007 MetaCarta, Inc., published under the BSD license.
- * See http://svn.openlayers.org/trunk/openlayers/repository-license.txt 
+ * See http://svn.openlayers.org/trunk/openlayers/release-license.txt 
  * for the full text of the license. */
 
 

lib/OpenLayers/Layer/Canvas.js

@@ -1,5 +1,5 @@
-/* Copyright (c) 2006 MetaCarta, Inc., published under a modified BSD license.
+/* Copyright (c) 2006-2007 MetaCarta, Inc., published under the BSD license.
- * See http://svn.openlayers.org/trunk/openlayers/repository-license.txt 
+ * See http://svn.openlayers.org/trunk/openlayers/release-license.txt 
  * for the full text of the license. */
 
 

lib/OpenLayers/Layer/EventPane.js

@@ -1,5 +1,5 @@
-/* Copyright (c) 2006 MetaCarta, Inc., published under a modified BSD license.
+/* Copyright (c) 2006-2007 MetaCarta, Inc., published under the BSD license.
- * See http://svn.openlayers.org/trunk/openlayers/repository-license.txt 
+ * See http://svn.openlayers.org/trunk/openlayers/release-license.txt 
  * for the full text of the license. */
 
 

lib/OpenLayers/Layer/FixedZoomLevels.js

@@ -1,5 +1,5 @@
-/* Copyright (c) 2006 MetaCarta, Inc., published under a modified BSD license.
+/* Copyright (c) 2006-2007 MetaCarta, Inc., published under the BSD license.
- * See http://svn.openlayers.org/trunk/openlayers/repository-license.txt 
+ * See http://svn.openlayers.org/trunk/openlayers/release-license.txt 
  * for the full text of the license. */
 
 

lib/OpenLayers/Layer/GeoRSS.js

@@ -1,5 +1,5 @@
-/* Copyright (c) 2006 MetaCarta, Inc., published under a modified BSD license.
+/* Copyright (c) 2006-2007 MetaCarta, Inc., published under the BSD license.
- * See http://svn.openlayers.org/trunk/openlayers/repository-license.txt 
+ * See http://svn.openlayers.org/trunk/openlayers/release-license.txt 
  * for the full text of the license. */
 
 

lib/OpenLayers/Layer/Google.js

@@ -1,5 +1,5 @@
-/* Copyright (c) 2006 MetaCarta, Inc., published under a modified BSD license.
+/* Copyright (c) 2006-2007 MetaCarta, Inc., published under the BSD license.
- * See http://svn.openlayers.org/trunk/openlayers/repository-license.txt 
+ * See http://svn.openlayers.org/trunk/openlayers/release-license.txt 
  * for the full text of the license. */
 
 

lib/OpenLayers/Layer/Grid.js

@@ -1,5 +1,5 @@
-/* Copyright (c) 2006 MetaCarta, Inc., published under a modified BSD license.
+/* Copyright (c) 2006-2007 MetaCarta, Inc., published under the BSD license.
- * See http://svn.openlayers.org/trunk/openlayers/repository-license.txt 
+ * See http://svn.openlayers.org/trunk/openlayers/release-license.txt 
  * for the full text of the license. */
 
 

lib/OpenLayers/Layer/HTTPRequest.js

@@ -1,5 +1,5 @@
-/* Copyright (c) 2006 MetaCarta, Inc., published under a modified BSD license.
+/* Copyright (c) 2006-2007 MetaCarta, Inc., published under the BSD license.
- * See http://svn.openlayers.org/trunk/openlayers/repository-license.txt 
+ * See http://svn.openlayers.org/trunk/openlayers/release-license.txt 
  * for the full text of the license. */
 
 

lib/OpenLayers/Layer/Image.js

@@ -1,5 +1,5 @@
-/* Copyright (c) 2006 MetaCarta, Inc., published under a modified BSD license.
+/* Copyright (c) 2006-2007 MetaCarta, Inc., published under the BSD license.
- * See http://svn.openlayers.org/trunk/openlayers/repository-license.txt 
+ * See http://svn.openlayers.org/trunk/openlayers/release-license.txt 
  * for the full text of the license. */
  
 /**

lib/OpenLayers/Layer/KaMap.js

@@ -1,5 +1,5 @@
-/* Copyright (c) 2006 MetaCarta, Inc., published under a modified BSD license.
+/* Copyright (c) 2006-2007 MetaCarta, Inc., published under the BSD license.
- * See http://svn.openlayers.org/trunk/openlayers/repository-license.txt 
+ * See http://svn.openlayers.org/trunk/openlayers/release-license.txt 
  * for the full text of the license. */
 
 

lib/OpenLayers/Layer/MapServer.js

@@ -1,5 +1,5 @@
-/* Copyright (c) 2006 MetaCarta, Inc., published under a modified BSD license.
+/* Copyright (c) 2006-2007 MetaCarta, Inc., published under the BSD license.
- * See http://svn.openlayers.org/trunk/openlayers/repository-license.txt 
+ * See http://svn.openlayers.org/trunk/openlayers/release-license.txt 
  * for the full text of the license. */
 // @requires OpenLayers/Layer/Grid.js
 /**

lib/OpenLayers/Layer/Markers.js

@@ -1,5 +1,5 @@
-/* Copyright (c) 2006 MetaCarta, Inc., published under a modified BSD license.
+/* Copyright (c) 2006-2007 MetaCarta, Inc., published under the BSD license.
- * See http://svn.openlayers.org/trunk/openlayers/repository-license.txt 
+ * See http://svn.openlayers.org/trunk/openlayers/release-license.txt 
  * for the full text of the license. */
 
 

lib/OpenLayers/Layer/MultiMap.js

@@ -1,5 +1,5 @@
-/* Copyright (c) 2006 MetaCarta, Inc., published under a modified BSD license.
+/* Copyright (c) 2006-2007 MetaCarta, Inc., published under the BSD license.
- * See http://svn.openlayers.org/trunk/openlayers/repository-license.txt 
+ * See http://svn.openlayers.org/trunk/openlayers/release-license.txt 
  * for the full text of the license. */
 
 /**

lib/OpenLayers/Layer/TMS.js

@@ -1,5 +1,5 @@
-/* Copyright (c) 2006 MetaCarta, Inc., published under a modified BSD licence.
+/* Copyright (c) 2006-2007 MetaCarta, Inc., published under the BSD licence.
- * See http://svn.openlayers.org/trunk/openlayers/repository-license.txt 
+ * See http://svn.openlayers.org/trunk/openlayers/release-license.txt 
  * for the full text of the license. */
 
 

lib/OpenLayers/Layer/Text.js

@@ -1,5 +1,5 @@
-/* Copyright (c) 2006 MetaCarta, Inc., published under a modified BSD license.
+/* Copyright (c) 2006-2007 MetaCarta, Inc., published under the BSD license.
- * See http://svn.openlayers.org/trunk/openlayers/repository-license.txt 
+ * See http://svn.openlayers.org/trunk/openlayers/release-license.txt 
  * for the full text of the license. */
 
 

lib/OpenLayers/Layer/VirtualEarth.js

@@ -1,5 +1,5 @@
-/* Copyright (c) 2006 MetaCarta, Inc., published under a modified BSD license.
+/* Copyright (c) 2006-2007 MetaCarta, Inc., published under the BSD license.
- * See http://svn.openlayers.org/trunk/openlayers/repository-license.txt 
+ * See http://svn.openlayers.org/trunk/openlayers/release-license.txt 
  * for the full text of the license. */
 
 

lib/OpenLayers/Layer/WFS.js

@@ -1,5 +1,5 @@
-/* Copyright (c) 2006 MetaCarta, Inc., published under a modified BSD license.
+/* Copyright (c) 2006-2007 MetaCarta, Inc., published under the BSD license.
- * See http://svn.openlayers.org/trunk/openlayers/repository-license.txt 
+ * See http://svn.openlayers.org/trunk/openlayers/release-license.txt 
  * for the full text of the license. */
 
 

lib/OpenLayers/Layer/WMS.js

@@ -1,5 +1,5 @@
-/* Copyright (c) 2006 MetaCarta, Inc., published under a modified BSD license.
+/* Copyright (c) 2006-2007 MetaCarta, Inc., published under the BSD license.
- * See http://svn.openlayers.org/trunk/openlayers/repository-license.txt 
+ * See http://svn.openlayers.org/trunk/openlayers/release-license.txt 
  * for the full text of the license. */
 
 

lib/OpenLayers/Layer/WMS/Untiled.js

@@ -1,5 +1,5 @@
-/* Copyright (c) 2006 MetaCarta, Inc., published under a modified BSD license.
+/* Copyright (c) 2006-2007 MetaCarta, Inc., published under the BSD license.
- * See http://svn.openlayers.org/trunk/openlayers/repository-license.txt 
+ * See http://svn.openlayers.org/trunk/openlayers/release-license.txt 
  * for the full text of the license. */
 
  
@@ -30,7 +30,10 @@ OpenLayers.Layer.WMS.Untiled.prototype =
 
     /** @type OpenLayers.Tile.Image */
     tile: null,
-    
+
+    /** did the image finish loading before a new draw was initiated?
+     * @type Boolean */
+    doneLoading: false,
 
     /**
     * @constructor
@@ -63,8 +66,10 @@ OpenLayers.Layer.WMS.Untiled.prototype =
      * 
      */
     destroy: function() {
-        this.tile.destroy();
+        if (this.tile) {
-        this.tile = null;    
+          this.tile.destroy();
+          this.tile = null;    
+        }
         OpenLayers.Layer.HTTPRequest.prototype.destroy.apply(this, arguments);
     },
     
@@ -108,6 +113,10 @@ OpenLayers.Layer.WMS.Untiled.prototype =
      * @param {Boolean} dragging
      */
     moveTo:function(bounds, zoomChanged, dragging) {
+        if (!this.doneLoading) {
+            this.events.triggerEvent("loadcancel"); 
+            this.doneLoading = true; 
+        }
         OpenLayers.Layer.HTTPRequest.prototype.moveTo.apply(this,arguments);
         
         if (bounds == null) {
@@ -155,10 +164,18 @@ OpenLayers.Layer.WMS.Untiled.prototype =
                 this.tile = null;
             }
 
+            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);
             } 

lib/OpenLayers/Layer/WorldWind.js

@@ -1,5 +1,5 @@
-/* Copyright (c) 2006 MetaCarta, Inc., published under a modified BSD license.
+/* Copyright (c) 2006-2007 MetaCarta, Inc., published under the BSD license.
- * See http://svn.openlayers.org/trunk/openlayers/repository-license.txt 
+ * See http://svn.openlayers.org/trunk/openlayers/release-license.txt 
  * for the full text of the license. */
 
 

lib/OpenLayers/Layer/Yahoo.js

@@ -1,5 +1,5 @@
-/* Copyright (c) 2006 MetaCarta, Inc., published under a modified BSD license.
+/* Copyright (c) 2006-2007 MetaCarta, Inc., published under the BSD license.
- * See http://svn.openlayers.org/trunk/openlayers/repository-license.txt 
+ * See http://svn.openlayers.org/trunk/openlayers/release-license.txt 
  * for the full text of the license. */
 
 

lib/OpenLayers/Map.js

@@ -1,5 +1,5 @@
-/* Copyright (c) 2006 MetaCarta, Inc., published under a modified BSD license.
+/* Copyright (c) 2006-2007 MetaCarta, Inc., published under the BSD license.
- * See http://svn.openlayers.org/trunk/openlayers/repository-license.txt 
+ * See http://svn.openlayers.org/trunk/openlayers/release-license.txt 
  * for the full text of the license. */
 
 
@@ -77,6 +77,18 @@ OpenLayers.Map.prototype = {
     /** @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
 
     /** @type OpenLayers.Size */
@@ -201,7 +213,9 @@ OpenLayers.Map.prototype = {
     destroy:function() {
         if (this.layers != null) {
             for(var i=0; i< this.layers.length; i++) {
-                this.layers[i].destroy();
+                //pass 'false' to destroy so that map wont try to set a new 
+                // baselayer after each baselayer is removed
+                this.layers[i].destroy(false);
             } 
             this.layers = null;
         }
@@ -344,8 +358,13 @@ OpenLayers.Map.prototype = {
      *     its own personal list of popups, removing them from the map.
      * 
      * @param {OpenLayers.Layer} layer
+     * @param {Boolean} setNewBaseLayer Default is true
      */
-    removeLayer: function(layer) {
+    removeLayer: function(layer, setNewBaseLayer) {
+        if (setNewBaseLayer == null) {
+            setNewBaseLayer = true;
+        }
+
         if (layer.isFixed) {
             this.viewPortDiv.removeChild(layer.div);
         } else {
@@ -355,7 +374,7 @@ OpenLayers.Map.prototype = {
         OpenLayers.Util.removeItem(this.layers, layer);
 
         // if we removed the base layer, need to set a new one
-        if (this.baseLayer == layer) {
+        if (setNewBaseLayer && (this.baseLayer == layer)) {
             this.baseLayer = null;
             for(i=0; i < this.layers.length; i++) {
                 var iLayer = this.layers[i];
@@ -448,6 +467,11 @@ OpenLayers.Map.prototype = {
 
                 // 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);
 
                 //redraw all layers
@@ -743,6 +767,9 @@ OpenLayers.Map.prototype = {
                 for (var i = 0; i < this.popups.length; i++) {
                     this.popups[i].updatePosition();
                 }
+
+                // zoom level has changed, increment viewRequestID.
+                this.viewRequestID++;
             }    
             
             var bounds = this.getExtent();

lib/OpenLayers/Marker.js

@@ -1,5 +1,5 @@
-/* Copyright (c) 2006 MetaCarta, Inc., published under a modified BSD license.
+/* Copyright (c) 2006-2007 MetaCarta, Inc., published under the BSD license.
- * See http://svn.openlayers.org/trunk/openlayers/repository-license.txt 
+ * See http://svn.openlayers.org/trunk/openlayers/release-license.txt 
  * for the full text of the license. */
 
 

lib/OpenLayers/Marker/Box.js

@@ -1,5 +1,5 @@
-/* Copyright (c) 2006 MetaCarta, Inc., published under a modified BSD license.
+/* Copyright (c) 2006-2007 MetaCarta, Inc., published under the BSD license.
- * See http://svn.openlayers.org/trunk/openlayers/repository-license.txt 
+ * See http://svn.openlayers.org/trunk/openlayers/release-license.txt 
  * for the full text of the license. */
 
 

lib/OpenLayers/Popup.js

@@ -1,5 +1,5 @@
-/* Copyright (c) 2006 MetaCarta, Inc., published under a modified BSD license.
+/* Copyright (c) 2006-2007 MetaCarta, Inc., published under the BSD license.
- * See http://svn.openlayers.org/trunk/openlayers/repository-license.txt 
+ * See http://svn.openlayers.org/trunk/openlayers/release-license.txt 
  * for the full text of the license. */
 
 

lib/OpenLayers/Popup/Anchored.js

@@ -1,5 +1,5 @@
-/* Copyright (c) 2006 MetaCarta, Inc., published under a modified BSD license.
+/* Copyright (c) 2006-2007 MetaCarta, Inc., published under the BSD license.
- * See http://svn.openlayers.org/trunk/openlayers/repository-license.txt 
+ * See http://svn.openlayers.org/trunk/openlayers/release-license.txt 
  * for the full text of the license. */
 
 

lib/OpenLayers/Popup/AnchoredBubble.js

@@ -1,5 +1,5 @@
-/* Copyright (c) 2006 MetaCarta, Inc., published under a modified BSD license.
+/* Copyright (c) 2006-2007 MetaCarta, Inc., published under the BSD license.
- * See http://svn.openlayers.org/trunk/openlayers/repository-license.txt 
+ * See http://svn.openlayers.org/trunk/openlayers/release-license.txt 
  * for the full text of the license. */
 
 

lib/OpenLayers/SingleFile.js

@@ -1,5 +1,5 @@
-/* Copyright (c) 2006 MetaCarta, Inc., published under a modified BSD license.
+/* Copyright (c) 2006-2007 MetaCarta, Inc., published under the BSD license.
- * See http://svn.openlayers.org/trunk/openlayers/repository-license.txt 
+ * See http://svn.openlayers.org/trunk/openlayers/release-license.txt 
  * for the full text of the license. */
 
 _OPENLAYERS_SFL_=true;

lib/OpenLayers/Tile.js

@@ -1,5 +1,5 @@
-/* Copyright (c) 2006 MetaCarta, Inc., published under a modified BSD license.
+/* Copyright (c) 2006-2007 MetaCarta, Inc., published under the BSD license.
- * See http://svn.openlayers.org/trunk/openlayers/repository-license.txt 
+ * See http://svn.openlayers.org/trunk/openlayers/release-license.txt 
  * for the full text of the license. */
 
 

lib/OpenLayers/Tile/Image.js

@@ -1,5 +1,5 @@
-/* Copyright (c) 2006 MetaCarta, Inc., published under a modified BSD license.
+/* Copyright (c) 2006-2007 MetaCarta, Inc., published under the BSD license.
- * See http://svn.openlayers.org/trunk/openlayers/repository-license.txt 
+ * See http://svn.openlayers.org/trunk/openlayers/release-license.txt 
  * for the full text of the license. */
 
 
@@ -34,6 +34,7 @@ OpenLayers.Tile.Image.prototype =
     destroy: function() {
         if ((this.imgDiv != null) && (this.imgDiv.parentNode == this.layer.div)) {
             this.layer.div.removeChild(this.imgDiv);
+            this.imgDiv.map = null;
         }
         this.imgDiv = null;
         OpenLayers.Tile.prototype.destroy.apply(this, arguments);
@@ -52,6 +53,8 @@ OpenLayers.Tile.Image.prototype =
         if (this.imgDiv == null) {
             this.initImgDiv();
         }
+
+        this.imgDiv.viewRequestID = this.layer.map.viewRequestID;
         
         this.url = this.layer.getURL(this.bounds);
   
@@ -120,7 +123,7 @@ OpenLayers.Tile.Image.prototype =
         /* checkImgURL used to be used to called as a work around, but it
            ended up hiding problems instead of solving them and broke things
            like relative URLs. See discussion on the dev list:
-           http://openlayers.org/pipermail/dev/2007-January/000205.html
+           http://openlayers.org/pipermail/dev/2006-2007-January/000205.html
 
         OpenLayers.Event.observe( this.imgDiv, "load",
                         this.checkImgURL.bindAsEventListener(this) );
@@ -132,6 +135,10 @@ OpenLayers.Tile.Image.prototype =
                                              null, null, null, 
                                              this.layer.opacity);
         }
+
+        // we need this reference to check back the viewRequestID
+        this.imgDiv.map = this.layer.map;
+
     },
 
     /**
@@ -148,7 +155,7 @@ OpenLayers.Tile.Image.prototype =
      * 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
+     * http://openlayers.org/pipermail/dev/2006-2007-January/000205.html
      *
      * @private
      */

lib/OpenLayers/Tile/WFS.js

@@ -1,5 +1,5 @@
-/* Copyright (c) 2006 MetaCarta, Inc., published under a modified BSD license.
+/* Copyright (c) 2006-2007 MetaCarta, Inc., published under the BSD license.
- * See http://svn.openlayers.org/trunk/openlayers/repository-license.txt 
+ * See http://svn.openlayers.org/trunk/openlayers/release-license.txt 
  * for the full text of the license. */
 
  

lib/OpenLayers/Util.js

@@ -1,5 +1,5 @@
-/* Copyright (c) 2006 MetaCarta, Inc., published under a modified BSD license.
+/* Copyright (c) 2006-2007 MetaCarta, Inc., published under the BSD license.
- * See http://svn.openlayers.org/trunk/openlayers/repository-license.txt 
+ * See http://svn.openlayers.org/trunk/openlayers/release-license.txt 
  * for the full text of the license. */
 
 
@@ -217,8 +217,25 @@ OpenLayers.Util.setOpacity = function(element, opacity) {
 }
 
 OpenLayers.Util.onImageLoad = function() {
-    this.style.backgroundColor = null;
+    // The complex check here is to solve issues described in #480.
-    this.style.display = "";  
+    // Every time a map view changes, it increments the 'viewRequestID' 
+    // property. As the requests for the images for the new map view are sent
+    // out, they are tagged with this unique viewRequestID. 
+    // 
+    // If an image has no viewRequestID property set, we display it regardless, 
+    // but if it does have a viewRequestID property, we check that it matches 
+    // the viewRequestID set on the map.
+    // 
+    // If the viewRequestID on the map has changed, that means that the user
+    // has changed the map view since this specific request was sent out, and
+    // therefore this tile does not need to be displayed (so we do not execute
+    // this code that turns its display on).
+    //
+    if (!this.viewRequestID ||
+        (this.viewRequestID == this.map.viewRequestID)) { 
+        this.style.backgroundColor = null;
+        this.style.display = "";  
+    }
 };
 
 OpenLayers.Util.onImageLoadErrorColor = "pink";
@@ -321,7 +338,7 @@ OpenLayers.Util.createAlphaImageDiv = function(id, px, sz, imgURL,
     
     var div = OpenLayers.Util.createDiv();
     var img = OpenLayers.Util.createImage(null, null, null, null, null, null, 
-                                          false);
+                                          null, false);
     div.appendChild(img);
 
     if (delayDisplay) {
@@ -377,17 +394,32 @@ OpenLayers.Util.applyDefaults = function (to, from) {
 * @returns a concatenation of the properties of an object in 
 *    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
 */
 OpenLayers.Util.getParameterString = function(params) {
     paramsArray = new Array();
     
     for (var key in params) {
-        var value = params[key];
+      var value = params[key];
-        if ((value != null) && (typeof value != 'function')) {
+      if ((value != null) && (typeof value != 'function')) {
-            paramsArray.push(encodeURIComponent(key) + "=" +
+        var encodedValue;
-                             encodeURIComponent(value));
+        if (typeof value == 'object' && value.constructor == Array) {
+          /* value is an array; encode items and separate with "," */
+          var encodedItemArray = new Array();
+          for (var itemIndex=0; itemIndex<value.length; itemIndex++) {
+            encodedItemArray.push(encodeURIComponent(value[itemIndex]));
+          }
+          encodedValue = encodedItemArray.join(",");
         }
+        else {
+          /* value is a string; simply encode */
+          encodedValue = encodeURIComponent(value);
+        }
+        paramsArray.push(encodeURIComponent(key) + "=" + encodedValue);
+      }
     }
     
     return paramsArray.join("&");

release-license.txt

@@ -1,6 +1,6 @@
 This license applies to official code releases at www.openlayers.org:
 
-Copyright (c) 2005-2006 MetaCarta, Inc.
+Copyright (c) 2005-2007 MetaCarta, Inc.
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without

repository-license.txt

@@ -1,35 +0,0 @@
-This license applies to all code and content in the OpenLayers code
-repository at svn.openlayers.org:
-
-Copyright (c) 2005-2006 MetaCarta, Inc.
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-
-  * Redistributions of source code must retain the above copyright notice, this
-    list of conditions and the following disclaimer.
-
-  * Redistributions in binary form must reproduce the above copyright notice,
-    this list of conditions and the following disclaimer in the documentation
-    and/or other materials provided with the distribution.
-
-  * Neither the name of MetaCarta, Inc. nor the names of its contributors
-    may be used to endorse or promote products derived from this software
-    without specific prior written permission.
-
-This license grants no rights to any components related to natural language
-processing, free text querying, or unstructured information retrieval.  This 
-license grants no rights to components that implement inventions on which
-MetaCarta has patents or has filed applications for patents. 
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
-ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

tests/grid_inittiles.html

@@ -0,0 +1,32 @@
+<html xmlns="http://www.w3.org/1999/xhtml">
+  <head>
+    <style type="text/css">
+        #map {
+            width: 800px;
+            height: 475px;
+            border: 1px solid black;
+        }
+    </style>
+    <script src="../lib/OpenLayers.js"></script>
+    <script type="text/javascript">
+        <!--
+        function init(){
+            var map = new OpenLayers.Map('map', {'maxResolution': 1.40625/2, tileSize: new OpenLayers.Size(256,256)});
+            ww = new OpenLayers.Layer.WMS( "Basic", 
+            "http://labs.metacarta.com/wms-c/Basic.py?", 
+            {layers:"basic"});
+            map.addLayers([ww]);
+            map.zoomToMaxExtent();
+            map.zoomIn();
+            map.zoomOut();
+            map.zoomOut();
+        }
+        // -->
+    </script>
+  </head>
+  <body onload="init()">
+    <h1>Grid Test</h1>
+    <p>Map should display with two centered tiles. If there appear to be a combination of two zoom levels, then this test is failed, and something is broken in OpenLayers.</p>
+    <div id="map"></div>
+  </body>
+</html>

tests/test_Util.html

@@ -177,7 +177,7 @@
     }
 
     function test_07_Util_getParameterString(t) {
-        t.plan( 2 );
+        t.plan( 4 );
 
         var params = { foo: "bar",
                        chicken: 1.5
@@ -185,6 +185,15 @@
 
         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. ");    
     }
 
     function test_08_Util_createAlphaImageDiv(t) {