From 044368664f35cb7aa4872153264467724700b1bc Mon Sep 17 00:00:00 2001 From: crschmidt Date: Wed, 2 May 2007 14:20:28 +0000 Subject: [PATCH] Tag OpenLayers 2.4-rc3. git-svn-id: http://svn.openlayers.org/tags/openlayers/release-2.4-rc3@3113 dc9f47b5-9b13-0410-9fdd-eb0c1a62fdaf --- build/license.txt | 4 +- examples/outOfRangeMarkers.html | 54 ++++++ examples/outOfRangeMarkers.txt | 3 + examples/panel.html | 2 +- lib/OpenLayers.js | 4 +- lib/OpenLayers/Ajax.js | 4 +- lib/OpenLayers/BaseTypes.js | 4 +- lib/OpenLayers/Control.js | 4 +- lib/OpenLayers/Control/ArgParser.js | 4 +- lib/OpenLayers/Control/DragPan.js | 4 +- lib/OpenLayers/Control/DrawFeature.js | 4 +- lib/OpenLayers/Control/EditingToolbar.js | 4 +- lib/OpenLayers/Control/KeyboardDefaults.js | 4 +- lib/OpenLayers/Control/LayerSwitcher.js | 4 +- lib/OpenLayers/Control/MouseDefaults.js | 4 +- lib/OpenLayers/Control/MousePosition.js | 4 +- lib/OpenLayers/Control/MouseToolbar.js | 4 +- lib/OpenLayers/Control/NavToolbar.js | 4 +- lib/OpenLayers/Control/Navigation.js | 4 +- lib/OpenLayers/Control/OverviewMap.js | 8 +- lib/OpenLayers/Control/PanZoom.js | 4 +- lib/OpenLayers/Control/PanZoomBar.js | 4 +- lib/OpenLayers/Control/Panel.js | 8 +- lib/OpenLayers/Control/Permalink.js | 4 +- lib/OpenLayers/Control/Scale.js | 4 +- lib/OpenLayers/Control/SelectFeature.js | 4 +- lib/OpenLayers/Control/ZoomBox.js | 4 +- lib/OpenLayers/Control/ZoomToMaxExtent.js | 4 +- lib/OpenLayers/Events.js | 4 +- lib/OpenLayers/Feature.js | 4 +- lib/OpenLayers/Feature/Vector.js | 4 +- lib/OpenLayers/Feature/WFS.js | 4 +- lib/OpenLayers/Format.js | 4 +- lib/OpenLayers/Format/GML.js | 16 +- lib/OpenLayers/Format/GeoRSS.js | 4 +- lib/OpenLayers/Format/KML.js | 4 +- lib/OpenLayers/Format/WFS.js | 4 +- lib/OpenLayers/Format/WKT.js | 4 +- lib/OpenLayers/Geometry.js | 4 +- lib/OpenLayers/Geometry/Collection.js | 4 +- lib/OpenLayers/Geometry/Curve.js | 4 +- lib/OpenLayers/Geometry/LineString.js | 4 +- lib/OpenLayers/Geometry/LinearRing.js | 4 +- lib/OpenLayers/Geometry/MultiLineString.js | 4 +- lib/OpenLayers/Geometry/MultiPoint.js | 4 +- lib/OpenLayers/Geometry/MultiPolygon.js | 4 +- lib/OpenLayers/Geometry/Point.js | 4 +- lib/OpenLayers/Geometry/Polygon.js | 4 +- lib/OpenLayers/Geometry/Rectangle.js | 4 +- lib/OpenLayers/Geometry/Surface.js | 4 +- lib/OpenLayers/Handler.js | 4 +- lib/OpenLayers/Handler/Box.js | 4 +- lib/OpenLayers/Handler/Drag.js | 4 +- lib/OpenLayers/Handler/Feature.js | 4 +- lib/OpenLayers/Handler/Keyboard.js | 4 +- lib/OpenLayers/Handler/MouseWheel.js | 4 +- lib/OpenLayers/Handler/Path.js | 4 +- lib/OpenLayers/Handler/Point.js | 4 +- lib/OpenLayers/Handler/Polygon.js | 4 +- lib/OpenLayers/Icon.js | 4 +- lib/OpenLayers/Layer.js | 6 +- lib/OpenLayers/Layer/Boxes.js | 4 +- lib/OpenLayers/Layer/Canvas.js | 4 +- lib/OpenLayers/Layer/EventPane.js | 4 +- lib/OpenLayers/Layer/FixedZoomLevels.js | 4 +- lib/OpenLayers/Layer/GML.js | 4 +- lib/OpenLayers/Layer/GeoRSS.js | 4 +- lib/OpenLayers/Layer/Google.js | 4 +- lib/OpenLayers/Layer/Grid.js | 4 +- lib/OpenLayers/Layer/HTTPRequest.js | 4 +- lib/OpenLayers/Layer/Image.js | 4 +- lib/OpenLayers/Layer/KaMap.js | 4 +- lib/OpenLayers/Layer/MapServer.js | 4 +- lib/OpenLayers/Layer/Markers.js | 16 +- lib/OpenLayers/Layer/MultiMap.js | 4 +- lib/OpenLayers/Layer/TMS.js | 4 +- lib/OpenLayers/Layer/Text.js | 4 +- lib/OpenLayers/Layer/Vector.js | 10 +- lib/OpenLayers/Layer/VirtualEarth.js | 4 +- lib/OpenLayers/Layer/WFS.js | 4 +- lib/OpenLayers/Layer/WMS.js | 4 +- lib/OpenLayers/Layer/WMS/Untiled.js | 4 +- lib/OpenLayers/Layer/WorldWind.js | 4 +- lib/OpenLayers/Layer/Yahoo.js | 4 +- lib/OpenLayers/Map.js | 4 +- lib/OpenLayers/Marker.js | 4 +- lib/OpenLayers/Marker/Box.js | 4 +- lib/OpenLayers/Popup.js | 4 +- lib/OpenLayers/Popup/Anchored.js | 4 +- lib/OpenLayers/Popup/AnchoredBubble.js | 4 +- lib/OpenLayers/Renderer.js | 4 +- lib/OpenLayers/Renderer/Elements.js | 4 +- lib/OpenLayers/Renderer/SVG.js | 4 +- lib/OpenLayers/Renderer/VML.js | 4 +- lib/OpenLayers/SingleFile.js | 4 +- lib/OpenLayers/Tile.js | 4 +- lib/OpenLayers/Tile/Image.js | 4 +- lib/OpenLayers/Tile/WFS.js | 4 +- lib/OpenLayers/Util.js | 4 +- repository-license.txt | 35 ---- tests/Format/test_GML.html | 57 +++++++ tests/Layer/test_Vector.html | 14 +- tests/Marker/test_Box.html | 183 +-------------------- tests/list-tests.html | 1 + 104 files changed, 351 insertions(+), 422 deletions(-) create mode 100644 examples/outOfRangeMarkers.html create mode 100644 examples/outOfRangeMarkers.txt delete mode 100644 repository-license.txt create mode 100644 tests/Format/test_GML.html diff --git a/build/license.txt b/build/license.txt index 7b91084f45..e25b7a0c25 100644 --- a/build/license.txt +++ b/build/license.txt @@ -2,8 +2,8 @@ OpenLayers.js -- OpenLayers Map Viewer Library - Copyright 2005-2006 MetaCarta, Inc., released under a modified BSD license. - Please see http://svn.openlayers.org/trunk/openlayers/repository-license.txt + Copyright 2005-2006 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/outOfRangeMarkers.html b/examples/outOfRangeMarkers.html new file mode 100644 index 0000000000..efb8076520 --- /dev/null +++ b/examples/outOfRangeMarkers.html @@ -0,0 +1,54 @@ + + + + + + + + + + + +
+ + + diff --git a/examples/outOfRangeMarkers.txt b/examples/outOfRangeMarkers.txt new file mode 100644 index 0000000000..6d8897760f --- /dev/null +++ b/examples/outOfRangeMarkers.txt @@ -0,0 +1,3 @@ +point title description icon +-4.14,37.90 Kilimanjaro Beskrivning http://www.villageografica.com/Africa-Webmap/img/marker-blue.png +-3.24,34.35 Shinyanga Beskrivning http://www.villageografica.com/Africa-Webmap/img/marker-blue.png diff --git a/examples/panel.html b/examples/panel.html index 489b97dbef..9644c11d4f 100644 --- a/examples/panel.html +++ b/examples/panel.html @@ -69,7 +69,7 @@ zb = new OpenLayers.Control.ZoomBox(); - panel = new OpenLayers.Control.Panel({defaultControl: zb}); + var panel = new OpenLayers.Control.Panel({defaultControl: zb}); panel.addControls([ new OpenLayers.Control.MouseDefaults(), zb, diff --git a/lib/OpenLayers.js b/lib/OpenLayers.js index 89cc92f102..6c1a64ca8a 100644 --- a/lib/OpenLayers.js +++ b/lib/OpenLayers.js @@ -1,5 +1,5 @@ -/* Copyright (c) 2006 MetaCarta, Inc., published under a modified BSD license. - * See http://svn.openlayers.org/trunk/openlayers/repository-license.txt +/* 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. */ /* @requires OpenLayers/BaseTypes.js diff --git a/lib/OpenLayers/Ajax.js b/lib/OpenLayers/Ajax.js index 46599274df..32cbb6580a 100644 --- a/lib/OpenLayers/Ajax.js +++ b/lib/OpenLayers/Ajax.js @@ -1,5 +1,5 @@ -/* Copyright (c) 2006 MetaCarta, Inc., published under a modified BSD license. - * See http://svn.openlayers.org/trunk/openlayers/repository-license.txt +/* 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/BaseTypes.js b/lib/OpenLayers/BaseTypes.js index f342f69ac7..a303bf2274 100644 --- a/lib/OpenLayers/BaseTypes.js +++ b/lib/OpenLayers/BaseTypes.js @@ -1,5 +1,5 @@ -/* Copyright (c) 2006 MetaCarta, Inc., published under a modified BSD license. - * See http://svn.openlayers.org/trunk/openlayers/repository-license.txt +/* 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.js b/lib/OpenLayers/Control.js index 467629a389..4fe6ac8ae7 100644 --- a/lib/OpenLayers/Control.js +++ b/lib/OpenLayers/Control.js @@ -1,5 +1,5 @@ -/* Copyright (c) 2006 MetaCarta, Inc., published under a modified BSD license. - * See http://svn.openlayers.org/trunk/openlayers/repository-license.txt +/* 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/ArgParser.js b/lib/OpenLayers/Control/ArgParser.js index 272ced4ca9..8b31050ebd 100644 --- a/lib/OpenLayers/Control/ArgParser.js +++ b/lib/OpenLayers/Control/ArgParser.js @@ -1,5 +1,5 @@ -/* Copyright (c) 2006 MetaCarta, Inc., published under a modified BSD license. - * See http://svn.openlayers.org/trunk/openlayers/repository-license.txt +/* 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/DragPan.js b/lib/OpenLayers/Control/DragPan.js index 0cb876a268..37c24d3331 100644 --- a/lib/OpenLayers/Control/DragPan.js +++ b/lib/OpenLayers/Control/DragPan.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/DrawFeature.js b/lib/OpenLayers/Control/DrawFeature.js index da4b8dfb26..a502eb2009 100644 --- a/lib/OpenLayers/Control/DrawFeature.js +++ b/lib/OpenLayers/Control/DrawFeature.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/EditingToolbar.js b/lib/OpenLayers/Control/EditingToolbar.js index 81cbf7ea99..44d2088250 100644 --- a/lib/OpenLayers/Control/EditingToolbar.js +++ b/lib/OpenLayers/Control/EditingToolbar.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/KeyboardDefaults.js b/lib/OpenLayers/Control/KeyboardDefaults.js index 86d610a0a8..e34827cd63 100644 --- a/lib/OpenLayers/Control/KeyboardDefaults.js +++ b/lib/OpenLayers/Control/KeyboardDefaults.js @@ -1,5 +1,5 @@ -/* Copyright (c) 2006 MetaCarta, Inc., published under a modified BSD license. - * See http://svn.openlayers.org/trunk/openlayers/repository-license.txt +/* 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/LayerSwitcher.js b/lib/OpenLayers/Control/LayerSwitcher.js index 8531d536e9..2f70f7069c 100644 --- a/lib/OpenLayers/Control/LayerSwitcher.js +++ b/lib/OpenLayers/Control/LayerSwitcher.js @@ -1,5 +1,5 @@ -/* Copyright (c) 2006 MetaCarta, Inc., published under a modified BSD license. - * See http://svn.openlayers.org/trunk/openlayers/repository-license.txt +/* 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 3210009ef7..d659db5ef4 100644 --- a/lib/OpenLayers/Control/MouseDefaults.js +++ b/lib/OpenLayers/Control/MouseDefaults.js @@ -1,5 +1,5 @@ -/* Copyright (c) 2006 MetaCarta, Inc., published under a modified BSD license. - * See http://svn.openlayers.org/trunk/openlayers/repository-license.txt +/* 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/MousePosition.js b/lib/OpenLayers/Control/MousePosition.js index 9d02c69ddd..d69b953e58 100644 --- a/lib/OpenLayers/Control/MousePosition.js +++ b/lib/OpenLayers/Control/MousePosition.js @@ -1,5 +1,5 @@ -/* Copyright (c) 2006 MetaCarta, Inc., published under a modified BSD license. - * See http://svn.openlayers.org/trunk/openlayers/repository-license.txt +/* 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/MouseToolbar.js b/lib/OpenLayers/Control/MouseToolbar.js index 9c9f77a248..f0eb9e0124 100644 --- a/lib/OpenLayers/Control/MouseToolbar.js +++ b/lib/OpenLayers/Control/MouseToolbar.js @@ -1,5 +1,5 @@ -/* Copyright (c) 2006 MetaCarta, Inc., published under a modified BSD license. - * See http://svn.openlayers.org/trunk/openlayers/repository-license.txt +/* 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/NavToolbar.js b/lib/OpenLayers/Control/NavToolbar.js index a701a4cdb3..68d0e2ab95 100644 --- a/lib/OpenLayers/Control/NavToolbar.js +++ b/lib/OpenLayers/Control/NavToolbar.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/Navigation.js b/lib/OpenLayers/Control/Navigation.js index ea927f3ecd..00deec284b 100644 --- a/lib/OpenLayers/Control/Navigation.js +++ b/lib/OpenLayers/Control/Navigation.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/OverviewMap.js b/lib/OpenLayers/Control/OverviewMap.js index cb5301125b..a2ce7955cc 100644 --- a/lib/OpenLayers/Control/OverviewMap.js +++ b/lib/OpenLayers/Control/OverviewMap.js @@ -1,5 +1,5 @@ -/* Copyright (c) 2006 MetaCarta, Inc., published under a modified BSD license. - * See http://svn.openlayers.org/trunk/openlayers/repository-license.txt +/* 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. */ /** * @fileoverview Locator Map Control @@ -520,8 +520,8 @@ OpenLayers.Control.OverviewMap.prototype = this.ovmap.size.w - this.wComp); this.extentRectangle.style.top = parseInt(top) + 'px'; this.extentRectangle.style.left = parseInt(left) + 'px'; - this.extentRectangle.style.height = parseInt(bottom - top)+ 'px'; - this.extentRectangle.style.width = parseInt(right - left) + 'px'; + this.extentRectangle.style.height = parseInt(Math.max(bottom - top, 0))+ 'px'; + this.extentRectangle.style.width = parseInt(Math.max(right - left, 0)) + 'px'; }, /** diff --git a/lib/OpenLayers/Control/PanZoom.js b/lib/OpenLayers/Control/PanZoom.js index 2af98474e1..5fcea5259e 100644 --- a/lib/OpenLayers/Control/PanZoom.js +++ b/lib/OpenLayers/Control/PanZoom.js @@ -1,5 +1,5 @@ -/* Copyright (c) 2006 MetaCarta, Inc., published under a modified BSD license. - * See http://svn.openlayers.org/trunk/openlayers/repository-license.txt +/* 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/PanZoomBar.js b/lib/OpenLayers/Control/PanZoomBar.js index 8eb0de2871..21422d0ca0 100644 --- a/lib/OpenLayers/Control/PanZoomBar.js +++ b/lib/OpenLayers/Control/PanZoomBar.js @@ -1,5 +1,5 @@ -/* Copyright (c) 2006 MetaCarta, Inc., published under a modified BSD license. - * See http://svn.openlayers.org/trunk/openlayers/repository-license.txt +/* 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/Panel.js b/lib/OpenLayers/Control/Panel.js index 1e12642456..2bdec1fa17 100644 --- a/lib/OpenLayers/Control/Panel.js +++ b/lib/OpenLayers/Control/Panel.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. */ /** @@ -129,6 +129,8 @@ OpenLayers.Control.Panel.prototype = // Give each control a panel_div which will be used later. // Access to this div is via the panel_div attribute of the // control added to the panel. + // Also, stop mousedowns and clicks, but don't stop mouseup, + // since they need to pass through. for (var i = 0; i < controls.length; i++) { var element = document.createElement("div"); var textNode = document.createTextNode(" "); @@ -137,8 +139,6 @@ OpenLayers.Control.Panel.prototype = this.onClick.bind(this, controls[i])); OpenLayers.Event.observe(controls[i].panel_div, "mousedown", OpenLayers.Event.stop.bindAsEventListener()); - OpenLayers.Event.observe(controls[i].panel_div, "mouseup", - OpenLayers.Event.stop.bindAsEventListener()); } if (this.map) { // map.addControl() has already been called on the panel diff --git a/lib/OpenLayers/Control/Permalink.js b/lib/OpenLayers/Control/Permalink.js index 0235e719de..d2a8f201e6 100644 --- a/lib/OpenLayers/Control/Permalink.js +++ b/lib/OpenLayers/Control/Permalink.js @@ -1,5 +1,5 @@ -/* Copyright (c) 2006 MetaCarta, Inc., published under a modified BSD license. - * See http://svn.openlayers.org/trunk/openlayers/repository-license.txt +/* 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/Scale.js b/lib/OpenLayers/Control/Scale.js index 3c7cf41456..16fa87fb7f 100644 --- a/lib/OpenLayers/Control/Scale.js +++ b/lib/OpenLayers/Control/Scale.js @@ -1,5 +1,5 @@ -/* Copyright (c) 2006 MetaCarta, Inc., published under a modified BSD license. - * See http://svn.openlayers.org/trunk/openlayers/repository-license.txt +/* 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/SelectFeature.js b/lib/OpenLayers/Control/SelectFeature.js index 4aa31cd717..3376cf9932 100644 --- a/lib/OpenLayers/Control/SelectFeature.js +++ b/lib/OpenLayers/Control/SelectFeature.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/ZoomBox.js b/lib/OpenLayers/Control/ZoomBox.js index 8f111943cf..516fe83aa7 100644 --- a/lib/OpenLayers/Control/ZoomBox.js +++ b/lib/OpenLayers/Control/ZoomBox.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/ZoomToMaxExtent.js b/lib/OpenLayers/Control/ZoomToMaxExtent.js index 16cff056b2..49843483d2 100644 --- a/lib/OpenLayers/Control/ZoomToMaxExtent.js +++ b/lib/OpenLayers/Control/ZoomToMaxExtent.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/Events.js b/lib/OpenLayers/Events.js index 014a334c35..976040df16 100644 --- a/lib/OpenLayers/Events.js +++ b/lib/OpenLayers/Events.js @@ -1,5 +1,5 @@ -/* Copyright (c) 2006 MetaCarta, Inc., published under a modified BSD license. - * See http://svn.openlayers.org/trunk/openlayers/repository-license.txt +/* 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/Feature.js b/lib/OpenLayers/Feature.js index f98c10c230..9291f1fd7e 100644 --- a/lib/OpenLayers/Feature.js +++ b/lib/OpenLayers/Feature.js @@ -1,5 +1,5 @@ -/* Copyright (c) 2006 MetaCarta, Inc., published under a modified BSD license. - * See http://svn.openlayers.org/trunk/openlayers/repository-license.txt +/* 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/Feature/Vector.js b/lib/OpenLayers/Feature/Vector.js index 4e6e9d6bf0..8e2bc93b23 100644 --- a/lib/OpenLayers/Feature/Vector.js +++ b/lib/OpenLayers/Feature/Vector.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. */ // TRASH THIS diff --git a/lib/OpenLayers/Feature/WFS.js b/lib/OpenLayers/Feature/WFS.js index da424f727d..58acfc37ff 100644 --- a/lib/OpenLayers/Feature/WFS.js +++ b/lib/OpenLayers/Feature/WFS.js @@ -1,5 +1,5 @@ -/* Copyright (c) 2006 MetaCarta, Inc., published under a modified BSD license. - * See http://svn.openlayers.org/trunk/openlayers/repository-license.txt +/* 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/Format.js b/lib/OpenLayers/Format.js index bca2681f1b..fd55265493 100644 --- a/lib/OpenLayers/Format.js +++ b/lib/OpenLayers/Format.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/Format/GML.js b/lib/OpenLayers/Format/GML.js index 3695684ab2..4ebe1cc65b 100644 --- a/lib/OpenLayers/Format/GML.js +++ b/lib/OpenLayers/Format/GML.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. */ /** @@ -84,13 +84,11 @@ OpenLayers.Format.GML.prototype = var feature = new OpenLayers.Feature.Vector(); - if (xmlNode.firstChild.attributes && xmlNode.firstChild.attributes['fid']) { - feature.fid = xmlNode.firstChild.attributes['fid'].nodeValue; - } - // match MultiPolygon if (OpenLayers.Ajax.getElementsByTagNameNS(xmlNode, this.gmlns, "gml", "MultiPolygon").length != 0) { var multipolygon = OpenLayers.Ajax.getElementsByTagNameNS(xmlNode, this.gmlns, "gml", "MultiPolygon")[0]; + feature.fid = multipolygon.parentNode.parentNode.getAttribute('fid'); + geom = new OpenLayers.Geometry.MultiPolygon(); var polygons = OpenLayers.Ajax.getElementsByTagNameNS(multipolygon, this.gmlns, "gml", "Polygon"); @@ -104,6 +102,7 @@ OpenLayers.Format.GML.prototype = this.gmlns, "gml", "MultiLineString").length != 0) { var multilinestring = OpenLayers.Ajax.getElementsByTagNameNS(xmlNode, this.gmlns, "gml", "MultiLineString")[0]; + feature.fid = multilinestring.parentNode.parentNode.getAttribute('fid'); geom = new OpenLayers.Geometry.MultiLineString(); var lineStrings = OpenLayers.Ajax.getElementsByTagNameNS(multilinestring, this.gmlns, "gml", "LineString"); @@ -122,6 +121,7 @@ OpenLayers.Format.GML.prototype = this.gmlns, "gml", "MultiPoint").length != 0) { var multiPoint = OpenLayers.Ajax.getElementsByTagNameNS(xmlNode, this.gmlns, "gml", "MultiPoint")[0]; + feature.fid = multiPoint.parentNode.parentNode.getAttribute('fid'); geom = new OpenLayers.Geometry.MultiPoint(); @@ -138,6 +138,7 @@ OpenLayers.Format.GML.prototype = this.gmlns, "gml", "Polygon").length != 0) { var polygon = OpenLayers.Ajax.getElementsByTagNameNS(xmlNode, this.gmlns, "gml", "Polygon")[0]; + feature.fid = polygon.parentNode.parentNode.getAttribute('fid'); geom = this.parsePolygonNode(polygon); } @@ -146,6 +147,8 @@ OpenLayers.Format.GML.prototype = this.gmlns, "gml", "LineString").length != 0) { var lineString = OpenLayers.Ajax.getElementsByTagNameNS(xmlNode, this.gmlns, "gml", "LineString")[0]; + feature.fid = lineString.parentNode.parentNode.getAttribute('fid'); + p = this.parseCoords(lineString); if (p.points) { geom = new OpenLayers.Geometry.LineString(p.points); @@ -157,6 +160,7 @@ OpenLayers.Format.GML.prototype = this.gmlns, "gml", "Point").length != 0) { var point = OpenLayers.Ajax.getElementsByTagNameNS(xmlNode, this.gmlns, "gml", "Point")[0]; + feature.fid = point.parentNode.parentNode.getAttribute('fid'); p = this.parseCoords(point); if (p.points) { diff --git a/lib/OpenLayers/Format/GeoRSS.js b/lib/OpenLayers/Format/GeoRSS.js index 93c6226740..a706cc8031 100644 --- a/lib/OpenLayers/Format/GeoRSS.js +++ b/lib/OpenLayers/Format/GeoRSS.js @@ -1,5 +1,5 @@ -/* Copyright (c) 2006 MetaCarta, Inc., published under a modified BSD license. - * See http://svn.openlayers.org/trunk/openlayers/repository-license.txt +/* 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/Format/KML.js b/lib/OpenLayers/Format/KML.js index 7ed9378b35..8bd2f75423 100644 --- a/lib/OpenLayers/Format/KML.js +++ b/lib/OpenLayers/Format/KML.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/Format/WFS.js b/lib/OpenLayers/Format/WFS.js index ac3c7f7e43..b9d3d97258 100644 --- a/lib/OpenLayers/Format/WFS.js +++ b/lib/OpenLayers/Format/WFS.js @@ -1,5 +1,5 @@ -/* Copyright (c) 2006 MetaCarta, Inc., published under a modified BSD license. - * See http://svn.openlayers.org/trunk/openlayers/repository-license.txt +/* 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/Format/WKT.js b/lib/OpenLayers/Format/WKT.js index 5e1fa80cbd..5f8d3e3c49 100644 --- a/lib/OpenLayers/Format/WKT.js +++ b/lib/OpenLayers/Format/WKT.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/Geometry.js b/lib/OpenLayers/Geometry.js index 430c11539d..2e3fa19747 100644 --- a/lib/OpenLayers/Geometry.js +++ b/lib/OpenLayers/Geometry.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/Geometry/Collection.js b/lib/OpenLayers/Geometry/Collection.js index f02632b1ff..311b3c7ee0 100644 --- a/lib/OpenLayers/Geometry/Collection.js +++ b/lib/OpenLayers/Geometry/Collection.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/Geometry/Curve.js b/lib/OpenLayers/Geometry/Curve.js index fd063520b8..38680e38d9 100644 --- a/lib/OpenLayers/Geometry/Curve.js +++ b/lib/OpenLayers/Geometry/Curve.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/Geometry/LineString.js b/lib/OpenLayers/Geometry/LineString.js index b6774d1c30..37c8ec1445 100644 --- a/lib/OpenLayers/Geometry/LineString.js +++ b/lib/OpenLayers/Geometry/LineString.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/Geometry/LinearRing.js b/lib/OpenLayers/Geometry/LinearRing.js index f9ce479647..92dc16b27d 100644 --- a/lib/OpenLayers/Geometry/LinearRing.js +++ b/lib/OpenLayers/Geometry/LinearRing.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/Geometry/MultiLineString.js b/lib/OpenLayers/Geometry/MultiLineString.js index e806617886..7a9e53886f 100644 --- a/lib/OpenLayers/Geometry/MultiLineString.js +++ b/lib/OpenLayers/Geometry/MultiLineString.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/Geometry/MultiPoint.js b/lib/OpenLayers/Geometry/MultiPoint.js index 16b195b1c1..c1ccabd34b 100644 --- a/lib/OpenLayers/Geometry/MultiPoint.js +++ b/lib/OpenLayers/Geometry/MultiPoint.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/Geometry/MultiPolygon.js b/lib/OpenLayers/Geometry/MultiPolygon.js index e00cd7240b..f1b6251671 100644 --- a/lib/OpenLayers/Geometry/MultiPolygon.js +++ b/lib/OpenLayers/Geometry/MultiPolygon.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/Geometry/Point.js b/lib/OpenLayers/Geometry/Point.js index 929ffcbe1c..4a7b2ca398 100644 --- a/lib/OpenLayers/Geometry/Point.js +++ b/lib/OpenLayers/Geometry/Point.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/Geometry/Polygon.js b/lib/OpenLayers/Geometry/Polygon.js index cf496c0014..4ee4e12f28 100644 --- a/lib/OpenLayers/Geometry/Polygon.js +++ b/lib/OpenLayers/Geometry/Polygon.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/Geometry/Rectangle.js b/lib/OpenLayers/Geometry/Rectangle.js index 63c312ab22..c8beb651fe 100644 --- a/lib/OpenLayers/Geometry/Rectangle.js +++ b/lib/OpenLayers/Geometry/Rectangle.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/Geometry/Surface.js b/lib/OpenLayers/Geometry/Surface.js index d7a8aa756a..8a259e7483 100644 --- a/lib/OpenLayers/Geometry/Surface.js +++ b/lib/OpenLayers/Geometry/Surface.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/Handler.js b/lib/OpenLayers/Handler.js index a04bd0c7d0..66c6516a79 100644 --- a/lib/OpenLayers/Handler.js +++ b/lib/OpenLayers/Handler.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/Handler/Box.js b/lib/OpenLayers/Handler/Box.js index f7509f236b..9900a88530 100644 --- a/lib/OpenLayers/Handler/Box.js +++ b/lib/OpenLayers/Handler/Box.js @@ -1,5 +1,5 @@ -/* Copyright (c) 2006 MetaCarta, Inc., published under a modified BSD license. - * See http://svn.openlayers.org/trunk/openlayers/repository-license.txt +/* 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/Handler/Drag.js b/lib/OpenLayers/Handler/Drag.js index b3c7661b4e..1cd80ffc79 100644 --- a/lib/OpenLayers/Handler/Drag.js +++ b/lib/OpenLayers/Handler/Drag.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/Handler/Feature.js b/lib/OpenLayers/Handler/Feature.js index dafd0297dc..7520dd0970 100644 --- a/lib/OpenLayers/Handler/Feature.js +++ b/lib/OpenLayers/Handler/Feature.js @@ -1,5 +1,5 @@ -/* Copyright (c) 2006 MetaCarta, Inc., published under a modified BSD license. - * See http://svn.openlayers.org/trunk/openlayers/repository-license.txt +/* 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/Handler/Keyboard.js b/lib/OpenLayers/Handler/Keyboard.js index 2ac61ad5f0..dbce3df485 100644 --- a/lib/OpenLayers/Handler/Keyboard.js +++ b/lib/OpenLayers/Handler/Keyboard.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/Handler/MouseWheel.js b/lib/OpenLayers/Handler/MouseWheel.js index 91477cabbb..68bf6ee9d6 100644 --- a/lib/OpenLayers/Handler/MouseWheel.js +++ b/lib/OpenLayers/Handler/MouseWheel.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/Handler/Path.js b/lib/OpenLayers/Handler/Path.js index 0b0c42a7b1..afb1cb08f5 100644 --- a/lib/OpenLayers/Handler/Path.js +++ b/lib/OpenLayers/Handler/Path.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/Handler/Point.js b/lib/OpenLayers/Handler/Point.js index 435ce7025d..6772738dda 100644 --- a/lib/OpenLayers/Handler/Point.js +++ b/lib/OpenLayers/Handler/Point.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/Handler/Polygon.js b/lib/OpenLayers/Handler/Polygon.js index 8225c5e038..f11d74f424 100644 --- a/lib/OpenLayers/Handler/Polygon.js +++ b/lib/OpenLayers/Handler/Polygon.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/Icon.js b/lib/OpenLayers/Icon.js index 5d48781d2a..c8fb567a24 100644 --- a/lib/OpenLayers/Icon.js +++ b/lib/OpenLayers/Icon.js @@ -1,5 +1,5 @@ -/* Copyright (c) 2006 MetaCarta, Inc., published under a modified BSD license. - * See http://svn.openlayers.org/trunk/openlayers/repository-license.txt +/* 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/Layer.js b/lib/OpenLayers/Layer.js index fe82f36318..9a0b7aea75 100644 --- a/lib/OpenLayers/Layer.js +++ b/lib/OpenLayers/Layer.js @@ -1,5 +1,5 @@ -/* Copyright (c) 2006 MetaCarta, Inc., published under a modified BSD license. - * See http://svn.openlayers.org/trunk/openlayers/repository-license.txt +/* 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. */ @@ -286,6 +286,8 @@ OpenLayers.Layer.prototype = { if (!this.isBaseLayer) { this.inRange = this.calculateInRange(); + var show = ((this.visibility) && (this.inRange)); + this.div.style.display = show ? "" : "none"; } // deal with gutters diff --git a/lib/OpenLayers/Layer/Boxes.js b/lib/OpenLayers/Layer/Boxes.js index a50610de35..49f594d809 100644 --- a/lib/OpenLayers/Layer/Boxes.js +++ b/lib/OpenLayers/Layer/Boxes.js @@ -1,5 +1,5 @@ -/* Copyright (c) 2006 MetaCarta, Inc., published under a modified BSD license. - * See http://svn.openlayers.org/trunk/openlayers/repository-license.txt +/* 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/Layer/Canvas.js b/lib/OpenLayers/Layer/Canvas.js index c2569d5407..2a0c1ae875 100644 --- a/lib/OpenLayers/Layer/Canvas.js +++ b/lib/OpenLayers/Layer/Canvas.js @@ -1,5 +1,5 @@ -/* Copyright (c) 2006 MetaCarta, Inc., published under a modified BSD license. - * See http://svn.openlayers.org/trunk/openlayers/repository-license.txt +/* 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/Layer/EventPane.js b/lib/OpenLayers/Layer/EventPane.js index 8dca860459..a99121848d 100644 --- a/lib/OpenLayers/Layer/EventPane.js +++ b/lib/OpenLayers/Layer/EventPane.js @@ -1,5 +1,5 @@ -/* Copyright (c) 2006 MetaCarta, Inc., published under a modified BSD license. - * See http://svn.openlayers.org/trunk/openlayers/repository-license.txt +/* 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/Layer/FixedZoomLevels.js b/lib/OpenLayers/Layer/FixedZoomLevels.js index 205ef42067..5170b0bf5b 100644 --- a/lib/OpenLayers/Layer/FixedZoomLevels.js +++ b/lib/OpenLayers/Layer/FixedZoomLevels.js @@ -1,5 +1,5 @@ -/* Copyright (c) 2006 MetaCarta, Inc., published under a modified BSD license. - * See http://svn.openlayers.org/trunk/openlayers/repository-license.txt +/* 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/Layer/GML.js b/lib/OpenLayers/Layer/GML.js index f4ed95c1df..3fb95433ba 100644 --- a/lib/OpenLayers/Layer/GML.js +++ b/lib/OpenLayers/Layer/GML.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/Layer/GeoRSS.js b/lib/OpenLayers/Layer/GeoRSS.js index 082ccb1059..98a818b5ad 100644 --- a/lib/OpenLayers/Layer/GeoRSS.js +++ b/lib/OpenLayers/Layer/GeoRSS.js @@ -1,5 +1,5 @@ -/* Copyright (c) 2006 MetaCarta, Inc., published under a modified BSD license. - * See http://svn.openlayers.org/trunk/openlayers/repository-license.txt +/* 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/Layer/Google.js b/lib/OpenLayers/Layer/Google.js index 26e9c83282..7a4bfaaafe 100644 --- a/lib/OpenLayers/Layer/Google.js +++ b/lib/OpenLayers/Layer/Google.js @@ -1,5 +1,5 @@ -/* Copyright (c) 2006 MetaCarta, Inc., published under a modified BSD license. - * See http://svn.openlayers.org/trunk/openlayers/repository-license.txt +/* 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/Layer/Grid.js b/lib/OpenLayers/Layer/Grid.js index 16b8dca2b2..d0e5d1c2ea 100644 --- a/lib/OpenLayers/Layer/Grid.js +++ b/lib/OpenLayers/Layer/Grid.js @@ -1,5 +1,5 @@ -/* Copyright (c) 2006 MetaCarta, Inc., published under a modified BSD license. - * See http://svn.openlayers.org/trunk/openlayers/repository-license.txt +/* 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/Layer/HTTPRequest.js b/lib/OpenLayers/Layer/HTTPRequest.js index 08070377ec..f00050f460 100644 --- a/lib/OpenLayers/Layer/HTTPRequest.js +++ b/lib/OpenLayers/Layer/HTTPRequest.js @@ -1,5 +1,5 @@ -/* Copyright (c) 2006 MetaCarta, Inc., published under a modified BSD license. - * See http://svn.openlayers.org/trunk/openlayers/repository-license.txt +/* 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/Layer/Image.js b/lib/OpenLayers/Layer/Image.js index 9bd9205944..5772be5fd2 100644 --- a/lib/OpenLayers/Layer/Image.js +++ b/lib/OpenLayers/Layer/Image.js @@ -1,5 +1,5 @@ -/* Copyright (c) 2006 MetaCarta, Inc., published under a modified BSD license. - * See http://svn.openlayers.org/trunk/openlayers/repository-license.txt +/* 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/Layer/KaMap.js b/lib/OpenLayers/Layer/KaMap.js index a1e736e124..a9c7ee3fb1 100644 --- a/lib/OpenLayers/Layer/KaMap.js +++ b/lib/OpenLayers/Layer/KaMap.js @@ -1,5 +1,5 @@ -/* Copyright (c) 2006 MetaCarta, Inc., published under a modified BSD license. - * See http://svn.openlayers.org/trunk/openlayers/repository-license.txt +/* 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/Layer/MapServer.js b/lib/OpenLayers/Layer/MapServer.js index c45268c7bd..576b2099af 100644 --- a/lib/OpenLayers/Layer/MapServer.js +++ b/lib/OpenLayers/Layer/MapServer.js @@ -1,5 +1,5 @@ -/* Copyright (c) 2006 MetaCarta, Inc., published under a modified BSD license. - * See http://svn.openlayers.org/trunk/openlayers/repository-license.txt +/* 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. */ // @requires OpenLayers/Layer/Grid.js /** diff --git a/lib/OpenLayers/Layer/Markers.js b/lib/OpenLayers/Layer/Markers.js index 55150f0a2c..b48f35db6f 100644 --- a/lib/OpenLayers/Layer/Markers.js +++ b/lib/OpenLayers/Layer/Markers.js @@ -1,5 +1,5 @@ -/* Copyright (c) 2006 MetaCarta, Inc., published under a modified BSD license. - * See http://svn.openlayers.org/trunk/openlayers/repository-license.txt +/* 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. */ @@ -21,6 +21,15 @@ OpenLayers.Layer.Markers.prototype = /** internal marker list * @type Array(OpenLayers.Marker) */ markers: null, + + + /** internal state of drawing. This is a workaround for the fact + * that the map does not call moveTo with a zoomChanged when the + * map is first starting up. This lets us catch the case where we + * have *never* drawn the layer, and draw it even if the zoom hasn't + * changed. + * @type Boolean */ + drawn: false, /** * @constructor @@ -51,8 +60,9 @@ OpenLayers.Layer.Markers.prototype = moveTo:function(bounds, zoomChanged, dragging) { OpenLayers.Layer.prototype.moveTo.apply(this, arguments); - if (zoomChanged) { + if (zoomChanged || !this.drawn) { this.redraw(); + this.drawn = true; } }, diff --git a/lib/OpenLayers/Layer/MultiMap.js b/lib/OpenLayers/Layer/MultiMap.js index 44cdb72890..ba49ff7aa8 100644 --- a/lib/OpenLayers/Layer/MultiMap.js +++ b/lib/OpenLayers/Layer/MultiMap.js @@ -1,5 +1,5 @@ -/* Copyright (c) 2006 MetaCarta, Inc., published under a modified BSD license. - * See http://svn.openlayers.org/trunk/openlayers/repository-license.txt +/* 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/Layer/TMS.js b/lib/OpenLayers/Layer/TMS.js index 9be25faee3..253e34cea2 100644 --- a/lib/OpenLayers/Layer/TMS.js +++ b/lib/OpenLayers/Layer/TMS.js @@ -1,5 +1,5 @@ -/* Copyright (c) 2006 MetaCarta, Inc., published under a modified BSD licence. - * See http://svn.openlayers.org/trunk/openlayers/repository-license.txt +/* Copyright (c) 2006 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 6b4088b966..7602b62f18 100644 --- a/lib/OpenLayers/Layer/Text.js +++ b/lib/OpenLayers/Layer/Text.js @@ -1,5 +1,5 @@ -/* Copyright (c) 2006 MetaCarta, Inc., published under a modified BSD license. - * See http://svn.openlayers.org/trunk/openlayers/repository-license.txt +/* 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/Layer/Vector.js b/lib/OpenLayers/Layer/Vector.js index dd571cc138..549cfc2506 100644 --- a/lib/OpenLayers/Layer/Vector.js +++ b/lib/OpenLayers/Layer/Vector.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. */ /** @@ -248,6 +248,12 @@ OpenLayers.Layer.Vector.prototype = this.features = OpenLayers.Util.removeItem(this.features, feature); this.renderer.eraseGeometry(feature.geometry); + + //in the case that this feature is one of the selected features, + // remove it from that array as well. + if (OpenLayers.Util.indexOf(this.selectedFeatures, feature) != -1){ + OpenLayers.Util.removeItem(this.selectedFeatures, feature); + } } }, diff --git a/lib/OpenLayers/Layer/VirtualEarth.js b/lib/OpenLayers/Layer/VirtualEarth.js index 7c2069f702..ee3e3676b0 100644 --- a/lib/OpenLayers/Layer/VirtualEarth.js +++ b/lib/OpenLayers/Layer/VirtualEarth.js @@ -1,5 +1,5 @@ -/* Copyright (c) 2006 MetaCarta, Inc., published under a modified BSD license. - * See http://svn.openlayers.org/trunk/openlayers/repository-license.txt +/* 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/Layer/WFS.js b/lib/OpenLayers/Layer/WFS.js index bf1b52e779..bc73d88b7c 100644 --- a/lib/OpenLayers/Layer/WFS.js +++ b/lib/OpenLayers/Layer/WFS.js @@ -1,5 +1,5 @@ -/* Copyright (c) 2006 MetaCarta, Inc., published under a modified BSD license. - * See http://svn.openlayers.org/trunk/openlayers/repository-license.txt +/* 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/Layer/WMS.js b/lib/OpenLayers/Layer/WMS.js index efe39aadf2..4ae133c96f 100644 --- a/lib/OpenLayers/Layer/WMS.js +++ b/lib/OpenLayers/Layer/WMS.js @@ -1,5 +1,5 @@ -/* Copyright (c) 2006 MetaCarta, Inc., published under a modified BSD license. - * See http://svn.openlayers.org/trunk/openlayers/repository-license.txt +/* 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/Layer/WMS/Untiled.js b/lib/OpenLayers/Layer/WMS/Untiled.js index 0fb934b486..4d1804cf64 100644 --- a/lib/OpenLayers/Layer/WMS/Untiled.js +++ b/lib/OpenLayers/Layer/WMS/Untiled.js @@ -1,5 +1,5 @@ -/* Copyright (c) 2006 MetaCarta, Inc., published under a modified BSD license. - * See http://svn.openlayers.org/trunk/openlayers/repository-license.txt +/* 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/Layer/WorldWind.js b/lib/OpenLayers/Layer/WorldWind.js index 5dd34f8b39..7d815536ca 100644 --- a/lib/OpenLayers/Layer/WorldWind.js +++ b/lib/OpenLayers/Layer/WorldWind.js @@ -1,5 +1,5 @@ -/* Copyright (c) 2006 MetaCarta, Inc., published under a modified BSD license. - * See http://svn.openlayers.org/trunk/openlayers/repository-license.txt +/* 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/Layer/Yahoo.js b/lib/OpenLayers/Layer/Yahoo.js index ed93b5b0c7..90e466b39f 100644 --- a/lib/OpenLayers/Layer/Yahoo.js +++ b/lib/OpenLayers/Layer/Yahoo.js @@ -1,5 +1,5 @@ -/* Copyright (c) 2006 MetaCarta, Inc., published under a modified BSD license. - * See http://svn.openlayers.org/trunk/openlayers/repository-license.txt +/* 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/Map.js b/lib/OpenLayers/Map.js index 48daf1dc8e..ef11937c61 100644 --- a/lib/OpenLayers/Map.js +++ b/lib/OpenLayers/Map.js @@ -1,5 +1,5 @@ -/* Copyright (c) 2006 MetaCarta, Inc., published under a modified BSD license. - * See http://svn.openlayers.org/trunk/openlayers/repository-license.txt +/* 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/Marker.js b/lib/OpenLayers/Marker.js index 252868237b..2e192b258c 100644 --- a/lib/OpenLayers/Marker.js +++ b/lib/OpenLayers/Marker.js @@ -1,5 +1,5 @@ -/* Copyright (c) 2006 MetaCarta, Inc., published under a modified BSD license. - * See http://svn.openlayers.org/trunk/openlayers/repository-license.txt +/* 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/Marker/Box.js b/lib/OpenLayers/Marker/Box.js index 8501439560..124a24b2d9 100644 --- a/lib/OpenLayers/Marker/Box.js +++ b/lib/OpenLayers/Marker/Box.js @@ -1,5 +1,5 @@ -/* Copyright (c) 2006 MetaCarta, Inc., published under a modified BSD license. - * See http://svn.openlayers.org/trunk/openlayers/repository-license.txt +/* 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/Popup.js b/lib/OpenLayers/Popup.js index 00f630e338..27dd7c7773 100644 --- a/lib/OpenLayers/Popup.js +++ b/lib/OpenLayers/Popup.js @@ -1,5 +1,5 @@ -/* Copyright (c) 2006 MetaCarta, Inc., published under a modified BSD license. - * See http://svn.openlayers.org/trunk/openlayers/repository-license.txt +/* 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/Popup/Anchored.js b/lib/OpenLayers/Popup/Anchored.js index 0b5c628ac3..04fe12b46a 100644 --- a/lib/OpenLayers/Popup/Anchored.js +++ b/lib/OpenLayers/Popup/Anchored.js @@ -1,5 +1,5 @@ -/* Copyright (c) 2006 MetaCarta, Inc., published under a modified BSD license. - * See http://svn.openlayers.org/trunk/openlayers/repository-license.txt +/* 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/Popup/AnchoredBubble.js b/lib/OpenLayers/Popup/AnchoredBubble.js index 84503cd7a6..a876636a74 100644 --- a/lib/OpenLayers/Popup/AnchoredBubble.js +++ b/lib/OpenLayers/Popup/AnchoredBubble.js @@ -1,5 +1,5 @@ -/* Copyright (c) 2006 MetaCarta, Inc., published under a modified BSD license. - * See http://svn.openlayers.org/trunk/openlayers/repository-license.txt +/* 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/Renderer.js b/lib/OpenLayers/Renderer.js index 46be4d6196..39f4b06f71 100644 --- a/lib/OpenLayers/Renderer.js +++ b/lib/OpenLayers/Renderer.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/Renderer/Elements.js b/lib/OpenLayers/Renderer/Elements.js index 27eb0a9c78..b29a83f6da 100644 --- a/lib/OpenLayers/Renderer/Elements.js +++ b/lib/OpenLayers/Renderer/Elements.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/Renderer/SVG.js b/lib/OpenLayers/Renderer/SVG.js index 9666fca181..648313b550 100644 --- a/lib/OpenLayers/Renderer/SVG.js +++ b/lib/OpenLayers/Renderer/SVG.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/Renderer/VML.js b/lib/OpenLayers/Renderer/VML.js index 20819a3489..5cf577b6b6 100644 --- a/lib/OpenLayers/Renderer/VML.js +++ b/lib/OpenLayers/Renderer/VML.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/SingleFile.js b/lib/OpenLayers/SingleFile.js index 8d49452524..005924e5b5 100644 --- a/lib/OpenLayers/SingleFile.js +++ b/lib/OpenLayers/SingleFile.js @@ -1,5 +1,5 @@ -/* Copyright (c) 2006 MetaCarta, Inc., published under a modified BSD license. - * See http://svn.openlayers.org/trunk/openlayers/repository-license.txt +/* 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. */ _OPENLAYERS_SFL_=true; diff --git a/lib/OpenLayers/Tile.js b/lib/OpenLayers/Tile.js index e4219a074d..09d2967d39 100644 --- a/lib/OpenLayers/Tile.js +++ b/lib/OpenLayers/Tile.js @@ -1,5 +1,5 @@ -/* Copyright (c) 2006 MetaCarta, Inc., published under a modified BSD license. - * See http://svn.openlayers.org/trunk/openlayers/repository-license.txt +/* 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/Tile/Image.js b/lib/OpenLayers/Tile/Image.js index d930a3e0a9..cea0a5cfb5 100644 --- a/lib/OpenLayers/Tile/Image.js +++ b/lib/OpenLayers/Tile/Image.js @@ -1,5 +1,5 @@ -/* Copyright (c) 2006 MetaCarta, Inc., published under a modified BSD license. - * See http://svn.openlayers.org/trunk/openlayers/repository-license.txt +/* 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/Tile/WFS.js b/lib/OpenLayers/Tile/WFS.js index 6406a48814..6ebb5b171b 100644 --- a/lib/OpenLayers/Tile/WFS.js +++ b/lib/OpenLayers/Tile/WFS.js @@ -1,5 +1,5 @@ -/* Copyright (c) 2006 MetaCarta, Inc., published under a modified BSD license. - * See http://svn.openlayers.org/trunk/openlayers/repository-license.txt +/* 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/Util.js b/lib/OpenLayers/Util.js index 5e4bf3e7dd..c0f43e3df7 100644 --- a/lib/OpenLayers/Util.js +++ b/lib/OpenLayers/Util.js @@ -1,5 +1,5 @@ -/* Copyright (c) 2006 MetaCarta, Inc., published under a modified BSD license. - * See http://svn.openlayers.org/trunk/openlayers/repository-license.txt +/* 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/repository-license.txt b/repository-license.txt deleted file mode 100644 index 596af4a2d3..0000000000 --- a/repository-license.txt +++ /dev/null @@ -1,35 +0,0 @@ -This license applies to all code and content in the OpenLayers code -repository at svn.openlayers.org: - -Copyright (c) 2005-2006 MetaCarta, Inc. -All rights reserved. - -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions are met: - - * Redistributions of source code must retain the above copyright notice, this - list of conditions and the following disclaimer. - - * Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. - - * Neither the name of MetaCarta, Inc. nor the names of its contributors - may be used to endorse or promote products derived from this software - without specific prior written permission. - -This license grants no rights to any components related to natural language -processing, free text querying, or unstructured information retrieval. This -license grants no rights to components that implement inventions on which -MetaCarta has patents or has filed applications for patents. - -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND -ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED -WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR -ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES -(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; -LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON -ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS -SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. diff --git a/tests/Format/test_GML.html b/tests/Format/test_GML.html new file mode 100644 index 0000000000..2d08ee7cc2 --- /dev/null +++ b/tests/Format/test_GML.html @@ -0,0 +1,57 @@ + + + + + + + + diff --git a/tests/Layer/test_Vector.html b/tests/Layer/test_Vector.html index b7565a5556..c368c14f9c 100644 --- a/tests/Layer/test_Vector.html +++ b/tests/Layer/test_Vector.html @@ -29,7 +29,7 @@ } function test_03_Layer_Vector_removeFeatures(t) { - t.plan(2); + t.plan(3); var layer = new OpenLayers.Layer.Vector(name); @@ -43,6 +43,9 @@ t.ok(layer.features.length == 1, "OpenLayers.Layer.Vector.removeFeatures removes a feature from the features array"); layer.addFeatures([pointFeature1.clone(), pointFeature2.clone()]); + layer.selectedFeatures.push(layer.features[0]); + layer.removeFeatures(layer.features[0]); + t.eq(layer.selectedFeatures, [], "Remove features removes selected features"); var features = layer.removeFeatures(layer.features); t.ok(layer.features.length == 0, @@ -69,12 +72,16 @@ var feature = new OpenLayers.Feature.Vector(geometry); var f, s; + + // Layer renderer needs a destroy, and draw, for functional tests. layer.renderer = { drawFeature: function(feature, style) { f = feature; s = style; - } + }, + destroy: function() { } }; + layer.drawFeature(feature); t.ok(geometry.equals(f.geometry), @@ -112,7 +119,8 @@ layer.renderer = { eraseFeatures: function(features) { f = features[0]; - } + }, + destroy: function() { } }; layer.eraseFeatures([feature]); diff --git a/tests/Marker/test_Box.html b/tests/Marker/test_Box.html index 066cf4197e..8d0f5829aa 100644 --- a/tests/Marker/test_Box.html +++ b/tests/Marker/test_Box.html @@ -178,185 +178,4 @@
- - - - - - - -
- - + \ No newline at end of file diff --git a/tests/list-tests.html b/tests/list-tests.html index d8104a89e4..cd719c67aa 100644 --- a/tests/list-tests.html +++ b/tests/list-tests.html @@ -17,6 +17,7 @@
  • Geometry/test_Rectangle.html
  • Geometry/test_Surface.html
  • test_Format.html
    • +
  • Format/test_GML.html
  • Format/test_WKT.html
  • test_Icon.html
  • test_Marker.html