Tag OpenLayers 2.4-rc3.

git-svn-id: http://svn.openlayers.org/tags/openlayers/release-2.4-rc3@3113 dc9f47b5-9b13-0410-9fdd-eb0c1a62fdaf
Pullup r2999:3087 for RC2.
2007-05-02 14:20:28 +00:00 · 2007-04-20 01:10:43 +00:00 · 2007-04-04 03:05:55 +00:00
122 changed files with 1565 additions and 740 deletions
--- 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.
+  Copyright 2005-2006 MetaCarta, Inc., released under the BSD license.
-  Please see http://svn.openlayers.org/trunk/openlayers/repository-license.txt
+  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:
--- a/examples/image-layer.html
+++ b/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',
--- a/examples/openmnnd.html
+++ b/examples/openmnnd.html
@@ -99,25 +99,19 @@
                }
            }
        }
-        var displayedGeom = null;
+        var displayedFeature = null;
-        function feature_info_hover(geometry) {
+        function feature_info_hover(feature) {
-            if(geometry.parent) {
+            if (displayedFeature != feature && 
-                geometry = geometry.parent;
+               (!feature.layer.selectedFeatures.length || 
-            }
+               (feature.layer.selectedFeatures[0] == feature))) {
-            if (displayedGeom != geometry && 
+            feature_info(feature);
-               (!geometry.feature.layer.selectedFeatures.length || 
+            displayedFeature = feature;
               (geometry.feature.layer.selectedFeatures[0].geometry == geometry))) {
            feature_info(geometry);
            displaydGeom = geometry;
           }
        }    
-        function feature_info(geometry) {
+        function feature_info(feature) {
            if(geometry.parent) {
                geometry = geometry.parent;
            }
            var html = "<ul>";
-            for(var i in geometry.feature.attributes)
+            for(var i in feature.attributes)
-               html += "<li><b>" + i + "</b>: "+  geometry.feature.attributes[i] + "</li>";
+               html += "<li><b>" + i + "</b>: "+  feature.attributes[i] + "</li>";
            html += "</ul>";
            $('feature_info').innerHTML = html;
        }
--- a/examples/outOfRangeMarkers.html
+++ b/examples/outOfRangeMarkers.html
@@ -0,0 +1,54 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
    <style type="text/css">
        #map {
            width: 650px;
            height: 550px;
            border: 1px solid black;
        }
    </style>
    <script src='http://maps.google.com/maps?file=api&amp;v=2&amp;key=ABQIAAAAKsGpqSOKkB-Ih2JopAmNbBTv_3ENzieGiNBMV02NiUJp8KZGIRTQWhul8K0wiNOHDxOF0-W2RmFoRg'></script>
    <script src="../lib/OpenLayers.js"></script>
    <script type="text/javascript">
        <!--
        function init(){
            // Variables
            var map = new OpenLayers.Map('map', { controls: [] });
            var lon = 35;
            var lat = -6;
            var zoom = 6;
            var map, layer;
            // Map Controls
            map.addControl(new OpenLayers.Control.PanZoomBar());
            map.addControl(new OpenLayers.Control.MouseToolbar());
            map.addControl(new OpenLayers.Control.LayerSwitcher({'ascending':false}));
            map.addControl(new OpenLayers.Control.MousePosition());
            // Map Layers
            var GMapsSat = new OpenLayers.Layer.Google( "Google Satellite" , {type: G_SATELLITE_MAP, 'maxZoomLevel':18} );
            var GMapsHybr = new OpenLayers.Layer.Google( "Google Hybrid" , {type: G_HYBRID_TYPE, 'maxZoomLevel':18} );
            var GMapsStreets = new OpenLayers.Layer.Google( "Google Steets" , {type: G_NORMAL_MAP, 'maxZoomLevel':18} );
            var MarkersLayer2 = new OpenLayers.Layer.Text( "Region info", {location: "outOfRangeMarkers.txt", maxResolution: 0.02});
            // Add Layers
            map.addLayers([GMapsHybr, GMapsStreets, GMapsSat, MarkersLayer2]);
            // Visual
            map.setCenter(new OpenLayers.LonLat(lon, lat), zoom);
            if (!map.getCenter()) map.zoomToMaxExtent();
        }
        // -->
    </script>
 </head>
 <body onload="init()">
    <div id="map"></div>
  </body>
 </html>
--- a/examples/outOfRangeMarkers.txt
+++ 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
--- 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,
--- a/examples/vector-features.html
+++ b/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;
--- a/examples/wfs-scribble.html
+++ b/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;
--- a/examples/wfs-t.html
+++ b/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 ]);
--- a/examples/wkt.html
+++ b/examples/wkt.html
@@ -77,8 +77,8 @@
            }
        }
-        function displayWKT(geometry) {
+        function displayWKT(feature) {
-            var str = wkt.write(geometry);
+            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;
--- a/lib/OpenLayers.js
+++ b/lib/OpenLayers.js
@@ -1,5 +1,5 @@
-/* Copyright (c) 2006 MetaCarta, Inc., published under a modified BSD license.
+/* Copyright (c) 2006 MetaCarta, Inc., published under the BSD license.
- * See http://svn.openlayers.org/trunk/openlayers/repository-license.txt 
+ * See http://svn.openlayers.org/trunk/openlayers/release-license.txt 
 * for the full text of the license. */
 /* @requires OpenLayers/BaseTypes.js
--- 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.
+/* Copyright (c) 2006 MetaCarta, Inc., published under the BSD license.
- * See http://svn.openlayers.org/trunk/openlayers/repository-license.txt 
+ * See http://svn.openlayers.org/trunk/openlayers/release-license.txt 
 * for the full text of the license. */
--- 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.
+/* Copyright (c) 2006 MetaCarta, Inc., published under the BSD license.
- * See http://svn.openlayers.org/trunk/openlayers/repository-license.txt 
+ * See http://svn.openlayers.org/trunk/openlayers/release-license.txt 
 * for the full text of the license. */
--- 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.
+/* Copyright (c) 2006 MetaCarta, Inc., published under the BSD license.
- * See http://svn.openlayers.org/trunk/openlayers/repository-license.txt 
+ * See http://svn.openlayers.org/trunk/openlayers/release-license.txt 
 * for the full text of the license. */
 /**
--- 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.
+/* Copyright (c) 2006 MetaCarta, Inc., published under the BSD license.
- * See http://svn.openlayers.org/trunk/openlayers/repository-license.txt 
+ * See http://svn.openlayers.org/trunk/openlayers/release-license.txt 
 * for the full text of the license. */
--- 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.
+/* Copyright (c) 2006 MetaCarta, Inc., published under the BSD license.
- * See http://svn.openlayers.org/trunk/openlayers/repository-license.txt 
+ * See http://svn.openlayers.org/trunk/openlayers/release-license.txt 
 * for the full text of the license. */
 /**
--- 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.
+/* Copyright (c) 2006 MetaCarta, Inc., published under the BSD license.
- * See http://svn.openlayers.org/trunk/openlayers/repository-license.txt 
+ * 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
--- 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.
+/* Copyright (c) 2006 MetaCarta, Inc., published under the BSD license.
- * See http://svn.openlayers.org/trunk/openlayers/repository-license.txt 
+ * See http://svn.openlayers.org/trunk/openlayers/release-license.txt 
 * for the full text of the license. */
 /**
--- 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.
+/* Copyright (c) 2006 MetaCarta, Inc., published under the BSD license.
- * See http://svn.openlayers.org/trunk/openlayers/repository-license.txt 
+ * 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,23 +50,45 @@ 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  
                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: // - 
-            case 34: // Page Down 
+                this.map.zoomOut();
                break; 
            case 107: // + (IE only)
                this.map.zoomIn();
                break;
            case 109: // - (IE only)
                this.map.zoomOut();
                break;
        } 
--- 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.
+/* Copyright (c) 2006 MetaCarta, Inc., published under the BSD license.
- * See http://svn.openlayers.org/trunk/openlayers/repository-license.txt 
+ * 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";
--- 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.
+/* Copyright (c) 2006 MetaCarta, Inc., published under the BSD license.
- * See http://svn.openlayers.org/trunk/openlayers/repository-license.txt 
+ * 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 = "";
    },
    /**
--- 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.
+/* Copyright (c) 2006 MetaCarta, Inc., published under the BSD license.
- * See http://svn.openlayers.org/trunk/openlayers/repository-license.txt 
+ * See http://svn.openlayers.org/trunk/openlayers/release-license.txt 
 * for the full text of the license. */
--- 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.
+/* Copyright (c) 2006 MetaCarta, Inc., published under the BSD license.
- * See http://svn.openlayers.org/trunk/openlayers/repository-license.txt 
+ * 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;
            }
--- 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.
+/* Copyright (c) 2006 MetaCarta, Inc., published under the BSD license.
- * See http://svn.openlayers.org/trunk/openlayers/repository-license.txt 
+ * See http://svn.openlayers.org/trunk/openlayers/release-license.txt 
 * for the full text of the license. */
 /**
--- 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.
+/* Copyright (c) 2006 MetaCarta, Inc., published under the BSD license.
- * See http://svn.openlayers.org/trunk/openlayers/repository-license.txt 
+ * See http://svn.openlayers.org/trunk/openlayers/release-license.txt 
 * for the full text of the license. */
 /**
--- 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.
+/* Copyright (c) 2006 MetaCarta, Inc., published under the BSD license.
- * See http://svn.openlayers.org/trunk/openlayers/repository-license.txt 
+ * 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]);
    },
@@ -519,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.height = parseInt(Math.max(bottom - top, 0))+ 'px';
-        this.extentRectangle.style.width = parseInt(right - left) + 'px';
+        this.extentRectangle.style.width = parseInt(Math.max(right - left, 0)) + 'px';
    },
    /**
--- 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.
+/* Copyright (c) 2006 MetaCarta, Inc., published under the BSD license.
- * See http://svn.openlayers.org/trunk/openlayers/repository-license.txt 
+ * 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;
--- 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.
+/* Copyright (c) 2006 MetaCarta, Inc., published under the BSD license.
- * See http://svn.openlayers.org/trunk/openlayers/repository-license.txt 
+ * 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
--- 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.
+/* Copyright (c) 2006 MetaCarta, Inc., published under the BSD license.
- * See http://svn.openlayers.org/trunk/openlayers/repository-license.txt 
+ * 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
--- 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.
+/* Copyright (c) 2006 MetaCarta, Inc., published under the BSD license.
- * See http://svn.openlayers.org/trunk/openlayers/repository-license.txt 
+ * See http://svn.openlayers.org/trunk/openlayers/release-license.txt 
 * for the full text of the license. */
--- 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.
+/* Copyright (c) 2006 MetaCarta, Inc., published under the BSD license.
- * See http://svn.openlayers.org/trunk/openlayers/repository-license.txt 
+ * See http://svn.openlayers.org/trunk/openlayers/release-license.txt 
 * for the full text of the license. */
--- 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.
+/* Copyright (c) 2006 MetaCarta, Inc., published under the BSD license.
- * See http://svn.openlayers.org/trunk/openlayers/repository-license.txt 
+ * 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) {
+            if(OpenLayers.Util.indexOf(this.layer.selectedFeatures, feature) > -1) {
-                this.unselect(geometry);
+                this.unselect(feature);
            } else {
-                this.select(geometry);
+                this.select(feature);
            }
        } else {
-            if(OpenLayers.Util.indexOf(this.layer.selectedFeatures, geometry.feature) > -1) {
+            if(OpenLayers.Util.indexOf(this.layer.selectedFeatures, feature) > -1) {
-                this.unselect(geometry);
+                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) {
+        if(!(OpenLayers.Util.indexOf(this.layer.selectedFeatures, feature) > -1)) {
-            geometry = geometry.parent;
+            this.select(feature);
        }
        if(!(OpenLayers.Util.indexOf(this.layer.selectedFeatures, geometry.feature) > -1)) {
            this.select(geometry);
        }
    },
    /**
     * 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) {
+        this.unselect(feature);
            geometry = geometry.parent;
        }
        this.unselect(geometry);
    },
    /**
     * 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) {
+        if(feature.originalStyle == null) {
-            geometry.feature.originalStyle = geometry.feature.style;
+            feature.originalStyle = feature.style;
        }
-        this.layer.selectedFeatures.push(geometry.feature);
+        this.layer.selectedFeatures.push(feature);
-        this.layer.renderer.drawGeometry(geometry, this.selectStyle);
+        this.layer.drawFeature(feature, this.selectStyle);
-        this.onSelect(geometry);
+        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) {
+        if(feature.originalStyle == null) {
-            geometry.feature.originalStyle = geometry.feature.style;
+            feature.originalStyle = feature.style;
        }
-        this.layer.renderer.drawGeometry(geometry, geometry.feature.originalStyle);
+        this.layer.drawFeature(feature, feature.originalStyle);
-        OpenLayers.Util.removeItem(this.layer.selectedFeatures, geometry.feature);
+        OpenLayers.Util.removeItem(this.layer.selectedFeatures, feature);
-        this.onUnselect(geometry);
+        this.onUnselect(feature);
    },
    /** Set the map property for the control. 
--- 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.
+/* Copyright (c) 2006 MetaCarta, Inc., published under the BSD license.
- * See http://svn.openlayers.org/trunk/openlayers/repository-license.txt 
+ * See http://svn.openlayers.org/trunk/openlayers/release-license.txt 
 * for the full text of the license. */
 /**
--- 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.
+/* Copyright (c) 2006 MetaCarta, Inc., published under the BSD license.
- * See http://svn.openlayers.org/trunk/openlayers/repository-license.txt 
+ * See http://svn.openlayers.org/trunk/openlayers/release-license.txt 
 * for the full text of the license. */
 /**
--- 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.
+/* Copyright (c) 2006 MetaCarta, Inc., published under the BSD license.
- * See http://svn.openlayers.org/trunk/openlayers/repository-license.txt 
+ * See http://svn.openlayers.org/trunk/openlayers/release-license.txt 
 * for the full text of the license. */
 /**
--- 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.
+/* Copyright (c) 2006 MetaCarta, Inc., published under the BSD license.
- * See http://svn.openlayers.org/trunk/openlayers/repository-license.txt 
+ * See http://svn.openlayers.org/trunk/openlayers/release-license.txt 
 * for the full text of the license. */
--- 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.
+/* Copyright (c) 2006 MetaCarta, Inc., published under the BSD license.
- * See http://svn.openlayers.org/trunk/openlayers/repository-license.txt 
+ * 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 */
+    /** @type Object */
-    attributes: {},
+    attributes: null,
-    /** @type strinng */
+    /** @type String */
    state: null,
    /** @type Object */
@@ -46,10 +46,11 @@ 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; 
    },
@@ -125,56 +126,6 @@ OpenLayers.Feature.Vector.prototype =
        return null;
    },
    /**
     * 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
@@ -277,7 +228,8 @@ OpenLayers.Feature.Vector.style = {
        pointRadius: 6,
        hoverPointRadius: 1,
        hoverPointUnit: "%",
-        pointerEvents: "visiblePainted"
+        pointerEvents: "visiblePainted",
        cursor: "pointer"
    },
    'temporary': {
        fillColor: "yellow",
--- 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.
+/* Copyright (c) 2006 MetaCarta, Inc., published under the BSD license.
- * See http://svn.openlayers.org/trunk/openlayers/repository-license.txt 
+ * See http://svn.openlayers.org/trunk/openlayers/release-license.txt 
 * for the full text of the license. */
--- 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.
+/* Copyright (c) 2006 MetaCarta, Inc., published under the BSD license.
- * See http://svn.openlayers.org/trunk/openlayers/repository-license.txt 
+ * See http://svn.openlayers.org/trunk/openlayers/release-license.txt 
 * for the full text of the license. */
 /**
--- 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.
+/* Copyright (c) 2006 MetaCarta, Inc., published under the BSD license.
- * See http://svn.openlayers.org/trunk/openlayers/repository-license.txt 
+ * 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) {
@@ -165,7 +169,7 @@ OpenLayers.Format.GML.prototype =
            }
        }
-        feature.setGeometry(geom, false); 
+        feature.geometry = geom; 
        if (this.extractAttributes) {
            feature.attributes = this.parseAttributes(xmlNode);
        }    
--- 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.
+/* Copyright (c) 2006 MetaCarta, Inc., published under the BSD license.
- * See http://svn.openlayers.org/trunk/openlayers/repository-license.txt 
+ * See http://svn.openlayers.org/trunk/openlayers/release-license.txt 
 * for the full text of the license. */
 /**
--- 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.
+/* Copyright (c) 2006 MetaCarta, Inc., published under the BSD license.
- * See http://svn.openlayers.org/trunk/openlayers/repository-license.txt 
+ * 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;
--- 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.
+/* Copyright (c) 2006 MetaCarta, Inc., published under the BSD license.
- * See http://svn.openlayers.org/trunk/openlayers/repository-license.txt 
+ * See http://svn.openlayers.org/trunk/openlayers/release-license.txt 
 * for the full text of the license. */
 /**
--- 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.
+/* Copyright (c) 2006 MetaCarta, Inc., published under the BSD license.
- * See http://svn.openlayers.org/trunk/openlayers/repository-license.txt 
+ * See http://svn.openlayers.org/trunk/openlayers/release-license.txt 
 * for the full text of the license. */
 /**
--- 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.
+/* Copyright (c) 2006 MetaCarta, Inc., published under the BSD license.
- * See http://svn.openlayers.org/trunk/openlayers/repository-license.txt 
+ * See http://svn.openlayers.org/trunk/openlayers/release-license.txt 
 * for the full text of the license. */
 /**
@@ -20,14 +20,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;
    },
--- 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.
+/* Copyright (c) 2006 MetaCarta, Inc., published under the BSD license.
- * See http://svn.openlayers.org/trunk/openlayers/repository-license.txt 
+ * See http://svn.openlayers.org/trunk/openlayers/release-license.txt 
 * for the full text of the license. */
 /**
@@ -70,14 +70,6 @@ OpenLayers.Geometry.Collection.prototype =
        return geometry;
    },
    /**
     * @returns the components of the geometry
     * @type Array(OpenLayers.Geometry)
     */
    getComponents: function(){
        return this.components;
    },
    /**
     * @returns the components of the geometry
     * @type String
--- 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.
+/* Copyright (c) 2006 MetaCarta, Inc., published under the BSD license.
- * See http://svn.openlayers.org/trunk/openlayers/repository-license.txt 
+ * See http://svn.openlayers.org/trunk/openlayers/release-license.txt 
 * for the full text of the license. */
 /**
--- 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.
+/* Copyright (c) 2006 MetaCarta, Inc., published under the BSD license.
- * See http://svn.openlayers.org/trunk/openlayers/repository-license.txt 
+ * See http://svn.openlayers.org/trunk/openlayers/release-license.txt 
 * for the full text of the license. */
 /**
--- 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.
+/* Copyright (c) 2006 MetaCarta, Inc., published under the BSD license.
- * See http://svn.openlayers.org/trunk/openlayers/repository-license.txt 
+ * See http://svn.openlayers.org/trunk/openlayers/release-license.txt 
 * for the full text of the license. */
 /**
--- 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.
+/* Copyright (c) 2006 MetaCarta, Inc., published under the BSD license.
- * See http://svn.openlayers.org/trunk/openlayers/repository-license.txt 
+ * See http://svn.openlayers.org/trunk/openlayers/release-license.txt 
 * for the full text of the license. */
 /**
--- 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.
+/* Copyright (c) 2006 MetaCarta, Inc., published under the BSD license.
- * See http://svn.openlayers.org/trunk/openlayers/repository-license.txt 
+ * See http://svn.openlayers.org/trunk/openlayers/release-license.txt 
 * for the full text of the license. */
 /**
--- 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.
+/* Copyright (c) 2006 MetaCarta, Inc., published under the BSD license.
- * See http://svn.openlayers.org/trunk/openlayers/repository-license.txt 
+ * See http://svn.openlayers.org/trunk/openlayers/release-license.txt 
 * for the full text of the license. */
 /**
--- 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.
+/* Copyright (c) 2006 MetaCarta, Inc., published under the BSD license.
- * See http://svn.openlayers.org/trunk/openlayers/repository-license.txt
+ * See http://svn.openlayers.org/trunk/openlayers/release-license.txt
 * for the full text of the license. */
 /**
--- 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.
+/* Copyright (c) 2006 MetaCarta, Inc., published under the BSD license.
- * See http://svn.openlayers.org/trunk/openlayers/repository-license.txt 
+ * See http://svn.openlayers.org/trunk/openlayers/release-license.txt 
 * for the full text of the license. */
 /**
--- 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.
+/* Copyright (c) 2006 MetaCarta, Inc., published under the BSD license.
- * See http://svn.openlayers.org/trunk/openlayers/repository-license.txt 
+ * See http://svn.openlayers.org/trunk/openlayers/release-license.txt 
 * for the full text of the license. */
 /**
--- 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.
+/* Copyright (c) 2006 MetaCarta, Inc., published under the BSD license.
- * See http://svn.openlayers.org/trunk/openlayers/repository-license.txt 
+ * See http://svn.openlayers.org/trunk/openlayers/release-license.txt 
 * for the full text of the license. */
 /**
--- 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.
+/* Copyright (c) 2006 MetaCarta, Inc., published under the BSD license.
- * See http://svn.openlayers.org/trunk/openlayers/repository-license.txt 
+ * See http://svn.openlayers.org/trunk/openlayers/release-license.txt 
 * for the full text of the license. */
--- 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.
+/* Copyright (c) 2006 MetaCarta, Inc., published under the BSD license.
- * See http://svn.openlayers.org/trunk/openlayers/repository-license.txt 
+ * 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]);
    },
--- 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.
+/* Copyright (c) 2006 MetaCarta, Inc., published under the BSD license.
- * See http://svn.openlayers.org/trunk/openlayers/repository-license.txt 
+ * 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) {
-                if(!this.oldOnselectstart) {
+                this.oldOnselectstart = document.onselectstart;
-                    this.oldOnselectstart = document.onselectstart;
+                document.onselectstart = function() {return false;}
                    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) {
+        if (this.dragging) {
-            this.dragging = true;
+            this.dragging = false;
            return false; 
        }
        this.started = false;
--- 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.
+/* Copyright (c) 2006 MetaCarta, Inc., published under the BSD license.
- * See http://svn.openlayers.org/trunk/openlayers/repository-license.txt 
+ * 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);
+        var feature = this.layer.getFeatureFromEvent(evt);
-        if(geometry) {
+        if(feature) {
            // three cases:
            // over a new, out of the last and over a new, or still on the last
-            if(!this.geometry) {
+            if(!this.feature) {
-                // over a new geometry
+                // over a new feature
-                this.callback('over', [geometry]);
+                this.callback('over', [feature]);
-            } else if(this.geometry != geometry) {
+            } else if(this.feature != feature) {
                // out of the last and over a new
-                this.callback('out', [this.geometry]);
+                this.callback('out', [this.feature]);
-                this.callback('over', [geometry]);
+                this.callback('over', [feature]);
            }
-            this.geometry = geometry;
+            this.feature = feature;
-            this.callback(type, [geometry]);
+            this.callback(type, [feature]);
            return true;
        } else {
-            if(this.geometry) {
+            if(this.feature) {
                // out of the last
-                this.callback('out', [this.geometry]);
+                this.callback('out', [this.feature]);
-                this.geometry = null;
+                this.feature = null;
            }
            return false;
        }
--- 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.
+/* Copyright (c) 2006 MetaCarta, Inc., published under the BSD license.
- * See http://svn.openlayers.org/trunk/openlayers/repository-license.txt 
+ * See http://svn.openlayers.org/trunk/openlayers/release-license.txt 
 * for the full text of the license. */
 /**
--- 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.
+/* Copyright (c) 2006 MetaCarta, Inc., published under the BSD license.
- * See http://svn.openlayers.org/trunk/openlayers/repository-license.txt 
+ * See http://svn.openlayers.org/trunk/openlayers/release-license.txt 
 * for the full text of the license. */
 /**
--- 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.
+/* Copyright (c) 2006 MetaCarta, Inc., published under the BSD license.
- * See http://svn.openlayers.org/trunk/openlayers/repository-license.txt 
+ * 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() {
+    createFeature: function() {
-        this.line = new OpenLayers.Geometry.LineString();
+        this.line = new OpenLayers.Feature.Vector(
-        this.point = new OpenLayers.Geometry.Point();
+                                        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() {
+    modifyFeature: function() {
-        var index = this.line.components.length - 1;
+        var index = this.line.geometry.components.length - 1;
-        this.line.components[index].x = this.point.x;
+        this.line.geometry.components[index].x = this.point.geometry.x;
-        this.line.components[index].y = this.point.y;
+        this.line.geometry.components[index].y = this.point.geometry.y;
    },
    /**
     * Render geometries on the temporary layer.
     */
-    drawGeometry: function() {
+    drawFeature: function() {
-        this.layer.renderer.drawGeometry(this.line, this.style);
+        this.layer.drawFeature(this.line, this.style);
-        this.layer.renderer.drawGeometry(this.point, 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.geometry.x = lonlat.lon;
-        this.point.y = lonlat.lat;
+        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.geometry.x = lonlat.lon;
-            this.point.y = lonlat.lat;
+            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;
+            var index = this.line.geometry.components.length - 1;
-            this.line.removeComponent(this.line.components[index]);
+            this.line.geometry.removeComponent(this.line.geometry.components[index]);
-            this.finalize(this.line);
+            this.finalize();
        }
        return false;
    },
--- 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.
+/* Copyright (c) 2006 MetaCarta, Inc., published under the BSD license.
- * See http://svn.openlayers.org/trunk/openlayers/repository-license.txt 
+ * 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() {
+    createFeature: function() {
-        this.point = new OpenLayers.Geometry.Point();
+        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() {
+    drawFeature: function() {
-        this.layer.renderer.drawGeometry(this.point, this.style);
+        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.geometry.x = lonlat.lon;
-        this.point.y = lonlat.lat;
+        this.point.geometry.y = lonlat.lat;
-        this.drawGeometry();
+        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.geometry.x = lonlat.lon;
-            this.point.y = lonlat.lat;
+            this.point.geometry.y = lonlat.lat;
-            this.drawGeometry();
+            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;
--- 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.
+/* Copyright (c) 2006 MetaCarta, Inc., published under the BSD license.
- * See http://svn.openlayers.org/trunk/openlayers/repository-license.txt 
+ * 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() {
+    createFeature: function() {
-        this.polygon = new OpenLayers.Geometry.Polygon();
+        this.polygon = new OpenLayers.Feature.Vector(
-        this.line = new OpenLayers.Geometry.LinearRing();
+                                        new OpenLayers.Geometry.Polygon());
-        this.polygon.addComponent(this.line);
+        this.line = new OpenLayers.Feature.Vector(
-        this.point = new OpenLayers.Geometry.Point();
+                                        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() {
+    modifyFeature: function() {
-        var index = this.line.components.length - 2;
+        var index = this.line.geometry.components.length - 2;
-        this.line.components[index].x = this.point.x;
+        this.line.geometry.components[index].x = this.point.geometry.x;
-        this.line.components[index].y = this.point.y;
+        this.line.geometry.components[index].y = this.point.geometry.y;
    },
    /**
     * Render geometries on the temporary layer.
     */
-    drawGeometry: function() {
+    drawFeature: function() {
-        this.layer.renderer.drawGeometry(this.polygon, this.style);
+        this.layer.drawFeature(this.polygon, this.style);
-        this.layer.renderer.drawGeometry(this.point, 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;
+            var index = this.line.geometry.components.length - 2;
-            this.line.removeComponent(this.line.components[index]);
+            this.line.geometry.removeComponent(this.line.geometry.components[index]);
-            this.finalize(this.line);
+            this.finalize();
        }
        return false;
    },
--- 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.
+/* Copyright (c) 2006 MetaCarta, Inc., published under the BSD license.
- * See http://svn.openlayers.org/trunk/openlayers/repository-license.txt 
+ * See http://svn.openlayers.org/trunk/openlayers/release-license.txt 
 * for the full text of the license. */
--- 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.
+/* Copyright (c) 2006 MetaCarta, Inc., published under the BSD license.
- * See http://svn.openlayers.org/trunk/openlayers/repository-license.txt 
+ * 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
+        this.addOptions(options);
        OpenLayers.Util.extend(this, this.options);
        this.name = name;
-        this.id = OpenLayers.Util.createUniqueID(this.CLASS_NAME + "_");
+        if (this.id == null) {
            this.id = OpenLayers.Util.createUniqueID(this.CLASS_NAME + "_");
        if (this.div == null) {
            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);
        }
    },
    /**
@@ -188,7 +187,9 @@ OpenLayers.Layer.prototype = {
        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 (newName != this.name) {
-        if (this.map != null)
+            this.name = newName;
-            this.map.events.triggerEvent("changelayer");
+            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,27 @@ 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
+            this.map = map;
        //  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();
+            // 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;
-        if (!this.isBaseLayer) {
+            this.initResolutions();
-            this.inRange = this.calculateInRange();
+            
            if (!this.isBaseLayer) {
                this.inRange = this.calculateInRange();
                var show = ((this.visibility) && (this.inRange));
                this.div.style.display = show ? "" : "none";
            }
            // deal with gutters
            this.setTileSize();
        }
        // deal with gutters
        this.setTileSize();
    },
    /**
@@ -336,7 +349,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 +391,11 @@ OpenLayers.Layer.prototype = {
     * @param {Boolean} isBaseLayer 
     */
    setIsBaseLayer: function(isBaseLayer) {
-        this.isBaseLayer = isBaseLayer;
+        if (isBaseLayer != this.isBaseLayer) {
-        if (this.map != null) {
+            this.isBaseLayer = isBaseLayer;
-            this.map.events.triggerEvent("changelayer");
+            if (this.map != null) {
                this.map.events.triggerEvent("changelayer");
            }
        }
    },
@@ -646,11 +661,13 @@ OpenLayers.Layer.prototype = {
     * @param {Float} opacity
     */
    setOpacity: function(opacity) {
-        this.opacity = opacity;
+        if (opacity != this.opacity) {
-        for(var i=0; i<this.div.childNodes.length; ++i) {
+            this.opacity = opacity;
-            var element = this.div.childNodes[i].firstChild;
+            for(var i=0; i<this.div.childNodes.length; ++i) {
-            OpenLayers.Util.modifyDOMElement(element, null, null, null, 
+                var element = this.div.childNodes[i].firstChild;
-                                             null, null, null, opacity);
+                OpenLayers.Util.modifyDOMElement(element, null, null, null, 
                                                 null, null, null, opacity);
            }
        }
    },
--- 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.
+/* Copyright (c) 2006 MetaCarta, Inc., published under the BSD license.
- * See http://svn.openlayers.org/trunk/openlayers/repository-license.txt 
+ * 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);
    },
--- 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.
+/* Copyright (c) 2006 MetaCarta, Inc., published under the BSD license.
- * See http://svn.openlayers.org/trunk/openlayers/repository-license.txt 
+ * See http://svn.openlayers.org/trunk/openlayers/release-license.txt 
 * for the full text of the license. */
--- 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.
+/* Copyright (c) 2006 MetaCarta, Inc., published under the BSD license.
- * See http://svn.openlayers.org/trunk/openlayers/repository-license.txt 
+ * See http://svn.openlayers.org/trunk/openlayers/release-license.txt 
 * for the full text of the license. */
--- 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.
+/* Copyright (c) 2006 MetaCarta, Inc., published under the BSD license.
- * See http://svn.openlayers.org/trunk/openlayers/repository-license.txt 
+ * See http://svn.openlayers.org/trunk/openlayers/release-license.txt 
 * for the full text of the license. */
--- 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.
+/* Copyright (c) 2006 MetaCarta, Inc., published under the BSD license.
- * See http://svn.openlayers.org/trunk/openlayers/repository-license.txt 
+ * See http://svn.openlayers.org/trunk/openlayers/release-license.txt 
 * for the full text of the license. */
 /**
--- 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.
+/* Copyright (c) 2006 MetaCarta, Inc., published under the BSD license.
- * See http://svn.openlayers.org/trunk/openlayers/repository-license.txt 
+ * See http://svn.openlayers.org/trunk/openlayers/release-license.txt 
 * for the full text of the license. */
--- 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.
+/* Copyright (c) 2006 MetaCarta, Inc., published under the BSD license.
- * See http://svn.openlayers.org/trunk/openlayers/repository-license.txt 
+ * See http://svn.openlayers.org/trunk/openlayers/release-license.txt 
 * for the full text of the license. */
--- 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.
+/* Copyright (c) 2006 MetaCarta, Inc., published under the BSD license.
- * See http://svn.openlayers.org/trunk/openlayers/repository-license.txt 
+ * See http://svn.openlayers.org/trunk/openlayers/release-license.txt 
 * for the full text of the license. */
--- 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.
+/* Copyright (c) 2006 MetaCarta, Inc., published under the BSD license.
- * See http://svn.openlayers.org/trunk/openlayers/repository-license.txt 
+ * See http://svn.openlayers.org/trunk/openlayers/release-license.txt 
 * for the full text of the license. */
@@ -15,8 +15,7 @@ OpenLayers.Layer.HTTPRequest.prototype =
    /** Used to hash URL param strings for multi-WMS server selection.
     * Set to the Golden Ratio per Knuth's recommendation.
     *
-     * @type Numeric
+     * @final @type Numeric
     * @private
     */
    URL_HASH_FACTOR: (Math.sqrt(5) - 1) / 2,
--- 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.
+/* Copyright (c) 2006 MetaCarta, Inc., published under the BSD license.
- * See http://svn.openlayers.org/trunk/openlayers/repository-license.txt 
+ * See http://svn.openlayers.org/trunk/openlayers/release-license.txt 
 * for the full text of the license. */
 /**
@@ -24,17 +24,23 @@ OpenLayers.Layer.Image.prototype =
    /** @type String */
    url: null,
-    /** @type OpenLayers.Bounds */
+    /**
     * The image bounds in map units
     * @type OpenLayers.Bounds
     */
    extent: null,
-    /** @type OpenLayers.Size */
+    /**
     * The image size in pixels
     * @type OpenLayers.Size
     */
    size: null,
    /** @type OpenLayers.Tile.Image */
    tile: null,
-    /** The ratio of height/width represented by a single pixel in the graphic
+    /**
-     * 
+     * The ratio of height/width represented by a single pixel in the graphic
     * @type Float */
    aspectRatio: null,
@@ -94,10 +100,16 @@ OpenLayers.Layer.Image.prototype =
     * @param {OpenLayers.Map} map
     */
    setMap: function(map) {
-        // If nothing to do with resolutions has been set, assume a single
+        /**
-        //  resolution determined by extent/size
+         * If nothing to do with resolutions has been set, assume a single
         * resolution determined by ratio*extent/size - if an image has a
         * pixel aspect ratio different than one (as calculated above), the
         * image will be stretched in one dimension only.
         */
        if( this.options.maxResolution == null ) {
-            this.options.maxResolution = this.extent.getWidth() / this.size.w;
+            this.options.maxResolution = this.aspectRatio *
                                         this.extent.getWidth() /
                                         this.size.w;
        }
        OpenLayers.Layer.prototype.setMap.apply(this, arguments);
    },
@@ -116,10 +128,7 @@ OpenLayers.Layer.Image.prototype =
        if(zoomChanged || firstRendering) {
            //determine new tile size
-            var tileWidth = this.extent.getWidth() / this.map.getResolution();
+            this.setTileSize();
            var tileHeight = this.extent.getHeight() /
                             (this.map.getResolution() * this.aspectRatio);
            var tileSize = new OpenLayers.Size(tileWidth, tileHeight);
            //determine new position (upper left corner of new bounds)
            var ul = new OpenLayers.LonLat(this.extent.left, this.extent.top);
@@ -128,16 +137,28 @@ OpenLayers.Layer.Image.prototype =
            if(firstRendering) {
                //create the new tile
                this.tile = new OpenLayers.Tile.Image(this, ulPx, this.extent, 
-                                                      this.url, tileSize);
+                                                      this.url, this.tileSize);
            } else {
                //just resize the tile and set it's new position
-                this.tile.size = tileSize.clone();
+                this.tile.size = this.tileSize.clone();
                this.tile.position = ulPx.clone();
            }
            this.tile.draw();
        }
    }, 
    /**
     * Set the tile size based on the map size.  This also sets layer.imageSize
     * and layer.imageOffset for use by Tile.Image.
     */
    setTileSize: function() {
        var tileWidth = this.extent.getWidth() / this.map.getResolution();
        var tileHeight = this.extent.getHeight() / this.map.getResolution();
        this.tileSize = new OpenLayers.Size(tileWidth, tileHeight);
        this.imageSize = this.tileSize;
        this.imageOffset = new OpenLayers.Pixel(0, 0);
    },
    /**
     * @param {String} newUrl
     */
--- 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.
+/* Copyright (c) 2006 MetaCarta, Inc., published under the BSD license.
- * See http://svn.openlayers.org/trunk/openlayers/repository-license.txt 
+ * See http://svn.openlayers.org/trunk/openlayers/release-license.txt 
 * for the full text of the license. */
@@ -146,6 +146,36 @@ OpenLayers.Layer.KaMap.prototype =
    },
    /**
     * @param {Object} obj
     * 
     * @returns An exact clone of this OpenLayers.Layer.Grid
     * @type OpenLayers.Layer.Grid
     */
    clone: function (obj) {
        if (obj == null) {
            obj = new OpenLayers.Layer.KaMap(this.name,
                                            this.url,
                                            this.params,
                                            this.options);
        }
        //get all additions from superclasses
        obj = OpenLayers.Layer.Grid.prototype.clone.apply(this, [obj]);
        // copy/set any non-init, non-simple values here
        if (this.tileSize != null) {
            obj.tileSize = this.tileSize.clone();
        }
        // we do not want to copy reference to grid, so we make a new array
        obj.grid = new Array();
        return obj;
    },    
    /** @final @type String */
    CLASS_NAME: "OpenLayers.Layer.KaMap"
 });
--- 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.
+/* Copyright (c) 2006 MetaCarta, Inc., published under the BSD license.
- * See http://svn.openlayers.org/trunk/openlayers/repository-license.txt 
+ * See http://svn.openlayers.org/trunk/openlayers/release-license.txt 
 * for the full text of the license. */
 // @requires OpenLayers/Layer/Grid.js
 /**
--- 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.
+/* Copyright (c) 2006 MetaCarta, Inc., published under the BSD license.
- * See http://svn.openlayers.org/trunk/openlayers/repository-license.txt 
+ * See http://svn.openlayers.org/trunk/openlayers/release-license.txt 
 * for the full text of the license. */
@@ -22,6 +22,15 @@ OpenLayers.Layer.Markers.prototype =
    * @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;
        }
    },
--- 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.
+/* Copyright (c) 2006 MetaCarta, Inc., published under the BSD license.
- * See http://svn.openlayers.org/trunk/openlayers/repository-license.txt 
+ * See http://svn.openlayers.org/trunk/openlayers/release-license.txt 
 * for the full text of the license. */
 /**
--- 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.
+/* Copyright (c) 2006 MetaCarta, Inc., published under the BSD licence.
- * See http://svn.openlayers.org/trunk/openlayers/repository-license.txt 
+ * See http://svn.openlayers.org/trunk/openlayers/release-license.txt 
 * for the full text of the license. */
--- 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.
+/* Copyright (c) 2006 MetaCarta, Inc., published under the BSD license.
- * See http://svn.openlayers.org/trunk/openlayers/repository-license.txt 
+ * See http://svn.openlayers.org/trunk/openlayers/release-license.txt 
 * for the full text of the license. */
--- 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.
+/* Copyright (c) 2006 MetaCarta, Inc., published under the BSD license.
- * See http://svn.openlayers.org/trunk/openlayers/repository-license.txt
+ * See http://svn.openlayers.org/trunk/openlayers/release-license.txt
 * for the full text of the license. */
 /**
@@ -7,6 +7,7 @@
 *
 * @requires OpenLayers/Layer.js
 * @requires OpenLayers/Renderer.js
 * @requires OpenLayers/Feature/Vector.js
 */
 OpenLayers.Layer.Vector = OpenLayers.Class.create();
 OpenLayers.Layer.Vector.prototype =
@@ -21,17 +22,11 @@ OpenLayers.Layer.Vector.prototype =
    /** @type Boolean */
    isVector: true,
-    /** @type {Array(OpenLayer.Feature.Vector)} */
+    /** @type Array(OpenLayer.Feature.Vector) */
    features: null,
-    /** @type {Array(OpenLayers.Feature.Vector)} */
+    /** @type Array(OpenLayers.Feature.Vector) */
-    selectedFeatures: [],
+    selectedFeatures: null,
    /** @type {Boolean} */
    editing: false,
    /** @type {Boolean} */
    editable: false,
    /** @type {Boolean} */
    reportError: true, 
@@ -75,6 +70,10 @@ OpenLayers.Layer.Vector.prototype =
     * Options renderer {Object}: Typically SVGRenderer or VMLRenderer.
     */
    initialize: function(name, options) {
        var defaultStyle = OpenLayers.Feature.Vector.style['default'];
        this.style = OpenLayers.Util.extend({}, defaultStyle);
        OpenLayers.Layer.prototype.initialize.apply(this, arguments);
        // allow user-set renderer, otherwise assign one
@@ -102,8 +101,6 @@ OpenLayers.Layer.Vector.prototype =
        //              calling feature[i].destroy() here. 
        this.features = null;
        this.selectedFeatures = null;
        this.editing = null;
        this.editable = null;
        if (this.renderer) {
            this.renderer.destroy();
        }
@@ -172,7 +169,7 @@ OpenLayers.Layer.Vector.prototype =
    /** Reset the vector layer's div so that it once again is lined up with 
     *   the map. Notify the renderer of the change of extent, and in the
     *   case of a change of zoom level (resolution), have the 
-     *   renderer reproject.
+     *   renderer redraw features.
     * 
     *  If the layer has not yet been drawn, cycle through the layer's 
     *   features and draw each one.
@@ -191,15 +188,11 @@ OpenLayers.Layer.Vector.prototype =
            this.renderer.setExtent(extent);
        }
-        if (zoomChanged) {
+        if (!this.drawn || zoomChanged) {
            this.renderer.reproject();
        }
        if (!this.drawn) {
            this.drawn = true;
            for(var i = 0; i < this.features.length; i++) {
                var feature = this.features[i];
-                this.renderer.drawGeometry(feature.geometry, feature.style);
+                this.drawFeature(feature);
            }
        }    
    },
@@ -228,17 +221,13 @@ OpenLayers.Layer.Vector.prototype =
            feature.layer = this;
            if (!feature.style) {
-                if (this.style) {
+                feature.style = OpenLayers.Util.extend({}, this.style);
                    feature.style = OpenLayers.Util.extend({}, this.style);
                } else {
                    feature.style = OpenLayers.Util.extend({}, OpenLayers.Feature.Vector.style['default']);
                }    
            }
            this.preFeatureInsert(feature);
            if (this.drawn) {
-                this.renderer.drawGeometry(feature.geometry, feature.style);
+                this.drawFeature(feature);
            }
            this.onFeatureInsert(feature);
@@ -254,60 +243,89 @@ OpenLayers.Layer.Vector.prototype =
            features = [features];
        }
-        for (var i = 0; i < features.length; i++) {
+        for (var i = features.length - 1; i >= 0; i--) {
            var feature = features[i];
            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);
            }
        }
    },
    /**
     * Destroy all features on the layer and empty the selected features array.
     */
    destroyFeatures: function () {
        this.selectedFeatures = new Array();
        for (var i = this.features.length - 1; i >= 0; i--) {
            this.features[i].destroy();
        }
    },
    /**
-     * @param {String} fid
+     * Draw (or redraw) a feature on the layer.  If the optional style argument
     * is included, this style will be used.  If no style is included, the
     * feature's style will be used.  If the feature doesn't have a style,
     * the layer's style will be used.
     * 
     * @param {OpenLayers.Feature.Vector} feature
     * @param {Object} style
     */
-    redrawFeature: function(fid, style) {
+    drawFeature: function(feature, style) {
-        for (var i = 0; i < this.features.length; i++) {
+        if(style == null) {
-            var feature = this.features[i];
+            if(feature.style) {
-            if (feature.fid == fid) {
+                style = feature.style;
-                this.renderer.drawGeometry(feature.geometry, style);
+            } else {
                style = this.style;
            }
        }
        this.renderer.drawFeature(feature, style);
    },
    /**
-     * Start editing the layer
+     * Erase features from the layer.
     * 
-     * @returns Whether or not the layer is editable
+     * @param {Array(OpenLayers.Feature.Vector)} features
     * @type Boolean
     */
-    unlock: function() {
+    eraseFeatures: function(features) {
-        if(this.editable) {
+        this.renderer.eraseFeatures(features);
            this.editing = true;
        }
        return this.editable;
    },
    /**
-     * Stop editing the layer
+     * Given an event, return a feature if the event occurred over one.
     * Otherwise, return null.
     *
-     * @return Whether or not the layer *was* editing 
+     * @param {Event}
-     * HACK HACK This return value seems wierd to me.
+     * @type OpenLayers.Feature.Vector
-     * @type Boolean
+     * @return A feature if one was under the event
     */
-    lock: function() {
+    getFeatureFromEvent: function(evt) {
-        if(this.editing) {
+        var featureId = this.renderer.getFeatureIdFromEvent(evt);
-            this.editing = false;
+        return this.getFeatureById(featureId);
    },
    /**
     * Given a feature id, return the feature if it exists in the features array
     * 
     * @param String featureId
     * @type OpenLayers.Feature.Vector
     * @return A feature corresponding to the given featureId
     */
    getFeatureById: function(featureId) {
        //TBD - would it be more efficient to use a hash for this.features?
        var feature = null;
        for(var i=0; i<this.features.length; ++i) {
            if(this.features[i].id == featureId) {
                feature = this.features[i];
                break;
            }
        }
-        return this.editing;
+        return feature;
    },
    /**
@@ -319,8 +337,7 @@ OpenLayers.Layer.Vector.prototype =
       var vectorLayer = this.map.vectorLayer;
        for (var i = 0; i < this.map.featureSelection.length; i++) {
            var featureSelection = this.map.featureSelection[i];
-            vectorLayer.renderer.drawGeometry(featureSelection.geometry, 
+            vectorLayer.drawFeature(featureSelection, vectorLayer.style);
                                              vectorLayer.style);
        }
        this.map.featureSelection = [];
    },
--- 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.
+/* Copyright (c) 2006 MetaCarta, Inc., published under the BSD license.
- * See http://svn.openlayers.org/trunk/openlayers/repository-license.txt 
+ * See http://svn.openlayers.org/trunk/openlayers/release-license.txt 
 * for the full text of the license. */
--- 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.
+/* Copyright (c) 2006 MetaCarta, Inc., published under the BSD license.
- * See http://svn.openlayers.org/trunk/openlayers/repository-license.txt 
+ * See http://svn.openlayers.org/trunk/openlayers/release-license.txt 
 * for the full text of the license. */
@@ -203,6 +203,17 @@ OpenLayers.Layer.WFS.prototype =
        }
    },
    /**
     * Call the onMapResize method of the appropriate parent class. 
     */
    onMapResize: function() {
        if(this.vectorMode) {
            OpenLayers.Layer.Vector.prototype.onMapResize.apply(this, arguments);
        } else {
            OpenLayers.Layer.Markers.prototype.onMapResize.apply(this, arguments);
        }
    },
    /**
     * @param {Object} obj
     * 
--- 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.
+/* Copyright (c) 2006 MetaCarta, Inc., published under the BSD license.
- * See http://svn.openlayers.org/trunk/openlayers/repository-license.txt 
+ * See http://svn.openlayers.org/trunk/openlayers/release-license.txt 
 * for the full text of the license. */
--- 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.
+/* Copyright (c) 2006 MetaCarta, Inc., published under the BSD license.
- * See http://svn.openlayers.org/trunk/openlayers/repository-license.txt 
+ * See http://svn.openlayers.org/trunk/openlayers/release-license.txt 
 * for the full text of the license. */
--- 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.
+/* Copyright (c) 2006 MetaCarta, Inc., published under the BSD license.
- * See http://svn.openlayers.org/trunk/openlayers/repository-license.txt 
+ * See http://svn.openlayers.org/trunk/openlayers/release-license.txt 
 * for the full text of the license. */
--- 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.
+/* Copyright (c) 2006 MetaCarta, Inc., published under the BSD license.
- * See http://svn.openlayers.org/trunk/openlayers/repository-license.txt 
+ * See http://svn.openlayers.org/trunk/openlayers/release-license.txt 
 * for the full text of the license. */
--- 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.
+/* Copyright (c) 2006 MetaCarta, Inc., published under the BSD license.
- * See http://svn.openlayers.org/trunk/openlayers/repository-license.txt 
+ * See http://svn.openlayers.org/trunk/openlayers/release-license.txt 
 * for the full text of the license. */
--- 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.
+/* Copyright (c) 2006 MetaCarta, Inc., published under the BSD license.
- * See http://svn.openlayers.org/trunk/openlayers/repository-license.txt 
+ * See http://svn.openlayers.org/trunk/openlayers/release-license.txt 
 * for the full text of the license. */
--- 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.
+/* Copyright (c) 2006 MetaCarta, Inc., published under the BSD license.
- * See http://svn.openlayers.org/trunk/openlayers/repository-license.txt 
+ * See http://svn.openlayers.org/trunk/openlayers/release-license.txt 
 * for the full text of the license. */
@@ -33,6 +33,17 @@ OpenLayers.Marker.Box.prototype =
        this.setBorder(borderColor, borderWidth);
    },
    /**
     * 
     */    
    destroy: function() {
        this.bounds = null;
        this.div = null;
        OpenLayers.Marker.prototype.destroy.apply(this, arguments);
    },
    /** Allow the user to change the box's color and border width
     * 
     * @param {String} color Default is "red"
--- 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.
+/* Copyright (c) 2006 MetaCarta, Inc., published under the BSD license.
- * See http://svn.openlayers.org/trunk/openlayers/repository-license.txt 
+ * See http://svn.openlayers.org/trunk/openlayers/release-license.txt 
 * for the full text of the license. */
@@ -104,8 +104,12 @@ OpenLayers.Popup.prototype = {
            closeImg.style.top = this.padding + "px";
            this.div.appendChild(closeImg);
-            var closeEvents = new OpenLayers.Events(this, closeImg);
+            var closePopup = function(e) {
-            closeEvents.register("mousedown", this, this.hide);
+                this.hide();
                OpenLayers.Event.stop(e);
            }
            OpenLayers.Event.observe(closeImg, "click", 
                                     closePopup.bindAsEventListener(this));
        }
--- 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.
+/* Copyright (c) 2006 MetaCarta, Inc., published under the BSD license.
- * See http://svn.openlayers.org/trunk/openlayers/repository-license.txt 
+ * See http://svn.openlayers.org/trunk/openlayers/release-license.txt 
 * for the full text of the license. */
--- 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.
+/* Copyright (c) 2006 MetaCarta, Inc., published under the BSD license.
- * See http://svn.openlayers.org/trunk/openlayers/repository-license.txt 
+ * See http://svn.openlayers.org/trunk/openlayers/release-license.txt 
 * for the full text of the license. */
--- 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.
+/* Copyright (c) 2006 MetaCarta, Inc., published under the BSD license.
- * See http://svn.openlayers.org/trunk/openlayers/repository-license.txt 
+ * See http://svn.openlayers.org/trunk/openlayers/release-license.txt 
 * for the full text of the license. */
 /**
@@ -106,36 +106,72 @@ OpenLayers.Renderer.prototype =
        return this.resolution;
    },
    /** 
     * Draw the feature.  The optional style argument can be used
     * to override the feature's own style.  This method should only
     * be called from layer.drawFeature().
     *
     * @param {OpenLayers.Feature.Vector} feature 
     * @param {Object} style
     * @private
     */
    drawFeature: function(feature, style) {
        if(style == null) {
            style = feature.style;
        }
        this.drawGeometry(feature.geometry, style, feature.id);
    },
    /** 
     * virtual function
     * 
-     * Draw a geometry on the specified layer.
+     * Draw a geometry.  This should only be called from the renderer itself.
     * Use layer.drawFeature() from outside the renderer.
     *
     * @param geometry {OpenLayers.Geometry}
     * @param style {Object}
     * @param {String} featureId
     * @private
     */
-    drawGeometry: function(geometry, style) {},
+    drawGeometry: function(geometry, style, featureId) {},
    /**
     * virtual function
     *
     * Clear all vectors from the renderer
-     *
+     * @private
     */    
    clear: function() {},
    /**
     * virtual function
     * 
-     * Returns a geometry from an event that happened on a layer.  
+     * Returns a feature id from an event on the renderer.  
-     * How this happens is specific to the renderer.
+     * How this happens is specific to the renderer.  This should be
     * called from layer.getFeatureFromEvent().
     * 
     * @param evt {OpenLayers.Event}
     *
-     * @returns A geometry from an event that happened on a layer
+     * @returns A feature id or null
-     * @type OpenLayers.Geometry
+     * @type String
     * @private
     */
-    getGeometryFromEvent: function(evt) {},
+    getFeatureIdFromEvent: function(evt) {},
    /**
     * This is called by the layer to erase features
     * @param {Array(OpenLayers.Feature.Vector)} features
     * @private
     */
    eraseFeatures: function(features) {
        if(!(features instanceof Array)) {
            features = [features];
        }
        for(var i=0; i<features.length; ++i) {
            this.eraseGeometry(features[i].geometry);
        }
    },
    /**
     * virtual function
@@ -143,6 +179,7 @@ OpenLayers.Renderer.prototype =
     * Remove a geometry from the renderer (by id)
     * 
     * @param geometry {OpenLayers.Geometry}
     * @private
     */
    eraseGeometry: function(geometry) {},
--- 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.
+/* Copyright (c) 2006 MetaCarta, Inc., published under the BSD license.
- * See http://svn.openlayers.org/trunk/openlayers/repository-license.txt 
+ * See http://svn.openlayers.org/trunk/openlayers/release-license.txt 
 * for the full text of the license. */
 /**
@@ -61,7 +61,7 @@ OpenLayers.Renderer.Elements.prototype =
    /**
     * Remove all the elements from the root
-     *
+     * @private
     */    
    clear: function() {
        if (this.root) {
@@ -71,24 +71,6 @@ OpenLayers.Renderer.Elements.prototype =
        }
    },
    /**
     * Cycle through the rendered nodes and reproject them (this should be 
     *  called when the extent or size has changed);
     *
     * @param {OpenLayers.Bounds} extent
     */
    reproject: function(extent) {
        for (var i = 0; i < this.root.childNodes.length; i++) {
            var node = this.root.childNodes[i];
            //reproject node
            //  for the moment, this only really happens so as to reset
            //  the heaviness of the line relative to the resolution and
            //  the size of the circle for the Point object
            this.reprojectNode(node);
        }
    },
    /** This function is in charge of asking the specific renderer which type
     *   of node to create for the given geometry. All geometries in an 
     *   Elements-based renderer consist of one node and some attributes. We
@@ -100,23 +82,27 @@ OpenLayers.Renderer.Elements.prototype =
     * 
     * @returns The corresponding node type for the specified geometry
     * @type String
     * @private
     */
    getNodeType: function(geometry) { },
    /** 
-     * Draw the geometry on the specified layer, creating new nodes, 
+     * Draw the geometry, creating new nodes, setting paths, setting style,
-     * setting paths, setting style.
+     * setting featureId on the node.  This method should only be called
     * by the renderer itself.
     *
     * @param {OpenLayers.Geometry} geometry 
     * @param {Object} style
     * @param {String} featureId
     * @private
     */
-    drawGeometry: function(geometry, style) {
+    drawGeometry: function(geometry, style, featureId) {
        if ((geometry.CLASS_NAME == "OpenLayers.Geometry.MultiPoint") ||
            (geometry.CLASS_NAME == "OpenLayers.Geometry.MultiLineString") ||
            (geometry.CLASS_NAME == "OpenLayers.Geometry.MultiPolygon")) {
            for (var i = 0; i < geometry.components.length; i++) {
-                this.drawGeometry(geometry.components[i], style);
+                this.drawGeometry(geometry.components[i], style, featureId);
            }
            return;
        };
@@ -124,24 +110,27 @@ OpenLayers.Renderer.Elements.prototype =
        //first we create the basic node and add it to the root
        var nodeType = this.getNodeType(geometry);
        var node = this.nodeFactory(geometry.id, nodeType, geometry);
-        node.geometry = geometry;
+        node._featureId = featureId;
-        node.olStyle = style;
+        node._geometryClass = geometry.CLASS_NAME;
        node._style = style;
        this.root.appendChild(node);
        //now actually draw the node, and style it
-        this.drawGeometryNode(node);
+        this.drawGeometryNode(node, geometry);
    },
    /** 
     * Given a node, draw a geometry on the specified layer.
     * node and geometry are required arguments, style is optional.
     * This method is only called by the render itself.
     *
     * @param {DOMElement} node
     * @param {OpenLayers.Geometry} geometry 
     * @param {Object} style
     * @private
     */
    drawGeometryNode: function(node, geometry, style) {
-        geometry = geometry || node.geometry;
+        style = style || node._style;
        style = style || node.olStyle;
        var options = {
            'isFilled': true,
@@ -171,19 +160,22 @@ OpenLayers.Renderer.Elements.prototype =
                break;
        }
-        node.olStyle = style; 
+        node._style = style; 
-        node.olOptions = options; 
+        node._options = options; 
        //set style
-        this.setStyle(node);
+        //TBD simplify this
        this.setStyle(node, style, options, geometry);
    },
    /** 
     * virtual functions for drawing different Geometries. 
     * These should all be implemented by subclasses.
     * These methods are only called by the render itself.
     *
     * @param {DOMElement} node
     * @param {OpenLayers.Geometry} geometry
     * @private
     */
    drawPoint: function(node, geometry) {},
    drawLineString: function(node, geometry) {},
@@ -199,11 +191,11 @@ OpenLayers.Renderer.Elements.prototype =
     *
     * @returns A geometry from an event that happened on a layer
     * @type OpenLayers.Geometry
     * @private
     */
-    getGeometryFromEvent: function(evt) {
+    getFeatureIdFromEvent: function(evt) {
        var node = evt.target || evt.srcElement;
-        var geometry = node.geometry ? node.geometry : null
+        return node._featureId;
        return geometry;
    },
    /** Erase a geometry from the renderer. In the case of a multi-geometry, 
@@ -212,6 +204,7 @@ OpenLayers.Renderer.Elements.prototype =
     *   the DOM.
     * 
     * @param {OpenLayers.Geometry} geometry
     * @private
     */
    eraseGeometry: function(geometry) {
        if ((geometry.CLASS_NAME == "OpenLayers.Geometry.MultiPoint") ||
@@ -246,6 +239,7 @@ OpenLayers.Renderer.Elements.prototype =
     * 
     * @returns A new node of the given type and id
     * @type DOMElement
     * @private
     */
    nodeFactory: function(id, type, geometry) {
        var node = $(id);
--- 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.
+/* Copyright (c) 2006 MetaCarta, Inc., published under the BSD license.
- * See http://svn.openlayers.org/trunk/openlayers/repository-license.txt 
+ * See http://svn.openlayers.org/trunk/openlayers/release-license.txt 
 * for the full text of the license. */
 /**
@@ -14,6 +14,16 @@ OpenLayers.Renderer.SVG.prototype =
    /** @type String */
    xmlns: "http://www.w3.org/2000/svg",
    // Firefox has a limitation where values larger or smaller than about
    // 15000 in an SVG document lock the browser up. This works around it.
    /** @type Integer */
    maxPixel: 15000,
    /** @type Float 
        @private */
    localResolution: null,
    /**
     * @constructor
     * 
@@ -46,6 +56,7 @@ OpenLayers.Renderer.SVG.prototype =
    /**
     * @param {OpenLayers.Bounds} extent
     * @private
     */
    setExtent: function(extent) {
        OpenLayers.Renderer.Elements.prototype.setExtent.apply(this, 
@@ -53,8 +64,33 @@ OpenLayers.Renderer.SVG.prototype =
        var resolution = this.getResolution();
-        var extentString = extent.left / resolution + " " + -extent.top / resolution + " " + 
+
        // If the resolution has changed, start over changing the corner, because
        // the features will redraw.
        if (!this.localResolution || resolution != this.localResolution) {
            this.left = -extent.left / resolution;
            this.top = extent.top / resolution;
        }
        var left = 0;
        var top = 0;
        // If the resolution has not changed, we already have features, and we need
        // to adjust the viewbox to fit them.
        if (this.localResolution && resolution == this.localResolution) {
            left = (this.left) - (-extent.left / resolution);
            top  = (this.top) - (extent.top / resolution);
        }    
        // Store resolution for use later.
        this.localResolution = resolution;
        // Set the viewbox -- the left/top will be pixels-dragged-since-res change,
        // the width/height will be pixels.
        var extentString = left + " " + top + " " + 
                             extent.getWidth() / resolution + " " + extent.getHeight() / resolution;
        //var extentString = extent.left / resolution + " " + -extent.top / resolution + " " + 
        this.rendererRoot.setAttributeNS(null, "viewBox", extentString);
    },
@@ -64,6 +100,7 @@ OpenLayers.Renderer.SVG.prototype =
     * sets the size of the drawing surface
     *
     * @param size {OpenLayers.Size} the size of the drawing surface
     * @private
     */
    setSize: function(size) {
        OpenLayers.Renderer.prototype.setSize.apply(this, arguments);
@@ -80,6 +117,7 @@ OpenLayers.Renderer.SVG.prototype =
     * 
     * @returns The corresponding node type for the specified geometry
     * @type String
     * @private
     */
    getNodeType: function(geometry) {
        var nodeType = null;
@@ -107,13 +145,6 @@ OpenLayers.Renderer.SVG.prototype =
        return nodeType;
    },
    /**
     * @param {DOMElement} node
     */
    reprojectNode: function(node) {
        this.drawGeometryNode(node);  
    },
    /** 
     * Use to set all the style attributes to a SVG node.
     * 
@@ -125,12 +156,13 @@ OpenLayers.Renderer.SVG.prototype =
     * @param {Object} options
     * @option isFilled {boolean} 
     * @option isStroked {boolean} 
     * @private
     */
    setStyle: function(node, style, options) {
-        style = style  || node.olStyle;
+        style = style  || node._style;
-        options = options || node.olOptions;
+        options = options || node._options;
-        if (node.geometry.CLASS_NAME == "OpenLayers.Geometry.Point") {
+        if (node._geometryClass == "OpenLayers.Geometry.Point") {
            node.setAttributeNS(null, "r", style.pointRadius);
        }
@@ -152,6 +184,10 @@ OpenLayers.Renderer.SVG.prototype =
        if (style.pointerEvents) {
            node.setAttributeNS(null, "pointer-events", style.pointerEvents);
        }
        if (style.cursor) {
            node.setAttributeNS(null, "cursor", style.cursor);
        }
    },
    /** 
@@ -187,6 +223,7 @@ OpenLayers.Renderer.SVG.prototype =
    /**
     * @returns The specific render engine's root element
     * @type DOMElement
     * @private
     */
    createRenderRoot: function() {
        var id = this.container.id + "_svgRoot";
@@ -197,6 +234,7 @@ OpenLayers.Renderer.SVG.prototype =
    /**
     * @returns The main root element to which we'll add vectors
     * @type DOMElement
     * @private
     */
    createRoot: function() {
        var id = this.container.id + "_root";
@@ -219,6 +257,7 @@ OpenLayers.Renderer.SVG.prototype =
    /** 
     * @param {DOMElement} node
     * @param {OpenLayers.Geometry} geometry
     * @private
     */
    drawPoint: function(node, geometry) {
        this.drawCircle(node, geometry, 1);
@@ -228,17 +267,32 @@ OpenLayers.Renderer.SVG.prototype =
     * @param {DOMElement} node
     * @param {OpenLayers.Geometry} geometry
     * @param {float} radius
     * @private
     */
    drawCircle: function(node, geometry, radius) {
        var resolution = this.getResolution();
-        node.setAttributeNS(null, "cx", geometry.x / resolution);
+        var x = (geometry.x / resolution + this.left);
-        node.setAttributeNS(null, "cy", geometry.y / resolution);
+        var y = (geometry.y / resolution - this.top);
-        node.setAttributeNS(null, "r", radius);
+        var draw = true;
        if (x < -this.maxPixel || x > this.maxPixel) { draw = false; }
        if (y < -this.maxPixel || y > this.maxPixel) { draw = false; }
        if (draw) { 
            node.setAttributeNS(null, "cx", x);
            node.setAttributeNS(null, "cy", y);
            node.setAttributeNS(null, "r", radius);
        } else {
            node.setAttributeNS(null, "cx", "");
            node.setAttributeNS(null, "cy", "");
            node.setAttributeNS(null, "r", 0);
        }    
    },
    /** 
     * @param {DOMElement} node
     * @param {OpenLayers.Geometry} geometry
     * @private
     */
    drawLineString: function(node, geometry) {
        node.setAttributeNS(null, "points", this.getComponentsString(geometry.components));  
@@ -247,6 +301,7 @@ OpenLayers.Renderer.SVG.prototype =
    /** 
     * @param {DOMElement} node
     * @param {OpenLayers.Geometry} geometry
     * @private
     */
    drawLinearRing: function(node, geometry) {
        node.setAttributeNS(null, "points", this.getComponentsString(geometry.components));
@@ -255,80 +310,132 @@ OpenLayers.Renderer.SVG.prototype =
    /** 
     * @param {DOMElement} node
     * @param {OpenLayers.Geometry} geometry
     * @private
     */
    drawPolygon: function(node, geometry) {
        var d = "";
        var draw = true;
        for (var j = 0; j < geometry.components.length; j++) {
            var linearRing = geometry.components[j];
            d += " M";
            for (var i = 0; i < linearRing.components.length; i++) {
-                d += " " + this.getShortString(linearRing.components[i]);
+                var component = this.getShortString(linearRing.components[i])
                if (component) {
                    d += " " + component;
                } else {
                    draw = false;
                }    
            }
        }
        d += " z";
-        
+        if (draw) {
-        node.setAttributeNS(null, "d", d);
+            node.setAttributeNS(null, "d", d);
-        node.setAttributeNS(null, "fill-rule", "evenodd");
+            node.setAttributeNS(null, "fill-rule", "evenodd");
        } else {
            node.setAttributeNS(null, "d", "");
        }    
    },
    /** 
     * @param {DOMElement} node
     * @param {OpenLayers.Geometry} geometry
     * @private
     */
    drawRectangle: function(node, geometry) {
-        node.setAttributeNS(null, "x", geometry.x / resolution);
+        // This needs to be reworked 
-        node.setAttributeNS(null, "y", geometry.y / resolution);
+        var x = (geometry.x / resolution + this.left);
-        node.setAttributeNS(null, "width", geometry.width);
+        var y = (geometry.y / resolution - this.top);
-        node.setAttributeNS(null, "height", geometry.height);
+        var draw = true;
        if (x < -this.maxPixel || x > this.maxPixel) { draw = false; }
        if (y < -this.maxPixel || y > this.maxPixel) { draw = false; }
        if (draw) {
            node.setAttributeNS(null, "x", x);
            node.setAttributeNS(null, "y", y);
            node.setAttributeNS(null, "width", geometry.width);
            node.setAttributeNS(null, "height", geometry.height);
        } else {
            node.setAttributeNS(null, "x", "");
            node.setAttributeNS(null, "y", "");
            node.setAttributeNS(null, "width", 0);
            node.setAttributeNS(null, "height", 0);
        }    
    },
    /** 
     * @param {DOMElement} node
     * @param {OpenLayers.Geometry} geometry
     * @private
     */
    drawCurve: function(node, geometry) {
        var d = null;
        var draw = true;
        for (var i = 0; i < geometry.components.length; i++) {
            if ((i%3) == 0 && (i/3) == 0) {
-                d = "M " + this.getShortString(geometry.components[i]);
+                var component = this.getShortString(geometry.components[i]);
                if (!component) { draw = false; }
                d = "M " + component;
            } else if ((i%3) == 1) {
-                d += " C " + this.getShortString(geometry.components[i]);
+                var component = this.getShortString(geometry.components[i]);
                if (!component) { draw = false; }
                d += " C " + component;
            } else {
-                d += " " + this.getShortString(geometry.components[i]);
+                var component = this.getShortString(geometry.components[i]);
                if (!component) { draw = false; }
                d += " " + component;
            }
        }
-        node.setAttributeNS(null, "d", d);
+        if (draw) {
            node.setAttributeNS(null, "d", d);
        } else {
            node.setAttributeNS(null, "d", "");
        }    
    },
    /** 
     * @param {DOMElement} node
     * @param {OpenLayers.Geometry} geometry
     * @private
     */
    drawSurface: function(node, geometry) {
        // create the svg path string representation
        var d = null;
        var draw = true;
        for (var i = 0; i < geometry.components.length; i++) {
            if ((i%3) == 0 && (i/3) == 0) {
-                d = "M " + this.getShortString(geometry.components[i]);
+                var component = this.getShortString(geometry.components[i]);
                if (!component) { draw = false; }
                d = "M " + component;
            } else if ((i%3) == 1) {
-                d += " C " + this.getShortString(geometry.components[i]);
+                var component = this.getShortString(geometry.components[i]);
                if (!component) { draw = false; }
                d += " C " + component;
            } else {
-                d += " " + this.getShortString(geometry.components[i]);
+                var component = this.getShortString(geometry.components[i]);
                if (!component) { draw = false; }
                d += " " + component;
            }
        }
        d += " Z";
-        node.setAttributeNS(null, "d", d);
+        if (draw) {
            node.setAttributeNS(null, "d", d);
        } else {
            node.setAttributeNS(null, "d", "");
        }    
    },
    /** 
     * @param {Array} components array of points
     * @private
     */
    getComponentsString: function(components) {
        var strings = [];
        for(var i = 0; i < components.length; i++) {
-            strings.push(this.getShortString(components[i]));
+            var component = this.getShortString(components[i]);
            if (!component) { return false; }
            strings.push(component);
        }
        return strings.join(",");
    },
@@ -336,10 +443,16 @@ OpenLayers.Renderer.SVG.prototype =
    /** 
     * @param {OpenLayers.Geometry.Point} point
     * @private
     */
    getShortString: function(point) {
        var resolution = this.getResolution();
-        return point.x / resolution + "," + point.y / resolution;  
+        var x = (point.x / resolution + this.left);
        var y = (point.y / resolution - this.top);
        if (x < -this.maxPixel || x > this.maxPixel) { return false; }
        if (y < -this.maxPixel || y > this.maxPixel) { return false; }
        var string =  x + "," + y;  
        return string;
    },
--- 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.
+/* Copyright (c) 2006 MetaCarta, Inc., published under the BSD license.
- * See http://svn.openlayers.org/trunk/openlayers/repository-license.txt
+ * See http://svn.openlayers.org/trunk/openlayers/release-license.txt
 * for the full text of the license. */
 /**
@@ -89,6 +89,7 @@ OpenLayers.Renderer.VML.prototype =
     * 
     * @returns The corresponding node type for the specified geometry
     * @type String
     * @private
     */
    getNodeType: function(geometry) {
        var nodeType = null;
@@ -112,16 +113,6 @@ OpenLayers.Renderer.VML.prototype =
        return nodeType;
    },
    /**
     * @param {DOMElement} node
     */
    reprojectNode: function(node) {
        //we have to reprojectNode the entire node since the coordinates 
        // system has changed
        this.drawGeometryNode(node);  
    },
    /**
     * Use to set all the style attributes to a VML node.
     *
@@ -130,13 +121,15 @@ OpenLayers.Renderer.VML.prototype =
     * @param {Object} options
     * @option isFilled {boolean} 
     * @option isStroked {boolean}
     * @param {OpenLayers.Geometry} geometry
     * @private
     */
-    setStyle: function(node, style, options) {
+    setStyle: function(node, style, options, geometry) {
-        style = style  || node.olStyle;
+        style = style  || node._style;
-        options = options || node.olOptions;
+        options = options || node._options;
-        if (node.geometry.CLASS_NAME == "OpenLayers.Geometry.Point") {
+        if (node._geometryClass == "OpenLayers.Geometry.Point") {
-            this.drawCircle(node, node.geometry, style.pointRadius);
+            this.drawCircle(node, geometry, style.pointRadius);
        }
      //fill
@@ -174,6 +167,10 @@ OpenLayers.Renderer.VML.prototype =
            }
            stroke.setAttribute("opacity", style.strokeOpacity);
        }
        if (style.cursor) {
            node.style.cursor = style.cursor;
        }
    },
@@ -182,6 +179,7 @@ OpenLayers.Renderer.VML.prototype =
     *   
     * @param {DOMElement} node
     * @param {OpenLayers.Geometry} geometry
     * @private
     */
    setNodeDimension: function(node, geometry) {
@@ -253,6 +251,7 @@ OpenLayers.Renderer.VML.prototype =
    /**
     * @returns The specific render engine's root element
     * @type DOMElement
     * @private
     */
    createRenderRoot: function() {
        var id = this.container.id + "_vmlRoot";
@@ -263,6 +262,7 @@ OpenLayers.Renderer.VML.prototype =
    /**
     * @returns The main root element to which we'll add vectors
     * @type DOMElement
     * @private
     */
    createRoot: function() {
        var id = this.container.id + "_root";
@@ -279,9 +279,10 @@ OpenLayers.Renderer.VML.prototype =
    /**
     * @param {DOMElement} node
     * @param {OpenLayers.Geometry} geometry
     * @private
     */
    drawPoint: function(node, geometry) {
-        this.drawCircle(node, node.geometry, 1);
+        this.drawCircle(node, geometry, 1);
    },
    /** Size and Center a circle given geometry (x,y center) and radius
@@ -289,6 +290,7 @@ OpenLayers.Renderer.VML.prototype =
     * @param {DOMElement} node
     * @param {OpenLayers.Geometry} geometry
     * @param {float} radius
     * @private
     */
    drawCircle: function(node, geometry, radius) {
@@ -307,6 +309,7 @@ OpenLayers.Renderer.VML.prototype =
    /**
     * @param {DOMElement} node
     * @param {OpenLayers.Geometry} geometry
     * @private
     */
    drawLineString: function(node, geometry) {
        this.drawLine(node, geometry, false);
@@ -315,6 +318,7 @@ OpenLayers.Renderer.VML.prototype =
    /**
     * @param {DOMElement} node
     * @param {OpenLayers.Geometry} geometry
     * @private
     */
    drawLinearRing: function(node, geometry) {
        this.drawLine(node, geometry, true);
@@ -324,6 +328,7 @@ OpenLayers.Renderer.VML.prototype =
     * @param {DOMElement} node
     * @param {OpenLayers.Geometry} geometry
     * @param {Boolean} closeLine Close the line? (make it a ring?)
     * @private
     */
    drawLine: function(node, geometry, closeLine) {
@@ -348,6 +353,7 @@ OpenLayers.Renderer.VML.prototype =
    /**
     * @parm {DOMElement} node
     * @param {OpenLayers.Geometry} geometry
     * @private
     */
    drawPolygon: function(node, geometry) {
        this.setNodeDimension(node, geometry);
@@ -376,6 +382,7 @@ OpenLayers.Renderer.VML.prototype =
    /**
     * @parm {DOMElement} node
     * @param {OpenLayers.Geometry} geometry
     * @private
     */
    drawRectangle: function(node, geometry) {
        var resolution = this.getResolution();
@@ -391,6 +398,7 @@ OpenLayers.Renderer.VML.prototype =
    /**
     * @parm {DOMElement} node
     * @param {OpenLayers.Geometry} geometry
     * @private
     */
    drawCurve: function(node, geometry) {
        this.setNodeDimension(node, geometry);
@@ -417,6 +425,7 @@ OpenLayers.Renderer.VML.prototype =
    /**
     * @parm {DOMElement} node
     * @param {OpenLayers.Geometry} geometry
     * @private
     */
    drawSurface: function(node, geometry) {
--- a/Show More
+++ b/Show More