openstreetmap · quincylvania · Apr 3, 2019 · Apr 3, 2019 · Apr 3, 2019 · Apr 3, 2019
diff --git a/build_data.js b/build_data.js
@@ -281,6 +281,7 @@ function generatePresets(tstrings, faIcons) {
 
         tstrings.presets[id] = {
             name: preset.name,
+            subtitle: preset.subtitle,
             terms: (preset.terms || []).join(',')
         };
 
@@ -344,6 +345,9 @@ function generateTranslations(fields, presets, tstrings) {
         } else {
             delete preset.terms;
         }
+        if (!p.subtitle) {
+            preset.subtitle = '<translate with short summary or explanation of \'' + preset.name + '\', if needed>';
+        }
     });
 
     return translations;

diff --git a/css/80_app.css b/css/80_app.css
@@ -1330,6 +1330,10 @@ a.hide-toggle {
     text-overflow: ellipsis;
     overflow: hidden;
 }
+.preset-list-button .label-inner .namepart:nth-child(2) {
+    font-weight: normal;
+    font-size: 11px;
+}
 
 .preset-list-button:hover .label,
 .preset-list-button:focus .label,

diff --git a/data/presets.yaml b/data/presets.yaml
diff --git a/data/presets/README.md b/data/presets/README.md
@@ -127,7 +127,7 @@ Generally, these properties will be equivalent and should be supersets of `tags`
 
 iD's validator will recommend that users add missing tags from `addTags` to matching features.
 
-For example, the Bridge preset has these properties: 
+For example, the Bridge preset has these properties:
 
 ```
     "tags": {
@@ -174,10 +174,42 @@ The default is `1.0`.
 
 The primary name of the feature type in American English.
 
+Names use [title case](https://en.wikipedia.org/wiki/Letter_case#Title_case), where most words are capitalized.
+
 Upon merging with `master`, this is sent to Transifex for translating to other localizations. Changing the name of an existing preset will require it to be re-translated to all localizations.
 
 This property is required. There is no default.
 
+##### `subtitle`
+
+An optional summary or explanation of the feature in American English. This is displayed alongside `name` in some parts of the UI. Its purpose is to help mappers accurately decide what preset to use.
+
+Subtitles use [sentence case](https://en.wikipedia.org/wiki/Letter_case#Sentence_case), where just the first word is capitalized.
+
+Subtitles can be noun phrases, where they further specify what the preset _is_.
+
+```
+    "name": "Stream",
+    "subtitle": "Minor natural waterway"
+```
+
+```
+    "name": "Ford",
+    "subtitle": "Where water flows over a road"
+```
+
+Alternatively, subtitles can be verb phrases, where they specify what the preset _does_.
+
+```
+    "name": "Bar",
+    "subtitle": "Serves alcoholic drinks"
+```
+
+```
+    "name": "Flat Coin Vending Machine",
+    "subtitle": "Presses coins into souvenirs"
+```
+
 ##### `replacement`
 
 The ID of a preset that is preferable to this one. iD's validator will flag features matching this preset and recommend that the user upgrade the tags.

diff --git a/data/presets/presets.json b/data/presets/presets.json
diff --git a/data/presets/presets/advertising/billboard.json b/data/presets/presets/advertising/billboard.json
@@ -11,5 +11,6 @@
     "tags": {
         "advertising": "billboard"
     },
-    "name": "Billboard"
+    "name": "Billboard",
+    "subtitle": "Large, flat advertising structure"
 }
diff --git a/data/presets/presets/amenity/animal_boarding.json b/data/presets/presets/amenity/animal_boarding.json
@@ -38,5 +38,6 @@
     "tags": {
         "amenity": "animal_boarding"
     },
-    "name": "Animal Boarding Facility"
+    "name": "Animal Boarding Facility",
+    "subtitle": "Temporary housing and care for pets"
 }
diff --git a/data/presets/presets/amenity/atm.json b/data/presets/presets/amenity/atm.json
@@ -27,5 +27,6 @@
     "tags": {
         "amenity": "atm"
     },
-    "name": "ATM"
+    "name": "ATM",
+    "subtitle": "Machine allowing bank account access"
 }
diff --git a/data/presets/presets/amenity/bar.json b/data/presets/presets/amenity/bar.json
@@ -32,5 +32,6 @@
     "tags": {
         "amenity": "bar"
     },
-    "name": "Bar"
+    "name": "Bar",
+    "subtitle": "Establishment serving alcoholic drinks"
 }
diff --git a/data/presets/presets/amenity/bbq.json b/data/presets/presets/amenity/bbq.json
@@ -18,5 +18,6 @@
     "tags": {
         "amenity": "bbq"
     },
-    "name": "Barbecue/Grill"
+    "name": "Barbecue Grill",
+    "subtitle": "Device for cooking over flames"
 }
diff --git a/data/presets/presets/amenity/biergarten.json b/data/presets/presets/amenity/biergarten.json
@@ -22,5 +22,6 @@
         "bier",
         "booze"
     ],
-    "name": "Biergarten"
+    "name": "Biergarten",
+    "subtitle": "Establishment serving beer outside"
 }
diff --git a/data/presets/presets/amenity/cinema.json b/data/presets/presets/amenity/cinema.json
@@ -33,5 +33,6 @@
     "tags": {
         "amenity": "cinema"
     },
-    "name": "Cinema"
+    "name": "Cinema",
+    "subtitle": "Venue for screening motion pictures"
 }
diff --git a/data/presets/presets/amenity/clock/sundial.json b/data/presets/presets/amenity/clock/sundial.json
@@ -23,5 +23,6 @@
         "key": "display",
         "value": "sundial"
     },
-    "name": "Sundial"
+    "name": "Sundial",
+    "subtitle": "Device using the sun to tell time"
 }
diff --git a/data/presets/presets/amenity/dojo.json b/data/presets/presets/amenity/dojo.json
@@ -26,5 +26,6 @@
     "tags": {
         "amenity": "dojo"
     },
-    "name": "Dojo / Martial Arts Academy"
+    "name": "Dojo",
+    "subtitle": "Martial arts academy"
 }
diff --git a/data/presets/presets/amenity/post_box.json b/data/presets/presets/amenity/post_box.json
@@ -20,5 +20,6 @@
         "letter",
         "post"
     ],
-    "name": "Mailbox"
+    "name": "Mailbox",
+    "subtitle": "Drop box for outgoing post"
 }
diff --git a/data/presets/presets/amenity/pub.json b/data/presets/presets/amenity/pub.json
@@ -38,5 +38,6 @@
         "bier",
         "booze"
     ],
-    "name": "Pub"
+    "name": "Pub",
+    "subtitle": "Establishment serving beer and food"
 }
diff --git a/data/presets/presets/amenity/pub/microbrewery.json b/data/presets/presets/amenity/pub/microbrewery.json
@@ -22,5 +22,6 @@
         "microbrewery",
         "small batch brewery"
     ],
-    "name": "Brewpub"
+    "name": "Brewpub",
+    "subtitle": "Pub with a microbrewery"
 }
diff --git a/data/presets/presets/amenity/shelter/lean_to.json b/data/presets/presets/amenity/shelter/lean_to.json
@@ -13,5 +13,6 @@
         "amenity": "shelter",
         "shelter_type": "lean_to"
     },
-    "name": "Lean-To"
+    "name": "Lean-To",
+    "subtitle": "Unenclosed wilderness shelter"
 }
diff --git a/data/presets/presets/amenity/theatre/type/amphi.json b/data/presets/presets/amenity/theatre/type/amphi.json
@@ -7,7 +7,8 @@
         "lit"
     ],
     "geometry": [
-        "point", "area"
+        "point",
+        "area"
     ],
     "terms": [
         "open air",
@@ -19,5 +20,9 @@
         "amenity": "theatre",
         "theatre:type": "amphi"
     },
+    "reference": {
+        "key": "theatre:type",
+        "value":  "amphi"
+    },
     "name": "Amphitheatre"
 }
diff --git a/data/presets/presets/amenity/vending_machine/elongated_coin.json b/data/presets/presets/amenity/vending_machine/elongated_coin.json
@@ -19,5 +19,6 @@
         "key": "vending",
         "value": "elongated_coin"
     },
-    "name": "Flat Coin Vending Machine"
+    "name": "Flat Coin Vending Machine",
+    "subtitle": "Presses coins into souvenirs"
 }
diff --git a/data/presets/presets/building.json b/data/presets/presets/building.json
@@ -23,5 +23,6 @@
     },
     "matchScore": 0.6,
     "terms": [],
-    "name": "Building"
+    "name": "Building",
+    "subtitle": "Structure"
 }
diff --git a/data/presets/presets/club.json b/data/presets/presets/club.json
@@ -26,5 +26,6 @@
     "terms": [
         "social"
     ],
-    "name": "Club"
+    "name": "Club",
+    "subtitle": "Meeting place of a social group"
 }
diff --git a/data/presets/presets/craft.json b/data/presets/presets/craft.json
@@ -25,5 +25,6 @@
         "craft": "*"
     },
     "terms": [],
-    "name": "Craft"
+    "name": "Craft",
+    "subtitle": "Workshop"
 }
diff --git a/data/presets/presets/ford.json b/data/presets/presets/ford.json
@@ -5,5 +5,6 @@
     "tags": {
         "ford": "yes"
     },
-    "name": "Ford"
+    "name": "Ford",
+    "subtitle": "Where water flows over a road"
 }
diff --git a/data/presets/presets/historic.json b/data/presets/presets/historic.json
@@ -13,5 +13,6 @@
     "tags": {
         "historic": "*"
     },
-    "name": "Historic Site"
+    "name": "Historic Site",
+    "subtitle": "Designated place of historic value"
 }
diff --git a/data/presets/presets/landuse/grass.json b/data/presets/presets/landuse/grass.json
@@ -6,5 +6,6 @@
         "landuse": "grass"
     },
     "terms": [],
-    "name": "Grass"
+    "name": "Grass",
+    "subtitle": "Managed grass area"
 }
diff --git a/data/presets/presets/leisure/adult_gaming_centre.json b/data/presets/presets/leisure/adult_gaming_centre.json
@@ -17,5 +17,6 @@
     "tags": {
         "leisure": "adult_gaming_centre"
     },
-    "name": "Adult Gaming Center"
+    "name": "Adult Gaming Center",
+    "subtitle": "Gambling arcade"
 }
diff --git a/data/presets/presets/man_made/adit.json b/data/presets/presets/man_made/adit.json
@@ -12,12 +12,12 @@
     ],
     "terms": [
         "cave",
-        "horizontal mine entrance",
         "tunnel",
         "underground"
     ],
     "tags": {
         "man_made": "adit"
     },
-    "name": "Adit"
+    "name": "Adit",
+    "subtitle": "Horizontal mine entrance"
 }
diff --git a/data/presets/presets/man_made/mast.json b/data/presets/presets/man_made/mast.json
@@ -31,5 +31,6 @@
     "tags": {
         "man_made": "mast"
     },
-    "name": "Mast"
+    "name": "Mast",
+    "subtitle": "Tall vertical structure"
 }
diff --git a/data/presets/presets/man_made/mineshaft.json b/data/presets/presets/man_made/mineshaft.json
@@ -13,11 +13,11 @@
         "cave",
         "mine shaft",
         "tunnel",
-        "underground",
-        "vertical mine entrance"
+        "underground"
     ],
     "tags": {
         "man_made": "mineshaft"
     },
-    "name": "Mineshaft"
+    "name": "Mineshaft",
+    "subtitle": "Vertical mine entrance"
 }
diff --git a/data/presets/presets/man_made/tower.json b/data/presets/presets/man_made/tower.json
@@ -16,5 +16,6 @@
     "tags": {
         "man_made": "tower"
     },
-    "name": "Tower"
+    "name": "Tower",
+    "subtitle": "Building constructed for its height"
 }
diff --git a/data/presets/presets/manhole.json b/data/presets/presets/manhole.json
@@ -20,5 +20,6 @@
         "sewage",
         "telecom"
     ],
-    "name": "Manhole"
+    "name": "Manhole",
+    "subtitle": "Access to areas below ground level"
 }
diff --git a/data/presets/presets/natural/grassland.json b/data/presets/presets/natural/grassland.json
@@ -9,5 +9,6 @@
         "prairie",
         "savanna"
     ],
-    "name": "Grassland"
+    "name": "Grassland",
+    "subtitle": "Grass-dominated natural landscape"
 }
diff --git a/data/presets/presets/noexit/yes.json b/data/presets/presets/noexit/yes.json
@@ -15,5 +15,6 @@
         "key": "noexit",
         "value": "*"
     },
-    "name": "No Exit"
+    "name": "No Exit",
+    "subtitle": "Indicates a road does not continue"
 }
diff --git a/data/presets/presets/piste/downhill.json b/data/presets/presets/piste/downhill.json
@@ -22,5 +22,6 @@
     "tags": {
         "piste:type": "downhill"
     },
-    "name": "Downhill Piste/Ski Run"
+    "name": "Downhill Ski Trail",
+    "subtitle": "Alpine piste"
 }
diff --git a/data/presets/presets/piste/nordic.json b/data/presets/presets/piste/nordic.json
@@ -17,10 +17,12 @@
         "nordic",
         "crosscountry",
         "skating",
-        "piste"
+        "piste",
+        "XC skiing trail"
     ],
     "tags": {
         "piste:type": "nordic"
     },
-    "name": "Nordic or Crosscountry Piste/Ski Trail"
+    "name": "Cross-country Ski Trail",
+    "subtitle": "Nordic piste"
 }
diff --git a/data/presets/presets/power/generator/method/photovoltaic.json b/data/presets/presets/power/generator/method/photovoltaic.json
@@ -37,5 +37,6 @@
         "key": "generator:method",
         "value": "photovoltaic"
     },
-    "name": "Solar Panel"
+    "name": "Solar Panel",
+    "subtitle": "Generates electricity from sunlight"
 }
diff --git a/data/presets/presets/power/generator/source/wind.json b/data/presets/presets/power/generator/source/wind.json
@@ -29,5 +29,6 @@
         "key": "generator:source",
         "value": "wind"
     },
-    "name": "Wind Turbine"
+    "name": "Wind Turbine",
+    "subtitle": "Generates electricity from wind"
 }
diff --git a/data/presets/presets/public_transport/platform.json b/data/presets/presets/public_transport/platform.json
@@ -34,5 +34,6 @@
         "transportation"
     ],
     "name": "Transit Platform",
+    "subtitle": "Where passengers board",
     "matchScore": 0.2
 }
diff --git a/data/presets/presets/public_transport/platform/aerialway.json b/data/presets/presets/public_transport/platform/aerialway.json
@@ -37,5 +37,6 @@
         "transit",
         "transportation"
     ],
-    "name": "Aerialway Platform"
+    "name": "Aerialway Platform",
+    "subtitle": "Where passengers board"
 }