Sketch handler updates. Patch by tschaub, review elemoine (Closes #1698)

git-svn-id: http://svn.openlayers.org/trunk/openlayers@7964 dc9f47b5-9b13-0410-9fdd-eb0c1a62fdaf

lib/OpenLayers/Handler/Path.js

@@ -73,6 +73,7 @@ OpenLayers.Handler.Path = OpenLayers.Class(OpenLayers.Handler.Point, {
                                         new OpenLayers.Geometry.LineString());
         this.point = new OpenLayers.Feature.Vector(
                                         new OpenLayers.Geometry.Point());
+        this.layer.addFeatures([this.line, this.point], {silent: true});
     },
         
     /**
@@ -81,11 +82,18 @@ OpenLayers.Handler.Path = OpenLayers.Class(OpenLayers.Handler.Point, {
      */
     destroyFeature: function() {
         OpenLayers.Handler.Point.prototype.destroyFeature.apply(this);
-        if(this.line) {
-            this.line.destroy();
-        }
         this.line = null;
     },
+
+    /**
+     * Method: destroyPoint
+     * Destroy the temporary point.
+     */
+    destroyPoint: function() {
+        if(this.point) {
+            this.layer.destroyFeatures([this.point]);
+        }
+    },
     
     /**
      * Method: addPoint
@@ -95,7 +103,7 @@ OpenLayers.Handler.Path = OpenLayers.Class(OpenLayers.Handler.Point, {
     addPoint: function() {
         this.line.geometry.addComponent(this.point.geometry.clone(),
                                         this.line.geometry.components.length);
-        this.callback("point", [this.point.geometry]);
+        this.callback("point", [this.point.geometry, this.getGeometry()]);
     },
     
     /**
@@ -131,14 +139,19 @@ OpenLayers.Handler.Path = OpenLayers.Class(OpenLayers.Handler.Point, {
     },
 
     /**
-     * Method: geometryClone
-     * Return a clone of the relevant geometry.
+     * Method: getGeometry
+     * Return the sketch geometry.  If <multi> is true, this will return
+     *     a multi-part geometry.
      *
      * Returns:
      * {<OpenLayers.Geometry.LineString>}
      */
-    geometryClone: function() {
-        return this.line.geometry.clone();
+    getGeometry: function() {
+        var geometry = this.line.geometry;
+        if(this.multi) {
+            geometry = new OpenLayers.Geometry.MultiLineString([geometry]);
+        }
+        return geometry;
     },
 
     /**
@@ -158,6 +171,9 @@ OpenLayers.Handler.Path = OpenLayers.Class(OpenLayers.Handler.Point, {
             return false;
         }
         if(this.lastDown == null) {
+            if(this.persist) {
+                this.destroyFeature();
+            }
             this.createFeature();
         }
         this.mouseDown = true;
@@ -165,6 +181,7 @@ OpenLayers.Handler.Path = OpenLayers.Class(OpenLayers.Handler.Point, {
         var lonlat = this.control.map.getLonLatFromPixel(evt.xy);
         this.point.geometry.x = lonlat.lon;
         this.point.geometry.y = lonlat.lat;
+        this.point.geometry.clearBounds();
         if((this.lastUp == null) || !this.lastUp.equals(evt.xy)) {
             this.addPoint();
         }
@@ -215,6 +232,9 @@ OpenLayers.Handler.Path = OpenLayers.Class(OpenLayers.Handler.Point, {
         this.mouseDown = false;
         if(this.drawing) {
             if(this.freehandMode(evt)) {
+                if(this.persist) {
+                    this.destroyPoint();
+                }
                 this.finalize();
             } else {
                 if(this.lastUp == null) {
@@ -242,6 +262,9 @@ OpenLayers.Handler.Path = OpenLayers.Class(OpenLayers.Handler.Point, {
         if(!this.freehandMode(evt)) {
             var index = this.line.geometry.components.length - 1;
             this.line.geometry.removeComponent(this.line.geometry.components[index]);
+            if(this.persist) {
+                this.destroyPoint();
+            }
             this.finalize();
         }
         return false;