Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Tag 2.4-RC2.

git-svn-id: http://svn.openlayers.org/tags/openlayers/release-2.4-rc2@3089 dc9f47b5-9b13-0410-9fdd-eb0c1a62fdaf
  • Loading branch information...
commit 9011c8ca0a0bb8392b3db598c4ae46bdb8351a2d 1 parent b6fb161
@crschmidt crschmidt authored
Showing with 1,589 additions and 728 deletions.
  1. +2 −2 build/license.txt
  2. +3 −2 examples/image-layer.html
  3. +10 −16 examples/openmnnd.html
  4. +0 −1  examples/vector-features.html
  5. +2 −2 examples/wfs-scribble.html
  6. +3 −3 examples/wfs-t.html
  7. +2 −2 examples/wkt.html
  8. +2 −2 lib/OpenLayers.js
  9. +2 −2 lib/OpenLayers/Ajax.js
  10. +2 −2 lib/OpenLayers/BaseTypes.js
  11. +2 −2 lib/OpenLayers/Control.js
  12. +2 −2 lib/OpenLayers/Control/ArgParser.js
  13. +2 −2 lib/OpenLayers/Control/DragPan.js
  14. +3 −3 lib/OpenLayers/Control/DrawFeature.js
  15. +2 −2 lib/OpenLayers/Control/EditingToolbar.js
  16. +34 −12 lib/OpenLayers/Control/KeyboardDefaults.js
  17. +3 −3 lib/OpenLayers/Control/LayerSwitcher.js
  18. +3 −3 lib/OpenLayers/Control/MouseDefaults.js
  19. +2 −2 lib/OpenLayers/Control/MousePosition.js
  20. +3 −3 lib/OpenLayers/Control/MouseToolbar.js
  21. +2 −2 lib/OpenLayers/Control/NavToolbar.js
  22. +2 −2 lib/OpenLayers/Control/Navigation.js
  23. +5 −4 lib/OpenLayers/Control/OverviewMap.js
  24. +4 −2 lib/OpenLayers/Control/PanZoom.js
  25. +3 −3 lib/OpenLayers/Control/PanZoomBar.js
  26. +2 −2 lib/OpenLayers/Control/Panel.js
  27. +2 −2 lib/OpenLayers/Control/Permalink.js
  28. +2 −2 lib/OpenLayers/Control/Scale.js
  29. +35 −44 lib/OpenLayers/Control/SelectFeature.js
  30. +2 −2 lib/OpenLayers/Control/ZoomBox.js
  31. +2 −2 lib/OpenLayers/Control/ZoomToMaxExtent.js
  32. +2 −2 lib/OpenLayers/Events.js
  33. +2 −2 lib/OpenLayers/Feature.js
  34. +11 −59 lib/OpenLayers/Feature/Vector.js
  35. +2 −2 lib/OpenLayers/Feature/WFS.js
  36. +2 −2 lib/OpenLayers/Format.js
  37. +3 −3 lib/OpenLayers/Format/GML.js
  38. +2 −2 lib/OpenLayers/Format/GeoRSS.js
  39. +3 −3 lib/OpenLayers/Format/KML.js
  40. +2 −2 lib/OpenLayers/Format/WFS.js
  41. +2 −2 lib/OpenLayers/Format/WKT.js
  42. +2 −11 lib/OpenLayers/Geometry.js
  43. +2 −10 lib/OpenLayers/Geometry/Collection.js
  44. +2 −2 lib/OpenLayers/Geometry/Curve.js
  45. +2 −2 lib/OpenLayers/Geometry/LineString.js
  46. +2 −2 lib/OpenLayers/Geometry/LinearRing.js
  47. +2 −2 lib/OpenLayers/Geometry/MultiLineString.js
  48. +2 −2 lib/OpenLayers/Geometry/MultiPoint.js
  49. +2 −2 lib/OpenLayers/Geometry/MultiPolygon.js
  50. +2 −2 lib/OpenLayers/Geometry/Point.js
  51. +2 −2 lib/OpenLayers/Geometry/Polygon.js
  52. +2 −2 lib/OpenLayers/Geometry/Rectangle.js
  53. +2 −2 lib/OpenLayers/Geometry/Surface.js
  54. +2 −2 lib/OpenLayers/Handler.js
  55. +3 −3 lib/OpenLayers/Handler/Box.js
  56. +10 −15 lib/OpenLayers/Handler/Drag.js
  57. +19 −19 lib/OpenLayers/Handler/Feature.js
  58. +2 −2 lib/OpenLayers/Handler/Keyboard.js
  59. +2 −2 lib/OpenLayers/Handler/MouseWheel.js
  60. +31 −28 lib/OpenLayers/Handler/Path.js
  61. +22 −21 lib/OpenLayers/Handler/Point.js
  62. +23 −20 lib/OpenLayers/Handler/Polygon.js
  63. +2 −2 lib/OpenLayers/Icon.js
  64. +55 −40 lib/OpenLayers/Layer.js
  65. +6 −3 lib/OpenLayers/Layer/Boxes.js
  66. +2 −2 lib/OpenLayers/Layer/Canvas.js
  67. +2 −2 lib/OpenLayers/Layer/EventPane.js
  68. +2 −2 lib/OpenLayers/Layer/FixedZoomLevels.js
  69. +2 −2 lib/OpenLayers/Layer/GML.js
  70. +2 −2 lib/OpenLayers/Layer/GeoRSS.js
  71. +2 −2 lib/OpenLayers/Layer/Google.js
  72. +2 −2 lib/OpenLayers/Layer/Grid.js
  73. +3 −4 lib/OpenLayers/Layer/HTTPRequest.js
  74. +38 −17 lib/OpenLayers/Layer/Image.js
  75. +32 −2 lib/OpenLayers/Layer/KaMap.js
  76. +2 −2 lib/OpenLayers/Layer/MapServer.js
  77. +2 −2 lib/OpenLayers/Layer/Markers.js
  78. +2 −2 lib/OpenLayers/Layer/MultiMap.js
  79. +2 −2 lib/OpenLayers/Layer/TMS.js
  80. +2 −2 lib/OpenLayers/Layer/Text.js
  81. +63 −52 lib/OpenLayers/Layer/Vector.js
  82. +2 −2 lib/OpenLayers/Layer/VirtualEarth.js
  83. +14 −3 lib/OpenLayers/Layer/WFS.js
  84. +2 −2 lib/OpenLayers/Layer/WMS.js
  85. +2 −2 lib/OpenLayers/Layer/WMS/Untiled.js
  86. +2 −2 lib/OpenLayers/Layer/WorldWind.js
  87. +2 −2 lib/OpenLayers/Layer/Yahoo.js
  88. +2 −2 lib/OpenLayers/Map.js
  89. +2 −2 lib/OpenLayers/Marker.js
  90. +13 −2 lib/OpenLayers/Marker/Box.js
  91. +8 −4 lib/OpenLayers/Popup.js
  92. +2 −2 lib/OpenLayers/Popup/Anchored.js
  93. +2 −2 lib/OpenLayers/Popup/AnchoredBubble.js
  94. +47 −10 lib/OpenLayers/Renderer.js
  95. +34 −40 lib/OpenLayers/Renderer/Elements.js
  96. +148 −35 lib/OpenLayers/Renderer/SVG.js
  97. +29 −20 lib/OpenLayers/Renderer/VML.js
  98. +2 −2 lib/OpenLayers/SingleFile.js
  99. +13 −4 lib/OpenLayers/Tile.js
  100. +12 −3 lib/OpenLayers/Tile/Image.js
  101. +8 −7 lib/OpenLayers/Tile/WFS.js
  102. +3 −3 lib/OpenLayers/Util.js
  103. +0 −35 repository-license.txt
  104. +107 −0 tests/Control/test_KeyboardDefaults.html
  105. +70 −3 tests/Control/test_PanZoom.html
  106. +0 −1  tests/Feature/test_Vector.html
  107. +2 −11 tests/Geometry/test_Collection.html
  108. +16 −4 tests/Layer/test_Image.html
  109. +3 −1 tests/Layer/test_KaMap.html
  110. +71 −4 tests/Layer/test_Vector.html
  111. +37 −0 tests/Layer/test_WFS.html
  112. +362 −0 tests/Marker/test_Box.html
  113. +2 −0  tests/list-tests.html
  114. +1 −3 tests/test_Geometry.html
  115. +17 −1 tests/test_Layer.html
  116. +12 −0 theme/default/style.css
  117. +2 −2 tools/mergejs.py
  118. +1 −1  tools/release.sh
View
4 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 a 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:
View
5 examples/image-layer.html
@@ -13,10 +13,11 @@
<script src="../lib/OpenLayers.js"></script>
<script type="text/javascript">
<!--
+ var map;
function init(){
- var map = new OpenLayers.Map('map');
+ map = new OpenLayers.Map('map');
- var options = {maxResolution: 'auto', numZoomLevels: 3};
+ var options = {numZoomLevels: 3};
var graphic = new OpenLayers.Layer.Image(
'City Lights',
View
26 examples/openmnnd.html
@@ -99,25 +99,19 @@
}
}
}
- var displayedGeom = null;
- function feature_info_hover(geometry) {
- if(geometry.parent) {
- geometry = geometry.parent;
- }
- if (displayedGeom != geometry &&
- (!geometry.feature.layer.selectedFeatures.length ||
- (geometry.feature.layer.selectedFeatures[0].geometry == geometry))) {
- feature_info(geometry);
- displaydGeom = geometry;
+ var displayedFeature = null;
+ function feature_info_hover(feature) {
+ if (displayedFeature != feature &&
+ (!feature.layer.selectedFeatures.length ||
+ (feature.layer.selectedFeatures[0] == feature))) {
+ feature_info(feature);
+ displayedFeature = feature;
}
}
- function feature_info(geometry) {
- if(geometry.parent) {
- geometry = geometry.parent;
- }
+ function feature_info(feature) {
var html = "<ul>";
- for(var i in geometry.feature.attributes)
- html += "<li><b>" + i + "</b>: "+ geometry.feature.attributes[i] + "</li>";
+ for(var i in feature.attributes)
+ html += "<li><b>" + i + "</b>: "+ feature.attributes[i] + "</li>";
html += "</ul>";
$('feature_info').innerHTML = html;
}
View
1  examples/vector-features.html
@@ -8,7 +8,6 @@
}
</style>
<script src="../lib/OpenLayers.js"></script>
- <script src="../lib/Firebug/debug.js"></script>
<script type="text/javascript">
<!--
var map;
View
4 examples/wfs-scribble.html
@@ -35,7 +35,7 @@
df.featureAdded = function(feature) {
feature.state = OpenLayers.State.INSERT;
feature.style['strokeColor'] = "#ff0000";
- feature.layer.renderer.drawGeometry(feature.geometry, feature.style);
+ feature.layer.drawFeature(feature);
}
p.addControls([ new OpenLayers.Control.Navigation(), df ]);
@@ -47,7 +47,7 @@
for(var i = 0; i < map.layers[1].features.length; i++) {
var f = map.layers[1].features[i];
f.style['strokeColor'] = '#ee9900';
- map.layers[1].renderer.drawGeometry(f.geometry, f.style);
+ map.layers[1].drawFeature(f);
}
map.layers[1].commit();
return false;
View
6 examples/wfs-t.html
@@ -27,7 +27,7 @@
featureNS: 'http://www.openplans.org/topp',
extractAttributes: false
} );
- rlayer.onFeatureInsert=function(feature) { feature.style.strokeColor = "#ff0000"; feature.layer.renderer.drawGeometry(feature.geometry, feature.style); }
+ rlayer.onFeatureInsert=function(feature) { feature.style.strokeColor = "#ff0000"; feature.layer.drawFeature(feature); }
map.addLayer(rlayer);
layer = new OpenLayers.Layer.WFS( "Cities",
"http://dev.openlayers.org/geoserver/wfs", {typename: 'topp:tasmania_cities'},
@@ -44,7 +44,7 @@
df.featureAdded = function(feature) {
feature.state = OpenLayers.State.INSERT;
feature.style['strokeColor'] = "#0000ff";
- feature.layer.renderer.drawGeometry(feature.geometry, feature.style);
+ feature.layer.drawFeature(feature);
}
dp = new OpenLayers.Control.DrawFeature(layer, OpenLayers.Handler.Point, {handlerOptions: {'freehand': false}, 'displayClass': 'olControlDrawFeaturePoint'});
dp.featureAdded = function(feature) {
@@ -53,7 +53,7 @@
feature.geometry = new OpenLayers.Geometry.MultiPoint(oldgeom);
feature.state = OpenLayers.State.INSERT;
feature.style['strokeColor'] = "#0000ff";
- feature.layer.renderer.drawGeometry(feature.geometry, feature.style);
+ feature.layer.drawFeature(feature);
}
p.addControls([ new OpenLayers.Control.Navigation(), df, dp ]);
View
4 examples/wkt.html
@@ -77,8 +77,8 @@
}
}
- function displayWKT(geometry) {
- var str = wkt.write(geometry);
+ function displayWKT(feature) {
+ var str = wkt.write(feature.geometry);
// not a good idea in general, just for this demo
str = str.replace(/,/g, ', ');
document.getElementById('info').innerHTML = str;
View
4 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 a BSD license.
+ * See http://svn.openlayers.org/trunk/openlayers/release-license.txt
* for the full text of the license. */
/* @requires OpenLayers/BaseTypes.js
View
4 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 a BSD license.
+ * See http://svn.openlayers.org/trunk/openlayers/release-license.txt
* for the full text of the license. */
View
4 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 a BSD license.
+ * See http://svn.openlayers.org/trunk/openlayers/release-license.txt
* for the full text of the license. */
View
4 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 a BSD license.
+ * See http://svn.openlayers.org/trunk/openlayers/release-license.txt
* for the full text of the license. */
/**
View
4 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 a BSD license.
+ * See http://svn.openlayers.org/trunk/openlayers/release-license.txt
* for the full text of the license. */
View
4 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 a BSD license.
+ * See http://svn.openlayers.org/trunk/openlayers/release-license.txt
* for the full text of the license. */
/**
View
6 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 a BSD license.
+ * See http://svn.openlayers.org/trunk/openlayers/release-license.txt
* for the full text of the license. */
@@ -22,7 +22,7 @@ OpenLayers.Control.DrawFeature.prototype =
/**
* @type {Object} The functions that are sent to the handler for callback
*/
- callbacks: {},
+ callbacks: null,
/**
* @type {Function} Called after each feature is added
View
4 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 a BSD license.
+ * See http://svn.openlayers.org/trunk/openlayers/release-license.txt
* for the full text of the license. */
/**
View
46 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 a BSD license.
+ * See http://svn.openlayers.org/trunk/openlayers/release-license.txt
* for the full text of the license. */
@@ -14,7 +14,7 @@ OpenLayers.Control.KeyboardDefaults.prototype =
OpenLayers.Class.inherit( OpenLayers.Control, {
/** @type int */
- slideFactor: 50,
+ slideFactor: 75,
/**
* @constructor
@@ -50,26 +50,48 @@ OpenLayers.Control.KeyboardDefaults.prototype =
defaultKeyPress: function (code) {
switch(code) {
case OpenLayers.Event.KEY_LEFT:
- this.map.pan(-50, 0);
+ this.map.pan(-this.slideFactor, 0);
break;
case OpenLayers.Event.KEY_RIGHT:
- this.map.pan(50, 0);
+ this.map.pan(this.slideFactor, 0);
break;
case OpenLayers.Event.KEY_UP:
- this.map.pan(0, -50);
+ this.map.pan(0, -this.slideFactor);
break;
case OpenLayers.Event.KEY_DOWN:
- this.map.pan(0, 50);
+ this.map.pan(0, this.slideFactor);
break;
- case 33: // Page Up
- case 43: // +
+
+ case 33: // Page Up
+ var size = this.map.getSize();
+ this.map.pan(0, -0.75*size.h);
+ break;
+ case 34: // Page Down
+ var size = this.map.getSize();
+ this.map.pan(0, 0.75*size.h);
+ break;
+ case 35: // End
+ var size = this.map.getSize();
+ this.map.pan(0.75*size.w, 0);
+ break;
+ case 36: // Pos1
+ var size = this.map.getSize();
+ this.map.pan(-0.75*size.w, 0);
+ break;
+
+ case 43: // +
+ this.map.zoomIn();
+ break;
+ case 45: // -
+ this.map.zoomOut();
+ break;
+ case 107: // + (IE only)
this.map.zoomIn();
break;
- case 45: // -
- case 34: // Page Down
+ case 109: // - (IE only)
this.map.zoomOut();
break;
- }
+ }
},
/** @final @type String */
View
6 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 a BSD license.
+ * See http://svn.openlayers.org/trunk/openlayers/release-license.txt
* for the full text of the license. */
/**
@@ -336,7 +336,7 @@ OpenLayers.Control.LayerSwitcher.prototype =
//configure main div
this.div.style.position = "absolute";
- this.div.style.top = "10px";
+ this.div.style.top = "25px";
this.div.style.right = "0px";
this.div.style.left = "";
this.div.style.fontFamily = "sans-serif";
View
6 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 a BSD license.
+ * See http://svn.openlayers.org/trunk/openlayers/release-license.txt
* for the full text of the license. */
/**
@@ -181,7 +181,7 @@ OpenLayers.Control.MouseDefaults.prototype =
}
document.onselectstart=null;
this.mouseDragStart = null;
- this.map.div.style.cursor = "default";
+ this.map.div.style.cursor = "";
},
/**
View
4 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 a BSD license.
+ * See http://svn.openlayers.org/trunk/openlayers/release-license.txt
* for the full text of the license. */
View
6 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 a BSD license.
+ * See http://svn.openlayers.org/trunk/openlayers/release-license.txt
* for the full text of the license. */
@@ -239,7 +239,7 @@ OpenLayers.Control.MouseToolbar.prototype =
this.map.div.style.cursor = "crosshair";
break;
default:
- this.map.div.style.cursor = "default";
+ this.map.div.style.cursor = "";
break;
}
View
4 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 a BSD license.
+ * See http://svn.openlayers.org/trunk/openlayers/release-license.txt
* for the full text of the license. */
/**
View
4 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 a BSD license.
+ * See http://svn.openlayers.org/trunk/openlayers/release-license.txt
* for the full text of the license. */
/**
View
9 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 a BSD license.
+ * See http://svn.openlayers.org/trunk/openlayers/release-license.txt
* for the full text of the license. */
/**
* @fileoverview Locator Map Control
@@ -46,7 +46,7 @@ OpenLayers.Control.OverviewMap.prototype =
*
* @type Array(OpenLayers.Layer)
*/
- layers: [],
+ layers: null,
/**
* The ratio of the overview map resolution to the main map resolution
@@ -68,13 +68,14 @@ OpenLayers.Control.OverviewMap.prototype =
* options that the main map was constructed with.
* @type: Object
*/
- mapOptions: {},
+ mapOptions: null,
/**
* @constructor
* @param {Object} options Hashtable of options to set on the overview map
*/
initialize: function(options) {
+ this.layers = new Array();
OpenLayers.Control.prototype.initialize.apply(this, [options]);
},
View
6 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 a BSD license.
+ * See http://svn.openlayers.org/trunk/openlayers/release-license.txt
* for the full text of the license. */
@@ -104,6 +104,8 @@ OpenLayers.Control.PanZoom.prototype =
this.doubleClick.bindAsEventListener(btn));
OpenLayers.Event.observe(btn, "dblclick",
this.doubleClick.bindAsEventListener(btn));
+ OpenLayers.Event.observe(btn, "click",
+ this.doubleClick.bindAsEventListener(btn));
btn.action = id;
btn.map = this.map;
btn.slideFactor = this.slideFactor;
View
6 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 a BSD license.
+ * See http://svn.openlayers.org/trunk/openlayers/release-license.txt
* for the full text of the license. */
@@ -228,7 +228,7 @@ OpenLayers.Control.PanZoomBar.prototype =
zoomBarUp:function(evt) {
if (!OpenLayers.Event.isLeftClick(evt)) return;
if (this.zoomStart) {
- this.div.style.cursor="default";
+ this.div.style.cursor="";
this.map.events.unregister("mouseup", this, this.passEventToSlider);
this.map.events.unregister("mousemove", this, this.passEventToSlider);
var deltaY = this.zoomStart.y - evt.xy.y
View
4 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 a BSD license.
+ * See http://svn.openlayers.org/trunk/openlayers/release-license.txt
* for the full text of the license. */
/**
View
4 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 a BSD license.
+ * See http://svn.openlayers.org/trunk/openlayers/release-license.txt
* for the full text of the license. */
View
4 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 a BSD license.
+ * See http://svn.openlayers.org/trunk/openlayers/release-license.txt
* for the full text of the license. */
View
79 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 a BSD license.
+ * See http://svn.openlayers.org/trunk/openlayers/release-license.txt
* for the full text of the license. */
@@ -27,13 +27,13 @@ OpenLayers.Control.SelectFeature.prototype =
/**
* @type {Function} Optional function to be called when a feature is selected.
- * The function should expect to be called with a geometry.
+ * The function should expect to be called with a feature.
*/
onSelect: function() {},
/**
* @type {Function} Optional function to be called when a feature is unselected.
- * The function should expect to be called with a geometry.
+ * The function should expect to be called with a feature.
*/
onUnselect: function() {},
@@ -45,7 +45,7 @@ OpenLayers.Control.SelectFeature.prototype =
/**
* @type {Object} The functions that are sent to the handler for callback
*/
- callbacks: {},
+ callbacks: null,
/**
* @type {Object} Hash of styles
@@ -76,31 +76,28 @@ OpenLayers.Control.SelectFeature.prototype =
/**
* Called when the feature handler detects a mouse-down on a feature
- * @param {OpenLayers.Geometry}
+ * @param {OpenLayers.Vector.Feature}
*/
- downFeature: function(geometry) {
+ downFeature: function(feature) {
if(this.hover) {
return;
}
- if(geometry.parent) {
- geometry = geometry.parent;
- }
if (this.multiple) {
- if(OpenLayers.Util.indexOf(this.layer.selectedFeatures, geometry.feature) > -1) {
- this.unselect(geometry);
+ if(OpenLayers.Util.indexOf(this.layer.selectedFeatures, feature) > -1) {
+ this.unselect(feature);
} else {
- this.select(geometry);
+ this.select(feature);
}
} else {
- if(OpenLayers.Util.indexOf(this.layer.selectedFeatures, geometry.feature) > -1) {
- this.unselect(geometry);
+ if(OpenLayers.Util.indexOf(this.layer.selectedFeatures, feature) > -1) {
+ this.unselect(feature);
} else {
if (this.layer.selectedFeatures) {
for (var i = 0; i < this.layer.selectedFeatures.length; i++) {
- this.unselect(this.layer.selectedFeatures[i].geometry);
+ this.unselect(this.layer.selectedFeatures[i]);
}
}
- this.select(geometry);
+ this.select(feature);
}
}
},
@@ -108,63 +105,57 @@ OpenLayers.Control.SelectFeature.prototype =
/**
* Called when the feature handler detects a mouse-over on a feature.
* Only responds if this.hover is true.
- * @param {OpenLayers.Geometry}
+ * @param {OpenLayers.Feature.Vector}
*/
- overFeature: function(geometry) {
+ overFeature: function(feature) {
if(!this.hover) {
return;
}
- if(geometry.parent) {
- geometry = geometry.parent;
- }
- if(!(OpenLayers.Util.indexOf(this.layer.selectedFeatures, geometry.feature) > -1)) {
- this.select(geometry);
+ if(!(OpenLayers.Util.indexOf(this.layer.selectedFeatures, feature) > -1)) {
+ this.select(feature);
}
},
/**
* Called when the feature handler detects a mouse-out on a feature.
* Only responds if this.hover is true.
- * @param {OpenLayers.Geometry}
+ * @param {OpenLayers.Feature.Vector}
*/
- outFeature: function(geometry) {
+ outFeature: function(feature) {
if(!this.hover) {
return;
}
- if(geometry.parent) {
- geometry = geometry.parent;
- }
- this.unselect(geometry);
+ this.unselect(feature);
},
/**
* Add feature to the layer's selectedFeature array, render the feature as
* selected, and call the onSelect function.
- * @param {OpenLayers.Geometry} geometry
+ * @param {OpenLayers.Feature.Vector} feature
*/
- select: function(geometry) {
+ select: function(feature) {
// Store feature style for restoration later
- if(geometry.feature.originalStyle == null) {
- geometry.feature.originalStyle = geometry.feature.style;
+ if(feature.originalStyle == null) {
+ feature.originalStyle = feature.style;
}
- this.layer.selectedFeatures.push(geometry.feature);
- this.layer.renderer.drawGeometry(geometry, this.selectStyle);
- this.onSelect(geometry);
+ this.layer.selectedFeatures.push(feature);
+ this.layer.drawFeature(feature, this.selectStyle);
+ this.onSelect(feature);
},
/**
* Remove feature from the layer's selectedFeature array, render the feature as
* normal, and call the onUnselect function.
- * @param {OpenLayers.Geometry} geometry
+ * @param {OpenLayers.Feature.Vector} feature
*/
- unselect: function(geometry) {
+ unselect: function(feature) {
// Store feature style for restoration later
- if(geometry.feature.originalStyle == null) {
- geometry.feature.originalStyle = geometry.feature.style;
+ if(feature.originalStyle == null) {
+ feature.originalStyle = feature.style;
}
- this.layer.renderer.drawGeometry(geometry, geometry.feature.originalStyle);
- OpenLayers.Util.removeItem(this.layer.selectedFeatures, geometry.feature);
- this.onUnselect(geometry);
+ this.layer.drawFeature(feature, feature.originalStyle);
+ OpenLayers.Util.removeItem(this.layer.selectedFeatures, feature);
+ this.onUnselect(feature);
},
/** Set the map property for the control.
View
4 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 a BSD license.
+ * See http://svn.openlayers.org/trunk/openlayers/release-license.txt
* for the full text of the license. */
/**
View
4 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 a BSD license.
+ * See http://svn.openlayers.org/trunk/openlayers/release-license.txt
* for the full text of the license. */
/**
View
4 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 a BSD license.
+ * See http://svn.openlayers.org/trunk/openlayers/release-license.txt
* for the full text of the license. */
/**
View
4 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 a BSD license.
+ * See http://svn.openlayers.org/trunk/openlayers/release-license.txt
* for the full text of the license. */
View
70 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 a BSD license.
+ * See http://svn.openlayers.org/trunk/openlayers/release-license.txt
* for the full text of the license. */
// TRASH THIS
@@ -27,10 +27,10 @@ OpenLayers.Feature.Vector.prototype =
/** @type OpenLayers.Geometry */
geometry:null,
- /** @type array */
- attributes: {},
+ /** @type Object */
+ attributes: null,
- /** @type strinng */
+ /** @type String */
state: null,
/** @type Object */
@@ -46,11 +46,12 @@ OpenLayers.Feature.Vector.prototype =
initialize: function(geometry, data, style) {
OpenLayers.Feature.prototype.initialize.apply(this, [null, null, data]);
this.lonlat = null;
- this.setGeometry(geometry);
+ this.geometry = geometry;
this.state = null;
+ this.attributes = new Object();
if (data) {
- OpenLayers.Util.extend(this.attributes, data);
- }
+ this.attributes = OpenLayers.Util.extend(this.attributes, data);
+ }
this.style = style ? style : null;
},
@@ -126,56 +127,6 @@ OpenLayers.Feature.Vector.prototype =
},
/**
- * Set a feature id to the feature
- *
- * @param {String} feature id to set
- */
- setFid: function(fid) {
- this.fid = fid;
- },
-
- /**
- * Set a geometry to the feature
- *
- * @param {OpenLayers.Geometry} geometry to set
- * @param {Boolean} recurse Recursively set feature (for components)
- */
- setGeometry: function(geometry, recurse) {
- if(geometry) {
- this.geometry = geometry;
- this.geometry.feature = this;
- if (recurse != false) {
- this._setGeometryFeatureReference(this.geometry, this);
- }
- }
- },
-
- /**
- * Sets recursively the reference to the feature in the geometry
- *
- * @param {OpenLayers.Geometry}
- * @param {OpenLayers.Feature}
- */
- _setGeometryFeatureReference: function(geometry, feature) {
- geometry.feature = feature;
- if (geometry.components) {
- for (var i = 0; i < geometry.components.length; i++) {
- this._setGeometryFeatureReference(geometry.components[i], feature);
- }
- }
- },
-
- /**
- * Adds attributes an attributes object to the feature.
- * (should not be in geometry but in feature class)
- *
- * @param {Attributes} attributes
- */
- setAttributes: function(attributes) {
- this.attributes=attributes;
- },
-
- /**
* @param {OpenLayers.LonLat} lonlat
* @param {float} toleranceLon Optional tolerance in Geometric Coords
* @param {float} toleranceLat Optional tolerance in Geographic Coords
@@ -277,7 +228,8 @@ OpenLayers.Feature.Vector.style = {
pointRadius: 6,
hoverPointRadius: 1,
hoverPointUnit: "%",
- pointerEvents: "visiblePainted"
+ pointerEvents: "visiblePainted",
+ cursor: "pointer"
},
'temporary': {
fillColor: "yellow",
View
4 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 a BSD license.
+ * See http://svn.openlayers.org/trunk/openlayers/release-license.txt
* for the full text of the license. */
View
4 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 a BSD license.
+ * See http://svn.openlayers.org/trunk/openlayers/release-license.txt
* for the full text of the license. */
/**
View
6 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 a BSD license.
+ * See http://svn.openlayers.org/trunk/openlayers/release-license.txt
* for the full text of the license. */
/**
@@ -165,7 +165,7 @@ OpenLayers.Format.GML.prototype =
}
}
- feature.setGeometry(geom, false);
+ feature.geometry = geom;
if (this.extractAttributes) {
feature.attributes = this.parseAttributes(xmlNode);
}
View
4 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 a BSD license.
+ * See http://svn.openlayers.org/trunk/openlayers/release-license.txt
* for the full text of the license. */
/**
View
6 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 a BSD license.
+ * See http://svn.openlayers.org/trunk/openlayers/release-license.txt
* for the full text of the license. */
/**
@@ -80,7 +80,7 @@ OpenLayers.Format.KML.prototype =
}
}
- feature.setGeometry(geom);
+ feature.geometry = geom;
feature.attributes = this.parseAttributes(xmlNode);
return feature;
View
4 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 a BSD license.
+ * See http://svn.openlayers.org/trunk/openlayers/release-license.txt
* for the full text of the license. */
/**
View
4 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 a BSD license.
+ * See http://svn.openlayers.org/trunk/openlayers/release-license.txt
* for the full text of the license. */
/**
View
13 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 a BSD license.
+ * See http://svn.openlayers.org/trunk/openlayers/release-license.txt
* for the full text of the license. */
/**
@@ -19,14 +19,6 @@ OpenLayers.Geometry.prototype = {
/** @type OpenLayers.Bounds */
bounds: null,
-
- /**
- * Cross reference back to the feature that owns this geometry so
- * that that the feature can be identified after the geometry has been
- * selected by a mouse click.
- *
- * @type OpenLayers.Feature */
- feature: null,
/**
* @constructor
@@ -42,7 +34,6 @@ OpenLayers.Geometry.prototype = {
this.id = null;
this.bounds = null;
- this.feature = null;
},
View
12 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 a BSD license.
+ * See http://svn.openlayers.org/trunk/openlayers/release-license.txt
* for the full text of the license. */
/**
@@ -72,14 +72,6 @@ OpenLayers.Geometry.Collection.prototype =
/**
* @returns the components of the geometry
- * @type Array(OpenLayers.Geometry)
- */
- getComponents: function(){
- return this.components;
- },
-
- /**
- * @returns the components of the geometry
* @type String
*/
getComponentsString: function(){
View
4 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 a BSD license.
+ * See http://svn.openlayers.org/trunk/openlayers/release-license.txt
* for the full text of the license. */
/**
View
4 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 a BSD license.
+ * See http://svn.openlayers.org/trunk/openlayers/release-license.txt
* for the full text of the license. */
/**
View
4 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 a BSD license.
+ * See http://svn.openlayers.org/trunk/openlayers/release-license.txt
* for the full text of the license. */
/**
View
4 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 a BSD license.
+ * See http://svn.openlayers.org/trunk/openlayers/release-license.txt
* for the full text of the license. */
/**
View
4 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 a BSD license.
+ * See http://svn.openlayers.org/trunk/openlayers/release-license.txt
* for the full text of the license. */
/**
View
4 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 a BSD license.
+ * See http://svn.openlayers.org/trunk/openlayers/release-license.txt
* for the full text of the license. */
/**
View
4 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 a BSD license.
+ * See http://svn.openlayers.org/trunk/openlayers/release-license.txt
* for the full text of the license. */
/**
View
4 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 a BSD license.
+ * See http://svn.openlayers.org/trunk/openlayers/release-license.txt
* for the full text of the license. */
/**
View
4 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 a BSD license.
+ * See http://svn.openlayers.org/trunk/openlayers/release-license.txt
* for the full text of the license. */
/**
View
4 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 a BSD license.
+ * See http://svn.openlayers.org/trunk/openlayers/release-license.txt
* for the full text of the license. */
/**
View
4 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 a BSD license.
+ * See http://svn.openlayers.org/trunk/openlayers/release-license.txt
* for the full text of the license. */
View
6 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 a BSD license.
+ * See http://svn.openlayers.org/trunk/openlayers/release-license.txt
* for the full text of the license. */
/**
@@ -99,7 +99,7 @@ OpenLayers.Handler.Box.prototype = OpenLayers.Class.inherit( OpenLayers.Handler,
this.removeBox();
// TBD: use CSS classes instead
- this.map.div.style.cursor = "default";
+ this.map.div.style.cursor = "";
this.callback("done", [result]);
},
View
25 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 a BSD license.
+ * See http://svn.openlayers.org/trunk/openlayers/release-license.txt
* for the full text of the license. */
/**
@@ -76,11 +76,9 @@ OpenLayers.Handler.Drag.prototype = OpenLayers.Class.inherit( OpenLayers.Handler
if (this.started) {
this.dragging = true;
this.callback("move", [evt.xy]);
- if(document.onselectstart) {
- if(!this.oldOnselectstart) {
- this.oldOnselectstart = document.onselectstart;
- document.onselectstart = function() {return false;}
- }
+ if(!this.oldOnselectstart) {
+ this.oldOnselectstart = document.onselectstart;
+ document.onselectstart = function() {return false;}
}
}
return true;
@@ -95,13 +93,10 @@ OpenLayers.Handler.Drag.prototype = OpenLayers.Class.inherit( OpenLayers.Handler
mouseup: function (evt) {
if (this.started) {
this.started = false;
- this.dragging = false;
// TBD replace with CSS classes
- this.map.div.style.cursor = "default";
+ this.map.div.style.cursor = "";
this.callback("up", [evt.xy]);
- if(document.onselectstart) {
- document.onselectstart = this.oldOnselectstart;
- }
+ document.onselectstart = this.oldOnselectstart;
}
return true;
},
@@ -117,7 +112,7 @@ OpenLayers.Handler.Drag.prototype = OpenLayers.Class.inherit( OpenLayers.Handler
this.started = false;
this.dragging = false;
// TBD replace with CSS classes
- this.map.div.style.cursor = "default";
+ this.map.div.style.cursor = "";
this.callback("out", []);
if(document.onselectstart) {
document.onselectstart = this.oldOnselectstart;
@@ -136,8 +131,8 @@ OpenLayers.Handler.Drag.prototype = OpenLayers.Class.inherit( OpenLayers.Handler
*/
click: function (evt) {
// throw away the first left click event that happens after a mouse up
- if (OpenLayers.Event.isLeftClick(evt) && this.dragging) {
- this.dragging = true;
+ if (this.dragging) {
+ this.dragging = false;
return false;
}
this.started = false;
View
38 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 a BSD license.
+ * See http://svn.openlayers.org/trunk/openlayers/release-license.txt
* for the full text of the license. */
@@ -21,9 +21,9 @@ OpenLayers.Handler.Feature.prototype =
layerIndex: null,
/**
- * @type {OpenLayers.Geometry}
+ * @type {OpenLayers.Feature.Vector}
*/
- geometry: null,
+ feature: null,
/**
* @constructor
@@ -33,7 +33,7 @@ OpenLayers.Handler.Feature.prototype =
* @param {Array} callbacks An object with a 'over' property whos value is
* a function to be called when the mouse is over
* a feature. The callback should expect to recieve
- * a single argument, the geometry.
+ * a single argument, the feature.
* @param {Object} options
*/
initialize: function(control, layer, callbacks, options) {
@@ -75,7 +75,7 @@ OpenLayers.Handler.Feature.prototype =
/**
* Capture double-clicks. Let the event continue propagating if the
- * double-click doesn't hit a geometry. Otherwise call the dblclick
+ * double-click doesn't hit a feature. Otherwise call the dblclick
* callback.
*
* @param {Event} evt
@@ -92,26 +92,26 @@ OpenLayers.Handler.Feature.prototype =
* @type {Boolean} A feature was selected
*/
select: function(type, evt) {
- var geometry = this.layer.renderer.getGeometryFromEvent(evt);
- if(geometry) {
+ var feature = this.layer.getFeatureFromEvent(evt);
+ if(feature) {
// three cases:
// over a new, out of the last and over a new, or still on the last
- if(!this.geometry) {
- // over a new geometry
- this.callback('over', [geometry]);
- } else if(this.geometry != geometry) {
+ if(!this.feature) {
+ // over a new feature
+ this.callback('over', [feature]);
+ } else if(this.feature != feature) {
// out of the last and over a new
- this.callback('out', [this.geometry]);
- this.callback('over', [geometry]);
+ this.callback('out', [this.feature]);
+ this.callback('over', [feature]);
}
- this.geometry = geometry;
- this.callback(type, [geometry]);
+ this.feature = feature;
+ this.callback(type, [feature]);
return true;
} else {
- if(this.geometry) {
+ if(this.feature) {
// out of the last
- this.callback('out', [this.geometry]);
- this.geometry = null;
+ this.callback('out', [this.feature]);
+ this.feature = null;
}
return false;
}
View
4 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 a BSD license.
+ * See http://svn.openlayers.org/trunk/openlayers/release-license.txt
* for the full text of the license. */
/**
View
4 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 a BSD license.
+ * See http://svn.openlayers.org/trunk/openlayers/release-license.txt
* for the full text of the license. */
/**
View
59 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 a BSD license.
+ * See http://svn.openlayers.org/trunk/openlayers/release-license.txt
* for the full text of the license. */
@@ -17,7 +17,7 @@ OpenLayers.Handler.Path.prototype =
OpenLayers.Class.inherit(OpenLayers.Handler.Point, {
/**
- * @type OpenLayers.Geometry.LineString
+ * @type OpenLayers.Feature.Vector
* @private
*/
line: null,
@@ -65,15 +65,17 @@ OpenLayers.Handler.Path.prototype =
/**
* Add temporary geometries
*/
- createGeometry: function() {
- this.line = new OpenLayers.Geometry.LineString();
- this.point = new OpenLayers.Geometry.Point();
+ createFeature: function() {
+ this.line = new OpenLayers.Feature.Vector(
+ new OpenLayers.Geometry.LineString());
+ this.point = new OpenLayers.Feature.Vector(
+ new OpenLayers.Geometry.Point());
},
/**
* Destroy temporary geometries
*/
- destroyGeometry: function() {
+ destroyFeature: function() {
this.line.destroy();
this.point.destroy();
},
@@ -83,7 +85,9 @@ OpenLayers.Handler.Path.prototype =
* the behavior of LinearRing that disregards adding duplicate points.
*/
addPoint: function() {
- this.line.addComponent(this.point.clone(), this.line.components.length);
+ this.line.geometry.addComponent(this.point.geometry.clone(),
+ this.line.geometry.components.length);
+ this.callback("point", [this.point.geometry]);
},
/**
@@ -100,18 +104,18 @@ OpenLayers.Handler.Path.prototype =
* Modify the existing geometry given the new point
*
*/
- modifyGeometry: function() {
- var index = this.line.components.length - 1;
- this.line.components[index].x = this.point.x;
- this.line.components[index].y = this.point.y;
+ modifyFeature: function() {
+ var index = this.line.geometry.components.length - 1;
+ this.line.geometry.components[index].x = this.point.geometry.x;
+ this.line.geometry.components[index].y = this.point.geometry.y;
},
/**
* Render geometries on the temporary layer.
*/
- drawGeometry: function() {
- this.layer.renderer.drawGeometry(this.line, this.style);
- this.layer.renderer.drawGeometry(this.point, this.style);
+ drawFeature: function() {
+ this.layer.drawFeature(this.line, this.style);
+ this.layer.drawFeature(this.point, this.style);
},
/**
@@ -120,7 +124,7 @@ OpenLayers.Handler.Path.prototype =
* @type OpenLayers.Geometry.LineString
*/
geometryClone: function() {
- return this.line.clone();
+ return this.line.geometry.clone();
},
/**
@@ -136,17 +140,17 @@ OpenLayers.Handler.Path.prototype =
return false;
}
if(this.lastDown == null) {
- this.createGeometry();
+ this.createFeature();
}
this.mouseDown = true;
this.lastDown = evt.xy;
var lonlat = this.control.map.getLonLatFromPixel(evt.xy);
- this.point.x = lonlat.lon;
- this.point.y = lonlat.lat;
+ this.point.geometry.x = lonlat.lon;
+ this.point.geometry.y = lonlat.lat;
if((this.lastUp == null) || !this.lastUp.equals(evt.xy)) {
this.addPoint();
}
- this.drawGeometry();
+ this.drawFeature();
this.drawing = true;
return false;
},
@@ -161,14 +165,14 @@ OpenLayers.Handler.Path.prototype =
mousemove: function (evt) {
if(this.drawing) {
var lonlat = this.map.getLonLatFromPixel(evt.xy);
- this.point.x = lonlat.lon;
- this.point.y = lonlat.lat;
+ this.point.geometry.x = lonlat.lon;
+ this.point.geometry.y = lonlat.lat;
if(this.mouseDown && this.freehandMode(evt)) {
this.addPoint();
} else {
- this.modifyGeometry();
+ this.modifyFeature();
}
- this.drawGeometry();
+ this.drawFeature();
}
return true;
},
@@ -190,7 +194,6 @@ OpenLayers.Handler.Path.prototype =
this.addPoint();
}
this.lastUp = evt.xy;
- this.callback("point", [this.point]);
}
return false;
}
@@ -205,9 +208,9 @@ OpenLayers.Handler.Path.prototype =
*/
dblclick: function(evt) {
if(!this.freehandMode(evt)) {
- var index = this.line.components.length - 1;
- this.line.removeComponent(this.line.components[index]);
- this.finalize(this.line);
+ var index = this.line.geometry.components.length - 1;
+ this.line.geometry.removeComponent(this.line.geometry.components[index]);
+ this.finalize();
}
return false;
},
View
43 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 a BSD license.
+ * See http://svn.openlayers.org/trunk/openlayers/release-license.txt
* for the full text of the license. */
@@ -16,7 +16,7 @@ OpenLayers.Handler.Point.prototype =
OpenLayers.Class.inherit(OpenLayers.Handler, {
/**
- * @type OpenLayers.Geometry.Point
+ * @type OpenLayers.Feature.Vector
* @private
*/
point: null,
@@ -87,10 +87,11 @@ OpenLayers.Handler.Point.prototype =
},
/**
- * Add temporary geometries
+ * Add temporary features
*/
- createGeometry: function() {
- this.point = new OpenLayers.Geometry.Point();
+ createFeature: function() {
+ this.point = new OpenLayers.Feature.Vector(
+ new OpenLayers.Geometry.Point());
},
/**
@@ -112,7 +113,7 @@ OpenLayers.Handler.Point.prototype =
/**
* Destroy the temporary geometries
*/
- destroyGeometry: function() {
+ destroyFeature: function() {
this.point.destroy();
},
@@ -122,7 +123,7 @@ OpenLayers.Handler.Point.prototype =
finalize: function() {
this.layer.renderer.clear();
this.callback("done", [this.geometryClone()]);
- this.destroyGeometry();
+ this.destroyFeature();
this.drawing = false;
this.mouseDown = false;
this.lastDown = null;
@@ -135,7 +136,7 @@ OpenLayers.Handler.Point.prototype =
cancel: function() {
this.layer.renderer.clear();
this.callback("cancel", [this.geometryClone()]);
- this.destroyGeometry();
+ this.destroyFeature();
this.drawing = false;
this.mouseDown = false;
this.lastDown = null;
@@ -151,10 +152,10 @@ OpenLayers.Handler.Point.prototype =
},
/**
- * Render geometries on the temporary layer.
+ * Render features on the temporary layer.
*/
- drawGeometry: function() {
- this.layer.renderer.drawGeometry(this.point, this.style);
+ drawFeature: function() {
+ this.layer.drawFeature(this.point, this.style);
},
/**
@@ -163,7 +164,7 @@ OpenLayers.Handler.Point.prototype =
* @type OpenLayers.Geometry.Point
*/
geometryClone: function() {
- return this.point.clone();
+ return this.point.geometry.clone();
},
/**
@@ -183,14 +184,14 @@ OpenLayers.Handler.Point.prototype =
return true;
}
if(this.lastDown == null) {
- this.createGeometry();
+ this.createFeature();
}
this.lastDown = evt.xy;
this.drawing = true;
var lonlat = this.map.getLonLatFromPixel(evt.xy);
- this.point.x = lonlat.lon;
- this.point.y = lonlat.lat;
- this.drawGeometry();
+ this.point.geometry.x = lonlat.lon;
+ this.point.geometry.y = lonlat.lat;
+ this.drawFeature();
return false;
},
@@ -204,9 +205,9 @@ OpenLayers.Handler.Point.prototype =
mousemove: function (evt) {
if(this.drawing) {
var lonlat = this.map.getLonLatFromPixel(evt.xy);
- this.point.x = lonlat.lon;
- this.point.y = lonlat.lat;
- this.drawGeometry();
+ this.point.geometry.x = lonlat.lon;
+ this.point.geometry.y = lonlat.lat;
+ this.drawFeature();
}
return true;
},
@@ -220,7 +221,7 @@ OpenLayers.Handler.Point.prototype =
*/
mouseup: function (evt) {
if(this.drawing) {
- this.finalize(this.point);
+ this.finalize();
return false;
} else {
return true;
View
43 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 a BSD license.
+ * See http://svn.openlayers.org/trunk/openlayers/release-license.txt
* for the full text of the license. */
@@ -16,7 +16,7 @@ OpenLayers.Handler.Polygon.prototype =
OpenLayers.Class.inherit(OpenLayers.Handler.Path, {
/**
- * @type OpenLayers.Geometry.Polygon
+ * @type OpenLayers.Feature.Vector
* @private
*/
polygon: null,
@@ -44,17 +44,20 @@ OpenLayers.Handler.Polygon.prototype =
/**
* Add temporary geometries
*/
- createGeometry: function() {
- this.polygon = new OpenLayers.Geometry.Polygon();
- this.line = new OpenLayers.Geometry.LinearRing();
- this.polygon.addComponent(this.line);
- this.point = new OpenLayers.Geometry.Point();
+ createFeature: function() {
+ this.polygon = new OpenLayers.Feature.Vector(
+ new OpenLayers.Geometry.Polygon());
+ this.line = new OpenLayers.Feature.Vector(
+ new OpenLayers.Geometry.LinearRing());
+ this.polygon.geometry.addComponent(this.line.geometry);
+ this.point = new OpenLayers.Feature.Vector(
+ new OpenLayers.Geometry.Point());
},
/**
* Destroy temporary geometries
*/
- destroyGeometry: function() {
+ destroyFeature: function() {
this.polygon.destroy();
this.point.destroy();
},
@@ -63,18 +66,18 @@ OpenLayers.Handler.Polygon.prototype =
* Modify the existing geometry given the new point
*
*/
- modifyGeometry: function() {
- var index = this.line.components.length - 2;
- this.line.components[index].x = this.point.x;
- this.line.components[index].y = this.point.y;
+ modifyFeature: function() {
+ var index = this.line.geometry.components.length - 2;
+ this.line.geometry.components[index].x = this.point.geometry.x;
+ this.line.geometry.components[index].y = this.point.geometry.y;
},
/**
* Render geometries on the temporary layer.
*/
- drawGeometry: function() {
- this.layer.renderer.drawGeometry(this.polygon, this.style);
- this.layer.renderer.drawGeometry(this.point, this.style);
+ drawFeature: function() {
+ this.layer.drawFeature(this.polygon, this.style);
+ this.layer.drawFeature(this.point, this.style);
},
/**
@@ -83,7 +86,7 @@ OpenLayers.Handler.Polygon.prototype =
* @type OpenLayers.Geometry.Polygon
*/
geometryClone: function() {
- return this.polygon.clone();
+ return this.polygon.geometry.clone();
},
/**
@@ -95,9 +98,9 @@ OpenLayers.Handler.Polygon.prototype =
dblclick: function(evt) {
if(!this.freehandMode(evt)) {
// remove the penultimate point
- var index = this.line.components.length - 2;
- this.line.removeComponent(this.line.components[index]);
- this.finalize(this.line);
+ var index = this.line.geometry.components.length - 2;
+ this.line.geometry.removeComponent(this.line.geometry.components[index]);
+ this.finalize();
}
return false;
},
View
4 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 a BSD license.
+ * See http://svn.openlayers.org/trunk/openlayers/release-license.txt
* for the full text of the license. */
View
95 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 a BSD license.
+ * See http://svn.openlayers.org/trunk/openlayers/release-license.txt
* for the full text of the license. */
@@ -148,24 +148,23 @@ OpenLayers.Layer.prototype = {
* @param {Object} options Hashtable of extra options to tag onto the layer
*/
initialize: function(name, options) {
- //store a copy of the custom options for later cloning
- this.options = OpenLayers.Util.extend(new Object(), options);
-
- //add options to layer
- OpenLayers.Util.extend(this, this.options);
+
+ this.addOptions(options);
this.name = name;
- this.id = OpenLayers.Util.createUniqueID(this.CLASS_NAME + "_");
-
- if (this.div == null) {
+ if (this.id == null) {
+
+ this.id = OpenLayers.Util.createUniqueID(this.CLASS_NAME + "_");
+
this.div = OpenLayers.Util.createDiv();
this.div.style.width = "100%";
this.div.style.height = "100%";
this.div.id = this.id;
- }
- this.events = new OpenLayers.Events(this, this.div, this.EVENT_TYPES);
+ this.events = new OpenLayers.Events(this, this.div,
+ this.EVENT_TYPES);
+ }
},
/**
@@ -187,8 +186,10 @@ OpenLayers.Layer.prototype = {
this.name = null;
this.div = null;
this.options = null;
-
- this.events.destroy();
+
+ if (this.events) {
+ this.events.destroy();
+ }
this.events = null;
},
@@ -216,9 +217,12 @@ OpenLayers.Layer.prototype = {
* @param {String} newName
*/
setName: function(newName) {
- this.name = newName;
- if (this.map != null)
- this.map.events.triggerEvent("changelayer");
+ if (newName != this.name) {
+ this.name = newName;
+ if (this.map != null) {
+ this.map.events.triggerEvent("changelayer");
+ }
+ }
},
/**
@@ -226,6 +230,10 @@ OpenLayers.Layer.prototype = {
*/
addOptions: function (newOptions) {
+ if (this.options == null) {
+ this.options = new Object();
+ }
+
// update our copy for clone
OpenLayers.Util.extend(this.options, newOptions);
@@ -264,22 +272,25 @@ OpenLayers.Layer.prototype = {
* @param {OpenLayers.Map} map
*/
setMap: function(map) {
- this.map = map;
+ if (this.map == null) {
- // grab some essential layer data from the map if it hasn't already
- // been set
- this.maxExtent = this.maxExtent || this.map.maxExtent;
- this.projection = this.projection || this.map.projection;
- this.units = this.units || this.map.units;
-
- this.initResolutions();
-
- if (!this.isBaseLayer) {
- this.inRange = this.calculateInRange();
+ this.map = map;
+
+ // grab some essential layer data from the map if it hasn't already
+ // been set
+ this.maxExtent = this.maxExtent || this.map.maxExtent;
+ this.projection = this.projection || this.map.projection;
+ this.units = this.units || this.map.units;
+
+ this.initResolutions();
+
+ if (!this.isBaseLayer) {
+ this.inRange = this.calculateInRange();
+ }
+
+ // deal with gutters
+ this.setTileSize();
}
-
- // deal with gutters
- this.setTileSize();
},
/**
@@ -336,7 +347,7 @@ OpenLayers.Layer.prototype = {
if (visibility != this.visibility) {
this.visibility = visibility;
this.display(visibility);
- if (this.map != null) {
+ if (visibility && this.map != null) {
var extent = this.map.getExtent();
if (extent != null) {
this.moveTo(extent, true);
@@ -378,9 +389,11 @@ OpenLayers.Layer.prototype = {
* @param {Boolean} isBaseLayer
*/
setIsBaseLayer: function(isBaseLayer) {
- this.isBaseLayer = isBaseLayer;
- if (this.map != null) {
- this.map.events.triggerEvent("changelayer");
+ if (isBaseLayer != this.isBaseLayer) {
+ this.isBaseLayer = isBaseLayer;
+ if (this.map != null) {
+ this.map.events.triggerEvent("changelayer");
+ }
}
},
@@ -646,11 +659,13 @@ OpenLayers.Layer.prototype = {
* @param {Float} opacity
*/
setOpacity: function(opacity) {
- this.opacity = opacity;
- for(var i=0; i<this.div.childNodes.length; ++i) {
- var element = this.div.childNodes[i].firstChild;
- OpenLayers.Util.modifyDOMElement(element, null, null, null,
- null, null, null, opacity);
+ if (opacity != this.opacity) {
+ this.opacity = opacity;
+ for(var i=0; i<this.div.childNodes.length; ++i) {
+ var element = this.div.childNodes[i].firstChild;
+ OpenLayers.Util.modifyDOMElement(element, null, null, null,
+ null, null, null, opacity);
+ }
}
},
View
9 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 a BSD license.
+ * See http://svn.openlayers.org/trunk/openlayers/release-license.txt
* for the full text of the license. */
@@ -15,8 +15,11 @@ OpenLayers.Layer.Boxes.prototype =
/**
* @constructor
+ *
+ * @param {String} name
+ * @param {Object} options Hashtable of extra options to tag onto the layer
*/
- initialize: function () {
+ initialize: function (name, options) {
OpenLayers.Layer.Markers.prototype.initialize.apply(this, arguments);
},
View
4 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 a BSD license.
+ * See http://svn.openlayers.org/trunk/openlayers/release-license.txt
* for the full text of the license. */
View
4 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 a BSD license.
+ * See http://svn.openlayers.org/trunk/openlayers/release-license.txt
* for the full text of the license. */
View
4 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 a BSD license.
+ * See http://svn.openlayers.org/trunk/openlayers/release-license.txt
* for the full text of the license. */
View
4 lib/OpenLayers/Layer/GML.js
@@ -1,5 +1,5 @@
-/* Copyright (c) 2006 MetaCarta, Inc., published under a modified BSD license.