OpenLayers OpenLayers

Changeset 1740

Show
Ignore:
Timestamp:
10/27/06 10:26:28 (2 years ago)
Author:
crschmidt
Message:

Pullups for 2.2-rc2:

#371, Link to license broken
#376, Fix tile.clear() calls that got overrun during removal of Prototype.js
#374, Need to bring up new licenses into 2.2 Branch
#336, create OpenLayers.Layer.Graphic to layers created with simple static images
#375, No need to exlude Yahoo.js from singlefile build

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • branches/openlayers/2.2/build/docs.sh

    r1695 r1740  
    22 
    33rm ../doc/reference.html 
    4 CLASSES="Map Layer Layer.HTTPRequest Layer.Grid Layer.WMS Layer.KaMap Layer.EventPane Layer.Google Layer.VirtualEarth Layer.Markers Layer.Text Layer.GeoRSS Layer.Boxes Icon Marker Marker.Box Tile Tile.Image Tile.WFS Control Control.LayerSwitcher Control.MouseDefaults Control.MousePosition Control.MouseToolbar Control.OverviewMap Control.PanZoom Control.PanZoomBar Control.Permalink Control.Scale LonLat Size Pixel Bounds Util Ajax" 
     4CLASSES="Map Layer Layer.Image Layer.HTTPRequest Layer.Grid Layer.WMS Layer.KaMap Layer.EventPane Layer.Google Layer.VirtualEarth Layer.Markers Layer.Text Layer.GeoRSS Layer.Boxes Icon Marker Marker.Box Tile Tile.Image Tile.WFS Control Control.LayerSwitcher Control.MouseDefaults Control.MousePosition Control.MouseToolbar Control.OverviewMap Control.PanZoom Control.PanZoomBar Control.Permalink Control.Scale LonLat Size Pixel Bounds Util Ajax" 
    55echo "<html> 
    66  <head> 
  • branches/openlayers/2.2/build/library.cfg

    r1695 r1740  
    1111 
    1212[exclude] 
    13 OpenLayers/Layer/Yahoo.js 
    1413OpenLayers/Control/KeyboardDefaults.js 
  • branches/openlayers/2.2/build/license.txt

    r1588 r1740  
    33  OpenLayers.js -- OpenLayers Map Viewer Library 
    44 
    5   Copyright 2005-2006 MetaCarta, Inc., released under the BSD License. 
    6   Please see http://svn.openlayers.org/trunk/openlayers/license.txt 
     5  Copyright 2005-2006 MetaCarta, Inc., released under a modified BSD license. 
     6  Please see http://svn.openlayers.org/trunk/openlayers/repository-license.txt 
    77  for the full text of the license. 
    88 
  • branches/openlayers/2.2/lib/OpenLayers.js

    r1695 r1740  
    1 /* Copyright (c) 2006 MetaCarta, Inc., published under the BSD license. 
    2  * See http://svn.openlayers.org/trunk/openlayers/license.txt for the full 
    3  * text of the license. */ 
     1/* Copyright (c) 2006 MetaCarta, Inc., published under a modified BSD license. 
     2 * See http://svn.openlayers.org/trunk/openlayers/repository-license.txt  
     3 * for the full text of the license. */ 
     4 
    45//// 
    56/// This blob sucks in all the files in uncompressed form for ease of use 
     
    6667        "OpenLayers/Tile/Image.js", 
    6768        "OpenLayers/Tile/WFS.js", 
     69        "OpenLayers/Layer/Image.js", 
    6870        "OpenLayers/Layer/EventPane.js", 
    6971        "OpenLayers/Layer/FixedZoomLevels.js", 
  • branches/openlayers/2.2/lib/OpenLayers/Ajax.js

    r1651 r1740  
    1 /* Copyright (c) 2006 MetaCarta, Inc., published under the BSD license. 
    2  * See http://svn.openlayers.org/trunk/openlayers/license.txt for the full 
    3  * text of the license. */ 
     1/* Copyright (c) 2006 MetaCarta, Inc., published under a modified BSD license. 
     2 * See http://svn.openlayers.org/trunk/openlayers/repository-license.txt  
     3 * for the full text of the license. */ 
     4 
    45 
    56OpenLayers.ProxyHost = ""; 
  • branches/openlayers/2.2/lib/OpenLayers/BaseTypes.js

    r1661 r1740  
    1 /* Copyright (c) 2006 MetaCarta, Inc., published under the BSD license. 
    2  * See http://svn.openlayers.org/trunk/openlayers/license.txt for the full 
    3  * text of the license. */ 
     1/* Copyright (c) 2006 MetaCarta, Inc., published under a modified BSD license. 
     2 * See http://svn.openlayers.org/trunk/openlayers/repository-license.txt  
     3 * for the full text of the license. */ 
     4 
    45 
    56/* OpenLayers.Class metaclass */ 
  • branches/openlayers/2.2/lib/OpenLayers/Control.js

    r1695 r1740  
    1 /* Copyright (c) 2006 MetaCarta, Inc., published under the BSD license. 
    2  * See http://svn.openlayers.org/trunk/openlayers/license.txt for the full 
    3  * text of the license. */ 
     1/* Copyright (c) 2006 MetaCarta, Inc., published under a modified BSD license. 
     2 * See http://svn.openlayers.org/trunk/openlayers/repository-license.txt  
     3 * for the full text of the license. */ 
     4 
    45 
    56/** 
  • branches/openlayers/2.2/lib/OpenLayers/Control/ArgParser.js

    r1651 r1740  
    1 /* Copyright (c) 2006 MetaCarta, Inc., published under the BSD license. 
    2  * See http://svn.openlayers.org/trunk/openlayers/license.txt for the full 
    3  * text of the license. */ 
     1/* Copyright (c) 2006 MetaCarta, Inc., published under a modified BSD license. 
     2 * See http://svn.openlayers.org/trunk/openlayers/repository-license.txt  
     3 * for the full text of the license. */ 
     4 
    45 
    56/** 
  • branches/openlayers/2.2/lib/OpenLayers/Control/KeyboardDefaults.js

    r1651 r1740  
    1 /* Copyright (c) 2006 MetaCarta, Inc., published under the BSD license. 
    2  * See http://svn.openlayers.org/trunk/openlayers/license.txt for the full 
    3  * text of the license. */ 
     1/* Copyright (c) 2006 MetaCarta, Inc., published under a modified BSD license. 
     2 * See http://svn.openlayers.org/trunk/openlayers/repository-license.txt  
     3 * for the full text of the license. */ 
     4 
    45 
    56/** 
  • branches/openlayers/2.2/lib/OpenLayers/Control/LayerSwitcher.js

    r1654 r1740  
    1 /* Copyright (c) 2006 MetaCarta, Inc., published under the BSD license. 
    2  * See http://svn.openlayers.org/trunk/openlayers/license.txt for the full 
    3  * text of the license. */ 
     1/* Copyright (c) 2006 MetaCarta, Inc., published under a modified BSD license. 
     2 * See http://svn.openlayers.org/trunk/openlayers/repository-license.txt  
     3 * for the full text of the license. */ 
    44 
    55/**  
  • branches/openlayers/2.2/lib/OpenLayers/Control/MouseDefaults.js

    r1695 r1740  
    1 /* Copyright (c) 2006 MetaCarta, Inc., published under the BSD license. 
    2  * See http://svn.openlayers.org/trunk/openlayers/license.txt for the full 
    3  * text of the license. */ 
     1/* Copyright (c) 2006 MetaCarta, Inc., published under a modified BSD license. 
     2 * See http://svn.openlayers.org/trunk/openlayers/repository-license.txt  
     3 * for the full text of the license. */ 
     4 
    45 
    56/** 
  • branches/openlayers/2.2/lib/OpenLayers/Control/MousePosition.js

    r1720 r1740  
    1 /* Copyright (c) 2006 MetaCarta, Inc., published under the BSD license. 
    2  * See http://svn.openlayers.org/trunk/openlayers/license.txt for the full 
    3  * text of the license. */ 
     1/* Copyright (c) 2006 MetaCarta, Inc., published under a modified BSD license. 
     2 * See http://svn.openlayers.org/trunk/openlayers/repository-license.txt  
     3 * for the full text of the license. */ 
     4 
    45 
    56/** 
  • branches/openlayers/2.2/lib/OpenLayers/Control/MouseToolbar.js

    r1706 r1740  
    1 /* Copyright (c) 2006 MetaCarta, Inc., published under the BSD license. 
    2  * See http://svn.openlayers.org/trunk/openlayers/license.txt for the full 
    3  * text of the license. */ 
     1/* Copyright (c) 2006 MetaCarta, Inc., published under a modified BSD license. 
     2 * See http://svn.openlayers.org/trunk/openlayers/repository-license.txt  
     3 * for the full text of the license. */ 
     4 
    45 
    56/** 
  • branches/openlayers/2.2/lib/OpenLayers/Control/OverviewMap.js

    r1718 r1740  
     1/* Copyright (c) 2006 MetaCarta, Inc., published under a modified BSD license. 
     2 * See http://svn.openlayers.org/trunk/openlayers/repository-license.txt  
     3 * for the full text of the license. */ 
    14/** 
    25 * @fileoverview Locator Map Control 
  • branches/openlayers/2.2/lib/OpenLayers/Control/PanZoom.js

    r1651 r1740  
    1 /* Copyright (c) 2006 MetaCarta, Inc., published under the BSD license. 
    2  * See http://svn.openlayers.org/trunk/openlayers/license.txt for the full 
    3  * text of the license. */ 
     1/* Copyright (c) 2006 MetaCarta, Inc., published under a modified BSD license. 
     2 * See http://svn.openlayers.org/trunk/openlayers/repository-license.txt  
     3 * for the full text of the license. */ 
     4 
    45 
    56/** 
  • branches/openlayers/2.2/lib/OpenLayers/Control/PanZoomBar.js

    r1651 r1740  
    1 /* Copyright (c) 2006 MetaCarta, Inc., published under the BSD license. 
    2  * See http://svn.openlayers.org/trunk/openlayers/license.txt for the full 
    3  * text of the license. */ 
     1/* Copyright (c) 2006 MetaCarta, Inc., published under a modified BSD license. 
     2 * See http://svn.openlayers.org/trunk/openlayers/repository-license.txt  
     3 * for the full text of the license. */ 
     4 
    45 
    56/** 
  • branches/openlayers/2.2/lib/OpenLayers/Control/Permalink.js

    r1651 r1740  
    1 /* Copyright (c) 2006 MetaCarta, Inc., published under the BSD license. 
    2  * See http://svn.openlayers.org/trunk/openlayers/license.txt for the full 
    3  * text of the license. */ 
     1/* Copyright (c) 2006 MetaCarta, Inc., published under a modified BSD license. 
     2 * See http://svn.openlayers.org/trunk/openlayers/repository-license.txt  
     3 * for the full text of the license. */ 
     4 
    45 
    56/** 
  • branches/openlayers/2.2/lib/OpenLayers/Control/Scale.js

    r1651 r1740  
    1 /* Copyright (c) 2006 MetaCarta, Inc., published under the BSD license. 
    2  * See http://svn.openlayers.org/trunk/openlayers/license.txt for the full 
    3  * text of the license. */ 
     1/* Copyright (c) 2006 MetaCarta, Inc., published under a modified BSD license. 
     2 * See http://svn.openlayers.org/trunk/openlayers/repository-license.txt  
     3 * for the full text of the license. */ 
     4 
    45 
    56/** 
  • branches/openlayers/2.2/lib/OpenLayers/Events.js

    r1692 r1740  
    1 /* Copyright (c) 2006 MetaCarta, Inc., published under the BSD license. 
    2  * See http://svn.openlayers.org/trunk/openlayers/license.txt for the full 
    3  * text of the license. */ 
     1/* Copyright (c) 2006 MetaCarta, Inc., published under a modified BSD license. 
     2 * See http://svn.openlayers.org/trunk/openlayers/repository-license.txt  
     3 * for the full text of the license. */ 
     4 
    45 
    56OpenLayers.Event = { 
  • branches/openlayers/2.2/lib/OpenLayers/Feature.js

    r1588 r1740  
    1 /* Copyright (c) 2006 MetaCarta, Inc., published under the BSD license. 
    2  * See http://svn.openlayers.org/trunk/openlayers/license.txt for the full 
    3  * text of the license. */ 
     1/* Copyright (c) 2006 MetaCarta, Inc., published under a modified BSD license. 
     2 * See http://svn.openlayers.org/trunk/openlayers/repository-license.txt  
     3 * for the full text of the license. */ 
     4 
    45 
    56/** 
  • branches/openlayers/2.2/lib/OpenLayers/Feature/WFS.js

    r1651 r1740  
    1 /* Copyright (c) 2006 MetaCarta, Inc., published under the BSD license. 
    2  * See http://svn.openlayers.org/trunk/openlayers/license.txt for the full 
    3  * text of the license. */ 
     1/* Copyright (c) 2006 MetaCarta, Inc., published under a modified BSD license. 
     2 * See http://svn.openlayers.org/trunk/openlayers/repository-license.txt  
     3 * for the full text of the license. */ 
     4 
    45 
    56/** 
  • branches/openlayers/2.2/lib/OpenLayers/Icon.js

    r1651 r1740  
    1 /* Copyright (c) 2006 MetaCarta, Inc., published under the BSD license. 
    2  * See http://svn.openlayers.org/trunk/openlayers/license.txt for the full 
    3  * text of the license. */ 
     1/* Copyright (c) 2006 MetaCarta, Inc., published under a modified BSD license. 
     2 * See http://svn.openlayers.org/trunk/openlayers/repository-license.txt  
     3 * for the full text of the license. */ 
     4 
    45 
    56/** 
  • branches/openlayers/2.2/lib/OpenLayers/Layer.js

    r1702 r1740  
    1 /* Copyright (c) 2006 MetaCarta, Inc., published under the BSD license. 
    2  * See http://svn.openlayers.org/trunk/openlayers/license.txt for the full 
    3  * text of the license. */ 
     1/* Copyright (c) 2006 MetaCarta, Inc., published under a modified BSD license. 
     2 * See http://svn.openlayers.org/trunk/openlayers/repository-license.txt  
     3 * for the full text of the license. */ 
     4 
    45 
    56/** 
  • branches/openlayers/2.2/lib/OpenLayers/Layer/Boxes.js

    r1649 r1740  
    1 /* Copyright (c) 2006 MetaCarta, Inc., published under the BSD license. 
    2  * See http://svn.openlayers.org/trunk/openlayers/license.txt for the full 
    3  * text of the license. */ 
     1/* Copyright (c) 2006 MetaCarta, Inc., published under a modified BSD license. 
     2 * See http://svn.openlayers.org/trunk/openlayers/repository-license.txt  
     3 * for the full text of the license. */ 
     4 
    45 
    56/** 
  • branches/openlayers/2.2/lib/OpenLayers/Layer/Canvas.js

    r1649 r1740  
    1 /* Copyright (c) 2006 MetaCarta, Inc., published under the BSD license. 
    2  * See http://svn.openlayers.org/trunk/openlayers/license.txt for the full 
    3  * text of the license. */ 
     1/* Copyright (c) 2006 MetaCarta, Inc., published under a modified BSD license. 
     2 * See http://svn.openlayers.org/trunk/openlayers/repository-license.txt  
     3 * for the full text of the license. */ 
     4 
    45 
    56/** 
  • branches/openlayers/2.2/lib/OpenLayers/Layer/EventPane.js

    r1695 r1740  
    1 /* Copyright (c) 2006 MetaCarta, Inc., published under the BSD license. 
    2  * See http://svn.openlayers.org/trunk/openlayers/license.txt for the full 
    3  * text of the license. */ 
     1/* Copyright (c) 2006 MetaCarta, Inc., published under a modified BSD license. 
     2 * See http://svn.openlayers.org/trunk/openlayers/repository-license.txt  
     3 * for the full text of the license. */ 
     4 
    45 
    56/** 
  • branches/openlayers/2.2/lib/OpenLayers/Layer/FixedZoomLevels.js

    r1695 r1740  
    1 /* Copyright (c) 2006 MetaCarta, Inc., published under the BSD license. 
    2  * See http://svn.openlayers.org/trunk/openlayers/license.txt for the full 
    3  * text of the license. */ 
     1/* Copyright (c) 2006 MetaCarta, Inc., published under a modified BSD license. 
     2 * See http://svn.openlayers.org/trunk/openlayers/repository-license.txt  
     3 * for the full text of the license. */ 
     4 
    45 
    56 
  • branches/openlayers/2.2/lib/OpenLayers/Layer/GeoRSS.js

    r1695 r1740  
    1 /* Copyright (c) 2006 MetaCarta, Inc., published under the BSD license. 
    2  * See http://svn.openlayers.org/trunk/openlayers/license.txt for the full 
    3  * text of the license. */ 
     1/* Copyright (c) 2006 MetaCarta, Inc., published under a modified BSD license. 
     2 * See http://svn.openlayers.org/trunk/openlayers/repository-license.txt  
     3 * for the full text of the license. */ 
     4 
    45 
    56/** 
  • branches/openlayers/2.2/lib/OpenLayers/Layer/Google.js

    r1714 r1740  
    1 /* Copyright (c) 2006 MetaCarta, Inc., published under the BSD license. 
    2  * See http://svn.openlayers.org/trunk/openlayers/license.txt for the full 
    3  * text of the license. */ 
     1/* Copyright (c) 2006 MetaCarta, Inc., published under a modified BSD license. 
     2 * See http://svn.openlayers.org/trunk/openlayers/repository-license.txt  
     3 * for the full text of the license. */ 
     4 
    45 
    56/** 
  • branches/openlayers/2.2/lib/OpenLayers/Layer/Grid.js

    r1649 r1740  
    1 /* Copyright (c) 2006 MetaCarta, Inc., published under the BSD license. 
    2  * See http://svn.openlayers.org/trunk/openlayers/license.txt for the full 
    3  * text of the license. */ 
     1/* Copyright (c) 2006 MetaCarta, Inc., published under a modified BSD license. 
     2 * See http://svn.openlayers.org/trunk/openlayers/repository-license.txt  
     3 * for the full text of the license. */ 
     4 
    45 
    56/** 
  • branches/openlayers/2.2/lib/OpenLayers/Layer/HTTPRequest.js

    r1695 r1740  
    1 /* Copyright (c) 2006 MetaCarta, Inc., published under the BSD license. 
    2  * See http://svn.openlayers.org/trunk/openlayers/license.txt for the full 
    3  * text of the license. */ 
     1/* Copyright (c) 2006 MetaCarta, Inc., published under a modified BSD license. 
     2 * See http://svn.openlayers.org/trunk/openlayers/repository-license.txt  
     3 * for the full text of the license. */ 
     4 
    45 
    56/** 
  • branches/openlayers/2.2/lib/OpenLayers/Layer/Image.js

    r1712 r1740  
     1/* Copyright (c) 2006 MetaCarta, Inc., published under a modified BSD license. 
     2 * See http://svn.openlayers.org/trunk/openlayers/repository-license.txt  
     3 * for the full text of the license. */ 
     4  
    15/** 
    26 * @fileoverview Image Layer 
     
    1317  OpenLayers.Class.inherit(OpenLayers.Layer, { 
    1418 
    15     /** @type String */ 
    16     name: null, 
    17  
     19    /** By default, Layer.Image will be a baselayer 
     20     *  
     21     * @type Boolean */ 
     22    isBaseLayer: true, 
     23     
    1824    /** @type String */ 
    1925    url: null, 
     
    2531    size: null, 
    2632 
    27     /** @type Object */ 
    28     options: null, 
    29  
    3033    /** @type OpenLayers.Tile.Image */ 
    3134    tile: null, 
    3235 
    33     /** 
    34      * The ratio of height/width represented by a single pixel in the graphic 
     36    /** The ratio of height/width represented by a single pixel in the graphic 
    3537     *  
    3638     * @type Float */ 
     
    5052        this.extent = extent; 
    5153        this.size = size; 
     54        OpenLayers.Layer.prototype.initialize.apply(this, [name, options]); 
     55 
    5256        this.aspectRatio = (this.extent.getHeight() / this.size.h) / 
    5357                           (this.extent.getWidth() / this.size.w); 
    54         OpenLayers.Layer.prototype.initialize.apply(this, [name, options]); 
    55  
    56         // unless explicitly set in options, the layer will be a base layer 
    57         if((options == null) || (options.isBaseLayer == null)) { 
    58             this.isBaseLayer = true; 
    59         } 
    6058    },     
    6159 
     
    9492     
    9593    /** 
    96      * This is a bad method to have here.  It would be nicer to be able 
    97      * to ask Layer directly. 
    98      */ 
    99     shouldCalcResolutions: function() { 
    100         var props = new Array( 
    101             'scales', 'resolutions', 
    102             'maxScale', 'minScale',  
    103             'maxResolution', 'minResolution',  
    104             'minExtent', 'maxExtent', 
    105             'numZoomLevels', 'maxZoomLevel' 
    106         ); 
    107         for(var i=0; i < props.length; i++) { 
    108             var property = props[i]; 
    109             if(this.options[property] != null) { 
    110                 return false; 
    111             } 
    112         } 
    113         return true; 
    114     }, 
    115          
    116      
    117     /** 
    11894     * @param {OpenLayers.Map} map 
    11995     */ 
     
    12197        // If nothing to do with resolutions has been set, assume a single 
    12298        //  resolution determined by extent/size 
    123         if(this.shouldCalcResolutions()) { 
    124             this.options.resolutions = [this.extent.getWidth() / this.size.w]
     99        if( this.options.maxResolution == null ) { 
     100           this.options.maxResolution = this.extent.getWidth() / this.size.w
    125101        } 
    126102        OpenLayers.Layer.prototype.setMap.apply(this, arguments); 
    127103    }, 
    128104 
    129     /** When zooming or first rendering, create a new tile for the image. 
     105    /** Create the tile for the image or resize it for the new resolution 
    130106     *  
    131107     * @param {OpenLayers.Bounds} bounds 
     
    140116        if(zoomChanged || firstRendering) { 
    141117 
    142             //clear out the old tile 
    143             if(this.tile) { 
    144                 this.tile.destroy(); 
    145                 this.tile = null; 
    146             } 
    147              
    148             //determine new tile bounds 
    149             var tileBounds = this.extent.clone(); 
    150  
    151118            //determine new tile size 
    152119            var tileWidth = this.extent.getWidth() / this.map.getResolution(); 
     
    156123             
    157124            //determine new position (upper left corner of new bounds) 
    158             var ul = new OpenLayers.LonLat(tileBounds.left, tileBounds.top); 
    159             var pos = this.map.getLayerPxFromLonLat(ul); 
     125            var ul = new OpenLayers.LonLat(this.extent.left, this.extent.top); 
     126            var ulPx = this.map.getLayerPxFromLonLat(ul); 
    160127 
    161             this.tile = new OpenLayers.Tile.Image(this, pos, tileBounds,  
    162                                                   this.url, tileSize); 
     128            if(firstRendering) { 
     129                //create the new tile 
     130                this.tile = new OpenLayers.Tile.Image(this, ulPx, this.extent,  
     131                                                      this.url, tileSize); 
     132            } else { 
     133                //just resize the tile and set it's new position 
     134                this.tile.size = tileSize.clone(); 
     135                this.tile.position = ulPx.clone(); 
     136            } 
    163137            this.tile.draw(); 
    164138        } 
     
    170144    setUrl: function(newUrl) { 
    171145        this.url = newUrl; 
    172         this.moveTo(); 
     146        this.draw(); 
    173147    }, 
    174148 
    175     /** 
     149    /** The url we return is always the same (the image itself never changes) 
     150     *   so we can ignore the bounds parameter (it will always be the same,  
     151     *   anyways)  
     152     *  
    176153     * @param {OpenLayers.Bounds} bounds 
    177154     */ 
  • branches/openlayers/2.2/lib/OpenLayers/Layer/KaMap.js

    r1651 r1740  
    1 /* Copyright (c) 2006 MetaCarta, Inc., published under the BSD license. 
    2  * See http://svn.openlayers.org/trunk/openlayers/license.txt for the full 
    3  * text of the license. */ 
     1/* Copyright (c) 2006 MetaCarta, Inc., published under a modified BSD license. 
     2 * See http://svn.openlayers.org/trunk/openlayers/repository-license.txt  
     3 * for the full text of the license. */ 
     4 
    45 
    56/** 
  • branches/openlayers/2.2/lib/OpenLayers/Layer/MapServer.js

    r1651 r1740  
    1 /* Copyright (c) 2006 MetaCarta, Inc., published under the BSD license. 
    2  * See http://svn.openlayers.org/trunk/openlayers/license.txt for the full 
    3  * text of the license. */ 
     1/* Copyright (c) 2006 MetaCarta, Inc., published under a modified BSD license. 
     2 * See http://svn.openlayers.org/trunk/openlayers/repository-license.txt  
     3 * for the full text of the license. */ 
    44// @requires OpenLayers/Layer/Grid.js 
    55/** 
  • branches/openlayers/2.2/lib/OpenLayers/Layer/Markers.js

    r1649 r1740  
    1 /* Copyright (c) 2006 MetaCarta, Inc., published under the BSD license. 
    2  * See http://svn.openlayers.org/trunk/openlayers/license.txt for the full 
    3  * text of the license. */ 
     1/* Copyright (c) 2006 MetaCarta, Inc., published under a modified BSD license. 
     2 * See http://svn.openlayers.org/trunk/openlayers/repository-license.txt  
     3 * for the full text of the license. */ 
     4 
    45 
    56/** 
  • branches/openlayers/2.2/lib/OpenLayers/Layer/MultiMap.js

    r1714 r1740  
    1 /* Copyright (c) 2006 MetaCarta, Inc., published under the BSD license. 
    2  * See http://svn.openlayers.org/trunk/openlayers/license.txt for the full 
    3  * text of the license. */ 
     1/* Copyright (c) 2006 MetaCarta, Inc., published under a modified BSD license. 
     2 * See http://svn.openlayers.org/trunk/openlayers/repository-license.txt  
     3 * for the full text of the license. */ 
    44 
    55/** 
  • branches/openlayers/2.2/lib/OpenLayers/Layer/Text.js

    r1649 r1740  
    1 /* Copyright (c) 2006 MetaCarta, Inc., published under the BSD license. 
    2  * See http://svn.openlayers.org/trunk/openlayers/license.txt for the full 
    3  * text of the license. */ 
     1/* Copyright (c) 2006 MetaCarta, Inc., published under a modified BSD license. 
     2 * See http://svn.openlayers.org/trunk/openlayers/repository-license.txt  
     3 * for the full text of the license. */ 
     4 
    45 
    56/** 
  • branches/openlayers/2.2/lib/OpenLayers/Layer/VirtualEarth.js

    r1714 r1740  
    1 /* Copyright (c) 2006 MetaCarta, Inc., published under the BSD license. 
    2  * See http://svn.openlayers.org/trunk/openlayers/license.txt for the full 
    3  * text of the license. */ 
     1/* Copyright (c) 2006 MetaCarta, Inc., published under a modified BSD license. 
     2 * See http://svn.openlayers.org/trunk/openlayers/repository-license.txt  
     3 * for the full text of the license. */ 
     4 
    45 
    56/** 
  • branches/openlayers/2.2/lib/OpenLayers/Layer/WFS.js

    r1651 r1740  
    1 /* Copyright (c) 2006 MetaCarta, Inc., published under the BSD license. 
    2  * See http://svn.openlayers.org/trunk/openlayers/license.txt for the full 
    3  * text of the license. */ 
     1/* Copyright (c) 2006 MetaCarta, Inc., published under a modified BSD license. 
     2 * See http://svn.openlayers.org/trunk/openlayers/repository-license.txt  
     3 * for the full text of the license. */ 
     4 
    45 
    56/** 
  • branches/openlayers/2.2/lib/OpenLayers/Layer/WMS.js

    r1695 r1740  
    1 /* Copyright (c) 2006 MetaCarta, Inc., published under the BSD license. 
    2  * See http://svn.openlayers.org/trunk/openlayers/license.txt for the full 
    3  * text of the license. */ 
     1/* Copyright (c) 2006 MetaCarta, Inc., published under a modified BSD license. 
     2 * See http://svn.openlayers.org/trunk/openlayers/repository-license.txt  
     3 * for the full text of the license. */ 
     4 
    45 
    56/** 
  • branches/openlayers/2.2/lib/OpenLayers/Layer/WMS/Untiled.js

    r1705 r1740  
    1 /* Copyright (c) 2006 MetaCarta, Inc., published under the BSD license. 
    2  * See http://svn.openlayers.org/trunk/openlayers/license.txt for the full 
    3  * text of the license. */ 
     1/* Copyright (c) 2006 MetaCarta, Inc., published under a modified BSD license. 
     2 * See http://svn.openlayers.org/trunk/openlayers/repository-license.txt  
     3 * for the full text of the license. */ 
     4 
    45  
    56/** 
  • branches/openlayers/2.2/lib/OpenLayers/Layer/WorldWind.js

    r1694 r1740  
    1 /* Copyright (c) 2006 MetaCarta, Inc., published under the BSD license. 
    2  * See http://svn.openlayers.org/trunk/openlayers/license.txt for the full 
    3  * text of the license. */ 
     1/* Copyright (c) 2006 MetaCarta, Inc., published under a modified BSD license. 
     2 * See http://svn.openlayers.org/trunk/openlayers/repository-license.txt  
     3 * for the full text of the license. */ 
     4 
    45 
    56/** 
  • branches/openlayers/2.2/lib/OpenLayers/Layer/Yahoo.js

    r1714 r1740  
    1 /* Copyright (c) 2006 MetaCarta, Inc., published under the BSD license. 
    2  * See http://svn.openlayers.org/trunk/openlayers/license.txt for the full 
    3  * text of the license. */ 
     1/* Copyright (c) 2006 MetaCarta, Inc., published under a modified BSD license. 
     2 * See http://svn.openlayers.org/trunk/openlayers/repository-license.txt  
     3 * for the full text of the license. */ 
     4 
    45 
    56/** 
  • branches/openlayers/2.2/lib/OpenLayers/Map.js

    r1702 r1740  
    1 /* Copyright (c) 2006 MetaCarta, Inc., published under the BSD license. 
    2  * See http://svn.openlayers.org/trunk/openlayers/license.txt for the full 
    3  * text of the license. */ 
     1/* Copyright (c) 2006 MetaCarta, Inc., published under a modified BSD license. 
     2 * See http://svn.openlayers.org/trunk/openlayers/repository-license.txt  
     3 * for the full text of the license. */ 
     4 
    45 
    56/** 
  • branches/openlayers/2.2/lib/OpenLayers/Marker.js

    r1651 r1740  
    1 /* Copyright (c) 2006 MetaCarta, Inc., published under the BSD license. 
    2  * See http://svn.openlayers.org/trunk/openlayers/license.txt for the full 
    3  * text of the license. */ 
     1/* Copyright (c) 2006 MetaCarta, Inc., published under a modified BSD license. 
     2 * See http://svn.openlayers.org/trunk/openlayers/repository-license.txt  
     3 * for the full text of the license. */ 
     4 
    45 
    56/** 
  • branches/openlayers/2.2/lib/OpenLayers/Marker/Box.js

    r1651 r1740  
    1 /* Copyright (c) 2006 MetaCarta, Inc., published under the BSD license. 
    2  * See http://svn.openlayers.org/trunk/openlayers/license.txt for the full 
    3  * text of the license. */ 
     1/* Copyright (c) 2006 MetaCarta, Inc., published under a modified BSD license. 
     2 * See http://svn.openlayers.org/trunk/openlayers/repository-license.txt  
     3 * for the full text of the license. */ 
     4 
    45 
    56/** 
  • branches/openlayers/2.2/lib/OpenLayers/Popup.js