From 6803a1dbd9bf2eb4c8d492466e7f4804925fd7a4 Mon Sep 17 00:00:00 2001 From: Quincy Morgan Date: Tue, 24 Sep 2019 18:49:00 +0200 Subject: [PATCH] Add field for the `blind` key to some presets (re: #6351) --- data/presets.yaml | 5 +++++ data/presets/fields.json | 1 + data/presets/fields/blind.json | 14 ++++++++++++++ data/presets/presets.json | 8 ++++---- data/presets/presets/_playground.json | 1 + data/presets/presets/amenity/vending_machine.json | 1 + data/presets/presets/leisure/fitness_station.json | 5 ++++- data/presets/presets/playground/swing.json | 3 ++- data/taginfo.json | 1 + dist/locales/en.json | 4 ++++ 10 files changed, 37 insertions(+), 6 deletions(-) create mode 100644 data/presets/fields/blind.json diff --git a/data/presets.yaml b/data/presets.yaml index 29d6194de..0036b7b7b 100644 --- a/data/presets.yaml +++ b/data/presets.yaml @@ -277,6 +277,11 @@ en: label: Waste Bin # 'terms: garbage can,trash can' terms: '[translate with synonyms or related terms for ''Waste Bin'', separated by commas]' + blind: + # blind=* + label: Blind Person Access + # 'terms: sight impairment,vision impairment' + terms: '[translate with synonyms or related terms for ''Blind Person Access'', separated by commas]' blood_components: # 'blood:=*' label: Blood Components diff --git a/data/presets/fields.json b/data/presets/fields.json index 9b2518ddf..78b882099 100644 --- a/data/presets/fields.json +++ b/data/presets/fields.json @@ -38,6 +38,7 @@ "bench": {"key": "bench", "type": "check", "label": "Bench", "terms": ["seating"]}, "bicycle_parking": {"key": "bicycle_parking", "type": "combo", "label": "Type"}, "bin": {"key": "bin", "type": "check", "label": "Waste Bin", "terms": ["garbage can", "trash can"]}, + "blind": {"key": "blind", "type": "radio", "options": ["yes", "limited", "no"], "label": "Blind Person Access", "terms": ["sight impairment", "vision impairment"]}, "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"}, "bollard": {"key": "bollard", "type": "combo", "label": "Type"}, diff --git a/data/presets/fields/blind.json b/data/presets/fields/blind.json new file mode 100644 index 000000000..f8d168218 --- /dev/null +++ b/data/presets/fields/blind.json @@ -0,0 +1,14 @@ +{ + "key": "blind", + "type": "radio", + "options": [ + "yes", + "limited", + "no" + ], + "label": "Blind Person Access", + "terms": [ + "sight impairment", + "vision impairment" + ] +} diff --git a/data/presets/presets.json b/data/presets/presets.json index 23754cd0f..f486ad602 100644 --- a/data/presets/presets.json +++ b/data/presets/presets.json @@ -16,7 +16,7 @@ "man_made": {"icon": "temaki-storage_tank", "fields": ["name", "man_made"], "moreFields": ["material"], "geometry": ["point", "vertex", "line", "area"], "tags": {"man_made": "*"}, "matchScore": 0.95, "searchable": false, "name": "Man Made"}, "natural": {"icon": "maki-natural", "fields": ["name", "natural"], "geometry": ["point", "vertex", "line", "area"], "tags": {"natural": "*"}, "searchable": false, "name": "Natural"}, "place": {"fields": ["name", "place"], "geometry": ["point", "vertex", "area"], "tags": {"place": "*"}, "searchable": false, "name": "Place"}, - "playground": {"icon": "maki-playground", "fields": ["playground", "min_age", "max_age", "wheelchair", "height"], "geometry": ["point", "vertex", "line", "area"], "tags": {"playground": "*"}, "searchable": false, "name": "Playground Equipment"}, + "playground": {"icon": "maki-playground", "fields": ["playground", "min_age", "max_age", "wheelchair", "blind", "height"], "geometry": ["point", "vertex", "line", "area"], "tags": {"playground": "*"}, "searchable": false, "name": "Playground Equipment"}, "power": {"geometry": ["point", "vertex", "line", "area"], "tags": {"power": "*"}, "fields": ["power"], "moreFields": ["material"], "searchable": false, "name": "Power"}, "railway": {"fields": ["railway"], "geometry": ["point", "vertex", "line", "area"], "tags": {"railway": "*"}, "searchable": false, "name": "Railway"}, "seamark": {"icon": "maki-harbor", "fields": ["seamark/type"], "geometry": ["point", "vertex", "line", "area"], "tags": {"seamark:type": "*"}, "searchable": false, "name": "Seamark"}, @@ -231,7 +231,7 @@ "amenity/toy_library": {"icon": "fas-chess-knight", "fields": ["operator", "address", "building_area", "opening_hours"], "moreFields": ["level", "website", "wheelchair"], "geometry": ["point", "area"], "terms": ["game", "toy"], "tags": {"amenity": "toy_library"}, "name": "Toy Library"}, "amenity/university": {"icon": "maki-college", "fields": ["{amenity/college}"], "moreFields": ["{amenity/college}"], "geometry": ["point", "area"], "terms": ["college", "graduate school", "PhD program", "master's degree program"], "tags": {"amenity": "university"}, "name": "University Grounds"}, "amenity/vehicle_inspection": {"icon": "maki-car", "fields": ["name", "operator", "address", "building_area", "opening_hours"], "moreFields": ["email", "fax", "payment_multi", "phone", "website", "wheelchair"], "geometry": ["point", "area"], "terms": ["car inspection"], "tags": {"amenity": "vehicle_inspection"}, "name": "Vehicle Inspection"}, - "amenity/vending_machine": {"icon": "temaki-vending_machine", "fields": ["vending", "operator", "payment_multi", "currency_multi"], "moreFields": ["brand", "covered", "height", "indoor", "level", "manufacturer"], "geometry": ["point"], "terms": [], "tags": {"amenity": "vending_machine"}, "matchScore": 0.9, "name": "Vending Machine"}, + "amenity/vending_machine": {"icon": "temaki-vending_machine", "fields": ["vending", "operator", "payment_multi", "currency_multi"], "moreFields": ["blind", "brand", "covered", "height", "indoor", "level", "manufacturer"], "geometry": ["point"], "terms": [], "tags": {"amenity": "vending_machine"}, "matchScore": 0.9, "name": "Vending Machine"}, "amenity/vending_machine/bottle_return": {"icon": "temaki-vending_machine", "fields": ["vending", "operator"], "geometry": ["point"], "terms": ["bottle return"], "tags": {"amenity": "vending_machine", "vending": "bottle_return"}, "reference": {"key": "vending", "value": "bottle_return"}, "name": "Bottle Return Machine"}, "amenity/vending_machine/cigarettes": {"icon": "temaki-vending_machine", "moreFields": ["{amenity/vending_machine}", "min_age"], "geometry": ["point"], "terms": ["cigarette"], "tags": {"amenity": "vending_machine", "vending": "cigarettes"}, "reference": {"key": "vending", "value": "cigarettes"}, "name": "Cigarette Vending Machine"}, "amenity/vending_machine/coffee": {"icon": "temaki-vending_machine", "geometry": ["point"], "terms": ["coffee"], "tags": {"amenity": "vending_machine", "vending": "coffee"}, "reference": {"key": "vending", "value": "coffee"}, "name": "Coffee Vending Machine"}, @@ -630,7 +630,7 @@ "leisure/fishing": {"icon": "fas-fish", "fields": ["name", "access_simple", "fishing"], "geometry": ["vertex", "point", "area"], "tags": {"leisure": "fishing"}, "terms": ["angler"], "name": "Fishing Spot"}, "leisure/fitness_centre": {"icon": "fas-dumbbell", "fields": ["name", "sport", "address", "building_area"], "moreFields": ["charge_fee", "opening_hours", "fee", "payment_multi", "website", "phone", "email", "fax"], "geometry": ["point", "area"], "tags": {"leisure": "fitness_centre"}, "terms": ["health", "gym", "leisure", "studio"], "name": "Gym / Fitness Center"}, "leisure/fitness_centre/yoga": {"icon": "maki-pitch", "geometry": ["point", "area"], "terms": ["studio", "asanas", "modern yoga", "meditation"], "tags": {"leisure": "fitness_centre", "sport": "yoga"}, "reference": {"key": "sport", "value": "yoga"}, "name": "Yoga Studio"}, - "leisure/fitness_station": {"icon": "maki-pitch", "fields": ["fitness_station", "ref"], "moreFields": ["opening_hours"], "geometry": ["point", "area"], "tags": {"leisure": "fitness_station"}, "addTags": {"leisure": "fitness_station", "sport": "fitness"}, "reference": {"key": "leisure", "value": "fitness_station"}, "terms": ["exercise", "fitness", "gym", "trim trail"], "name": "Outdoor Fitness Station"}, + "leisure/fitness_station": {"icon": "maki-pitch", "fields": ["fitness_station", "ref", "wheelchair", "blind"], "moreFields": ["access_simple", "opening_hours"], "geometry": ["point", "area"], "tags": {"leisure": "fitness_station"}, "addTags": {"leisure": "fitness_station", "sport": "fitness"}, "reference": {"key": "leisure", "value": "fitness_station"}, "terms": ["exercise", "fitness", "gym", "trim trail"], "name": "Outdoor Fitness Station"}, "leisure/fitness_station/balance_beam": {"icon": "maki-pitch", "geometry": ["point", "area"], "tags": {"leisure": "fitness_station", "fitness_station": "balance_beam"}, "addTags": {"leisure": "fitness_station", "fitness_station": "balance_beam", "sport": "fitness"}, "reference": {"key": "leisure", "value": "fitness_station"}, "terms": ["balance", "exercise", "fitness", "gym", "trim trail"], "name": "Exercise Balance Beam"}, "leisure/fitness_station/box": {"icon": "maki-pitch", "geometry": ["point", "area"], "tags": {"leisure": "fitness_station", "fitness_station": "box"}, "addTags": {"leisure": "fitness_station", "fitness_station": "box", "sport": "fitness"}, "reference": {"key": "leisure", "value": "fitness_station"}, "terms": ["box", "exercise", "fitness", "gym", "jump", "trim trail"], "name": "Exercise Box"}, "leisure/fitness_station/horizontal_bar": {"icon": "maki-pitch", "geometry": ["point", "area"], "tags": {"leisure": "fitness_station", "fitness_station": "horizontal_bar"}, "addTags": {"leisure": "fitness_station", "fitness_station": "horizontal_bar", "sport": "fitness"}, "reference": {"key": "leisure", "value": "fitness_station"}, "terms": ["bar", "chinup", "chin up", "exercise", "fitness", "gym", "pullup", "pull up", "trim trail"], "name": "Exercise Horizontal Bar"}, @@ -886,7 +886,7 @@ "playground/seesaw": {"icon": "maki-playground", "geometry": ["point"], "tags": {"playground": "seesaw"}, "name": "Seesaw"}, "playground/slide": {"icon": "maki-playground", "geometry": ["point", "line"], "tags": {"playground": "slide"}, "name": "Slide"}, "playground/structure": {"icon": "maki-pitch", "geometry": ["point", "area"], "tags": {"playground": "structure"}, "name": "Play Structure"}, - "playground/swing": {"icon": "maki-playground", "fields": ["capacity", "baby_seat", "wheelchair"], "geometry": ["point"], "tags": {"playground": "swing"}, "name": "Swing"}, + "playground/swing": {"icon": "maki-playground", "fields": ["capacity", "baby_seat", "wheelchair", "blind"], "geometry": ["point"], "tags": {"playground": "swing"}, "name": "Swing"}, "playground/zipwire": {"icon": "maki-playground", "geometry": ["point", "line"], "tags": {"playground": "zipwire"}, "name": "Zip Wire"}, "point": {"fields": ["name"], "geometry": ["vertex", "point"], "tags": {}, "terms": ["node", "other", "vertex", "vertices"], "name": "Point", "matchScore": 0.1}, "polling_station": {"icon": "fas-vote-yea", "fields": ["name", "ref", "operator", "address", "opening_hours", "building_area"], "moreFields": ["air_conditioning", "email", "fax", "internet_access", "internet_access/fee", "internet_access/ssid", "level", "phone", "website", "wheelchair"], "geometry": ["point", "area"], "terms": ["ballot box", "ballot drop", "democracy", "elections", "polling place", "vote", "voting booth", "voting machine"], "tags": {"polling_station": "*"}, "matchScore": 0.75, "name": "Temporary Polling Place"}, diff --git a/data/presets/presets/_playground.json b/data/presets/presets/_playground.json index 747d37b1a..101857639 100644 --- a/data/presets/presets/_playground.json +++ b/data/presets/presets/_playground.json @@ -5,6 +5,7 @@ "min_age", "max_age", "wheelchair", + "blind", "height" ], "geometry": [ diff --git a/data/presets/presets/amenity/vending_machine.json b/data/presets/presets/amenity/vending_machine.json index 38e8581ad..054b2fe9c 100644 --- a/data/presets/presets/amenity/vending_machine.json +++ b/data/presets/presets/amenity/vending_machine.json @@ -7,6 +7,7 @@ "currency_multi" ], "moreFields": [ + "blind", "brand", "covered", "height", diff --git a/data/presets/presets/leisure/fitness_station.json b/data/presets/presets/leisure/fitness_station.json index 5929b1356..a75e23b95 100644 --- a/data/presets/presets/leisure/fitness_station.json +++ b/data/presets/presets/leisure/fitness_station.json @@ -2,9 +2,12 @@ "icon": "maki-pitch", "fields": [ "fitness_station", - "ref" + "ref", + "wheelchair", + "blind" ], "moreFields": [ + "access_simple", "opening_hours" ], "geometry": [ diff --git a/data/presets/presets/playground/swing.json b/data/presets/presets/playground/swing.json index 449bc8b3c..22b6676e3 100644 --- a/data/presets/presets/playground/swing.json +++ b/data/presets/presets/playground/swing.json @@ -3,7 +3,8 @@ "fields": [ "capacity", "baby_seat", - "wheelchair" + "wheelchair", + "blind" ], "geometry": [ "point" diff --git a/data/taginfo.json b/data/taginfo.json index d19ce9463..365f45f9b 100644 --- a/data/taginfo.json +++ b/data/taginfo.json @@ -1275,6 +1275,7 @@ {"key": "bench", "description": "🄵 Bench"}, {"key": "bicycle_parking", "description": "🄵 Type"}, {"key": "bin", "description": "🄵 Waste Bin"}, + {"key": "blind", "description": "🄵 Blind Person Access"}, {"key": "blood:", "value": "whole", "description": "🄵 Blood Components"}, {"key": "blood:", "value": "plasma", "description": "🄵 Blood Components"}, {"key": "blood:", "value": "platelets", "description": "🄵 Blood Components"}, diff --git a/dist/locales/en.json b/dist/locales/en.json index a36ddc232..ad35670a8 100644 --- a/dist/locales/en.json +++ b/dist/locales/en.json @@ -2692,6 +2692,10 @@ "label": "Waste Bin", "terms": "garbage can,trash can" }, + "blind": { + "label": "Blind Person Access", + "terms": "sight impairment,vision impairment" + }, "blood_components": { "label": "Blood Components", "terms": "",