From 070cfec7c7df81edd4358abd3c2fbbfebd5f8266 Mon Sep 17 00:00:00 2001
From: Quincy Morgan <quincy.morgan@icloud.com>
Date: Fri, 9 Aug 2019 09:34:35 -0500
Subject: [PATCH] Specify that connecting waterways and highways with the fix
 will add a ford (close #6734)

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

diff --git a/data/core.yaml b/data/core.yaml
index 504fd6661..3b772da67 100644
--- a/data/core.yaml
+++ b/data/core.yaml
@@ -1497,6 +1497,8 @@ en:
         title: Connect this feature
       connect_features:
         title: Connect the features
+      connect_using_ford:
+        title: Connect using a ford
       continue_from_start:
         title: Continue drawing from start
       continue_from_end:
diff --git a/dist/locales/en.json b/dist/locales/en.json
index a611d9a1e..b749c7d26 100644
--- a/dist/locales/en.json
+++ b/dist/locales/en.json
@@ -1863,6 +1863,9 @@
                 "connect_features": {
                     "title": "Connect the features"
                 },
+                "connect_using_ford": {
+                    "title": "Connect using a ford"
+                },
                 "continue_from_start": {
                     "title": "Continue drawing from start"
                 },
diff --git a/modules/validations/crossing_ways.js b/modules/validations/crossing_ways.js
index 54b4410f1..08f2c7d4b 100644
--- a/modules/validations/crossing_ways.js
+++ b/modules/validations/crossing_ways.js
@@ -404,7 +404,7 @@ export function validationCrossingWays(context) {
 
         var fixes = [];
         if (connectionTags) {
-            fixes.push(makeConnectWaysFix());
+            fixes.push(makeConnectWaysFix(connectionTags));
         }
 
         var useFixIcon = 'iD-icon-layers';
@@ -476,10 +476,16 @@ export function validationCrossingWays(context) {
         }
     }
 
-    function makeConnectWaysFix() {
+    function makeConnectWaysFix(connectionTags) {
+
+        var fixTitleID = 'connect_features';
+        if (connectionTags.ford) {
+            fixTitleID = 'connect_using_ford';
+        }
+
         return new validationIssueFix({
             icon: 'iD-icon-crossing',
-            title: t('issues.fix.connect_features.title'),
+            title: t('issues.fix.' + fixTitleID + '.title'),
             onClick: function(context) {
                 var loc = this.issue.loc;
                 var connectionTags = this.issue.data.connectionTags;