Changeset 1740
- Timestamp:
- 10/27/06 10:26:28 (2 years ago)
- Files:
-
- branches/openlayers/2.2/build/docs.sh (modified) (1 diff)
- branches/openlayers/2.2/build/library.cfg (modified) (1 diff)
- branches/openlayers/2.2/build/license.txt (modified) (1 diff)
- branches/openlayers/2.2/doc/Layer.Image.txt (copied) (copied from trunk/openlayers/doc/Layer.Image.txt)
- branches/openlayers/2.2/examples/image-layer.html (copied) (copied from trunk/openlayers/examples/image-layer.html)
- branches/openlayers/2.2/lib/OpenLayers.js (modified) (2 diffs)
- branches/openlayers/2.2/lib/OpenLayers/Ajax.js (modified) (1 diff)
- branches/openlayers/2.2/lib/OpenLayers/BaseTypes.js (modified) (1 diff)
- branches/openlayers/2.2/lib/OpenLayers/Control.js (modified) (1 diff)
- branches/openlayers/2.2/lib/OpenLayers/Control/ArgParser.js (modified) (1 diff)
- branches/openlayers/2.2/lib/OpenLayers/Control/KeyboardDefaults.js (modified) (1 diff)
- branches/openlayers/2.2/lib/OpenLayers/Control/LayerSwitcher.js (modified) (1 diff)
- branches/openlayers/2.2/lib/OpenLayers/Control/MouseDefaults.js (modified) (1 diff)
- branches/openlayers/2.2/lib/OpenLayers/Control/MousePosition.js (modified) (1 diff)
- branches/openlayers/2.2/lib/OpenLayers/Control/MouseToolbar.js (modified) (1 diff)
- branches/openlayers/2.2/lib/OpenLayers/Control/OverviewMap.js (modified) (1 diff)
- branches/openlayers/2.2/lib/OpenLayers/Control/PanZoom.js (modified) (1 diff)
- branches/openlayers/2.2/lib/OpenLayers/Control/PanZoomBar.js (modified) (1 diff)
- branches/openlayers/2.2/lib/OpenLayers/Control/Permalink.js (modified) (1 diff)
- branches/openlayers/2.2/lib/OpenLayers/Control/Scale.js (modified) (1 diff)
- branches/openlayers/2.2/lib/OpenLayers/Events.js (modified) (1 diff)
- branches/openlayers/2.2/lib/OpenLayers/Feature.js (modified) (1 diff)
- branches/openlayers/2.2/lib/OpenLayers/Feature/WFS.js (modified) (1 diff)
- branches/openlayers/2.2/lib/OpenLayers/Icon.js (modified) (1 diff)
- branches/openlayers/2.2/lib/OpenLayers/Layer.js (modified) (1 diff)
- branches/openlayers/2.2/lib/OpenLayers/Layer/Boxes.js (modified) (1 diff)
- branches/openlayers/2.2/lib/OpenLayers/Layer/Canvas.js (modified) (1 diff)
- branches/openlayers/2.2/lib/OpenLayers/Layer/EventPane.js (modified) (1 diff)
- branches/openlayers/2.2/lib/OpenLayers/Layer/FixedZoomLevels.js (modified) (1 diff)
- branches/openlayers/2.2/lib/OpenLayers/Layer/GeoRSS.js (modified) (1 diff)
- branches/openlayers/2.2/lib/OpenLayers/Layer/Google.js (modified) (1 diff)
- branches/openlayers/2.2/lib/OpenLayers/Layer/Grid.js (modified) (1 diff)
- branches/openlayers/2.2/lib/OpenLayers/Layer/HTTPRequest.js (modified) (1 diff)
- branches/openlayers/2.2/lib/OpenLayers/Layer/Image.js (copied) (copied from trunk/openlayers/lib/OpenLayers/Layer/Image.js) (9 diffs)
- branches/openlayers/2.2/lib/OpenLayers/Layer/KaMap.js (modified) (1 diff)
- branches/openlayers/2.2/lib/OpenLayers/Layer/MapServer.js (modified) (1 diff)
- branches/openlayers/2.2/lib/OpenLayers/Layer/Markers.js (modified) (1 diff)
- branches/openlayers/2.2/lib/OpenLayers/Layer/MultiMap.js (modified) (1 diff)
- branches/openlayers/2.2/lib/OpenLayers/Layer/Text.js (modified) (1 diff)
- branches/openlayers/2.2/lib/OpenLayers/Layer/VirtualEarth.js (modified) (1 diff)
- branches/openlayers/2.2/lib/OpenLayers/Layer/WFS.js (modified) (1 diff)
- branches/openlayers/2.2/lib/OpenLayers/Layer/WMS.js (modified) (1 diff)
- branches/openlayers/2.2/lib/OpenLayers/Layer/WMS/Untiled.js (modified) (1 diff)
- branches/openlayers/2.2/lib/OpenLayers/Layer/WorldWind.js (modified) (1 diff)
- branches/openlayers/2.2/lib/OpenLayers/Layer/Yahoo.js (modified) (1 diff)
- branches/openlayers/2.2/lib/OpenLayers/Map.js (modified) (1 diff)
- branches/openlayers/2.2/lib/OpenLayers/Marker.js (modified) (1 diff)
- branches/openlayers/2.2/lib/OpenLayers/Marker/Box.js (modified) (1 diff)
- branches/openlayers/2.2/lib/OpenLayers/Popup.js (modified) (1 diff)
- branches/openlayers/2.2/lib/OpenLayers/Popup/Anchored.js (modified) (1 diff)
- branches/openlayers/2.2/lib/OpenLayers/Popup/AnchoredBubble.js (modified) (1 diff)
- branches/openlayers/2.2/lib/OpenLayers/SingleFile.js (modified) (1 diff)
- branches/openlayers/2.2/lib/OpenLayers/Tile.js (modified) (3 diffs)
- branches/openlayers/2.2/lib/OpenLayers/Tile/Image.js (modified) (1 diff)
- branches/openlayers/2.2/lib/OpenLayers/Tile/WFS.js (modified) (3 diffs)
- branches/openlayers/2.2/lib/OpenLayers/Util.js (modified) (1 diff)
- branches/openlayers/2.2/license.txt (deleted)
- branches/openlayers/2.2/release-license.txt (copied) (copied from trunk/openlayers/release-license.txt)
- branches/openlayers/2.2/repository-license.txt (copied) (copied from trunk/openlayers/repository-license.txt)
- branches/openlayers/2.2/tests/list-tests.html (modified) (1 diff)
- branches/openlayers/2.2/tests/test_Layer_Image.html (copied) (copied from trunk/openlayers/tests/test_Layer_Image.html)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
branches/openlayers/2.2/build/docs.sh
r1695 r1740 2 2 3 3 rm ../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"4 CLASSES="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" 5 5 echo "<html> 6 6 <head> branches/openlayers/2.2/build/library.cfg
r1695 r1740 11 11 12 12 [exclude] 13 OpenLayers/Layer/Yahoo.js14 13 OpenLayers/Control/KeyboardDefaults.js branches/openlayers/2.2/build/license.txt
r1588 r1740 3 3 OpenLayers.js -- OpenLayers Map Viewer Library 4 4 5 Copyright 2005-2006 MetaCarta, Inc., released under the BSD License.6 Please see http://svn.openlayers.org/trunk/openlayers/ license.txt5 Copyright 2005-2006 MetaCarta, Inc., released under a modified BSD license. 6 Please see http://svn.openlayers.org/trunk/openlayers/repository-license.txt 7 7 for the full text of the license. 8 8 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 4 5 //// 5 6 /// This blob sucks in all the files in uncompressed form for ease of use … … 66 67 "OpenLayers/Tile/Image.js", 67 68 "OpenLayers/Tile/WFS.js", 69 "OpenLayers/Layer/Image.js", 68 70 "OpenLayers/Layer/EventPane.js", 69 71 "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 4 5 5 6 OpenLayers.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 4 5 5 6 /* 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 4 5 5 6 /** 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 4 5 5 6 /** 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 4 5 5 6 /** branches/openlayers/2.2/lib/OpenLayers/Control/LayerSwitcher.js
r1654 r1740 1 /* Copyright (c) 2006 MetaCarta, Inc., published under theBSD license.2 * See http://svn.openlayers.org/trunk/openlayers/ license.txt for the full3 * 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 4 5 5 /** 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 4 5 5 6 /** 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 4 5 5 6 /** 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 4 5 5 6 /** 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. */ 1 4 /** 2 5 * @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 4 5 5 6 /** 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 4 5 5 6 /** 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 4 5 5 6 /** 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 4 5 5 6 /** 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 4 5 5 6 OpenLayers.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 4 5 5 6 /** 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 4 5 5 6 /** 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 4 5 5 6 /** 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 4 5 5 6 /** 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 4 5 5 6 /** 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 4 5 5 6 /** 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 4 5 5 6 /** 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 4 5 5 6 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 4 5 5 6 /** 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 4 5 5 6 /** 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 4 5 5 6 /** 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 4 5 5 6 /** 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 1 5 /** 2 6 * @fileoverview Image Layer … … 13 17 OpenLayers.Class.inherit(OpenLayers.Layer, { 14 18 15 /** @type String */ 16 name: null, 17 19 /** By default, Layer.Image will be a baselayer 20 * 21 * @type Boolean */ 22 isBaseLayer: true, 23 18 24 /** @type String */ 19 25 url: null, … … 25 31 size: null, 26 32 27 /** @type Object */28 options: null,29 30 33 /** @type OpenLayers.Tile.Image */ 31 34 tile: null, 32 35 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 35 37 * 36 38 * @type Float */ … … 50 52 this.extent = extent; 51 53 this.size = size; 54 OpenLayers.Layer.prototype.initialize.apply(this, [name, options]); 55 52 56 this.aspectRatio = (this.extent.getHeight() / this.size.h) / 53 57 (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 layer57 if((options == null) || (options.isBaseLayer == null)) {58 this.isBaseLayer = true;59 }60 58 }, 61 59 … … 94 92 95 93 /** 96 * This is a bad method to have here. It would be nicer to be able97 * 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 /**118 94 * @param {OpenLayers.Map} map 119 95 */ … … 121 97 // If nothing to do with resolutions has been set, assume a single 122 98 // 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; 125 101 } 126 102 OpenLayers.Layer.prototype.setMap.apply(this, arguments); 127 103 }, 128 104 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 130 106 * 131 107 * @param {OpenLayers.Bounds} bounds … … 140 116 if(zoomChanged || firstRendering) { 141 117 142 //clear out the old tile143 if(this.tile) {144 this.tile.destroy();145 this.tile = null;146 }147 148 //determine new tile bounds149 var tileBounds = this.extent.clone();150 151 118 //determine new tile size 152 119 var tileWidth = this.extent.getWidth() / this.map.getResolution(); … … 156 123 157 124 //determine new position (upper left corner of new bounds) 158 var ul = new OpenLayers.LonLat(t ileBounds.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); 160 127 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 } 163 137 this.tile.draw(); 164 138 } … … 170 144 setUrl: function(newUrl) { 171 145 this.url = newUrl; 172 this. moveTo();146 this.draw(); 173 147 }, 174 148 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 * 176 153 * @param {OpenLayers.Bounds} bounds 177 154 */ 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 4 5 5 6 /** branches/openlayers/2.2/lib/OpenLayers/Layer/MapServer.js
r1651 r1740 1 /* Copyright (c) 2006 MetaCarta, Inc., published under theBSD license.2 * See http://svn.openlayers.org/trunk/openlayers/ license.txt for the full3 * 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 4 // @requires OpenLayers/Layer/Grid.js 5 5 /** 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 4 5 5 6 /** branches/openlayers/2.2/lib/OpenLayers/Layer/MultiMap.js
r1714 r1740 1 /* Copyright (c) 2006 MetaCarta, Inc., published under theBSD license.2 * See http://svn.openlayers.org/trunk/openlayers/ license.txt for the full3 * 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 4 5 5 /** 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 4 5 5 6 /** 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 4 5 5 6 /** 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 4 5 5 6 /** 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 4 5 5 6 /** 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 4 5 5 6 /** 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 4 5 5 6 /** 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 4 5 5 6 /** 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 4 5 5 6 /** 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 4 5 5 6 /** 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 4 5 5 6 /** branches/openlayers/2.2/lib/OpenLayers/Popup.js
