From c7764c1c1123e2157bed0812059c6b8d9d9efd14 Mon Sep 17 00:00:00 2001
From: Bryan Housel <bryan@mapbox.com>
Date: Fri, 17 Mar 2017 13:52:13 -0400
Subject: [PATCH] Make racetrack presets more coherent, update racing sport
 fields

---
 data/presets.yaml                             | 21 ++++++----
 data/presets/fields.json                      | 24 ++++++++----
 data/presets/fields/sport_ice.json            |  4 +-
 data/presets/fields/sport_racing_motor.json   | 10 +++++
 ...racing.json => sport_racing_nonmotor.json} |  8 ++--
 data/presets/presets.json                     | 39 +++++++++++++++----
 data/presets/presets/highway/raceway.json     | 19 ++++++---
 .../presets/leisure/running_track.json        | 10 ++++-
 data/presets/presets/leisure/track.json       | 10 ++++-
 dist/locales/en.json                          | 19 +++++----
 10 files changed, 117 insertions(+), 47 deletions(-)
 create mode 100644 data/presets/fields/sport_racing_motor.json
 rename data/presets/fields/{sport_racing.json => sport_racing_nonmotor.json} (56%)

diff --git a/data/presets.yaml b/data/presets.yaml
index cbe743337..0178b22cb 100644
--- a/data/presets.yaml
+++ b/data/presets.yaml
@@ -1144,10 +1144,13 @@ en:
         label: Sports
       sport_ice:
         # sport=*
-        label: Sport
-      sport_racing:
+        label: Sports
+      sport_racing_motor:
         # sport=*
-        label: Sport
+        label: Sports
+      sport_racing_nonmotor:
+        # sport=*
+        label: Sports
       stars:
         # stars=*
         label: Stars
@@ -2601,9 +2604,9 @@ en:
         terms: '<translate with synonyms or related terms for ''Primary Link'', separated by commas>'
       highway/raceway:
         # highway=raceway
-        name: Motor Raceway
-        # 'terms: auto*,race*,nascar'
-        terms: '<translate with synonyms or related terms for ''Motor Raceway'', separated by commas>'
+        name: Racetrack (Motorsport)
+        # 'terms: auto*,formula one,kart,motocross,nascar,race*,track'
+        terms: '<translate with synonyms or related terms for ''Racetrack (Motorsport)'', separated by commas>'
       highway/residential:
         # highway=residential
         name: Residential Road
@@ -3105,8 +3108,9 @@ en:
         terms: '<translate with synonyms or related terms for ''Resort'', separated by commas>'
       leisure/running_track:
         # 'leisure=track, sport=running'
-        name: Running Track
-        terms: '<translate with synonyms or related terms for ''Running Track'', separated by commas>'
+        name: Racetrack (Running)
+        # 'terms: race*,running,sprint,track'
+        terms: '<translate with synonyms or related terms for ''Racetrack (Running)'', separated by commas>'
       leisure/slipway:
         # leisure=slipway
         name: Slipway
@@ -3133,6 +3137,7 @@ en:
       leisure/track:
         # leisure=track
         name: Racetrack (Non-Motorsport)
+        # 'terms: cycle,dog,greyhound,horse,race*,track'
         terms: '<translate with synonyms or related terms for ''Racetrack (Non-Motorsport)'', separated by commas>'
       leisure/water_park:
         # leisure=water_park
diff --git a/data/presets/fields.json b/data/presets/fields.json
index fac984430..9fcf451d5 100644
--- a/data/presets/fields.json
+++ b/data/presets/fields.json
@@ -1518,8 +1518,8 @@
         },
         "sport_ice": {
             "key": "sport",
-            "type": "combo",
-            "label": "Sport",
+            "type": "semiCombo",
+            "label": "Sports",
             "options": [
                 "skating",
                 "hockey",
@@ -1528,17 +1528,25 @@
                 "ice_stock"
             ]
         },
-        "sport_racing": {
+        "sport_racing_motor": {
             "key": "sport",
-            "type": "combo",
-            "label": "Sport",
+            "type": "semiCombo",
+            "label": "Sports",
             "options": [
+                "motor",
+                "karting",
+                "motocross"
+            ]
+        },
+        "sport_racing_nonmotor": {
+            "key": "sport",
+            "type": "semiCombo",
+            "label": "Sports",
+            "options": [
+                "bmx",
                 "cycling",
                 "dog_racing",
                 "horse_racing",
-                "karting",
-                "motor",
-                "motocross",
                 "running"
             ]
         },
diff --git a/data/presets/fields/sport_ice.json b/data/presets/fields/sport_ice.json
index 7e5133bf9..dd8560bd1 100644
--- a/data/presets/fields/sport_ice.json
+++ b/data/presets/fields/sport_ice.json
@@ -1,7 +1,7 @@
 {
     "key": "sport",
-    "type": "combo",
-    "label": "Sport",
+    "type": "semiCombo",
+    "label": "Sports",
     "options": [
         "skating",
         "hockey",
diff --git a/data/presets/fields/sport_racing_motor.json b/data/presets/fields/sport_racing_motor.json
new file mode 100644
index 000000000..e2c4d773d
--- /dev/null
+++ b/data/presets/fields/sport_racing_motor.json
@@ -0,0 +1,10 @@
+{
+    "key": "sport",
+    "type": "semiCombo",
+    "label": "Sports",
+    "options": [
+        "motor",
+        "karting",
+        "motocross"
+    ]
+}
diff --git a/data/presets/fields/sport_racing.json b/data/presets/fields/sport_racing_nonmotor.json
similarity index 56%
rename from data/presets/fields/sport_racing.json
rename to data/presets/fields/sport_racing_nonmotor.json
index 16f0d3a42..90688e109 100644
--- a/data/presets/fields/sport_racing.json
+++ b/data/presets/fields/sport_racing_nonmotor.json
@@ -1,14 +1,12 @@
 {
     "key": "sport",
-    "type": "combo",
-    "label": "Sport",
+    "type": "semiCombo",
+    "label": "Sports",
     "options": [
+        "bmx",
         "cycling",
         "dog_racing",
         "horse_racing",
-        "karting",
-        "motor",
-        "motocross",
         "running"
     ]
 }
diff --git a/data/presets/presets.json b/data/presets/presets.json
index c0a62ca73..167e6256b 100644
--- a/data/presets/presets.json
+++ b/data/presets/presets.json
@@ -5437,11 +5437,16 @@
             "fields": [
                 "oneway",
                 "surface",
-                "sport_racing",
-                "structure"
+                "sport_racing_motor",
+                "structure",
+                "lit",
+                "width",
+                "lanes"
             ],
             "geometry": [
-                "line"
+                "point",
+                "line",
+                "area"
             ],
             "tags": {
                 "highway": "raceway"
@@ -5452,10 +5457,14 @@
             },
             "terms": [
                 "auto*",
+                "formula one",
+                "kart",
+                "motocross",
+                "nascar",
                 "race*",
-                "nascar"
+                "track"
             ],
-            "name": "Motor Raceway"
+            "name": "Racetrack (Motorsport)"
         },
         "highway/residential": {
             "icon": "highway-residential",
@@ -7590,7 +7599,7 @@
             "icon": "pitch",
             "fields": [
                 "surface",
-                "sport_racing",
+                "sport_racing_nonmotor",
                 "lit",
                 "width",
                 "lanes"
@@ -7604,7 +7613,13 @@
                 "leisure": "track",
                 "sport": "running"
             },
-            "name": "Running Track"
+            "terms": [
+                "race*",
+                "running",
+                "sprint",
+                "track"
+            ],
+            "name": "Racetrack (Running)"
         },
         "leisure/slipway": {
             "icon": "poi-beach",
@@ -7700,7 +7715,7 @@
             "icon": "highway-road",
             "fields": [
                 "surface",
-                "sport_racing",
+                "sport_racing_nonmotor",
                 "lit",
                 "width",
                 "lanes"
@@ -7713,6 +7728,14 @@
             "tags": {
                 "leisure": "track"
             },
+            "terms": [
+                "cycle",
+                "dog",
+                "greyhound",
+                "horse",
+                "race*",
+                "track"
+            ],
             "name": "Racetrack (Non-Motorsport)"
         },
         "leisure/water_park": {
diff --git a/data/presets/presets/highway/raceway.json b/data/presets/presets/highway/raceway.json
index c3a693c97..c87f32253 100644
--- a/data/presets/presets/highway/raceway.json
+++ b/data/presets/presets/highway/raceway.json
@@ -3,11 +3,16 @@
     "fields": [
         "oneway",
         "surface",
-        "sport_racing",
-        "structure"
+        "sport_racing_motor",
+        "structure",
+        "lit",
+        "width",
+        "lanes"
     ],
     "geometry": [
-        "line"
+        "point",
+        "line",
+        "area"
     ],
     "tags": {
         "highway": "raceway"
@@ -18,8 +23,12 @@
     },
     "terms": [
         "auto*",
+        "formula one",
+        "kart",
+        "motocross",
+        "nascar",
         "race*",
-        "nascar"
+        "track"
     ],
-    "name": "Motor Raceway"
+    "name": "Racetrack (Motorsport)"
 }
diff --git a/data/presets/presets/leisure/running_track.json b/data/presets/presets/leisure/running_track.json
index 3d8a59a32..a5b295cc5 100644
--- a/data/presets/presets/leisure/running_track.json
+++ b/data/presets/presets/leisure/running_track.json
@@ -2,7 +2,7 @@
     "icon": "pitch",
     "fields": [
         "surface",
-        "sport_racing",
+        "sport_racing_nonmotor",
         "lit",
         "width",
         "lanes"
@@ -16,5 +16,11 @@
         "leisure": "track",
         "sport": "running"
     },
-    "name": "Running Track"
+    "terms": [
+        "race*",
+        "running",
+        "sprint",
+        "track"
+    ],
+    "name": "Racetrack (Running)"
 }
diff --git a/data/presets/presets/leisure/track.json b/data/presets/presets/leisure/track.json
index 7a41c94c0..8f6a6a0ff 100644
--- a/data/presets/presets/leisure/track.json
+++ b/data/presets/presets/leisure/track.json
@@ -2,7 +2,7 @@
     "icon": "highway-road",
     "fields": [
         "surface",
-        "sport_racing",
+        "sport_racing_nonmotor",
         "lit",
         "width",
         "lanes"
@@ -15,5 +15,13 @@
     "tags": {
         "leisure": "track"
     },
+    "terms": [
+        "cycle",
+        "dog",
+        "greyhound",
+        "horse",
+        "race*",
+        "track"
+    ],
     "name": "Racetrack (Non-Motorsport)"
 }
diff --git a/dist/locales/en.json b/dist/locales/en.json
index 370d513af..dac35bf95 100644
--- a/dist/locales/en.json
+++ b/dist/locales/en.json
@@ -1698,10 +1698,13 @@
                     "label": "Source"
                 },
                 "sport_ice": {
-                    "label": "Sport"
+                    "label": "Sports"
                 },
-                "sport_racing": {
-                    "label": "Sport"
+                "sport_racing_motor": {
+                    "label": "Sports"
+                },
+                "sport_racing_nonmotor": {
+                    "label": "Sports"
                 },
                 "sport": {
                     "label": "Sports"
@@ -3040,8 +3043,8 @@
                     "terms": ""
                 },
                 "highway/raceway": {
-                    "name": "Motor Raceway",
-                    "terms": "auto*,race*,nascar"
+                    "name": "Racetrack (Motorsport)",
+                    "terms": "auto*,formula one,kart,motocross,nascar,race*,track"
                 },
                 "highway/residential": {
                     "name": "Residential Road",
@@ -3488,8 +3491,8 @@
                     "terms": ""
                 },
                 "leisure/running_track": {
-                    "name": "Running Track",
-                    "terms": ""
+                    "name": "Racetrack (Running)",
+                    "terms": "race*,running,sprint,track"
                 },
                 "leisure/slipway": {
                     "name": "Slipway",
@@ -3513,7 +3516,7 @@
                 },
                 "leisure/track": {
                     "name": "Racetrack (Non-Motorsport)",
-                    "terms": ""
+                    "terms": "cycle,dog,greyhound,horse,race*,track"
                 },
                 "leisure/water_park": {
                     "name": "Water Park",