From dda810683ea2c6c4fdcbe864e8b83b72b4dc4754 Mon Sep 17 00:00:00 2001
From: Bryan Housel <bryan@mapbox.com>
Date: Thu, 11 Apr 2019 21:26:53 -0400
Subject: [PATCH] Adjust matchscore, feature filters to boost physical tags
 over boundary (closes #6162)

---
 data/presets/presets.json                         |  2 +-
 data/presets/presets/boundary/administrative.json | 13 +++++++------
 modules/renderer/features.js                      |  8 +++++++-
 3 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/data/presets/presets.json b/data/presets/presets.json
index 98ae70afe..74cf7e79c 100644
--- a/data/presets/presets.json
+++ b/data/presets/presets.json
@@ -269,7 +269,7 @@
     "barrier/stile": {"icon": "maki-roadblock", "fields": ["access"], "geometry": ["vertex"], "tags": {"barrier": "stile"}, "name": "Stile"},
     "barrier/toll_booth": {"icon": "maki-roadblock", "fields": ["access", "building_area", "payment_multi", "currency_multi"], "moreFields": ["address", "website", "phone", "email", "fax"], "geometry": ["vertex", "area"], "tags": {"barrier": "toll_booth"}, "name": "Toll Booth"},
     "barrier/wall": {"icon": "temaki-wall", "fields": ["wall", "height", "material"], "geometry": ["line", "area"], "tags": {"barrier": "wall"}, "name": "Wall", "matchScore": 0.25},
-    "boundary/administrative": {"name": "Administrative Boundary", "geometry": ["line"], "tags": {"boundary": "administrative"}, "fields": ["name", "admin_level"]},
+    "boundary/administrative": {"fields": ["name", "admin_level"], "geometry": ["line"], "tags": {"boundary": "administrative"}, "name": "Administrative Boundary", "matchScore": 0.5},
     "bridge/support": {"icon": "fas-archway", "fields": ["bridge/support"], "moreFields": ["material", "seamark/type"], "geometry": ["point", "vertex", "area"], "tags": {"bridge:support": "*"}, "name": "Bridge Support"},
     "bridge/support/pier": {"icon": "fas-archway", "fields": ["bridge/support"], "moreFields": ["material", "seamark/type"], "geometry": ["point", "vertex", "area"], "tags": {"bridge:support": "pier"}, "name": "Bridge Pier"},
     "building_part": {"icon": "maki-building", "fields": ["levels", "height", "building/material", "roof/colour"], "moreFields": ["layer"], "geometry": ["area"], "tags": {"building:part": "*"}, "matchScore": 0.5, "terms": ["roof", "simple 3D buildings"], "name": "Building Part"},
diff --git a/data/presets/presets/boundary/administrative.json b/data/presets/presets/boundary/administrative.json
index 4b24acec1..5d31d87f5 100644
--- a/data/presets/presets/boundary/administrative.json
+++ b/data/presets/presets/boundary/administrative.json
@@ -1,13 +1,14 @@
 {
-    "name": "Administrative Boundary",
+    "fields": [
+        "name",
+        "admin_level"
+    ],
     "geometry": [
         "line"
     ],
     "tags": {
         "boundary": "administrative"
     },
-    "fields": [
-        "name",
-        "admin_level"
-    ]
-}
\ No newline at end of file
+    "name": "Administrative Boundary",
+    "matchScore": 0.5
+}
diff --git a/modules/renderer/features.js b/modules/renderer/features.js
index 28b9a8cd3..12946406f 100644
--- a/modules/renderer/features.js
+++ b/modules/renderer/features.js
@@ -138,7 +138,13 @@ export function rendererFeatures(context) {
         ) && !(
             traffic_roads[tags.highway] ||
             service_roads[tags.highway] ||
-            paths[tags.highway]
+            paths[tags.highway] ||
+            tags.waterway ||
+            tags.railway ||
+            tags.landuse ||
+            tags.natural ||
+            tags.building ||
+            tags.power
         );
     });