From b1252d43ff14f9d7e43e8f0d7a6edda1e1d1bc79 Mon Sep 17 00:00:00 2001 From: Bryan Housel Date: Sun, 24 Jun 2018 12:11:56 -0400 Subject: [PATCH] Add booth field to telephone presets (closes #5088) --- data/presets.yaml | 3 +++ data/presets/fields.json | 1 + data/presets/fields/booth.json | 6 ++++++ data/presets/presets.json | 4 ++-- data/presets/presets/amenity/telephone.json | 3 ++- data/presets/presets/emergency/phone.json | 6 ++++-- data/taginfo.json | 1 + dist/locales/en.json | 3 +++ modules/services/taginfo.js | 2 +- 9 files changed, 23 insertions(+), 6 deletions(-) create mode 100644 data/presets/fields/booth.json diff --git a/data/presets.yaml b/data/presets.yaml index ce4ff2ba5..2c6b4041a 100644 --- a/data/presets.yaml +++ b/data/presets.yaml @@ -241,6 +241,9 @@ en: board_type: # board_type=* label: Type + booth: + # booth=* + label: Booth boules: # boules=* label: Type diff --git a/data/presets/fields.json b/data/presets/fields.json index b6d861577..9fd3cd6e0 100644 --- a/data/presets/fields.json +++ b/data/presets/fields.json @@ -33,6 +33,7 @@ "bin": {"key": "bin", "type": "check", "label": "Waste Bin"}, "blood_components": {"key": "blood:", "type": "multiCombo", "label": "Blood Components", "strings": {"options": {"whole": "whole blood", "plasma": "plasma", "platelets": "platelets", "stemcells": "stem cell samples"}}}, "board_type": {"key": "board_type", "type": "typeCombo", "label": "Type"}, + "booth": {"key": "booth", "type": "combo", "label": "Booth", "caseSensitive": true}, "boules": {"key": "boules", "type": "typeCombo", "label": "Type"}, "boundary": {"key": "boundary", "type": "combo", "label": "Type"}, "brand": {"key": "brand", "type": "text", "label": "Brand"}, diff --git a/data/presets/fields/booth.json b/data/presets/fields/booth.json new file mode 100644 index 000000000..2746f52a7 --- /dev/null +++ b/data/presets/fields/booth.json @@ -0,0 +1,6 @@ +{ + "key": "booth", + "type": "combo", + "label": "Booth", + "caseSensitive": true +} diff --git a/data/presets/presets.json b/data/presets/presets.json index 246904114..dc5d33927 100644 --- a/data/presets/presets.json +++ b/data/presets/presets.json @@ -137,7 +137,7 @@ "amenity/social_facility/nursing_home": {"icon": "maki-wheelchair", "fields": ["name", "operator", "address", "building_area", "social_facility", "social_facility_for", "opening_hours", "wheelchair"], "geometry": ["point", "area"], "terms": ["elderly", "living", "nursing", "old", "senior", "assisted living"], "tags": {"amenity": "social_facility", "social_facility": "nursing_home", "social_facility:for": "senior"}, "reference": {"key": "social_facility", "value": "nursing_home"}, "name": "Nursing Home"}, "amenity/studio": {"icon": "maki-karaoke", "fields": ["name", "studio", "address", "building_area"], "geometry": ["point", "area"], "terms": ["recording", "radio", "television"], "tags": {"amenity": "studio"}, "name": "Studio"}, "amenity/taxi": {"icon": "fas-taxi", "fields": ["name", "operator", "capacity"], "geometry": ["point", "vertex", "area"], "terms": ["cab"], "tags": {"amenity": "taxi"}, "name": "Taxi Stand"}, - "amenity/telephone": {"icon": "maki-telephone", "fields": ["operator", "phone", "fee", "payment_multi", "covered", "indoor"], "geometry": ["point", "vertex"], "tags": {"amenity": "telephone"}, "terms": ["phone"], "name": "Telephone"}, + "amenity/telephone": {"icon": "maki-telephone", "fields": ["operator", "phone", "fee", "payment_multi", "covered", "indoor", "booth"], "geometry": ["point", "vertex"], "tags": {"amenity": "telephone"}, "terms": ["phone"], "name": "Telephone"}, "amenity/theatre": {"icon": "maki-theatre", "fields": ["name", "operator", "address", "building_area"], "geometry": ["point", "area"], "terms": ["theatre", "performance", "play", "musical"], "tags": {"amenity": "theatre"}, "name": "Theater"}, "amenity/toilets": {"icon": "maki-toilet", "fields": ["toilets/disposal", "operator", "building_area", "access_simple", "gender", "fee", "diaper"], "geometry": ["point", "vertex", "area"], "terms": ["bathroom", "restroom", "outhouse", "privy", "head", "lavatory", "latrine", "water closet", "WC", "W.C."], "tags": {"amenity": "toilets"}, "name": "Toilets"}, "amenity/townhall": {"icon": "maki-town-hall", "fields": ["name", "operator", "address", "building_area"], "geometry": ["point", "area"], "terms": ["village", "city", "government", "courthouse", "municipal"], "tags": {"amenity": "townhall"}, "name": "Town Hall"}, @@ -316,7 +316,7 @@ "emergency/fire_hydrant": {"icon": "temaki-fire_hydrant", "fields": ["fire_hydrant/type", "fire_hydrant/position", "ref", "operator"], "geometry": ["point", "vertex"], "terms": ["fire plug"], "tags": {"emergency": "fire_hydrant"}, "name": "Fire Hydrant"}, "emergency/first_aid_kit": {"icon": "fas-medkit", "fields": ["indoor", "ref", "operator"], "geometry": ["point", "vertex"], "terms": ["bandage", "first aid", "med", "med kit", "medic*", "medkit"], "tags": {"emergency": "first_aid_kit"}, "name": "First Aid Kit"}, "emergency/life_ring": {"icon": "fas-life-ring", "fields": ["ref", "operator"], "geometry": ["point", "vertex"], "terms": ["life buoy", "kisby ring", "kisbie ring", "perry buoy"], "tags": {"emergency": "life_ring"}, "name": "Life Ring"}, - "emergency/phone": {"icon": "maki-emergency-phone", "fields": ["indoor", "ref", "operator"], "geometry": ["point", "vertex"], "tags": {"emergency": "phone"}, "name": "Emergency Phone"}, + "emergency/phone": {"icon": "maki-emergency-phone", "fields": ["ref", "operator", "covered", "indoor", "booth"], "geometry": ["point", "vertex"], "tags": {"emergency": "phone"}, "name": "Emergency Phone"}, "emergency/siren": {"icon": "fas-volume-up", "fields": ["siren/purpose", "siren/type", "ref", "operator"], "geometry": ["point", "vertex"], "terms": ["air raid", "loud", "noise", "storm", "tornado", "warning"], "tags": {"emergency": "siren"}, "name": "Siren"}, "emergency/water_tank": {"icon": "maki-water", "fields": ["name", "ref", "operator"], "geometry": ["point", "vertex"], "terms": ["water tank", "cistern", "reservoir"], "tags": {"emergency": "water_tank"}, "name": "Emergency Water Tank"}, "entrance": {"icon": "maki-entrance-alt1", "geometry": ["vertex"], "tags": {"entrance": "*"}, "fields": ["entrance", "access_simple", "address"], "name": "Entrance/Exit"}, diff --git a/data/presets/presets/amenity/telephone.json b/data/presets/presets/amenity/telephone.json index 27442a136..a656431e4 100644 --- a/data/presets/presets/amenity/telephone.json +++ b/data/presets/presets/amenity/telephone.json @@ -6,7 +6,8 @@ "fee", "payment_multi", "covered", - "indoor" + "indoor", + "booth" ], "geometry": [ "point", diff --git a/data/presets/presets/emergency/phone.json b/data/presets/presets/emergency/phone.json index a3046dafe..8846a234b 100644 --- a/data/presets/presets/emergency/phone.json +++ b/data/presets/presets/emergency/phone.json @@ -1,9 +1,11 @@ { "icon": "maki-emergency-phone", "fields": [ - "indoor", "ref", - "operator" + "operator", + "covered", + "indoor", + "booth" ], "geometry": [ "point", diff --git a/data/taginfo.json b/data/taginfo.json index ae916f483..e605487f1 100644 --- a/data/taginfo.json +++ b/data/taginfo.json @@ -6345,6 +6345,7 @@ {"key": "blood:", "value": "platelets", "description": "Blood Components"}, {"key": "blood:", "value": "stemcells", "description": "Blood Components"}, {"key": "board_type", "description": "Type"}, + {"key": "booth", "description": "Booth"}, {"key": "boules", "description": "Type"}, {"key": "boundary", "description": "Type"}, {"key": "brand", "description": "Brand"}, diff --git a/dist/locales/en.json b/dist/locales/en.json index 06c75e35f..cb556b931 100644 --- a/dist/locales/en.json +++ b/dist/locales/en.json @@ -1572,6 +1572,9 @@ "board_type": { "label": "Type" }, + "booth": { + "label": "Booth" + }, "boules": { "label": "Type" }, diff --git a/modules/services/taginfo.js b/modules/services/taginfo.js index 2149b37a3..98adfc97d 100644 --- a/modules/services/taginfo.js +++ b/modules/services/taginfo.js @@ -264,7 +264,7 @@ export default { // A few OSM keys expect values to contain uppercase values (see #3377). // This is not an exhaustive list (e.g. `name` also has uppercase values) // but these are the fields where taginfo value lookup is most useful. - var re = /network|taxon|genus|species|brand|grape_variety|rating|:output|_hours|_times/; + var re = /network|taxon|genus|species|brand|grape_variety|booth|rating|:output|_hours|_times/; var allowUpperCase = (params.key.match(re) !== null); var f = filterValues(allowUpperCase);