From 8de10def2a76f4f825574db19f4e8514660b0cb4 Mon Sep 17 00:00:00 2001
From: Quincy Morgan <quincy.morgan@icloud.com>
Date: Fri, 10 May 2019 09:12:11 -0400
Subject: [PATCH] Use actionMergeNodes instead of operationMerge for the very
 close nodes issue fix (close #6343)

---
 data/core.yaml                     | 2 ++
 dist/locales/en.json               | 3 +++
 modules/validations/close_nodes.js | 6 +++---
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/data/core.yaml b/data/core.yaml
index 2341e12c4..921fc8487 100644
--- a/data/core.yaml
+++ b/data/core.yaml
@@ -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:
diff --git a/dist/locales/en.json b/dist/locales/en.json
index 020e56c3c..d11763369 100644
--- a/dist/locales/en.json
+++ b/dist/locales/en.json
@@ -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"
                 },
diff --git a/modules/validations/close_nodes.js b/modules/validations/close_nodes.js
index 8fcf3dfa6..f664870ad 100644
--- a/modules/validations/close_nodes.js
+++ b/modules/validations/close_nodes.js
@@ -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({