diff --git a/build/license.txt b/build/license.txt index 369af6a5a6..91f00da32d 100644 --- a/build/license.txt +++ b/build/license.txt @@ -2,8 +2,8 @@ OpenLayers.js -- OpenLayers Map Viewer Library - Copyright 2005-2007 MetaCarta, Inc., released under a modified BSD license. - Please see http://svn.openlayers.org/trunk/openlayers/repository-license.txt + Copyright 2005-2007 MetaCarta, Inc., released under the BSD license. + 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: diff --git a/examples/kml-layer-linestring.html b/examples/kml-layer-linestring.html deleted file mode 100644 index 8b55185338..0000000000 --- a/examples/kml-layer-linestring.html +++ /dev/null @@ -1,30 +0,0 @@ - - - - - - - -
- - diff --git a/examples/kml-layer.html b/examples/kml-layer.html index 2e91865a6b..da99f9c184 100644 --- a/examples/kml-layer.html +++ b/examples/kml-layer.html @@ -19,8 +19,8 @@ layer = new OpenLayers.Layer.WMS( "OpenLayers WMS", "http://labs.metacarta.com/wms/vmap0", {layers: 'basic'} ); map.addLayer(layer); - map.addLayer(new OpenLayers.Layer.GML("KML", "kml/mc-search.kml", {format: OpenLayers.Format.KML})); - map.zoomToMaxExtent(); + map.addLayer(new OpenLayers.Layer.GML("KML", "kml/lines.kml", {format: OpenLayers.Format.KML})); + map.zoomToExtent(new OpenLayers.Bounds(-112.306698,36.017792,-112.03204,36.18087)); } diff --git a/lib/OpenLayers.js b/lib/OpenLayers.js index cdc53dd9db..75ae432b4d 100644 --- a/lib/OpenLayers.js +++ b/lib/OpenLayers.js @@ -1,5 +1,5 @@ -/* Copyright (c) 2006-2007 MetaCarta, Inc., published under a modified BSD license. - * See http://svn.openlayers.org/trunk/openlayers/repository-license.txt +/* Copyright (c) 2006-2007 MetaCarta, Inc., published under the BSD license. + * See http://svn.openlayers.org/trunk/openlayers/release-license.txt * for the full text of the license. */ /* diff --git a/lib/OpenLayers/Ajax.js b/lib/OpenLayers/Ajax.js index d0ab1dec24..d2663c2dab 100644 --- a/lib/OpenLayers/Ajax.js +++ b/lib/OpenLayers/Ajax.js @@ -1,5 +1,5 @@ -/* Copyright (c) 2006-2007 MetaCarta, Inc., published under a modified BSD license. - * See http://svn.openlayers.org/trunk/openlayers/repository-license.txt +/* Copyright (c) 2006-2007 MetaCarta, Inc., published under the BSD license. + * See http://svn.openlayers.org/trunk/openlayers/release-license.txt * for the full text of the license. */ diff --git a/lib/OpenLayers/BaseTypes.js b/lib/OpenLayers/BaseTypes.js index 1589269607..3aa86247e6 100644 --- a/lib/OpenLayers/BaseTypes.js +++ b/lib/OpenLayers/BaseTypes.js @@ -1,5 +1,5 @@ -/* Copyright (c) 2006-2007 MetaCarta, Inc., published under a modified BSD license. - * See http://svn.openlayers.org/trunk/openlayers/repository-license.txt +/* Copyright (c) 2006-2007 MetaCarta, Inc., published under the BSD license. + * See http://svn.openlayers.org/trunk/openlayers/release-license.txt * for the full text of the license. */ /** diff --git a/lib/OpenLayers/BaseTypes/Bounds.js b/lib/OpenLayers/BaseTypes/Bounds.js index a33c0ef3bc..0388cad9e1 100644 --- a/lib/OpenLayers/BaseTypes/Bounds.js +++ b/lib/OpenLayers/BaseTypes/Bounds.js @@ -1,5 +1,5 @@ -/* Copyright (c) 2006-2007 MetaCarta, Inc., published under a modified BSD license. - * See http://svn.openlayers.org/trunk/openlayers/repository-license.txt +/* Copyright (c) 2006-2007 MetaCarta, Inc., published under the BSD license. + * See http://svn.openlayers.org/trunk/openlayers/release-license.txt * for the full text of the license. */ /** diff --git a/lib/OpenLayers/BaseTypes/Class.js b/lib/OpenLayers/BaseTypes/Class.js index 664bbfb0b0..98df0209b3 100644 --- a/lib/OpenLayers/BaseTypes/Class.js +++ b/lib/OpenLayers/BaseTypes/Class.js @@ -1,5 +1,5 @@ -/* Copyright (c) 2006-2007 MetaCarta, Inc., published under a modified BSD license. - * See http://svn.openlayers.org/trunk/openlayers/repository-license.txt +/* Copyright (c) 2006-2007 MetaCarta, Inc., published under the BSD license. + * See http://svn.openlayers.org/trunk/openlayers/release-license.txt * for the full text of the license. */ /** diff --git a/lib/OpenLayers/BaseTypes/Element.js b/lib/OpenLayers/BaseTypes/Element.js index de12e41448..0ab2b429f6 100644 --- a/lib/OpenLayers/BaseTypes/Element.js +++ b/lib/OpenLayers/BaseTypes/Element.js @@ -1,5 +1,5 @@ -/* Copyright (c) 2006-2007 MetaCarta, Inc., published under a modified BSD license. - * See http://svn.openlayers.org/trunk/openlayers/repository-license.txt +/* Copyright (c) 2006-2007 MetaCarta, Inc., published under the BSD license. + * See http://svn.openlayers.org/trunk/openlayers/release-license.txt * for the full text of the license. */ /** diff --git a/lib/OpenLayers/BaseTypes/LonLat.js b/lib/OpenLayers/BaseTypes/LonLat.js index f881d65ee3..922e7a9ae0 100644 --- a/lib/OpenLayers/BaseTypes/LonLat.js +++ b/lib/OpenLayers/BaseTypes/LonLat.js @@ -1,5 +1,5 @@ -/* Copyright (c) 2006-2007 MetaCarta, Inc., published under a modified BSD license. - * See http://svn.openlayers.org/trunk/openlayers/repository-license.txt +/* Copyright (c) 2006-2007 MetaCarta, Inc., published under the BSD license. + * See http://svn.openlayers.org/trunk/openlayers/release-license.txt * for the full text of the license. */ /** diff --git a/lib/OpenLayers/BaseTypes/Pixel.js b/lib/OpenLayers/BaseTypes/Pixel.js index 028e16a959..05af7df866 100644 --- a/lib/OpenLayers/BaseTypes/Pixel.js +++ b/lib/OpenLayers/BaseTypes/Pixel.js @@ -1,5 +1,5 @@ -/* Copyright (c) 2006-2007 MetaCarta, Inc., published under a modified BSD license. - * See http://svn.openlayers.org/trunk/openlayers/repository-license.txt +/* Copyright (c) 2006-2007 MetaCarta, Inc., published under the BSD license. + * See http://svn.openlayers.org/trunk/openlayers/release-license.txt * for the full text of the license. */ /** diff --git a/lib/OpenLayers/BaseTypes/Size.js b/lib/OpenLayers/BaseTypes/Size.js index 9ff11a3d07..4f3dde956f 100644 --- a/lib/OpenLayers/BaseTypes/Size.js +++ b/lib/OpenLayers/BaseTypes/Size.js @@ -1,5 +1,5 @@ -/* Copyright (c) 2006-2007 MetaCarta, Inc., published under a modified BSD license. - * See http://svn.openlayers.org/trunk/openlayers/repository-license.txt +/* Copyright (c) 2006-2007 MetaCarta, Inc., published under the BSD license. + * See http://svn.openlayers.org/trunk/openlayers/release-license.txt * for the full text of the license. */ /** diff --git a/lib/OpenLayers/Console.js b/lib/OpenLayers/Console.js index e59419fc9d..e7903913d3 100644 --- a/lib/OpenLayers/Console.js +++ b/lib/OpenLayers/Console.js @@ -1,5 +1,5 @@ -/* Copyright (c) 2006-2007 MetaCarta, Inc., published under a modified BSD license. - * See http://svn.openlayers.org/trunk/openlayers/repository-license.txt +/* Copyright (c) 2006-2007 MetaCarta, Inc., published under the BSD license. + * See http://svn.openlayers.org/trunk/openlayers/release-license.txt * for the full text of the license. */ /** diff --git a/lib/OpenLayers/Control.js b/lib/OpenLayers/Control.js index 6f04a645bd..1db8d57f66 100644 --- a/lib/OpenLayers/Control.js +++ b/lib/OpenLayers/Control.js @@ -1,5 +1,5 @@ -/* Copyright (c) 2006-2007 MetaCarta, Inc., published under a modified BSD license. - * See http://svn.openlayers.org/trunk/openlayers/repository-license.txt +/* Copyright (c) 2006-2007 MetaCarta, Inc., published under the BSD license. + * See http://svn.openlayers.org/trunk/openlayers/release-license.txt * for the full text of the license. */ /** diff --git a/lib/OpenLayers/Control/ArgParser.js b/lib/OpenLayers/Control/ArgParser.js index a0261c7dd2..93eff5ab76 100644 --- a/lib/OpenLayers/Control/ArgParser.js +++ b/lib/OpenLayers/Control/ArgParser.js @@ -1,5 +1,5 @@ -/* Cpyright (c) 2006-2007 MetaCarta, Inc., published under a modified BSD license. - * See http://svn.openlayers.org/trunk/openlayers/repository-license.txt +/* Cpyright (c) 2006-2007 MetaCarta, Inc., published under the BSD license. + * See http://svn.openlayers.org/trunk/openlayers/release-license.txt * for the full text of the license. */ diff --git a/lib/OpenLayers/Control/Attribution.js b/lib/OpenLayers/Control/Attribution.js index fa686ac327..3cd23a18ae 100644 --- a/lib/OpenLayers/Control/Attribution.js +++ b/lib/OpenLayers/Control/Attribution.js @@ -1,5 +1,5 @@ -/* Copyright (c) 2006-2007 MetaCarta, Inc., published under a modified BSD license. - * See http://svn.openlayers.org/trunk/openlayers/repository-license.txt +/* Copyright (c) 2006-2007 MetaCarta, Inc., published under the BSD license. + * See http://svn.openlayers.org/trunk/openlayers/release-license.txt * for the full text of the license. */ /** diff --git a/lib/OpenLayers/Control/DragFeature.js b/lib/OpenLayers/Control/DragFeature.js index dc484d923f..e5373cbbf8 100644 --- a/lib/OpenLayers/Control/DragFeature.js +++ b/lib/OpenLayers/Control/DragFeature.js @@ -1,5 +1,5 @@ -/* Copyright (c) 2006-2007 MetaCarta, Inc., published under a modified BSD license. - * See http://svn.openlayers.org/trunk/openlayers/repository-license.txt +/* Copyright (c) 2006-2007 MetaCarta, Inc., published under the BSD license. + * See http://svn.openlayers.org/trunk/openlayers/release-license.txt * for the full text of the license. */ diff --git a/lib/OpenLayers/Control/DragPan.js b/lib/OpenLayers/Control/DragPan.js index 66499d9729..56916d7940 100644 --- a/lib/OpenLayers/Control/DragPan.js +++ b/lib/OpenLayers/Control/DragPan.js @@ -1,5 +1,5 @@ -/* Copyright (c) 2006-2007 MetaCarta, Inc., published under a modified BSD license. - * See http://svn.openlayers.org/trunk/openlayers/repository-license.txt +/* Copyright (c) 2006-2007 MetaCarta, Inc., published under the BSD license. + * See http://svn.openlayers.org/trunk/openlayers/release-license.txt * for the full text of the license. */ /** diff --git a/lib/OpenLayers/Control/DrawFeature.js b/lib/OpenLayers/Control/DrawFeature.js index 9743235170..0ae947184e 100644 --- a/lib/OpenLayers/Control/DrawFeature.js +++ b/lib/OpenLayers/Control/DrawFeature.js @@ -1,5 +1,5 @@ -/* Copyright (c) 2006-2007 MetaCarta, Inc., published under a modified BSD license. - * See http://svn.openlayers.org/trunk/openlayers/repository-license.txt +/* Copyright (c) 2006-2007 MetaCarta, Inc., published under the BSD license. + * See http://svn.openlayers.org/trunk/openlayers/release-license.txt * for the full text of the license. */ diff --git a/lib/OpenLayers/Control/EditingToolbar.js b/lib/OpenLayers/Control/EditingToolbar.js index aa8b1f5c07..5c9ab534ff 100644 --- a/lib/OpenLayers/Control/EditingToolbar.js +++ b/lib/OpenLayers/Control/EditingToolbar.js @@ -1,5 +1,5 @@ -/* Copyright (c) 2006-2007 MetaCarta, Inc., published under a modified BSD license. - * See http://svn.openlayers.org/trunk/openlayers/repository-license.txt +/* Copyright (c) 2006-2007 MetaCarta, Inc., published under the BSD license. + * See http://svn.openlayers.org/trunk/openlayers/release-license.txt * for the full text of the license. */ /** diff --git a/lib/OpenLayers/Control/KeyboardDefaults.js b/lib/OpenLayers/Control/KeyboardDefaults.js index 8480e6aaed..4805afefbe 100644 --- a/lib/OpenLayers/Control/KeyboardDefaults.js +++ b/lib/OpenLayers/Control/KeyboardDefaults.js @@ -1,5 +1,5 @@ -/* Copyright (c) 2006-2007 MetaCarta, Inc., published under a modified BSD license. - * See http://svn.openlayers.org/trunk/openlayers/repository-license.txt +/* Copyright (c) 2006-2007 MetaCarta, Inc., published under the BSD license. + * See http://svn.openlayers.org/trunk/openlayers/release-license.txt * for the full text of the license. */ diff --git a/lib/OpenLayers/Control/LayerSwitcher.js b/lib/OpenLayers/Control/LayerSwitcher.js index 32363f94db..08cc42ffd2 100644 --- a/lib/OpenLayers/Control/LayerSwitcher.js +++ b/lib/OpenLayers/Control/LayerSwitcher.js @@ -1,5 +1,5 @@ -/* Copyright (c) 2006-2007 MetaCarta, Inc., published under a modified BSD license. - * See http://svn.openlayers.org/trunk/openlayers/repository-license.txt +/* Copyright (c) 2006-2007 MetaCarta, Inc., published under the BSD license. + * See http://svn.openlayers.org/trunk/openlayers/release-license.txt * for the full text of the license. */ /** diff --git a/lib/OpenLayers/Control/ModifyFeature.js b/lib/OpenLayers/Control/ModifyFeature.js index 826030105d..9fa1471545 100644 --- a/lib/OpenLayers/Control/ModifyFeature.js +++ b/lib/OpenLayers/Control/ModifyFeature.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 +/* Copyright (c) 2006 MetaCarta, Inc., published under the BSD license. + * See http://svn.openlayers.org/trunk/openlayers/release-license.txt * for the full text of the license. */ diff --git a/lib/OpenLayers/Control/MouseDefaults.js b/lib/OpenLayers/Control/MouseDefaults.js index 4429af89b3..02dc943480 100644 --- a/lib/OpenLayers/Control/MouseDefaults.js +++ b/lib/OpenLayers/Control/MouseDefaults.js @@ -1,5 +1,5 @@ -/* Copyright (c) 2006-2007 MetaCarta, Inc., published under a modified BSD license. - * See http://svn.openlayers.org/trunk/openlayers/repository-license.txt +/* Copyright (c) 2006-2007 MetaCarta, Inc., published under the BSD license. + * See http://svn.openlayers.org/trunk/openlayers/release-license.txt * for the full text of the license. */ /** diff --git a/lib/OpenLayers/Control/MousePosition.js b/lib/OpenLayers/Control/MousePosition.js index d7e310f0ec..5f114ec625 100644 --- a/lib/OpenLayers/Control/MousePosition.js +++ b/lib/OpenLayers/Control/MousePosition.js @@ -1,5 +1,5 @@ -/* Copyright (c) 2006-2007 MetaCarta, Inc., published under a modified BSD license. - * See http://svn.openlayers.org/trunk/openlayers/repository-license.txt +/* Copyright (c) 2006-2007 MetaCarta, Inc., published under the BSD license. + * See http://svn.openlayers.org/trunk/openlayers/release-license.txt * for the full text of the license. */ @@ -61,6 +61,16 @@ OpenLayers.Control.MousePosition = OpenLayers.Class(OpenLayers.Control, { OpenLayers.Control.prototype.initialize.apply(this, arguments); }, + /** + * Method: destroy + */ + destroy: function() { + if (this.map) { + this.map.events.unregister('mousemove', this, this.redraw); + } + OpenLayers.Control.prototype.destroy.apply(this, arguments); + }, + /** * Method: draw * {DOMElement} diff --git a/lib/OpenLayers/Control/MouseToolbar.js b/lib/OpenLayers/Control/MouseToolbar.js index 47bff32d34..5ad3b36954 100644 --- a/lib/OpenLayers/Control/MouseToolbar.js +++ b/lib/OpenLayers/Control/MouseToolbar.js @@ -1,5 +1,5 @@ -/* Copyright (c) 2006-2007 MetaCarta, Inc., published under a modified BSD license. - * See http://svn.openlayers.org/trunk/openlayers/repository-license.txt +/* Copyright (c) 2006-2007 MetaCarta, Inc., published under the BSD license. + * See http://svn.openlayers.org/trunk/openlayers/release-license.txt * for the full text of the license. */ diff --git a/lib/OpenLayers/Control/NavToolbar.js b/lib/OpenLayers/Control/NavToolbar.js index 3f27416903..b2d3fef457 100644 --- a/lib/OpenLayers/Control/NavToolbar.js +++ b/lib/OpenLayers/Control/NavToolbar.js @@ -1,5 +1,5 @@ -/* Copyright (c) 2006-2007 MetaCarta, Inc., published under a modified BSD license. - * See http://svn.openlayers.org/trunk/openlayers/repository-license.txt +/* Copyright (c) 2006-2007 MetaCarta, Inc., published under the BSD license. + * See http://svn.openlayers.org/trunk/openlayers/release-license.txt * for the full text of the license. */ /** diff --git a/lib/OpenLayers/Control/Navigation.js b/lib/OpenLayers/Control/Navigation.js index 2aa6668420..b2502d8822 100644 --- a/lib/OpenLayers/Control/Navigation.js +++ b/lib/OpenLayers/Control/Navigation.js @@ -1,5 +1,5 @@ -/* Copyright (c) 2006-2007 MetaCarta, Inc., published under a modified BSD license. - * See http://svn.openlayers.org/trunk/openlayers/repository-license.txt +/* Copyright (c) 2006-2007 MetaCarta, Inc., published under the BSD license. + * See http://svn.openlayers.org/trunk/openlayers/release-license.txt * for the full text of the license. */ /** diff --git a/lib/OpenLayers/Control/OverviewMap.js b/lib/OpenLayers/Control/OverviewMap.js index 70a0ab1f79..383a28fdb8 100644 --- a/lib/OpenLayers/Control/OverviewMap.js +++ b/lib/OpenLayers/Control/OverviewMap.js @@ -1,5 +1,5 @@ -/* Copyright (c) 2006-2007 MetaCarta, Inc., published under a modified BSD license. - * See http://svn.openlayers.org/trunk/openlayers/repository-license.txt +/* Copyright (c) 2006-2007 MetaCarta, Inc., published under the BSD license. + * See http://svn.openlayers.org/trunk/openlayers/release-license.txt * for the full text of the license. */ /** diff --git a/lib/OpenLayers/Control/PanZoom.js b/lib/OpenLayers/Control/PanZoom.js index dae4734022..6fbcf71916 100644 --- a/lib/OpenLayers/Control/PanZoom.js +++ b/lib/OpenLayers/Control/PanZoom.js @@ -1,5 +1,5 @@ -/* Copyright (c) 2006-2007 MetaCarta, Inc., published under a modified BSD license. - * See http://svn.openlayers.org/trunk/openlayers/repository-license.txt +/* Copyright (c) 2006-2007 MetaCarta, Inc., published under the BSD license. + * See http://svn.openlayers.org/trunk/openlayers/release-license.txt * for the full text of the license. */ diff --git a/lib/OpenLayers/Control/PanZoomBar.js b/lib/OpenLayers/Control/PanZoomBar.js index 987e2c16a8..f6ea803d71 100644 --- a/lib/OpenLayers/Control/PanZoomBar.js +++ b/lib/OpenLayers/Control/PanZoomBar.js @@ -1,5 +1,5 @@ -/* Copyright (c) 2006-2007 MetaCarta, Inc., published under a modified BSD license. - * See http://svn.openlayers.org/trunk/openlayers/repository-license.txt +/* Copyright (c) 2006-2007 MetaCarta, Inc., published under the BSD license. + * See http://svn.openlayers.org/trunk/openlayers/release-license.txt * for the full text of the license. */ diff --git a/lib/OpenLayers/Control/Panel.js b/lib/OpenLayers/Control/Panel.js index d62599636a..2e20139383 100644 --- a/lib/OpenLayers/Control/Panel.js +++ b/lib/OpenLayers/Control/Panel.js @@ -1,5 +1,5 @@ -/* Copyright (c) 2006-2007 MetaCarta, Inc., published under a modified BSD license. - * See http://svn.openlayers.org/trunk/openlayers/repository-license.txt +/* Copyright (c) 2006-2007 MetaCarta, Inc., published under the BSD license. + * See http://svn.openlayers.org/trunk/openlayers/release-license.txt * for the full text of the license. */ /** diff --git a/lib/OpenLayers/Control/Permalink.js b/lib/OpenLayers/Control/Permalink.js index 0a372f8205..e019eb8d7a 100644 --- a/lib/OpenLayers/Control/Permalink.js +++ b/lib/OpenLayers/Control/Permalink.js @@ -1,5 +1,5 @@ -/* Copyright (c) 2006-2007 MetaCarta, Inc., published under a modified BSD license. - * See http://svn.openlayers.org/trunk/openlayers/repository-license.txt +/* Copyright (c) 2006-2007 MetaCarta, Inc., published under the BSD license. + * See http://svn.openlayers.org/trunk/openlayers/release-license.txt * for the full text of the license. */ diff --git a/lib/OpenLayers/Control/Scale.js b/lib/OpenLayers/Control/Scale.js index 857e83d75c..db5de57617 100644 --- a/lib/OpenLayers/Control/Scale.js +++ b/lib/OpenLayers/Control/Scale.js @@ -1,5 +1,5 @@ -/* Copyright (c) 2006-2007 MetaCarta, Inc., published under a modified BSD license. - * See http://svn.openlayers.org/trunk/openlayers/repository-license.txt +/* Copyright (c) 2006-2007 MetaCarta, Inc., published under the BSD license. + * See http://svn.openlayers.org/trunk/openlayers/release-license.txt * for the full text of the license. */ diff --git a/lib/OpenLayers/Control/SelectFeature.js b/lib/OpenLayers/Control/SelectFeature.js index c711cfc899..284de14dae 100644 --- a/lib/OpenLayers/Control/SelectFeature.js +++ b/lib/OpenLayers/Control/SelectFeature.js @@ -1,5 +1,5 @@ -/* Copyright (c) 2006-2007 MetaCarta, Inc., published under a modified BSD license. - * See http://svn.openlayers.org/trunk/openlayers/repository-license.txt +/* Copyright (c) 2006-2007 MetaCarta, Inc., published under the BSD license. + * See http://svn.openlayers.org/trunk/openlayers/release-license.txt * for the full text of the license. */ diff --git a/lib/OpenLayers/Control/ZoomBox.js b/lib/OpenLayers/Control/ZoomBox.js index 0b5b55f0b1..cbb20c49c9 100644 --- a/lib/OpenLayers/Control/ZoomBox.js +++ b/lib/OpenLayers/Control/ZoomBox.js @@ -1,5 +1,5 @@ -/* Copyright (c) 2006-2007 MetaCarta, Inc., published under a modified BSD license. - * See http://svn.openlayers.org/trunk/openlayers/repository-license.txt +/* Copyright (c) 2006-2007 MetaCarta, Inc., published under the BSD license. + * See http://svn.openlayers.org/trunk/openlayers/release-license.txt * for the full text of the license. */ /** diff --git a/lib/OpenLayers/Control/ZoomToMaxExtent.js b/lib/OpenLayers/Control/ZoomToMaxExtent.js index ff67bead07..e52269db75 100644 --- a/lib/OpenLayers/Control/ZoomToMaxExtent.js +++ b/lib/OpenLayers/Control/ZoomToMaxExtent.js @@ -1,5 +1,5 @@ -/* Copyright (c) 2006-2007 MetaCarta, Inc., published under a modified BSD license. - * See http://svn.openlayers.org/trunk/openlayers/repository-license.txt +/* Copyright (c) 2006-2007 MetaCarta, Inc., published under the BSD license. + * See http://svn.openlayers.org/trunk/openlayers/release-license.txt * for the full text of the license. */ /** diff --git a/lib/OpenLayers/Events.js b/lib/OpenLayers/Events.js index d4c4a620da..ed6b9890dc 100644 --- a/lib/OpenLayers/Events.js +++ b/lib/OpenLayers/Events.js @@ -1,5 +1,5 @@ -/* Copyright (c) 2006-2007 MetaCarta, Inc., published under a modified BSD license. - * See http://svn.openlayers.org/trunk/openlayers/repository-license.txt +/* Copyright (c) 2006-2007 MetaCarta, Inc., published under the BSD license. + * See http://svn.openlayers.org/trunk/openlayers/release-license.txt * for the full text of the license. */ diff --git a/lib/OpenLayers/Feature.js b/lib/OpenLayers/Feature.js index 2004a45591..9f6ef35a01 100644 --- a/lib/OpenLayers/Feature.js +++ b/lib/OpenLayers/Feature.js @@ -1,5 +1,5 @@ -/* Copyright (c) 2006-2007 MetaCarta, Inc., published under a modified BSD license. - * See http://svn.openlayers.org/trunk/openlayers/repository-license.txt +/* Copyright (c) 2006-2007 MetaCarta, Inc., published under the BSD license. + * See http://svn.openlayers.org/trunk/openlayers/release-license.txt * for the full text of the license. */ diff --git a/lib/OpenLayers/Feature/Vector.js b/lib/OpenLayers/Feature/Vector.js index dec6a753da..942cd5ad4c 100644 --- a/lib/OpenLayers/Feature/Vector.js +++ b/lib/OpenLayers/Feature/Vector.js @@ -1,5 +1,5 @@ -/* Copyright (c) 2006-2007 MetaCarta, Inc., published under a modified BSD license. - * See http://svn.openlayers.org/trunk/openlayers/repository-license.txt +/* Copyright (c) 2006-2007 MetaCarta, Inc., published under the BSD license. + * See http://svn.openlayers.org/trunk/openlayers/release-license.txt * for the full text of the license. */ // TRASH THIS diff --git a/lib/OpenLayers/Feature/WFS.js b/lib/OpenLayers/Feature/WFS.js index b2b974e32e..eda89da53b 100644 --- a/lib/OpenLayers/Feature/WFS.js +++ b/lib/OpenLayers/Feature/WFS.js @@ -1,5 +1,5 @@ -/* Copyright (c) 2006-2007 MetaCarta, Inc., published under a modified BSD license. - * See http://svn.openlayers.org/trunk/openlayers/repository-license.txt +/* Copyright (c) 2006-2007 MetaCarta, Inc., published under the BSD license. + * See http://svn.openlayers.org/trunk/openlayers/release-license.txt * for the full text of the license. */ diff --git a/lib/OpenLayers/Format.js b/lib/OpenLayers/Format.js index 2339aa11f7..b02a935d81 100644 --- a/lib/OpenLayers/Format.js +++ b/lib/OpenLayers/Format.js @@ -1,5 +1,5 @@ -/* Copyright (c) 2006-2007 MetaCarta, Inc., published under a modified BSD license. - * See http://svn.openlayers.org/trunk/openlayers/repository-license.txt +/* Copyright (c) 2006-2007 MetaCarta, Inc., published under the BSD license. + * See http://svn.openlayers.org/trunk/openlayers/release-license.txt * for the full text of the license. */ /** diff --git a/lib/OpenLayers/Format/GML.js b/lib/OpenLayers/Format/GML.js index 033536120e..3a1f2b5ebb 100644 --- a/lib/OpenLayers/Format/GML.js +++ b/lib/OpenLayers/Format/GML.js @@ -1,5 +1,5 @@ -/* Copyright (c) 2006-2007 MetaCarta, Inc., published under a modified BSD license. - * See http://svn.openlayers.org/trunk/openlayers/repository-license.txt +/* Copyright (c) 2006-2007 MetaCarta, Inc., published under the BSD license. + * See http://svn.openlayers.org/trunk/openlayers/release-license.txt * for the full text of the license. */ /** @@ -295,7 +295,7 @@ OpenLayers.Format.GML = OpenLayers.Class(OpenLayers.Format.XML, { // look for nodeList = this.getElementsByTagNameNS(node, this.gmlns, "posList"); if(nodeList.length > 0) { - coordString = nodeList[0].firstChild.nodeValue; + coordString = this.concatChildValues(nodeList[0]); coordString = coordString.replace(this.regExes.trimSpace, ""); coords = coordString.split(this.regExes.splitSpace); var dim = parseInt(nodeList[0].getAttribute("dimension")); @@ -314,7 +314,7 @@ OpenLayers.Format.GML = OpenLayers.Class(OpenLayers.Format.XML, { nodeList = this.getElementsByTagNameNS(node, this.gmlns, "coordinates"); if(nodeList.length > 0) { - coordString = nodeList[0].firstChild.nodeValue; + coordString = this.concatChildValues(nodeList[0]); coordString = coordString.replace(this.regExes.trimSpace, ""); coordString = coordString.replace(this.regExes.trimComma, @@ -453,7 +453,8 @@ OpenLayers.Format.GML = OpenLayers.Class(OpenLayers.Format.XML, { grandchildren = child.childNodes; if(grandchildren.length == 1) { grandchild = grandchildren[0]; - if(grandchild.nodeType == 3) { + if(grandchild.nodeType == 3 || + grandchild.nodeType == 4) { name = (child.prefix) ? child.nodeName.split(":")[1] : child.nodeName; diff --git a/lib/OpenLayers/Format/GeoJSON.js b/lib/OpenLayers/Format/GeoJSON.js index 848a5b488e..2d61f5628c 100644 --- a/lib/OpenLayers/Format/GeoJSON.js +++ b/lib/OpenLayers/Format/GeoJSON.js @@ -1,5 +1,5 @@ -/* Copyright (c) 2006-2007 MetaCarta, Inc., published under a modified BSD license. - * See http://svn.openlayers.org/trunk/openlayers/repository-license.txt +/* Copyright (c) 2006-2007 MetaCarta, Inc., published under the BSD license. + * See http://svn.openlayers.org/trunk/openlayers/release-license.txt * for the full text of the license. */ /** diff --git a/lib/OpenLayers/Format/GeoRSS.js b/lib/OpenLayers/Format/GeoRSS.js index 9435a38c3b..22d1a74f03 100644 --- a/lib/OpenLayers/Format/GeoRSS.js +++ b/lib/OpenLayers/Format/GeoRSS.js @@ -1,5 +1,5 @@ -/* Copyright (c) 2006-2007 MetaCarta, Inc., published under a modified BSD license. - * See http://svn.openlayers.org/trunk/openlayers/repository-license.txt +/* Copyright (c) 2006-2007 MetaCarta, Inc., published under the BSD license. + * See http://svn.openlayers.org/trunk/openlayers/release-license.txt * for the full text of the license. */ /** diff --git a/lib/OpenLayers/Format/JSON.js b/lib/OpenLayers/Format/JSON.js index c9f2011e58..171b08625b 100644 --- a/lib/OpenLayers/Format/JSON.js +++ b/lib/OpenLayers/Format/JSON.js @@ -1,5 +1,5 @@ -/* Copyright (c) 2006-2007 MetaCarta, Inc., published under a modified BSD license. - * See http://svn.openlayers.org/trunk/openlayers/repository-license.txt +/* Copyright (c) 2006-2007 MetaCarta, Inc., published under the BSD license. + * See http://svn.openlayers.org/trunk/openlayers/release-license.txt * for the full text of the license. */ /** diff --git a/lib/OpenLayers/Format/KML.js b/lib/OpenLayers/Format/KML.js index 3dd4db14b5..5e5fa1b04a 100644 --- a/lib/OpenLayers/Format/KML.js +++ b/lib/OpenLayers/Format/KML.js @@ -1,5 +1,5 @@ -/* Copyright (c) 2006-2007 MetaCarta, Inc., published under a modified BSD license. - * See http://svn.openlayers.org/trunk/openlayers/repository-license.txt +/* Copyright (c) 2006-2007 MetaCarta, Inc., published under the BSD license. + * See http://svn.openlayers.org/trunk/openlayers/release-license.txt * for the full text of the license. */ /** @@ -326,7 +326,7 @@ OpenLayers.Format.KML = OpenLayers.Class(OpenLayers.Format.XML, { grandchildren = child.childNodes; if(grandchildren.length == 1) { grandchild = grandchildren[0]; - if(grandchild.nodeType == 3) { + if(grandchild.nodeType == 3 || grandchild.nodeType == 4) { name = (child.prefix) ? child.nodeName.split(":")[1] : child.nodeName; @@ -638,4 +638,4 @@ OpenLayers.Format.KML = OpenLayers.Class(OpenLayers.Format.XML, { }, CLASS_NAME: "OpenLayers.Format.KML" -}); \ No newline at end of file +}); diff --git a/lib/OpenLayers/Format/WFS.js b/lib/OpenLayers/Format/WFS.js index 6b86c206e4..43ef4733e0 100644 --- a/lib/OpenLayers/Format/WFS.js +++ b/lib/OpenLayers/Format/WFS.js @@ -1,5 +1,5 @@ -/* Copyright (c) 2006-2007 MetaCarta, Inc., published under a modified BSD license. - * See http://svn.openlayers.org/trunk/openlayers/repository-license.txt +/* Copyright (c) 2006-2007 MetaCarta, Inc., published under the BSD license. + * See http://svn.openlayers.org/trunk/openlayers/release-license.txt * for the full text of the license. */ /** diff --git a/lib/OpenLayers/Format/WKT.js b/lib/OpenLayers/Format/WKT.js index 4c9ede431a..854fa5c8d1 100644 --- a/lib/OpenLayers/Format/WKT.js +++ b/lib/OpenLayers/Format/WKT.js @@ -1,5 +1,5 @@ -/* Copyright (c) 2006-2007 MetaCarta, Inc., published under a modified BSD license. - * See http://svn.openlayers.org/trunk/openlayers/repository-license.txt +/* Copyright (c) 2006-2007 MetaCarta, Inc., published under the BSD license. + * See http://svn.openlayers.org/trunk/openlayers/release-license.txt * for the full text of the license. */ /** diff --git a/lib/OpenLayers/Format/XML.js b/lib/OpenLayers/Format/XML.js index 44920e06a8..a512cf5900 100644 --- a/lib/OpenLayers/Format/XML.js +++ b/lib/OpenLayers/Format/XML.js @@ -1,5 +1,5 @@ -/* Copyright (c) 2006-2007 MetaCarta, Inc., published under a modified BSD license. - * See http://svn.openlayers.org/trunk/openlayers/repository-license.txt +/* Copyright (c) 2006-2007 MetaCarta, Inc., published under the BSD license. + * See http://svn.openlayers.org/trunk/openlayers/release-license.txt * for the full text of the license. */ /** @@ -256,6 +256,62 @@ OpenLayers.Format.XML = OpenLayers.Class(OpenLayers.Format, { } return attributeValue; }, + + /** + * APIMethod: getChildValue + * Get the value of the first child node if it exists, or return an + * optional default string. Returns an empty string if no first child + * exists and no default value is supplied. + * + * Parameters: + * node - {DOMElement} The element used to look for a first child value. + * def - {String} Optional string to return in the event that no + * first child value exists. + * + * Returns: + * {String} The value of the first child of the given node. + */ + getChildValue: function(node, def) { + var value; + try { + value = node.firstChild.nodeValue; + } catch(e) { + value = (def != undefined) ? def : ""; + } + return value; + }, + + /** + * APIMethod: concatChildValues + * Concatenate the value of all child nodes if any exist, or return an + * optional default string. Returns an empty string if no children + * exist and no default value is supplied. Not optimized for large + * numbers of child nodes. + * + * Parameters: + * node - {DOMElement} The element used to look for child values. + * def - {String} Optional string to return in the event that no + * child exist. + * + * Returns: + * {String} The concatenated value of all child nodes of the given node. + */ + concatChildValues: function(node, def) { + var value = ""; + var child = node.firstChild; + var childValue; + while(child) { + childValue = child.nodeValue; + if(childValue) { + value += childValue; + } + child = child.nextSibling; + } + if(value == "" && def != undefined) { + value = def; + } + return value; + }, /** * APIMethod: hasAttributeNS diff --git a/lib/OpenLayers/Geometry.js b/lib/OpenLayers/Geometry.js index 481c3e2da5..8ac4e58fb0 100644 --- a/lib/OpenLayers/Geometry.js +++ b/lib/OpenLayers/Geometry.js @@ -1,5 +1,5 @@ -/* Copyright (c) 2006-2007 MetaCarta, Inc., published under a modified BSD license. - * See http://svn.openlayers.org/trunk/openlayers/repository-license.txt +/* Copyright (c) 2006-2007 MetaCarta, Inc., published under the BSD license. + * See http://svn.openlayers.org/trunk/openlayers/release-license.txt * for the full text of the license. */ /** diff --git a/lib/OpenLayers/Geometry/Collection.js b/lib/OpenLayers/Geometry/Collection.js index 8c1c589695..d3c7e1fae0 100644 --- a/lib/OpenLayers/Geometry/Collection.js +++ b/lib/OpenLayers/Geometry/Collection.js @@ -1,5 +1,5 @@ -/* Copyright (c) 2006-2007 MetaCarta, Inc., published under a modified BSD license. - * See http://svn.openlayers.org/trunk/openlayers/repository-license.txt +/* Copyright (c) 2006-2007 MetaCarta, Inc., published under the BSD license. + * See http://svn.openlayers.org/trunk/openlayers/release-license.txt * for the full text of the license. */ /** diff --git a/lib/OpenLayers/Geometry/Curve.js b/lib/OpenLayers/Geometry/Curve.js index 5a618031f2..10daeb2302 100644 --- a/lib/OpenLayers/Geometry/Curve.js +++ b/lib/OpenLayers/Geometry/Curve.js @@ -1,5 +1,5 @@ -/* Copyright (c) 2006-2007 MetaCarta, Inc., published under a modified BSD license. - * See http://svn.openlayers.org/trunk/openlayers/repository-license.txt +/* Copyright (c) 2006-2007 MetaCarta, Inc., published under the BSD license. + * See http://svn.openlayers.org/trunk/openlayers/release-license.txt * for the full text of the license. */ /** diff --git a/lib/OpenLayers/Geometry/LineString.js b/lib/OpenLayers/Geometry/LineString.js index 0c3ebcf064..91170f78d1 100644 --- a/lib/OpenLayers/Geometry/LineString.js +++ b/lib/OpenLayers/Geometry/LineString.js @@ -1,5 +1,5 @@ -/* Copyright (c) 2006-2007 MetaCarta, Inc., published under a modified BSD license. - * See http://svn.openlayers.org/trunk/openlayers/repository-license.txt +/* Copyright (c) 2006-2007 MetaCarta, Inc., published under the BSD license. + * See http://svn.openlayers.org/trunk/openlayers/release-license.txt * for the full text of the license. */ /** diff --git a/lib/OpenLayers/Geometry/LinearRing.js b/lib/OpenLayers/Geometry/LinearRing.js index 081c0c3eb2..b0b7d31bc5 100644 --- a/lib/OpenLayers/Geometry/LinearRing.js +++ b/lib/OpenLayers/Geometry/LinearRing.js @@ -1,5 +1,5 @@ -/* Copyright (c) 2006-2007 MetaCarta, Inc., published under a modified BSD license. - * See http://svn.openlayers.org/trunk/openlayers/repository-license.txt +/* Copyright (c) 2006-2007 MetaCarta, Inc., published under the BSD license. + * See http://svn.openlayers.org/trunk/openlayers/release-license.txt * for the full text of the license. */ /** diff --git a/lib/OpenLayers/Geometry/MultiLineString.js b/lib/OpenLayers/Geometry/MultiLineString.js index 77bdffc089..2c47fc9955 100644 --- a/lib/OpenLayers/Geometry/MultiLineString.js +++ b/lib/OpenLayers/Geometry/MultiLineString.js @@ -1,5 +1,5 @@ -/* Copyright (c) 2006-2007 MetaCarta, Inc., published under a modified BSD license. - * See http://svn.openlayers.org/trunk/openlayers/repository-license.txt +/* Copyright (c) 2006-2007 MetaCarta, Inc., published under the BSD license. + * See http://svn.openlayers.org/trunk/openlayers/release-license.txt * for the full text of the license. */ /** diff --git a/lib/OpenLayers/Geometry/MultiPoint.js b/lib/OpenLayers/Geometry/MultiPoint.js index 4c851343db..b90a4ab43b 100644 --- a/lib/OpenLayers/Geometry/MultiPoint.js +++ b/lib/OpenLayers/Geometry/MultiPoint.js @@ -1,5 +1,5 @@ -/* Copyright (c) 2006-2007 MetaCarta, Inc., published under a modified BSD license. - * See http://svn.openlayers.org/trunk/openlayers/repository-license.txt +/* Copyright (c) 2006-2007 MetaCarta, Inc., published under the BSD license. + * See http://svn.openlayers.org/trunk/openlayers/release-license.txt * for the full text of the license. */ /** diff --git a/lib/OpenLayers/Geometry/MultiPolygon.js b/lib/OpenLayers/Geometry/MultiPolygon.js index 8eb27f556b..9d9012b38a 100644 --- a/lib/OpenLayers/Geometry/MultiPolygon.js +++ b/lib/OpenLayers/Geometry/MultiPolygon.js @@ -1,5 +1,5 @@ -/* Copyright (c) 2006-2007 MetaCarta, Inc., published under a modified BSD license. - * See http://svn.openlayers.org/trunk/openlayers/repository-license.txt +/* Copyright (c) 2006-2007 MetaCarta, Inc., published under the BSD license. + * See http://svn.openlayers.org/trunk/openlayers/release-license.txt * for the full text of the license. */ /** diff --git a/lib/OpenLayers/Geometry/Point.js b/lib/OpenLayers/Geometry/Point.js index 9950fa2ba2..565b254be5 100644 --- a/lib/OpenLayers/Geometry/Point.js +++ b/lib/OpenLayers/Geometry/Point.js @@ -1,5 +1,5 @@ -/* Copyright (c) 2006-2007 MetaCarta, Inc., published under a modified BSD license. - * See http://svn.openlayers.org/trunk/openlayers/repository-license.txt +/* Copyright (c) 2006-2007 MetaCarta, Inc., published under the BSD license. + * See http://svn.openlayers.org/trunk/openlayers/release-license.txt * for the full text of the license. */ /** diff --git a/lib/OpenLayers/Geometry/Polygon.js b/lib/OpenLayers/Geometry/Polygon.js index 3599c8a353..60d304045c 100644 --- a/lib/OpenLayers/Geometry/Polygon.js +++ b/lib/OpenLayers/Geometry/Polygon.js @@ -1,5 +1,5 @@ -/* Copyright (c) 2006-2007 MetaCarta, Inc., published under a modified BSD license. - * See http://svn.openlayers.org/trunk/openlayers/repository-license.txt +/* Copyright (c) 2006-2007 MetaCarta, Inc., published under the BSD license. + * See http://svn.openlayers.org/trunk/openlayers/release-license.txt * for the full text of the license. */ /** diff --git a/lib/OpenLayers/Geometry/Rectangle.js b/lib/OpenLayers/Geometry/Rectangle.js index dbf02b31ab..23f4242edc 100644 --- a/lib/OpenLayers/Geometry/Rectangle.js +++ b/lib/OpenLayers/Geometry/Rectangle.js @@ -1,5 +1,5 @@ -/* Copyright (c) 2006-2007 MetaCarta, Inc., published under a modified BSD license. - * See http://svn.openlayers.org/trunk/openlayers/repository-license.txt +/* Copyright (c) 2006-2007 MetaCarta, Inc., published under the BSD license. + * See http://svn.openlayers.org/trunk/openlayers/release-license.txt * for the full text of the license. */ /** diff --git a/lib/OpenLayers/Geometry/Surface.js b/lib/OpenLayers/Geometry/Surface.js index 269491a5a5..fb5f08ce2a 100644 --- a/lib/OpenLayers/Geometry/Surface.js +++ b/lib/OpenLayers/Geometry/Surface.js @@ -1,5 +1,5 @@ -/* Copyright (c) 2006-2007 MetaCarta, Inc., published under a modified BSD license. - * See http://svn.openlayers.org/trunk/openlayers/repository-license.txt +/* Copyright (c) 2006-2007 MetaCarta, Inc., published under the BSD license. + * See http://svn.openlayers.org/trunk/openlayers/release-license.txt * for the full text of the license. */ /** diff --git a/lib/OpenLayers/Handler.js b/lib/OpenLayers/Handler.js index a0176b6d45..6d34f26a9a 100644 --- a/lib/OpenLayers/Handler.js +++ b/lib/OpenLayers/Handler.js @@ -1,5 +1,5 @@ -/* Copyright (c) 2006-2007 MetaCarta, Inc., published under a modified BSD license. - * See http://svn.openlayers.org/trunk/openlayers/repository-license.txt +/* Copyright (c) 2006-2007 MetaCarta, Inc., published under the BSD license. + * See http://svn.openlayers.org/trunk/openlayers/release-license.txt * for the full text of the license. */ diff --git a/lib/OpenLayers/Handler/Box.js b/lib/OpenLayers/Handler/Box.js index f334c8d09a..64b4db15d4 100644 --- a/lib/OpenLayers/Handler/Box.js +++ b/lib/OpenLayers/Handler/Box.js @@ -1,5 +1,5 @@ -/* Copyright (c) 2006-2007 MetaCarta, Inc., published under a modified BSD license. - * See http://svn.openlayers.org/trunk/openlayers/repository-license.txt +/* Copyright (c) 2006-2007 MetaCarta, Inc., published under the BSD license. + * See http://svn.openlayers.org/trunk/openlayers/release-license.txt * for the full text of the license. */ /** diff --git a/lib/OpenLayers/Handler/Drag.js b/lib/OpenLayers/Handler/Drag.js index 0a49ed911e..d8205ffa40 100644 --- a/lib/OpenLayers/Handler/Drag.js +++ b/lib/OpenLayers/Handler/Drag.js @@ -1,5 +1,5 @@ -/* Copyright (c) 2006-2007 MetaCarta, Inc., published under a modified BSD license. - * See http://svn.openlayers.org/trunk/openlayers/repository-license.txt +/* Copyright (c) 2006-2007 MetaCarta, Inc., published under the BSD license. + * See http://svn.openlayers.org/trunk/openlayers/release-license.txt * for the full text of the license. */ /** @@ -143,9 +143,10 @@ OpenLayers.Handler.Drag = OpenLayers.Class(OpenLayers.Handler, { * {Boolean} Let the event propagate. */ mousedown: function (evt) { + var propagate = true; + this.dragging = false; if (this.checkModifiers(evt) && OpenLayers.Event.isLeftClick(evt)) { this.started = true; - this.dragging = false; this.start = evt.xy; this.last = evt.xy; // TBD replace with CSS classes @@ -159,9 +160,13 @@ OpenLayers.Handler.Drag = OpenLayers.Class(OpenLayers.Handler, { document.onselectstart = function() {return false;} } - return false; + propagate = false; + } else { + this.started = false; + this.start = null; + this.last = null; } - return true; + return propagate; }, /** diff --git a/lib/OpenLayers/Handler/Feature.js b/lib/OpenLayers/Handler/Feature.js index ed952e7e57..5975e29191 100644 --- a/lib/OpenLayers/Handler/Feature.js +++ b/lib/OpenLayers/Handler/Feature.js @@ -1,5 +1,5 @@ -/* Copyright (c) 2006-2007 MetaCarta, Inc., published under a modified BSD license. - * See http://svn.openlayers.org/trunk/openlayers/repository-license.txt +/* Copyright (c) 2006-2007 MetaCarta, Inc., published under the BSD license. + * See http://svn.openlayers.org/trunk/openlayers/release-license.txt * for the full text of the license. */ diff --git a/lib/OpenLayers/Handler/Keyboard.js b/lib/OpenLayers/Handler/Keyboard.js index 3e39551de2..7ff48a7a72 100644 --- a/lib/OpenLayers/Handler/Keyboard.js +++ b/lib/OpenLayers/Handler/Keyboard.js @@ -1,5 +1,5 @@ -/* Copyright (c) 2006-2007 MetaCarta, Inc., published under a modified BSD license. - * See http://svn.openlayers.org/trunk/openlayers/repository-license.txt +/* Copyright (c) 2006-2007 MetaCarta, Inc., published under the BSD license. + * See http://svn.openlayers.org/trunk/openlayers/release-license.txt * for the full text of the license. */ /** diff --git a/lib/OpenLayers/Handler/MouseWheel.js b/lib/OpenLayers/Handler/MouseWheel.js index 20b9d9d713..8d1c5746a8 100644 --- a/lib/OpenLayers/Handler/MouseWheel.js +++ b/lib/OpenLayers/Handler/MouseWheel.js @@ -1,5 +1,5 @@ -/* Copyright (c) 2006-2007 MetaCarta, Inc., published under a modified BSD license. - * See http://svn.openlayers.org/trunk/openlayers/repository-license.txt +/* Copyright (c) 2006-2007 MetaCarta, Inc., published under the BSD license. + * See http://svn.openlayers.org/trunk/openlayers/release-license.txt * for the full text of the license. */ /** diff --git a/lib/OpenLayers/Handler/Path.js b/lib/OpenLayers/Handler/Path.js index 50f6f6eee1..1c2565d315 100644 --- a/lib/OpenLayers/Handler/Path.js +++ b/lib/OpenLayers/Handler/Path.js @@ -1,5 +1,5 @@ -/* Copyright (c) 2006-2007 MetaCarta, Inc., published under a modified BSD license. - * See http://svn.openlayers.org/trunk/openlayers/repository-license.txt +/* Copyright (c) 2006-2007 MetaCarta, Inc., published under the BSD license. + * See http://svn.openlayers.org/trunk/openlayers/release-license.txt * for the full text of the license. */ diff --git a/lib/OpenLayers/Handler/Point.js b/lib/OpenLayers/Handler/Point.js index f74a86c6bd..be85732ceb 100644 --- a/lib/OpenLayers/Handler/Point.js +++ b/lib/OpenLayers/Handler/Point.js @@ -1,5 +1,5 @@ -/* Copyright (c) 2006-2007 MetaCarta, Inc., published under a modified BSD license. - * See http://svn.openlayers.org/trunk/openlayers/repository-license.txt +/* Copyright (c) 2006-2007 MetaCarta, Inc., published under the BSD license. + * See http://svn.openlayers.org/trunk/openlayers/release-license.txt * for the full text of the license. */ diff --git a/lib/OpenLayers/Handler/Polygon.js b/lib/OpenLayers/Handler/Polygon.js index 5d72dabdfd..9e28490c87 100644 --- a/lib/OpenLayers/Handler/Polygon.js +++ b/lib/OpenLayers/Handler/Polygon.js @@ -1,5 +1,5 @@ -/* Copyright (c) 2006-2007 MetaCarta, Inc., published under a modified BSD license. - * See http://svn.openlayers.org/trunk/openlayers/repository-license.txt +/* Copyright (c) 2006-2007 MetaCarta, Inc., published under the BSD license. + * See http://svn.openlayers.org/trunk/openlayers/release-license.txt * for the full text of the license. */ diff --git a/lib/OpenLayers/Handler/RegularPolygon.js b/lib/OpenLayers/Handler/RegularPolygon.js index a9ba1ed2d2..e708dc1299 100644 --- a/lib/OpenLayers/Handler/RegularPolygon.js +++ b/lib/OpenLayers/Handler/RegularPolygon.js @@ -1,5 +1,5 @@ -/* Copyright (c) 2006-2007 MetaCarta, Inc., published under a modified BSD license. - * See http://svn.openlayers.org/trunk/openlayers/repository-license.txt +/* Copyright (c) 2006-2007 MetaCarta, Inc., published under the BSD license. + * See http://svn.openlayers.org/trunk/openlayers/release-license.txt * for the full text of the license. */ diff --git a/lib/OpenLayers/Icon.js b/lib/OpenLayers/Icon.js index 6fbc0ca149..48b03cdf7f 100644 --- a/lib/OpenLayers/Icon.js +++ b/lib/OpenLayers/Icon.js @@ -1,5 +1,5 @@ -/* Copyright (c) 2006-2007 MetaCarta, Inc., published under a modified BSD license. - * See http://svn.openlayers.org/trunk/openlayers/repository-license.txt +/* Copyright (c) 2006-2007 MetaCarta, Inc., published under the BSD license. + * See http://svn.openlayers.org/trunk/openlayers/release-license.txt * for the full text of the license. */ diff --git a/lib/OpenLayers/Layer.js b/lib/OpenLayers/Layer.js index 0c8e02f59f..93e62fbb8c 100644 --- a/lib/OpenLayers/Layer.js +++ b/lib/OpenLayers/Layer.js @@ -1,5 +1,5 @@ -/* Copyright (c) 2006-2007 MetaCarta, Inc., published under a modified BSD license. - * See http://svn.openlayers.org/trunk/openlayers/repository-license.txt +/* Copyright (c) 2006-2007 MetaCarta, Inc., published under the BSD license. + * See http://svn.openlayers.org/trunk/openlayers/release-license.txt * for the full text of the license. */ diff --git a/lib/OpenLayers/Layer/Boxes.js b/lib/OpenLayers/Layer/Boxes.js index 98d6a75d0a..34e3c4213a 100644 --- a/lib/OpenLayers/Layer/Boxes.js +++ b/lib/OpenLayers/Layer/Boxes.js @@ -1,5 +1,5 @@ -/* Copyright (c) 2006-2007 MetaCarta, Inc., published under a modified BSD license. - * See http://svn.openlayers.org/trunk/openlayers/repository-license.txt +/* Copyright (c) 2006-2007 MetaCarta, Inc., published under the BSD license. + * See http://svn.openlayers.org/trunk/openlayers/release-license.txt * for the full text of the license. */ diff --git a/lib/OpenLayers/Layer/EventPane.js b/lib/OpenLayers/Layer/EventPane.js index 893205f5d6..1eacd4aa08 100644 --- a/lib/OpenLayers/Layer/EventPane.js +++ b/lib/OpenLayers/Layer/EventPane.js @@ -1,5 +1,5 @@ -/* Copyright (c) 2006-2007 MetaCarta, Inc., published under a modified BSD license. - * See http://svn.openlayers.org/trunk/openlayers/repository-license.txt +/* Copyright (c) 2006-2007 MetaCarta, Inc., published under the BSD license. + * See http://svn.openlayers.org/trunk/openlayers/release-license.txt * for the full text of the license. */ diff --git a/lib/OpenLayers/Layer/FixedZoomLevels.js b/lib/OpenLayers/Layer/FixedZoomLevels.js index 2900aaea36..32fce575f3 100644 --- a/lib/OpenLayers/Layer/FixedZoomLevels.js +++ b/lib/OpenLayers/Layer/FixedZoomLevels.js @@ -1,5 +1,5 @@ -/* Copyright (c) 2006-2007 MetaCarta, Inc., published under a modified BSD license. - * See http://svn.openlayers.org/trunk/openlayers/repository-license.txt +/* Copyright (c) 2006-2007 MetaCarta, Inc., published under the BSD license. + * See http://svn.openlayers.org/trunk/openlayers/release-license.txt * for the full text of the license. */ /** diff --git a/lib/OpenLayers/Layer/GML.js b/lib/OpenLayers/Layer/GML.js index a86614ac86..3be33eb3cd 100644 --- a/lib/OpenLayers/Layer/GML.js +++ b/lib/OpenLayers/Layer/GML.js @@ -1,5 +1,5 @@ -/* Copyright (c) 2006-2007 MetaCarta, Inc., published under a modified BSD license. - * See http://svn.openlayers.org/trunk/openlayers/repository-license.txt +/* Copyright (c) 2006-2007 MetaCarta, Inc., published under the BSD license. + * See http://svn.openlayers.org/trunk/openlayers/release-license.txt * for the full text of the license. */ /** diff --git a/lib/OpenLayers/Layer/GeoRSS.js b/lib/OpenLayers/Layer/GeoRSS.js index fb3ba5e20c..534aa4a63a 100644 --- a/lib/OpenLayers/Layer/GeoRSS.js +++ b/lib/OpenLayers/Layer/GeoRSS.js @@ -1,5 +1,5 @@ -/* Copyright (c) 2006-2007 MetaCarta, Inc., published under a modified BSD license. - * See http://svn.openlayers.org/trunk/openlayers/repository-license.txt +/* Copyright (c) 2006-2007 MetaCarta, Inc., published under the BSD license. + * See http://svn.openlayers.org/trunk/openlayers/release-license.txt * for the full text of the license. */ diff --git a/lib/OpenLayers/Layer/Google.js b/lib/OpenLayers/Layer/Google.js index 04596b86b3..a7d315210f 100644 --- a/lib/OpenLayers/Layer/Google.js +++ b/lib/OpenLayers/Layer/Google.js @@ -1,5 +1,5 @@ -/* Copyright (c) 2006-2007 MetaCarta, Inc., published under a modified BSD license. - * See http://svn.openlayers.org/trunk/openlayers/repository-license.txt +/* Copyright (c) 2006-2007 MetaCarta, Inc., published under the BSD license. + * See http://svn.openlayers.org/trunk/openlayers/release-license.txt * for the full text of the license. */ diff --git a/lib/OpenLayers/Layer/Grid.js b/lib/OpenLayers/Layer/Grid.js index 1eb7b93021..a966aea7ea 100644 --- a/lib/OpenLayers/Layer/Grid.js +++ b/lib/OpenLayers/Layer/Grid.js @@ -1,5 +1,5 @@ -/* Copyright (c) 2006-2007 MetaCarta, Inc., published under a modified BSD license. - * See http://svn.openlayers.org/trunk/openlayers/repository-license.txt +/* Copyright (c) 2006-2007 MetaCarta, Inc., published under the BSD license. + * See http://svn.openlayers.org/trunk/openlayers/release-license.txt * for the full text of the license. */ diff --git a/lib/OpenLayers/Layer/HTTPRequest.js b/lib/OpenLayers/Layer/HTTPRequest.js index d12e0df98d..b45e7b67a2 100644 --- a/lib/OpenLayers/Layer/HTTPRequest.js +++ b/lib/OpenLayers/Layer/HTTPRequest.js @@ -1,5 +1,5 @@ -/* Copyright (c) 2006-2007 MetaCarta, Inc., published under a modified BSD license. - * See http://svn.openlayers.org/trunk/openlayers/repository-license.txt +/* Copyright (c) 2006-2007 MetaCarta, Inc., published under the BSD license. + * See http://svn.openlayers.org/trunk/openlayers/release-license.txt * for the full text of the license. */ diff --git a/lib/OpenLayers/Layer/Image.js b/lib/OpenLayers/Layer/Image.js index cd8abd3f65..4d7d58b6a9 100644 --- a/lib/OpenLayers/Layer/Image.js +++ b/lib/OpenLayers/Layer/Image.js @@ -1,5 +1,5 @@ -/* Copyright (c) 2006-2007 MetaCarta, Inc., published under a modified BSD license. - * See http://svn.openlayers.org/trunk/openlayers/repository-license.txt +/* Copyright (c) 2006-2007 MetaCarta, Inc., published under the BSD license. + * See http://svn.openlayers.org/trunk/openlayers/release-license.txt * for the full text of the license. */ /** diff --git a/lib/OpenLayers/Layer/KaMap.js b/lib/OpenLayers/Layer/KaMap.js index 9f9a8d6dc6..455195f648 100644 --- a/lib/OpenLayers/Layer/KaMap.js +++ b/lib/OpenLayers/Layer/KaMap.js @@ -1,5 +1,5 @@ -/* Copyright (c) 2006-2007 MetaCarta, Inc., published under a modified BSD license. - * See http://svn.openlayers.org/trunk/openlayers/repository-license.txt +/* Copyright (c) 2006-2007 MetaCarta, Inc., published under the BSD license. + * See http://svn.openlayers.org/trunk/openlayers/release-license.txt * for the full text of the license. */ diff --git a/lib/OpenLayers/Layer/MapServer.js b/lib/OpenLayers/Layer/MapServer.js index 27492810be..cc1dc022d8 100644 --- a/lib/OpenLayers/Layer/MapServer.js +++ b/lib/OpenLayers/Layer/MapServer.js @@ -1,5 +1,5 @@ -/* Copyright (c) 2006-2007 MetaCarta, Inc., published under a modified BSD license. - * See http://svn.openlayers.org/trunk/openlayers/repository-license.txt +/* Copyright (c) 2006-2007 MetaCarta, Inc., published under the BSD license. + * See http://svn.openlayers.org/trunk/openlayers/release-license.txt * for the full text of the license. */ /** diff --git a/lib/OpenLayers/Layer/MapServer/Untiled.js b/lib/OpenLayers/Layer/MapServer/Untiled.js index 886c9e4101..4393c68cb8 100644 --- a/lib/OpenLayers/Layer/MapServer/Untiled.js +++ b/lib/OpenLayers/Layer/MapServer/Untiled.js @@ -1,5 +1,5 @@ -/* Copyright 2006-2007 MetaCarta, Inc., published under a modified BSD license. - * See http://svn.openlayers.org/trunk/openlayers/repository-license.txt +/* Copyright 2006-2007 MetaCarta, Inc., published under the BSD license. + * See http://svn.openlayers.org/trunk/openlayers/release-license.txt * for the full text of the license. */ diff --git a/lib/OpenLayers/Layer/Markers.js b/lib/OpenLayers/Layer/Markers.js index c5c891271e..006f7fbcfd 100644 --- a/lib/OpenLayers/Layer/Markers.js +++ b/lib/OpenLayers/Layer/Markers.js @@ -1,5 +1,5 @@ -/* Copyright (c) 2006-2007 MetaCarta, Inc., published under a modified BSD license. - * See http://svn.openlayers.org/trunk/openlayers/repository-license.txt +/* Copyright (c) 2006-2007 MetaCarta, Inc., published under the BSD license. + * See http://svn.openlayers.org/trunk/openlayers/release-license.txt * for the full text of the license. */ diff --git a/lib/OpenLayers/Layer/MultiMap.js b/lib/OpenLayers/Layer/MultiMap.js index 87c42ea931..66c00ab48d 100644 --- a/lib/OpenLayers/Layer/MultiMap.js +++ b/lib/OpenLayers/Layer/MultiMap.js @@ -1,5 +1,5 @@ -/* Copyright (c) 2006-2007 MetaCarta, Inc., published under a modified BSD license. - * See http://svn.openlayers.org/trunk/openlayers/repository-license.txt +/* Copyright (c) 2006-2007 MetaCarta, Inc., published under the BSD license. + * See http://svn.openlayers.org/trunk/openlayers/release-license.txt * for the full text of the license. */ /** diff --git a/lib/OpenLayers/Layer/TMS.js b/lib/OpenLayers/Layer/TMS.js index 437bfd79b5..dab3d7b5bf 100644 --- a/lib/OpenLayers/Layer/TMS.js +++ b/lib/OpenLayers/Layer/TMS.js @@ -1,5 +1,5 @@ -/* Copyright (c) 2006-2007 MetaCarta, Inc., published under a modified BSD licence. - * See http://svn.openlayers.org/trunk/openlayers/repository-license.txt +/* Copyright (c) 2006-2007 MetaCarta, Inc., published under the BSD licence. + * See http://svn.openlayers.org/trunk/openlayers/release-license.txt * for the full text of the license. */ diff --git a/lib/OpenLayers/Layer/Text.js b/lib/OpenLayers/Layer/Text.js index 9c62590369..ca89ac9e73 100644 --- a/lib/OpenLayers/Layer/Text.js +++ b/lib/OpenLayers/Layer/Text.js @@ -1,5 +1,5 @@ -/* Copyright (c) 2006-2007 MetaCarta, Inc., published under a modified BSD license. - * See http://svn.openlayers.org/trunk/openlayers/repository-license.txt +/* Copyright (c) 2006-2007 MetaCarta, Inc., published under the BSD license. + * See http://svn.openlayers.org/trunk/openlayers/release-license.txt * for the full text of the license. */ diff --git a/lib/OpenLayers/Layer/TileCache.js b/lib/OpenLayers/Layer/TileCache.js index f5ca846b1d..4d24107b0b 100644 --- a/lib/OpenLayers/Layer/TileCache.js +++ b/lib/OpenLayers/Layer/TileCache.js @@ -1,5 +1,5 @@ -/* Copyright (c) 2006-2007 MetaCarta, Inc., published under a modified BSD licence. - * See http://svn.openlayers.org/trunk/openlayers/repository-license.txt +/* Copyright (c) 2006-2007 MetaCarta, Inc., published under the BSD licence. + * See http://svn.openlayers.org/trunk/openlayers/release-license.txt * for the full text of the license. */ diff --git a/lib/OpenLayers/Layer/Vector.js b/lib/OpenLayers/Layer/Vector.js index 35080f4063..6de2d6a0a0 100644 --- a/lib/OpenLayers/Layer/Vector.js +++ b/lib/OpenLayers/Layer/Vector.js @@ -1,5 +1,5 @@ -/* Copyright (c) 2006-2007 MetaCarta, Inc., published under a modified BSD license. - * See http://svn.openlayers.org/trunk/openlayers/repository-license.txt +/* Copyright (c) 2006-2007 MetaCarta, Inc., published under the BSD license. + * See http://svn.openlayers.org/trunk/openlayers/release-license.txt * for the full text of the license. */ /** diff --git a/lib/OpenLayers/Layer/VirtualEarth.js b/lib/OpenLayers/Layer/VirtualEarth.js index 2aad877dc4..466d36086b 100644 --- a/lib/OpenLayers/Layer/VirtualEarth.js +++ b/lib/OpenLayers/Layer/VirtualEarth.js @@ -1,5 +1,5 @@ -/* Copyright (c) 2006-2007 MetaCarta, Inc., published under a modified BSD license. - * See http://svn.openlayers.org/trunk/openlayers/repository-license.txt +/* Copyright (c) 2006-2007 MetaCarta, Inc., published under the BSD license. + * See http://svn.openlayers.org/trunk/openlayers/release-license.txt * for the full text of the license. */ diff --git a/lib/OpenLayers/Layer/WFS.js b/lib/OpenLayers/Layer/WFS.js index a8af580fe2..cefc0728bd 100644 --- a/lib/OpenLayers/Layer/WFS.js +++ b/lib/OpenLayers/Layer/WFS.js @@ -1,5 +1,5 @@ -/* Copyright (c) 2006-2007 MetaCarta, Inc., published under a modified BSD license. - * See http://svn.openlayers.org/trunk/openlayers/repository-license.txt +/* Copyright (c) 2006-2007 MetaCarta, Inc., published under the BSD license. + * See http://svn.openlayers.org/trunk/openlayers/release-license.txt * for the full text of the license. */ diff --git a/lib/OpenLayers/Layer/WMS.js b/lib/OpenLayers/Layer/WMS.js index 518ab68284..e929db4695 100644 --- a/lib/OpenLayers/Layer/WMS.js +++ b/lib/OpenLayers/Layer/WMS.js @@ -1,5 +1,5 @@ -/* Copyright (c) 2006-2007 MetaCarta, Inc., published under a modified BSD license. - * See http://svn.openlayers.org/trunk/openlayers/repository-license.txt +/* Copyright (c) 2006-2007 MetaCarta, Inc., published under the BSD license. + * See http://svn.openlayers.org/trunk/openlayers/release-license.txt * for the full text of the license. */ diff --git a/lib/OpenLayers/Layer/WMS/Untiled.js b/lib/OpenLayers/Layer/WMS/Untiled.js index 5dd8c00b38..fb6706432e 100644 --- a/lib/OpenLayers/Layer/WMS/Untiled.js +++ b/lib/OpenLayers/Layer/WMS/Untiled.js @@ -1,5 +1,5 @@ -/* Copyright (c) 2006-2007 MetaCarta, Inc., published under a modified BSD license. - * See http://svn.openlayers.org/trunk/openlayers/repository-license.txt +/* Copyright (c) 2006-2007 MetaCarta, Inc., published under the BSD license. + * See http://svn.openlayers.org/trunk/openlayers/release-license.txt * for the full text of the license. */ diff --git a/lib/OpenLayers/Layer/WorldWind.js b/lib/OpenLayers/Layer/WorldWind.js index f8c46173cb..cb1f7366ed 100644 --- a/lib/OpenLayers/Layer/WorldWind.js +++ b/lib/OpenLayers/Layer/WorldWind.js @@ -1,5 +1,5 @@ -/* Copyright (c) 2006-2007 MetaCarta, Inc., published under a modified BSD license. - * See http://svn.openlayers.org/trunk/openlayers/repository-license.txt +/* Copyright (c) 2006-2007 MetaCarta, Inc., published under the BSD license. + * See http://svn.openlayers.org/trunk/openlayers/release-license.txt * for the full text of the license. */ diff --git a/lib/OpenLayers/Layer/Yahoo.js b/lib/OpenLayers/Layer/Yahoo.js index fd68a7192e..b2ed441f18 100644 --- a/lib/OpenLayers/Layer/Yahoo.js +++ b/lib/OpenLayers/Layer/Yahoo.js @@ -1,5 +1,5 @@ -/* Copyright (c) 2006-2007 MetaCarta, Inc., published under a modified BSD license. - * See http://svn.openlayers.org/trunk/openlayers/repository-license.txt +/* Copyright (c) 2006-2007 MetaCarta, Inc., published under the BSD license. + * See http://svn.openlayers.org/trunk/openlayers/release-license.txt * for the full text of the license. */ diff --git a/lib/OpenLayers/Map.js b/lib/OpenLayers/Map.js index ac455ac470..80af284d4f 100644 --- a/lib/OpenLayers/Map.js +++ b/lib/OpenLayers/Map.js @@ -1,5 +1,5 @@ -/* Copyright (c) 2006-2007 MetaCarta, Inc., published under a modified BSD license. - * See http://svn.openlayers.org/trunk/openlayers/repository-license.txt +/* Copyright (c) 2006-2007 MetaCarta, Inc., published under the BSD license. + * See http://svn.openlayers.org/trunk/openlayers/release-license.txt * for the full text of the license. */ diff --git a/lib/OpenLayers/Marker.js b/lib/OpenLayers/Marker.js index 59cab53532..5c8333b20f 100644 --- a/lib/OpenLayers/Marker.js +++ b/lib/OpenLayers/Marker.js @@ -1,5 +1,5 @@ -/* Copyright (c) 2006-2007 MetaCarta, Inc., published under a modified BSD license. - * See http://svn.openlayers.org/trunk/openlayers/repository-license.txt +/* Copyright (c) 2006-2007 MetaCarta, Inc., published under the BSD license. + * See http://svn.openlayers.org/trunk/openlayers/release-license.txt * for the full text of the license. */ diff --git a/lib/OpenLayers/Marker/Box.js b/lib/OpenLayers/Marker/Box.js index 8c2674dd43..48c805e034 100644 --- a/lib/OpenLayers/Marker/Box.js +++ b/lib/OpenLayers/Marker/Box.js @@ -1,5 +1,5 @@ -/* Copyright (c) 2006-2007 MetaCarta, Inc., published under a modified BSD license. - * See http://svn.openlayers.org/trunk/openlayers/repository-license.txt +/* Copyright (c) 2006-2007 MetaCarta, Inc., published under the BSD license. + * See http://svn.openlayers.org/trunk/openlayers/release-license.txt * for the full text of the license. */ diff --git a/lib/OpenLayers/Popup.js b/lib/OpenLayers/Popup.js index c1335befd5..6f5f77654b 100644 --- a/lib/OpenLayers/Popup.js +++ b/lib/OpenLayers/Popup.js @@ -1,5 +1,5 @@ -/* Copyright (c) 2006-2007 MetaCarta, Inc., published under a modified BSD license. - * See http://svn.openlayers.org/trunk/openlayers/repository-license.txt +/* Copyright (c) 2006-2007 MetaCarta, Inc., published under the BSD license. + * See http://svn.openlayers.org/trunk/openlayers/release-license.txt * for the full text of the license. */ diff --git a/lib/OpenLayers/Popup/Anchored.js b/lib/OpenLayers/Popup/Anchored.js index 3c3009adc0..b2387d3867 100644 --- a/lib/OpenLayers/Popup/Anchored.js +++ b/lib/OpenLayers/Popup/Anchored.js @@ -1,5 +1,5 @@ -/* Copyright (c) 2006-2007 MetaCarta, Inc., published under a modified BSD license. - * See http://svn.openlayers.org/trunk/openlayers/repository-license.txt +/* Copyright (c) 2006-2007 MetaCarta, Inc., published under the BSD license. + * See http://svn.openlayers.org/trunk/openlayers/release-license.txt * for the full text of the license. */ diff --git a/lib/OpenLayers/Popup/AnchoredBubble.js b/lib/OpenLayers/Popup/AnchoredBubble.js index ae3ee3eb42..4575f6fcff 100644 --- a/lib/OpenLayers/Popup/AnchoredBubble.js +++ b/lib/OpenLayers/Popup/AnchoredBubble.js @@ -1,5 +1,5 @@ -/* Copyright (c) 2006-2007 MetaCarta, Inc., published under a modified BSD license. - * See http://svn.openlayers.org/trunk/openlayers/repository-license.txt +/* Copyright (c) 2006-2007 MetaCarta, Inc., published under the BSD license. + * See http://svn.openlayers.org/trunk/openlayers/release-license.txt * for the full text of the license. */ diff --git a/lib/OpenLayers/Renderer.js b/lib/OpenLayers/Renderer.js index b2c82af3ba..2f624ae8a5 100644 --- a/lib/OpenLayers/Renderer.js +++ b/lib/OpenLayers/Renderer.js @@ -1,5 +1,5 @@ -/* Copyright (c) 2006-2007 MetaCarta, Inc., published under a modified BSD license. - * See http://svn.openlayers.org/trunk/openlayers/repository-license.txt +/* Copyright (c) 2006-2007 MetaCarta, Inc., published under the BSD license. + * See http://svn.openlayers.org/trunk/openlayers/release-license.txt * for the full text of the license. */ /** diff --git a/lib/OpenLayers/Renderer/Elements.js b/lib/OpenLayers/Renderer/Elements.js index 43c0e41bbd..9940acb045 100644 --- a/lib/OpenLayers/Renderer/Elements.js +++ b/lib/OpenLayers/Renderer/Elements.js @@ -1,5 +1,5 @@ -/* Copyright (c) 2006-2007 MetaCarta, Inc., published under a modified BSD license. - * See http://svn.openlayers.org/trunk/openlayers/repository-license.txt +/* Copyright (c) 2006-2007 MetaCarta, Inc., published under the BSD license. + * See http://svn.openlayers.org/trunk/openlayers/release-license.txt * for the full text of the license. */ /** diff --git a/lib/OpenLayers/Renderer/SVG.js b/lib/OpenLayers/Renderer/SVG.js index 525bb749c6..0922afbc96 100644 --- a/lib/OpenLayers/Renderer/SVG.js +++ b/lib/OpenLayers/Renderer/SVG.js @@ -1,5 +1,5 @@ -/* Copyright (c) 2006-2007 MetaCarta, Inc., published under a modified BSD license. - * See http://svn.openlayers.org/trunk/openlayers/repository-license.txt +/* Copyright (c) 2006-2007 MetaCarta, Inc., published under the BSD license. + * See http://svn.openlayers.org/trunk/openlayers/release-license.txt * for the full text of the license. */ /** diff --git a/lib/OpenLayers/Renderer/VML.js b/lib/OpenLayers/Renderer/VML.js index 08f65e25a0..cbd1853e31 100644 --- a/lib/OpenLayers/Renderer/VML.js +++ b/lib/OpenLayers/Renderer/VML.js @@ -1,5 +1,5 @@ -/* Copyright (c) 2006-2007 MetaCarta, Inc., published under a modified BSD license. - * See http://svn.openlayers.org/trunk/openlayers/repository-license.txt +/* Copyright (c) 2006-2007 MetaCarta, Inc., published under the BSD license. + * See http://svn.openlayers.org/trunk/openlayers/release-license.txt * for the full text of the license. */ /** diff --git a/lib/OpenLayers/SingleFile.js b/lib/OpenLayers/SingleFile.js index 1eda25e2fb..3bab31aaf6 100644 --- a/lib/OpenLayers/SingleFile.js +++ b/lib/OpenLayers/SingleFile.js @@ -1,5 +1,5 @@ -/* Copyright (c) 2006-2007 MetaCarta, Inc., published under a modified BSD license. - * See http://svn.openlayers.org/trunk/openlayers/repository-license.txt +/* Copyright (c) 2006-2007 MetaCarta, Inc., published under the BSD license. + * See http://svn.openlayers.org/trunk/openlayers/release-license.txt * for the full text of the license. */ OpenLayers = { diff --git a/lib/OpenLayers/Tile.js b/lib/OpenLayers/Tile.js index fef62dcefb..e911874a15 100644 --- a/lib/OpenLayers/Tile.js +++ b/lib/OpenLayers/Tile.js @@ -1,5 +1,5 @@ -/* Copyright (c) 2006-2007 MetaCarta, Inc., published under a modified BSD license. - * See http://svn.openlayers.org/trunk/openlayers/repository-license.txt +/* Copyright (c) 2006-2007 MetaCarta, Inc., published under the BSD license. + * See http://svn.openlayers.org/trunk/openlayers/release-license.txt * for the full text of the license. */ diff --git a/lib/OpenLayers/Tile/Image.js b/lib/OpenLayers/Tile/Image.js index acf7c9598e..c09f2f0e5a 100644 --- a/lib/OpenLayers/Tile/Image.js +++ b/lib/OpenLayers/Tile/Image.js @@ -1,5 +1,5 @@ -/* Copyright (c) 2006-2007 MetaCarta, Inc., published under a modified BSD license. - * See http://svn.openlayers.org/trunk/openlayers/repository-license.txt +/* Copyright (c) 2006-2007 MetaCarta, Inc., published under the BSD license. + * See http://svn.openlayers.org/trunk/openlayers/release-license.txt * for the full text of the license. */ diff --git a/lib/OpenLayers/Tile/WFS.js b/lib/OpenLayers/Tile/WFS.js index 2df96555f1..073571ec07 100644 --- a/lib/OpenLayers/Tile/WFS.js +++ b/lib/OpenLayers/Tile/WFS.js @@ -1,5 +1,5 @@ -/* Copyright (c) 2006-2007 MetaCarta, Inc., published under a modified BSD license. - * See http://svn.openlayers.org/trunk/openlayers/repository-license.txt +/* Copyright (c) 2006-2007 MetaCarta, Inc., published under the BSD license. + * See http://svn.openlayers.org/trunk/openlayers/release-license.txt * for the full text of the license. */ diff --git a/lib/OpenLayers/Util.js b/lib/OpenLayers/Util.js index ccbe7e2b54..4a01504127 100644 --- a/lib/OpenLayers/Util.js +++ b/lib/OpenLayers/Util.js @@ -1,5 +1,5 @@ -/* Copyright (c) 2006-2007 MetaCarta, Inc., published under a modified BSD license. - * See http://svn.openlayers.org/trunk/openlayers/repository-license.txt +/* Copyright (c) 2006-2007 MetaCarta, Inc., published under the BSD license. + * See http://svn.openlayers.org/trunk/openlayers/release-license.txt * for the full text of the license. */ diff --git a/tests/Control/test_MousePosition.html b/tests/Control/test_MousePosition.html new file mode 100644 index 0000000000..20b470914e --- /dev/null +++ b/tests/Control/test_MousePosition.html @@ -0,0 +1,45 @@ + + + + + + +
+ + diff --git a/tests/Format/test_GML.html b/tests/Format/test_GML.html index f142d01e96..601e9c7dc7 100644 --- a/tests/Format/test_GML.html +++ b/tests/Format/test_GML.html @@ -147,13 +147,14 @@ t.eq(data[0].geometry.components.length, 2, "rings length correct"); } function test_Format_GML_read_attributes(t) { - t.plan(1); + t.plan(2); var parser = new OpenLayers.Format.GML(); data = parser.read(test_content[0]); t.eq(data[0].attributes['NAME'], "WY", "Simple Attribute data is read correctly."); + t.eq(data[0].attributes['LONGNAME'], "Wyoming", "Attribute data is read from CDATA node correctly."); } - var test_content = ['\n\n \n \n -1254041.389711702250906.9515983529\n -634517.1199908922762236.2940800377\n \n \n \n \n -634517.11999089224,691849.77929356066,0 -653761.64509297756,471181.53429472551,0 -673343.60852865304,250906.9515983529,0 -1088825.734430399,299284.85108220269,0 -1254041.3897117018,324729.27754874947,0 -1235750.4212498858,434167.33911316615,0 -1190777.7803201093,704392.96327195223,0 -1181607.835811228,762236.29408003774,0 -634517.11999089224,691849.77929356066,0\n WY\n \n \n\n', + var test_content = ['\n\n \n \n -1254041.389711702250906.9515983529\n -634517.1199908922762236.2940800377\n \n \n \n \n -634517.11999089224,691849.77929356066,0 -653761.64509297756,471181.53429472551,0 -673343.60852865304,250906.9515983529,0 -1088825.734430399,299284.85108220269,0 -1254041.3897117018,324729.27754874947,0 -1235750.4212498858,434167.33911316615,0 -1190777.7803201093,704392.96327195223,0 -1181607.835811228,762236.29408003774,0 -634517.11999089224,691849.77929356066,0\n WY\n \n \n \n\n', 'Control/test_OverviewMap.html
  • Control/test_NavToolbar.html
  • Control/test_MouseToolbar.html
    • +
  • Control/test_MousePosition.html
  • Control/test_LayerSwitcher.html
  • Control/test_Panel.html
  • Control/test_PanZoom.html