From 67f7995559b6eddb98f756b0cddc583b70d9092c Mon Sep 17 00:00:00 2001
From: Quincy Morgan <quincy.morgan@icloud.com>
Date: Wed, 12 Jun 2019 09:31:06 -0400
Subject: [PATCH] Avoid stale "connect endpoints" fix for "tags imply area"
 that could cause invalid areas (close #6525) Lower match score for
 man_made/bridge preset

---
 data/presets/presets.json                 | 2 +-
 data/presets/presets/man_made/bridge.json | 3 ++-
 modules/validations/tag_suggests_area.js  | 4 +++-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/data/presets/presets.json b/data/presets/presets.json
index 6a7f5de37..06caf2d5e 100644
--- a/data/presets/presets.json
+++ b/data/presets/presets.json
@@ -685,7 +685,7 @@
     "man_made/beacon": {"icon": "maki-communications-tower", "fields": ["name", "height"], "moreFields": ["seamark/type"], "geometry": ["point", "area"], "tags": {"man_made": "beacon"}, "name": "Beacon", "matchScore": 0.5},
     "man_made/beehive": {"icon": "fas-archive", "geometry": ["point", "area"], "fields": ["ref", "operator", "seasonal", "height", "colour"], "moreFields": ["manufacturer"], "terms": ["apiary", "beekeeper", "farm", "honey", "pollination"], "tags": {"man_made": "beehive"}, "name": "Beehive"},
     "man_made/breakwater": {"fields": ["material", "seamark/type"], "geometry": ["line", "area"], "tags": {"man_made": "breakwater"}, "name": "Breakwater"},
-    "man_made/bridge": {"icon": "maki-bridge", "fields": ["name", "bridge", "layer", "maxweight"], "moreFields": ["manufacturer", "material", "seamark/type"], "geometry": ["area"], "tags": {"man_made": "bridge"}, "addTags": {"man_made": "bridge", "layer": "1"}, "removeTags": {"man_made": "bridge", "layer": "*"}, "reference": {"key": "man_made", "value": "bridge"}, "name": "Bridge"},
+    "man_made/bridge": {"icon": "maki-bridge", "fields": ["name", "bridge", "layer", "maxweight"], "moreFields": ["manufacturer", "material", "seamark/type"], "geometry": ["area"], "tags": {"man_made": "bridge"}, "addTags": {"man_made": "bridge", "layer": "1"}, "removeTags": {"man_made": "bridge", "layer": "*"}, "reference": {"key": "man_made", "value": "bridge"}, "name": "Bridge", "matchScore": 0.85},
     "man_made/bunker_silo": {"icon": "temaki-silo", "fields": ["content"], "geometry": ["point", "area"], "terms": ["Silage", "Storage"], "tags": {"man_made": "bunker_silo"}, "name": "Bunker Silo"},
     "man_made/chimney": {"icon": "temaki-chimney", "fields": ["operator", "material", "height"], "geometry": ["point", "area"], "tags": {"man_made": "chimney"}, "name": "Chimney"},
     "man_made/clearcut": {"icon": "maki-logging", "geometry": ["area"], "tags": {"man_made": "clearcut"}, "terms": ["cut", "forest", "lumber", "tree", "wood"], "name": "Clearcut Forest"},
diff --git a/data/presets/presets/man_made/bridge.json b/data/presets/presets/man_made/bridge.json
index 49d38886d..042f9d178 100644
--- a/data/presets/presets/man_made/bridge.json
+++ b/data/presets/presets/man_made/bridge.json
@@ -29,5 +29,6 @@
         "key": "man_made",
         "value": "bridge"
     },
-    "name": "Bridge"
+    "name": "Bridge",
+    "matchScore": 0.85
 }
diff --git a/modules/validations/tag_suggests_area.js b/modules/validations/tag_suggests_area.js
index be61d774a..cfd92772e 100644
--- a/modules/validations/tag_suggests_area.js
+++ b/modules/validations/tag_suggests_area.js
@@ -106,7 +106,9 @@ export function validationTagSuggestsArea(context) {
             },
             reference: showReference,
             entityIds: [entity.id],
-            hash: JSON.stringify(tagSuggestingArea),
+            hash: JSON.stringify(tagSuggestingArea) +
+                // avoid stale "connect endpoints" fix
+                (typeof connectEndpointsOnClick),
             fixes: fixes
         })];