From 3abca299b54db955ab5e67a8cdfd4a4fd6e75e6a Mon Sep 17 00:00:00 2001 From: Thomas Hervey Date: Tue, 24 Jul 2018 09:17:12 -0400 Subject: [PATCH] cleaned unused vars --- modules/modes/add_note.js | 4 ---- modules/modes/drag_note.js | 32 ++++++-------------------------- modules/modes/select.js | 2 +- 3 files changed, 7 insertions(+), 31 deletions(-) diff --git a/modules/modes/add_note.js b/modules/modes/add_note.js index 685dcf3c7..e2aaab7b3 100644 --- a/modules/modes/add_note.js +++ b/modules/modes/add_note.js @@ -3,14 +3,10 @@ import { behaviorDraw } from '../behavior'; import { modeBrowse, modeSelectNote } from './index'; import { osmNote } from '../osm'; import { services } from '../services'; -import { dispatch as d3_dispatch } from 'd3-dispatch'; - export function modeAddNote(context) { - var dispatch = d3_dispatch('change'); - var mode = { id: 'add-note', button: 'note', diff --git a/modules/modes/drag_note.js b/modules/modes/drag_note.js index f51e9bdcc..ed42e8ba7 100644 --- a/modules/modes/drag_note.js +++ b/modules/modes/drag_note.js @@ -1,25 +1,15 @@ -import _find from 'lodash-es/find'; - import { event as d3_event, select as d3_select } from 'd3-selection'; -import { dispatch as d3_dispatch } from 'd3-dispatch'; - import { d3keybinding as d3_keybinding } from '../lib/d3.keybinding.js'; import { geoVecInterp } from '../geo'; -import { t } from '../util/locale'; - import { services } from '../services'; - import { - actionAddMidpoint, - actionConnect, - actionMoveNode, actionNoop } from '../actions'; @@ -30,16 +20,11 @@ import { } from '../behavior'; import { - geoChooseEdge, - geoHasLineIntersections, - geoHasSelfIntersections, geoVecSubtract, geoViewportEdge } from '../geo'; import { modeBrowse, modeSelectNote } from './index'; -import { osmJoinWays, osmNode } from '../osm'; -import { uiFlash } from '../ui'; export function modeDragNote(context) { @@ -51,14 +36,10 @@ export function modeDragNote(context) { .on('hover', context.ui().sidebar.hover); var edit = behaviorEdit(context); - var dispatch = d3_dispatch('redraw', 'change'); - var _nudgeInterval; var _restoreSelectedNoteID = []; - var _wasMidpoint = false; var _isCancelled = false; var _activeEntity; - var _startLoc; var _lastLoc; @@ -112,7 +93,6 @@ export function modeDragNote(context) { function start(entity) { _activeEntity = entity; - _startLoc = entity.loc; context.surface().selectAll('.note-' + _activeEntity.id) .classed('active', true); @@ -130,12 +110,12 @@ export function modeDragNote(context) { _lastLoc = context.projection.invert(d3_event.point); doMove(entity); - // var nudge = geoViewportEdge(d3_event.point, context.map().dimensions()); - // if (nudge) { - // startNudge(entity, nudge); - // } else { - // stopNudge(); - // } + var nudge = geoViewportEdge(d3_event.point, context.map().dimensions()); + if (nudge) { + startNudge(entity, nudge); + } else { + stopNudge(); + } } diff --git a/modules/modes/select.js b/modules/modes/select.js index 917fa9548..57f9b18b9 100644 --- a/modules/modes/select.js +++ b/modules/modes/select.js @@ -65,7 +65,7 @@ export function modeSelect(context, selectedIDs) { behaviorSelect(context), behaviorLasso(context), modeDragNode(context).restoreSelectedIDs(selectedIDs).behavior, - modeDragNote(context).restoreSelectedNoteID(selectedIDs).behavior // TODO: - likely remove + modeDragNote(context).restoreSelectedNoteID(selectedIDs).behavior ]; var inspector; var editMenu;