update one last license

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

build/license.txt

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

lib/OpenLayers.js

@@ -1,5 +1,5 @@
 /* Copyright (c) 2006 MetaCarta, Inc., published under a modified 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.
- * 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.
- * 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.
- * 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.
- * 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.
- * 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.
- * 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.
- * 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.
- * 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.
- * 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,5 +1,5 @@
 /* Copyright (c) 2006 MetaCarta, Inc., published under a modified 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

lib/OpenLayers/Control/PanZoom.js

@@ -1,5 +1,5 @@
 /* Copyright (c) 2006 MetaCarta, Inc., published under a modified 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/PanZoomBar.js

@@ -1,5 +1,5 @@
 /* Copyright (c) 2006 MetaCarta, Inc., published under a modified 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.
- * 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.
- * 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.
- * 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.
- * 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.
- * 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.
- * 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.
- * 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/Boxes.js

@@ -1,5 +1,5 @@
 /* Copyright (c) 2006 MetaCarta, Inc., published under a modified 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.
- * 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.
- * 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.
- * 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.
- * 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.
- * 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.
- * 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.
- * 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.
- * 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.
- * 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.
- * 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.
- * 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.
- * 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.
- * 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.
- * 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.
- * 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.
- * 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.
- * 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. */
 
  
@@ -125,7 +125,7 @@ OpenLayers.Layer.WMS.Untiled.prototype =
 
             //clear out the old tile 
             if (this.tile) {
-                OpenLayers.Util.clearArray(this.tile);
+                this.tile.clear();
             }
 
             //determine new tile bounds
@@ -150,6 +150,11 @@ OpenLayers.Layer.WMS.Untiled.prototype =
             var ul = new OpenLayers.LonLat(tileBounds.left, tileBounds.top);
             var pos = this.map.getLayerPxFromLonLat(ul);
 
+            if ( this.tile && !this.tile.size.equals(tileSize)) {
+                this.tile.destroy();
+                this.tile = null;
+            }
+
             if (!this.tile) {
                 this.tile = new OpenLayers.Tile.Image(this, pos, tileBounds, 
                                                      url, tileSize);

lib/OpenLayers/Layer/WorldWind.js

@@ -1,5 +1,5 @@
 /* Copyright (c) 2006 MetaCarta, Inc., published under a modified 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.
- * 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.
- * 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. */
 
 
@@ -786,8 +786,10 @@ OpenLayers.Map.prototype = {
         var originPx = this.getViewPortPxFromLonLat(this.layerContainerOrigin);
         var newPx = this.getViewPortPxFromLonLat(lonlat);
 
-        this.layerContainerDiv.style.left = (originPx.x - newPx.x) + "px";
+        if ((originPx != null) && (newPx != null)) {
-        this.layerContainerDiv.style.top  = (originPx.y - newPx.y) + "px";
+            this.layerContainerDiv.style.left = (originPx.x - newPx.x) + "px";
+            this.layerContainerDiv.style.top  = (originPx.y - newPx.y) + "px";
+        }
     },
 
     /**

lib/OpenLayers/Marker.js

@@ -1,5 +1,5 @@
 /* Copyright (c) 2006 MetaCarta, Inc., published under a modified 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.
- * 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.
- * 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.
- * 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.
- * 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.
- * 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.
- * 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.
- * 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/WFS.js

@@ -1,5 +1,5 @@
 /* Copyright (c) 2006 MetaCarta, Inc., published under a modified 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.
- * 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. */
 
 

tests/test_Layer_EventPane.html

@@ -108,6 +108,6 @@
   </script>
 </head>
 <body>
-  <div id="map"></div>
+  <div id="map" style="height:500px;width:500px"></div>
 </body>
 </html>

tests/test_Popup.html

@@ -52,7 +52,7 @@
 
     function test_03_Popup_draw(t) {
     
-        t.plan( 11 );
+        t.plan( 17 );
         
         var id = "chicken";
         var x = 50;
@@ -78,7 +78,17 @@
         t.eq(popup.div.style.top, y + "px", "top position of popup.div set correctly");
         t.eq(popup.div.style.width, w + "px", "width position of popup.div set correctly");
         t.eq(popup.div.style.height, h + "px", "heightposition of popup.div set correctly");
-        t.eq(popup.div.innerHTML, '<div class="olPopupContent" style="overflow: hidden; width: 200px; height: 200px; position: relative;" id="chicken_contentDiv">charlie</div>', "good default popup.contentHTML");
+
+        var contentDiv = popup.div.childNodes[0];
+        
+        t.eq(contentDiv.className, "olPopupContent", "correct content div className");
+        t.eq(contentDiv.id, "chicken_contentDiv", "correct content div id");
+        t.eq(contentDiv.style.width, "200px", "correct content div width");	 
+        t.eq(contentDiv.style.height, "200px", "correct content div height");
+        t.eq(contentDiv.style.position, "relative", "correct content div position");
+        t.eq(contentDiv.style.overflow, "hidden", "correct content div overflow");
+        t.eq(contentDiv.innerHTML, content, "correct content div content");				 
+
         t.eq(popup.div.style.backgroundColor, color, "good default popup.backgroundColor");
 
         if (navigator.appName.indexOf("Microsoft") == -1) {

tests/test_Tile_Image.html

@@ -127,7 +127,7 @@
   </script>
 </head>
 <body>
-<div id="map"></div>
+<div id="map" style="height:500px;width:500px"></div>
 </body>
 </html>