From e3c8330775d6f5849fd7b2b6dae0f50a55ac9cf6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Minh=20Nguy=E1=BB=85n?= <mxn@1ec5.org>
Date: Thu, 16 Dec 2021 10:02:49 -0800
Subject: [PATCH] Added Expressway field to Trunk and Primary Road presets
 (#216)

---
 data/fields/expressway.json       | 8 ++++++++
 data/presets/highway/primary.json | 1 +
 data/presets/highway/trunk.json   | 3 +++
 interim/source_strings.yaml       | 6 +++++-
 4 files changed, 17 insertions(+), 1 deletion(-)
 create mode 100644 data/fields/expressway.json

diff --git a/data/fields/expressway.json b/data/fields/expressway.json
new file mode 100644
index 00000000..c393c153
--- /dev/null
+++ b/data/fields/expressway.json
@@ -0,0 +1,8 @@
+{
+    "key": "expressway",
+    "type": "check",
+    "label": "Expressway",
+    "locationSet": {
+        "include": ["US"]
+    }
+}
diff --git a/data/presets/highway/primary.json b/data/presets/highway/primary.json
index 371bae87..5e4a4088 100644
--- a/data/presets/highway/primary.json
+++ b/data/presets/highway/primary.json
@@ -14,6 +14,7 @@
         "charge_toll",
         "covered",
         "cycleway",
+        "expressway",
         "flood_prone",
         "incline",
         "junction_line",
diff --git a/data/presets/highway/trunk.json b/data/presets/highway/trunk.json
index 8de60437..af02bb67 100644
--- a/data/presets/highway/trunk.json
+++ b/data/presets/highway/trunk.json
@@ -6,6 +6,7 @@
         "oneway",
         "maxspeed",
         "lanes",
+        "expressway",
         "surface",
         "structure",
         "access"
@@ -31,6 +32,8 @@
         "highway": "trunk"
     },
     "terms": [
+        "expressway",
+        "highway",
         "road",
         "street"
     ],
diff --git a/interim/source_strings.yaml b/interim/source_strings.yaml
index 7820faac..fa9af5b9 100644
--- a/interim/source_strings.yaml
+++ b/interim/source_strings.yaml
@@ -1020,6 +1020,10 @@ en:
       expected_rwn_route_relations:
         # expected_rwn_route_relations=*
         label: Adjacent Walking Nodes
+      expressway:
+        # expressway=*
+        label: Expressway
+        terms: '[translate with synonyms or related terms for ''Expressway'', separated by commas]'
       faces:
         # faces=*
         label: Faces
@@ -5917,7 +5921,7 @@ en:
       highway/trunk:
         # 'highway=trunk\n\nTranslate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key).'
         name: Trunk Road
-        # 'terms: road,street'
+        # 'terms: expressway,highway,road,street'
         terms: '<translate with synonyms or related terms for ''Trunk Road'', separated by commas>'
       highway/trunk_link:
         # 'highway=trunk_link\n\nTranslate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key).'