From ab561ff1988ce0c78564db554b46313e9edcfa79 Mon Sep 17 00:00:00 2001
From: John Firebaugh <john.firebaugh@gmail.com>
Date: Mon, 11 Mar 2013 12:26:10 -0700
Subject: [PATCH] Better way to prevent snapping to area fill

This also prevents are hover behavior during node dragging,
while allowing snapping to vertex fill.
---
 css/map.css                 | 13 +++++++------
 js/id/behavior/drag_node.js |  9 +--------
 2 files changed, 8 insertions(+), 14 deletions(-)

diff --git a/css/map.css b/css/map.css
index 4626ed13f..819c717af 100644
--- a/css/map.css
+++ b/css/map.css
@@ -940,10 +940,11 @@ text.point {
 }
 
 /* Ensure drawing doesn't interact with area fills. */
-.mode-add-point .area,
-.mode-draw-line .area,
-.mode-draw-area .area,
-.mode-add-line .area,
-.mode-add-area .area {
-    pointer-events: visibleStroke;
+.mode-add-point .area.fill,
+.mode-draw-line .area.fill,
+.mode-draw-area .area.fill,
+.mode-add-line .area.fill,
+.mode-add-area .area.fill,
+.behavior-drag-node .area.fill {
+    pointer-events: none;
 }
diff --git a/js/id/behavior/drag_node.js b/js/id/behavior/drag_node.js
index cabed2db6..f1c875c26 100644
--- a/js/id/behavior/drag_node.js
+++ b/js/id/behavior/drag_node.js
@@ -74,14 +74,7 @@ iD.behavior.DragNode = function(context) {
             return {};
         }
 
-        var datum = d3.event.sourceEvent.target.__data__,
-            target = d3.select(d3.event.sourceEvent.target);
-
-        if (datum && !target.classed('fill')) {
-            return datum;
-        }
-
-        return {};
+        return d3.event.sourceEvent.target.__data__ || {};
     }
 
     function move(entity) {