From 84b7e08bf80d04fa5b36afdebb5ec0e1296f5c7f Mon Sep 17 00:00:00 2001 From: Quincy Morgan Date: Tue, 16 Apr 2019 14:21:15 -0700 Subject: [PATCH] Don't select the previously-edited node when undoing/redoing (re: #5831) --- modules/renderer/map.js | 18 +++++------------- 1 file changed, 5 insertions(+), 13 deletions(-) diff --git a/modules/renderer/map.js b/modules/renderer/map.js index 64f360483..fae2b72a1 100644 --- a/modules/renderer/map.js +++ b/modules/renderer/map.js @@ -8,7 +8,7 @@ import { zoom as d3_zoom, zoomIdentity as d3_zoomIdentity } from 'd3-zoom'; import { t } from '../util/locale'; import { geoExtent, geoRawMercator, geoScaleToZoom, geoZoomToScale } from '../geo'; -import { modeBrowse, modeSelect } from '../modes'; +import { modeBrowse } from '../modes'; import { svgAreas, svgLabels, svgLayers, svgLines, svgMidpoints, svgPoints, svgVertices } from '../svg'; import { uiFlash } from '../ui'; import { utilFastMouse, utilFunctor, utilRebind, utilSetTransform } from '../util'; @@ -95,18 +95,10 @@ export function rendererMap(context) { osm.on('change.map', immediateRedraw); } - function didUndoOrRedo(stack, targetTransform) { + function didUndoOrRedo(targetTransform) { var mode = context.mode().id; if (mode !== 'browse' && mode !== 'select') return; - - var followSelected = false; - if (Array.isArray(stack.selectedIDs)) { - followSelected = (stack.selectedIDs.length === 1 && stack.selectedIDs[0][0] === 'n'); - context.enter( - modeSelect(context, stack.selectedIDs).follow(followSelected) - ); - } - if (!followSelected && targetTransform) { + if (targetTransform) { map.transformEase(targetTransform); } } @@ -114,10 +106,10 @@ export function rendererMap(context) { context.history() .on('change.map', immediateRedraw) .on('undone.map', function(stack, fromStack) { - didUndoOrRedo(stack, fromStack.transform); + didUndoOrRedo(fromStack.transform); }) .on('redone.map', function(stack) { - didUndoOrRedo(stack, stack.transform); + didUndoOrRedo(stack.transform); }); context.background()