From 4fa754e71705a67b52b4322a8502e5750dd549ea Mon Sep 17 00:00:00 2001
From: Bryan Housel <bryan@mapbox.com>
Date: Mon, 12 Dec 2016 22:33:53 -0500
Subject: [PATCH] Adjust matchScores so features match types other than barrier
 (closes #3647)

e.g. `office=* + barrier=wall` should match as an office not a wall
---
 data/presets/presets.json               | 17 +++++++++++------
 data/presets/presets/barrier.json       |  3 ++-
 data/presets/presets/barrier/ditch.json |  3 ++-
 data/presets/presets/barrier/fence.json |  3 ++-
 data/presets/presets/barrier/hedge.json |  3 ++-
 data/presets/presets/barrier/wall.json  |  3 ++-
 data/presets/presets/building.json      |  2 +-
 7 files changed, 22 insertions(+), 12 deletions(-)

diff --git a/data/presets/presets.json b/data/presets/presets.json
index 4b897a68d..ba4310008 100644
--- a/data/presets/presets.json
+++ b/data/presets/presets.json
@@ -2684,7 +2684,8 @@
             "fields": [
                 "barrier"
             ],
-            "name": "Barrier"
+            "name": "Barrier",
+            "matchScore": 0.4
         },
         "barrier/entrance": {
             "icon": "entrance",
@@ -2772,7 +2773,8 @@
             "tags": {
                 "barrier": "ditch"
             },
-            "name": "Trench"
+            "name": "Trench",
+            "matchScore": 0.25
         },
         "barrier/fence": {
             "icon": "prison",
@@ -2786,7 +2788,8 @@
             "tags": {
                 "barrier": "fence"
             },
-            "name": "Fence"
+            "name": "Fence",
+            "matchScore": 0.25
         },
         "barrier/gate": {
             "icon": "prison",
@@ -2814,7 +2817,8 @@
             "tags": {
                 "barrier": "hedge"
             },
-            "name": "Hedge"
+            "name": "Hedge",
+            "matchScore": 0.25
         },
         "barrier/kissing_gate": {
             "icon": "prison",
@@ -2893,7 +2897,8 @@
             "tags": {
                 "barrier": "wall"
             },
-            "name": "Wall"
+            "name": "Wall",
+            "matchScore": 0.25
         },
         "boundary/administrative": {
             "name": "Administrative Boundary",
@@ -2921,7 +2926,7 @@
             "tags": {
                 "building": "*"
             },
-            "matchScore": 0.4,
+            "matchScore": 0.6,
             "terms": [],
             "name": "Building"
         },
diff --git a/data/presets/presets/barrier.json b/data/presets/presets/barrier.json
index cb71097de..4799b105a 100644
--- a/data/presets/presets/barrier.json
+++ b/data/presets/presets/barrier.json
@@ -12,5 +12,6 @@
     "fields": [
         "barrier"
     ],
-    "name": "Barrier"
+    "name": "Barrier",
+    "matchScore": 0.4
 }
diff --git a/data/presets/presets/barrier/ditch.json b/data/presets/presets/barrier/ditch.json
index 54443b5c5..7e32a0cab 100644
--- a/data/presets/presets/barrier/ditch.json
+++ b/data/presets/presets/barrier/ditch.json
@@ -7,5 +7,6 @@
     "tags": {
         "barrier": "ditch"
     },
-    "name": "Trench"
+    "name": "Trench",
+    "matchScore": 0.25
 }
diff --git a/data/presets/presets/barrier/fence.json b/data/presets/presets/barrier/fence.json
index 0497a4aba..0da24b3a2 100644
--- a/data/presets/presets/barrier/fence.json
+++ b/data/presets/presets/barrier/fence.json
@@ -10,5 +10,6 @@
     "tags": {
         "barrier": "fence"
     },
-    "name": "Fence"
+    "name": "Fence",
+    "matchScore": 0.25
 }
diff --git a/data/presets/presets/barrier/hedge.json b/data/presets/presets/barrier/hedge.json
index 97991c874..f9d66d50b 100644
--- a/data/presets/presets/barrier/hedge.json
+++ b/data/presets/presets/barrier/hedge.json
@@ -9,5 +9,6 @@
     "tags": {
         "barrier": "hedge"
     },
-    "name": "Hedge"
+    "name": "Hedge",
+    "matchScore": 0.25
 }
diff --git a/data/presets/presets/barrier/wall.json b/data/presets/presets/barrier/wall.json
index 3fa7171cb..4b1bb4518 100644
--- a/data/presets/presets/barrier/wall.json
+++ b/data/presets/presets/barrier/wall.json
@@ -11,5 +11,6 @@
     "tags": {
         "barrier": "wall"
     },
-    "name": "Wall"
+    "name": "Wall",
+    "matchScore": 0.25
 }
diff --git a/data/presets/presets/building.json b/data/presets/presets/building.json
index 983515746..b1c2957cd 100644
--- a/data/presets/presets/building.json
+++ b/data/presets/presets/building.json
@@ -12,7 +12,7 @@
     "tags": {
         "building": "*"
     },
-    "matchScore": 0.4,
+    "matchScore": 0.6,
     "terms": [],
     "name": "Building"
 }