CalvinBackup/iD
1
0
Fork 0
mirror of https://github.com/FoggedLens/iD.git synced 2026-05-20 23:44:47 +02:00
Code Issues Packages Projects Releases Wiki Activity

After merge, rematch preset and update tags if necessary

Browse Source 
(closes #3851)
This commit is contained in:
Bryan Housel
2017-03-02 11:03:45 -05:00
parent a6e1e0650d
commit 775b4eaafa
1 changed files with 32 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/operations/merge.js
+32 -7
View File
@@ -1,35 +1,60 @@
import { t } from '../util/locale';
import {
actionChangePreset,
actionJoin,
actionMerge,
actionMergePolygon
} from '../actions/index';
} from '../actions';
import { behaviorOperation } from '../behavior/index';
import { modeSelect } from '../modes/index';
import { behaviorOperation } from '../behavior';
import { modeSelect } from '../modes';
export function operationMerge(selectedIDs, context) {
function updatePresetTags(oldGraph, newGraph, ids) {
var id = ids[0],
oldEntity = oldGraph.hasEntity(id),
newEntity = newGraph.hasEntity(id);
if (!oldEntity || !newEntity) return;
var oldPreset = context.presets().match(oldEntity, oldGraph),
newPreset = context.presets().match(newEntity, newGraph);
context.replace(actionChangePreset(id, oldPreset, newPreset));
}
var join = actionJoin(selectedIDs),
merge = actionMerge(selectedIDs),
mergePolygon = actionMergePolygon(selectedIDs);
var operation = function() {
var action;
if (!join.disabled(context.graph())) {
var operation = function() {
var origGraph = context.graph(),
action;
if (!join.disabled(origGraph)) {
action = join;
} else if (!merge.disabled(context.graph())) {
} else if (!merge.disabled(origGraph)) {
action = merge;
} else {
action = mergePolygon;
}
context.perform(action, operation.annotation());
var ids = selectedIDs.filter(function(id) {
var entity = context.hasEntity(id);
return entity && entity.type !== 'node';
});
// if we merged tags, rematch preset and update tags if necessary (#3851)
if (action === merge) {
updatePresetTags(origGraph, context.graph(), ids);
}
context.enter(modeSelect(context, ids));
};