CalvinBackup/iD
1
0
Fork 0
mirror of https://github.com/FoggedLens/iD.git synced 2026-02-13 01:02:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use actionMergeNodes instead of operationMerge for the very close nodes issue fix (close #6343)

Browse Source
This commit is contained in:
Quincy Morgan
2019-05-10 09:12:11 -04:00
parent ad744a75ef
commit 8de10def2a
3 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
data/core.yaml
View File

@@ -1469,6 +1469,8 @@ en:
title: Delete this feature
ignore_issue:
title: Ignore this issue
merge_close_vertices:
annotation: Merged very close points in a way.
merge_points:
title: Merge these points
move_points_apart:

3
dist/locales/en.json vendored
View File

@@ -1826,6 +1826,9 @@
"ignore_issue": {
"title": "Ignore this issue"
},
"merge_close_vertices": {
"annotation": "Merged very close points in a way."
},
"merge_points": {
"title": "Merge these points"
},

6
modules/validations/close_nodes.js
View File

@@ -1,4 +1,4 @@
import { operationMerge } from '../operations/index';
import { actionMergeNodes } from '../actions/merge_nodes';
import { utilDisplayLabel } from '../util';
import { t } from '../util/locale';
import { validationIssue, validationIssueFix } from '../core/validation';
@@ -105,8 +105,8 @@ export function validationCloseNodes() {
title: t('issues.fix.merge_points.title'),
onClick: function() {
var entityIds = this.issue.entityIds;
var operation = operationMerge([entityIds[1], entityIds[2]], context);
operation();
var action = actionMergeNodes([entityIds[1], entityIds[2]]);
context.perform(action, t('issues.fix.merge_close_vertices.annotation'));
}
}),
new validationIssueFix({