From e6da524f82d3dab070842adf3c9c3f8e6c625cee Mon Sep 17 00:00:00 2001
From: Bryan Housel <bryan@mapbox.com>
Date: Tue, 25 Apr 2017 16:04:15 -0400
Subject: [PATCH] Allow all nodes and vertices to be dragged (revert of #3739)

---
 modules/modes/browse.js    |  7 +++++--
 modules/modes/drag_node.js | 15 +--------------
 2 files changed, 6 insertions(+), 16 deletions(-)

diff --git a/modules/modes/browse.js b/modules/modes/browse.js
index 16ed974d7..5ba0e7fee 100644
--- a/modules/modes/browse.js
+++ b/modules/modes/browse.js
@@ -5,7 +5,9 @@ import {
     behaviorLasso,
     behaviorPaste,
     behaviorSelect
-} from '../behavior/index';
+} from '../behavior';
+
+import { modeDragNode } from './drag_node';
 
 
 export function modeBrowse(context) {
@@ -20,7 +22,8 @@ export function modeBrowse(context) {
         behaviorPaste(context),
         behaviorHover(context).on('hover', context.ui().sidebar.hover),
         behaviorSelect(context),
-        behaviorLasso(context)
+        behaviorLasso(context),
+        modeDragNode(context).behavior
     ];
 
 
diff --git a/modules/modes/drag_node.js b/modules/modes/drag_node.js
index 4643b1005..f8b887653 100644
--- a/modules/modes/drag_node.js
+++ b/modules/modes/drag_node.js
@@ -101,20 +101,7 @@ export function modeDragNode(context) {
     function start(entity) {
         wasMidpoint = entity.type === 'midpoint';
 
-        // Things allowed to be dragged include:
-        // - midpoints
-        // - nodes that are selected
-        // - vertices that are selected
-        // - vertices classed 'sibling' which includes (see svg/vertices.js)
-        //   - children of selected ways or multipolygons
-        //   - vertices sharing a way with selected vertices
-        var selector = 'g.node.point.selected.' + entity.id +
-            ', g.vertex-persistent.selected.' + entity.id +
-            ', g.vertex-persistent.sibling.' + entity.id;
-
-        var isDraggable = wasMidpoint || !d3.select(selector).empty();
-
-        isCancelled = d3.event.sourceEvent.shiftKey || !isDraggable ||
+        isCancelled = d3.event.sourceEvent.shiftKey ||
             context.features().hasHiddenConnections(entity, context.graph());
 
         if (isCancelled) {