From fcafce7517ba3dd3e134a3f2e40ae2d1b0bfa6fc Mon Sep 17 00:00:00 2001
From: John Firebaugh <john.firebaugh@gmail.com>
Date: Mon, 13 May 2013 11:48:24 -0700
Subject: [PATCH] Really fix area drawing

---
 js/id/behavior/draw_way.js | 31 ++++++++++++-------------------
 js/id/renderer/map.js      |  2 ++
 js/id/util.js              |  4 ++++
 3 files changed, 18 insertions(+), 19 deletions(-)

diff --git a/js/id/behavior/draw_way.js b/js/id/behavior/draw_way.js
index b51341893..9c8f2e5f7 100644
--- a/js/id/behavior/draw_way.js
+++ b/js/id/behavior/draw_way.js
@@ -37,12 +37,6 @@ iD.behavior.DrawWay = function(context, wayId, index, mode, baseGraph) {
         }
 
         context.replace(iD.actions.MoveNode(end.id, loc));
-
-        context.surface().selectAll('.way, .node')
-            .filter(function(d) {
-                return d.id === end.id || d.id === segment.id;
-            })
-            .classed('active', true);
     }
 
     function undone() {
@@ -50,12 +44,10 @@ iD.behavior.DrawWay = function(context, wayId, index, mode, baseGraph) {
         context.enter(iD.modes.Browse(context));
     }
 
-    function lineActives(d) {
-        return d.id === segment.id || d.id === start.id || d.id === end.id;
-    }
-
-    function areaActives(d) {
-        return d.id === wayId || d.id === end.id;
+    function setActiveElements() {
+        var active = isArea ? [wayId, end.id] : [segment.id, start.id, end.id];
+        context.surface().selectAll(iD.util.entitySelector(active))
+            .classed('active', true);
     }
 
     var drawWay = function(surface) {
@@ -69,12 +61,12 @@ iD.behavior.DrawWay = function(context, wayId, index, mode, baseGraph) {
 
         context.map()
             .minzoom(16)
-            .dblclickEnable(false);
+            .dblclickEnable(false)
+            .on('drawn.draw', setActiveElements);
 
-        surface.call(draw)
-          .selectAll('.way, .node')
-            .filter(isArea ? areaActives : lineActives)
-            .classed('active', true);
+        setActiveElements();
+
+        surface.call(draw);
 
         context.history()
             .on('undone.draw', undone);
@@ -86,10 +78,11 @@ iD.behavior.DrawWay = function(context, wayId, index, mode, baseGraph) {
 
         context.map()
             .minzoom(0)
-            .tail(false);
+            .tail(false)
+            .on('drawn.draw', null);
 
         surface.call(draw.off)
-          .selectAll('.way, .node')
+            .selectAll('.active')
             .classed('active', false);
 
         context.history()
diff --git a/js/id/renderer/map.js b/js/id/renderer/map.js
index 9756dd91e..d64d32300 100644
--- a/js/id/renderer/map.js
+++ b/js/id/renderer/map.js
@@ -66,6 +66,7 @@ iD.Map = function(context) {
             if (map.editable() && !transformed) {
                 var hover = d3.event.target.__data__;
                 surface.call(vertices.drawHover, context.graph(), hover, map.zoom());
+                dispatch.drawn(map);
             }
         });
 
@@ -73,6 +74,7 @@ iD.Map = function(context) {
             if (map.editable() && !transformed) {
                 var hover = d3.event.relatedTarget && d3.event.relatedTarget.__data__;
                 surface.call(vertices.drawHover, context.graph(), hover, map.zoom());
+                dispatch.drawn(map);
             }
         });
 
diff --git a/js/id/util.js b/js/id/util.js
index 84fe62535..5efdcfb7e 100644
--- a/js/id/util.js
+++ b/js/id/util.js
@@ -6,6 +6,10 @@ iD.util.tagText = function(entity) {
     }).join(', ');
 };
 
+iD.util.entitySelector = function(ids) {
+    return ids.length ? '.' + ids.join(',.') : 'nothing';
+};
+
 iD.util.stringQs = function(str) {
     return str.split('&').reduce(function(obj, pair){
         var parts = pair.split('=');