From 315c37a075f5c427ce5355dc7702284d26541a4c Mon Sep 17 00:00:00 2001
From: fredj <frederic.junod@camptocamp.com>
Date: Wed, 7 Dec 2011 11:48:16 +0100
Subject: [PATCH 1/4] getFeatureIdFromEvent returns a feature id or undefined,
 fix getFeatureIdFromEvent docstring

---
 lib/OpenLayers/Renderer.js          | 2 +-
 lib/OpenLayers/Renderer/Elements.js | 3 +--
 lib/OpenLayers/Renderer/SVG.js      | 3 +--
 lib/OpenLayers/Renderer/SVG2.js     | 3 +--
 4 files changed, 4 insertions(+), 7 deletions(-)

diff --git a/lib/OpenLayers/Renderer.js b/lib/OpenLayers/Renderer.js
index a1b1a92342..bc4ac12cdb 100644
--- a/lib/OpenLayers/Renderer.js
+++ b/lib/OpenLayers/Renderer.js
@@ -302,7 +302,7 @@ OpenLayers.Renderer = OpenLayers.Class({
      * evt - {<OpenLayers.Event>} 
      *
      * Returns:
-     * {String} A feature id or null.
+     * {String} A feature id or undefined.
      */
     getFeatureIdFromEvent: function(evt) {},
     
diff --git a/lib/OpenLayers/Renderer/Elements.js b/lib/OpenLayers/Renderer/Elements.js
index af5234eaf6..54e5a3c4d5 100644
--- a/lib/OpenLayers/Renderer/Elements.js
+++ b/lib/OpenLayers/Renderer/Elements.js
@@ -885,8 +885,7 @@ OpenLayers.Renderer.Elements = OpenLayers.Class(OpenLayers.Renderer, {
      * evt - {Object} An <OpenLayers.Event> object
      *
      * Returns:
-     * {<OpenLayers.Geometry>} A geometry from an event that 
-     *     happened on a layer.
+     * {String} A feature id or undefined.
      */
     getFeatureIdFromEvent: function(evt) {
         var target = evt.target;
diff --git a/lib/OpenLayers/Renderer/SVG.js b/lib/OpenLayers/Renderer/SVG.js
index 132c12c7d3..0e2ee82c64 100644
--- a/lib/OpenLayers/Renderer/SVG.js
+++ b/lib/OpenLayers/Renderer/SVG.js
@@ -920,8 +920,7 @@ OpenLayers.Renderer.SVG = OpenLayers.Class(OpenLayers.Renderer.Elements, {
      * evt - {Object} An <OpenLayers.Event> object
      *
      * Returns:
-     * {<OpenLayers.Geometry>} A geometry from an event that 
-     *     happened on a layer.
+     * {String} A feature id or undefined.
      */
     getFeatureIdFromEvent: function(evt) {
         var featureId = OpenLayers.Renderer.Elements.prototype.getFeatureIdFromEvent.apply(this, arguments);
diff --git a/lib/OpenLayers/Renderer/SVG2.js b/lib/OpenLayers/Renderer/SVG2.js
index 628ed9504e..1d6261de4b 100644
--- a/lib/OpenLayers/Renderer/SVG2.js
+++ b/lib/OpenLayers/Renderer/SVG2.js
@@ -732,8 +732,7 @@ OpenLayers.Renderer.SVG2 = OpenLayers.Class(OpenLayers.Renderer.NG, {
      * evt - {Object} An <OpenLayers.Event> object
      *
      * Returns:
-     * {<OpenLayers.Geometry>} A geometry from an event that 
-     *     happened on a layer.
+     * {String} A feature id or undefined.
      */
     getFeatureIdFromEvent: function(evt) {
         var featureId = OpenLayers.Renderer.Elements.prototype.getFeatureIdFromEvent.apply(this, arguments);

From d20802369f955a99bbe55f22311cbba71e55f94d Mon Sep 17 00:00:00 2001
From: fredj <frederic.junod@camptocamp.com>
Date: Wed, 7 Dec 2011 11:52:04 +0100
Subject: [PATCH 2/4] code simplification

---
 lib/OpenLayers/Renderer/Elements.js | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/lib/OpenLayers/Renderer/Elements.js b/lib/OpenLayers/Renderer/Elements.js
index 54e5a3c4d5..72f5ca659e 100644
--- a/lib/OpenLayers/Renderer/Elements.js
+++ b/lib/OpenLayers/Renderer/Elements.js
@@ -891,8 +891,7 @@ OpenLayers.Renderer.Elements = OpenLayers.Class(OpenLayers.Renderer, {
         var target = evt.target;
         var useElement = target && target.correspondingUseElement;
         var node = useElement ? useElement : (target || evt.srcElement);
-        var featureId = node._featureId;
-        return featureId;
+        return node._featureId;
     },
 
     /** 

From 71fbfff02a0ebf13a8af87e8de415e6cc736828f Mon Sep 17 00:00:00 2001
From: fredj <frederic.junod@camptocamp.com>
Date: Wed, 7 Dec 2011 11:59:24 +0100
Subject: [PATCH 3/4] return undefined instead of false from
 getFeatureIdFromEvent

---
 lib/OpenLayers/Renderer/SVG.js  | 4 ++--
 lib/OpenLayers/Renderer/SVG2.js | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/lib/OpenLayers/Renderer/SVG.js b/lib/OpenLayers/Renderer/SVG.js
index 0e2ee82c64..b60b75a57b 100644
--- a/lib/OpenLayers/Renderer/SVG.js
+++ b/lib/OpenLayers/Renderer/SVG.js
@@ -926,8 +926,8 @@ OpenLayers.Renderer.SVG = OpenLayers.Class(OpenLayers.Renderer.Elements, {
         var featureId = OpenLayers.Renderer.Elements.prototype.getFeatureIdFromEvent.apply(this, arguments);
         if(!featureId) {
             var target = evt.target;
-            featureId = target.parentNode && target != this.rendererRoot &&
-                target.parentNode._featureId;
+            featureId = target.parentNode && target != this.rendererRoot ?
+                target.parentNode._featureId : undefined;
         }
         return featureId;
     },
diff --git a/lib/OpenLayers/Renderer/SVG2.js b/lib/OpenLayers/Renderer/SVG2.js
index 1d6261de4b..7dd179ef04 100644
--- a/lib/OpenLayers/Renderer/SVG2.js
+++ b/lib/OpenLayers/Renderer/SVG2.js
@@ -738,8 +738,8 @@ OpenLayers.Renderer.SVG2 = OpenLayers.Class(OpenLayers.Renderer.NG, {
         var featureId = OpenLayers.Renderer.Elements.prototype.getFeatureIdFromEvent.apply(this, arguments);
         if(!featureId) {
             var target = evt.target;
-            featureId = target.parentNode && target != this.rendererRoot &&
-                target.parentNode._featureId;
+            featureId = target.parentNode && target != this.rendererRoot ?
+                target.parentNode._featureId : undefined;
         }
         return featureId;
     },

From 03b8406746c423751102ebb2065e0411d4547656 Mon Sep 17 00:00:00 2001
From: fredj <frederic.junod@camptocamp.com>
Date: Wed, 7 Dec 2011 12:08:04 +0100
Subject: [PATCH 4/4] Canvas.getFeatureIdFromEvent: return undefined instead of
 null

---
 lib/OpenLayers/Renderer/Canvas.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/OpenLayers/Renderer/Canvas.js b/lib/OpenLayers/Renderer/Canvas.js
index a9a87bb788..e6883a86ca 100644
--- a/lib/OpenLayers/Renderer/Canvas.js
+++ b/lib/OpenLayers/Renderer/Canvas.js
@@ -626,12 +626,12 @@ OpenLayers.Renderer.Canvas = OpenLayers.Class(OpenLayers.Renderer, {
      * evt - {<OpenLayers.Event>} 
      *
      * Returns:
-     * {<OpenLayers.Feature.Vector} A feature or null.  This method returns a 
+     * {<OpenLayers.Feature.Vector} A feature or undefined.  This method returns a 
      *     feature instead of a feature id to avoid an unnecessary lookup on the
      *     layer.
      */
     getFeatureIdFromEvent: function(evt) {
-        var feature = null;
+        var feature;
         if (this.hitDetection) {
             // this dragging check should go in the feature handler
             if (!this.map.dragging) {