From 6e9d9ba274dc8f85c6df5b20484b085b2bc98275 Mon Sep 17 00:00:00 2001
From: Tom MacWright <tom@macwright.org>
Date: Thu, 6 Dec 2012 17:54:32 -0500
Subject: [PATCH] Refactor modes, use latedrag

---
 js/id/modes/add_area.js  | 2 +-
 js/id/modes/add_road.js  | 2 +-
 js/id/modes/draw_road.js | 2 +-
 js/id/renderer/map.js    | 3 ++-
 js/id/renderer/style.js  | 2 +-
 js/lib/d3.latedrag.js    | 2 +-
 6 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/js/id/modes/add_area.js b/js/id/modes/add_area.js
index 06857ba32..15fe6fd84 100644
--- a/js/id/modes/add_area.js
+++ b/js/id/modes/add_area.js
@@ -13,7 +13,7 @@ iD.modes.AddArea = function() {
         mode.map.surface.on('click.addarea', function() {
             var datum = d3.select(d3.event.target).datum() || {},
                 node,
-                way = iD.Way({tags: { building: 'yes', area: 'yes', elastic: 'true' }});
+                way = iD.Way({tags: { building: 'yes', area: 'yes' }});
 
             // connect a way to an existing way
             if (datum.type === 'node') {
diff --git a/js/id/modes/add_road.js b/js/id/modes/add_road.js
index efb3db113..8f7495b45 100644
--- a/js/id/modes/add_road.js
+++ b/js/id/modes/add_road.js
@@ -16,7 +16,7 @@ iD.modes.AddRoad = function() {
                 node,
                 direction = 'forward',
                 start = true,
-                way = iD.Way({ tags: { highway: 'residential', elastic: 'true' } });
+                way = iD.Way({ tags: { highway: 'residential' } });
 
             if (datum.type === 'node') {
                 // continue an existing way
diff --git a/js/id/modes/draw_road.js b/js/id/modes/draw_road.js
index bd4ad1507..5e9ad0415 100644
--- a/js/id/modes/draw_road.js
+++ b/js/id/modes/draw_road.js
@@ -12,7 +12,7 @@ iD.modes.DrawRoad = function(way_id, direction) {
                 'end the road.');
 
         var index = (direction === 'forward') ? undefined : -1,
-            node = iD.Node({loc: mode.map.mouseCoordinates(), tags: { elastic: true } }),
+            node = iD.Node({loc: mode.map.mouseCoordinates() }),
             way = mode.history.graph().entity(way_id),
             firstNode = way.nodes[0],
             lastNode = _.last(way.nodes);
diff --git a/js/id/renderer/map.js b/js/id/renderer/map.js
index 545c5db89..7fd0780d2 100644
--- a/js/id/renderer/map.js
+++ b/js/id/renderer/map.js
@@ -154,7 +154,8 @@ iD.Map = function() {
             });
         handles.attr('transform', function(entity) {
                 var p = projection(entity.loc);
-                return 'translate(' + [~~p[0], ~~p[1]] + ') translate(-3, -3) rotate(45, 3, 3)';
+                return 'translate(' + [~~p[0], ~~p[1]] +
+                    ') translate(-3, -3) rotate(45, 3, 3)';
             })
             .classed('active', classActive)
             .sort(olderOnTop);
diff --git a/js/id/renderer/style.js b/js/id/renderer/style.js
index bf6206c88..01bece5c8 100644
--- a/js/id/renderer/style.js
+++ b/js/id/renderer/style.js
@@ -50,7 +50,7 @@ iD.Style.markerimage = function(d) {
 
 iD.Style.TAG_CLASSES = iD.util.trueObj([
     'highway', 'railway', 'motorway', 'amenity', 'natural',
-    'landuse', 'building', 'oneway', 'bridge', 'elastic'
+    'landuse', 'building', 'oneway', 'bridge'
 ]);
 
 iD.Style.styleClasses = function(pre) {
diff --git a/js/lib/d3.latedrag.js b/js/lib/d3.latedrag.js
index 06970bca1..6ef3edd1e 100644
--- a/js/lib/d3.latedrag.js
+++ b/js/lib/d3.latedrag.js
@@ -7,7 +7,7 @@ d3.latedrag = function() {
         selection.on('mousedown.latedrag', function() {
             var datum = d3.select(d3.event.target).datum();
             if (datum && filter(datum)) {
-                mousedown.apply(d3.event.target, [datum]);
+                mousedown.apply(selection.node(), [datum]);
             }
         });
     }