From 955dc6e008b525820350657870f58d82bb0543b4 Mon Sep 17 00:00:00 2001 From: Quincy Morgan Date: Wed, 25 Sep 2019 15:23:40 +0200 Subject: [PATCH] Add field for the `lockable` key to relevant presets --- data/presets.yaml | 4 ++++ data/presets/fields.json | 1 + data/presets/fields/lockable.json | 5 +++++ data/presets/presets.json | 8 ++++---- data/presets/presets/amenity/hunting_stand.json | 3 ++- data/presets/presets/amenity/letter_box.json | 1 + data/presets/presets/amenity/shelter.json | 1 + .../presets/amenity/shelter/picnic_shelter.json | 17 ++++++++++++++--- data/presets/presets/building/shed.json | 4 ++++ data/taginfo.json | 1 + dist/locales/en.json | 4 ++++ 11 files changed, 41 insertions(+), 8 deletions(-) create mode 100644 data/presets/fields/lockable.json diff --git a/data/presets.yaml b/data/presets.yaml index 3fc8bfc35..bf7b377b0 100644 --- a/data/presets.yaml +++ b/data/presets.yaml @@ -1206,6 +1206,10 @@ en: lock: # lock=* label: Lock + lockable: + # lockable=* + label: Lockable + terms: '[translate with synonyms or related terms for ''Lockable'', separated by commas]' man_made: # man_made=* label: Type diff --git a/data/presets/fields.json b/data/presets/fields.json index c1c0c2047..e8213e704 100644 --- a/data/presets/fields.json +++ b/data/presets/fields.json @@ -219,6 +219,7 @@ "location_pool": {"key": "location", "type": "typeCombo", "label": "Location", "strings": {"options": {"outdoor": "Outdoor", "indoor": "Indoor", "roof": "Rooftop"}}}, "location": {"key": "location", "type": "combo", "label": "Location"}, "lock": {"key": "lock", "type": "check", "label": "Lock"}, + "lockable": {"key": "lockable", "type": "check", "label": "Lockable"}, "man_made": {"key": "man_made", "type": "typeCombo", "label": "Type"}, "manhole": {"key": "manhole", "type": "typeCombo", "label": "Type"}, "manufacturer": {"key": "manufacturer", "type": "combo", "snake_case": false, "caseSensitive": true, "label": "Manufacturer"}, diff --git a/data/presets/fields/lockable.json b/data/presets/fields/lockable.json new file mode 100644 index 000000000..b679ea466 --- /dev/null +++ b/data/presets/fields/lockable.json @@ -0,0 +1,5 @@ +{ + "key": "lockable", + "type": "check", + "label": "Lockable" +} diff --git a/data/presets/presets.json b/data/presets/presets.json index 325a931c1..a2fd37974 100644 --- a/data/presets/presets.json +++ b/data/presets/presets.json @@ -127,13 +127,13 @@ "amenity/grave_yard": {"icon": "maki-cemetery", "fields": ["religion", "address"], "moreFields": ["website", "phone", "email", "fax"], "geometry": ["point", "area"], "tags": {"amenity": "grave_yard"}, "name": "Graveyard"}, "amenity/grit_bin": {"icon": "fas-box", "fields": ["operator", "access_simple", "material", "collection_times"], "moreFields": ["colour", "height", "lit"], "geometry": ["point", "vertex"], "tags": {"amenity": "grit_bin"}, "terms": ["salt", "sand"], "name": "Grit Bin"}, "amenity/hospital": {"icon": "maki-hospital", "fields": ["name", "operator", "operator/type", "healthcare/speciality", "address", "emergency"], "moreFields": ["internet_access", "internet_access/fee", "internet_access/ssid", "website", "phone", "email", "fax", "wheelchair"], "geometry": ["point", "area"], "terms": ["clinic", "doctor", "emergency room", "health", "infirmary", "institution", "sanatorium", "sanitarium", "sick", "surgery", "ward"], "tags": {"amenity": "hospital"}, "addTags": {"amenity": "hospital", "healthcare": "hospital"}, "reference": {"key": "amenity", "value": "hospital"}, "name": "Hospital Grounds"}, - "amenity/hunting_stand": {"icon": "temaki-binoculars", "fields": ["access_simple"], "geometry": ["point", "vertex", "area"], "terms": ["game", "gun", "lookout", "rifle", "shoot*", "wild", "watch"], "tags": {"amenity": "hunting_stand"}, "name": "Hunting Stand"}, + "amenity/hunting_stand": {"icon": "temaki-binoculars", "fields": ["access_simple", "lockable"], "geometry": ["point", "vertex", "area"], "terms": ["game", "gun", "lookout", "rifle", "shoot*", "wild", "watch"], "tags": {"amenity": "hunting_stand"}, "name": "Hunting Stand"}, "amenity/ice_cream": {"icon": "fas-ice-cream", "fields": ["name", "address", "building_area", "opening_hours", "outdoor_seating"], "moreFields": ["takeaway", "delivery", "drive_through", "internet_access", "internet_access/fee", "internet_access/ssid", "level", "diet_multi", "payment_multi", "website", "phone", "email", "fax", "wheelchair"], "geometry": ["point", "area"], "terms": ["gelato", "sorbet", "sherbet", "frozen", "yogurt"], "tags": {"amenity": "ice_cream"}, "name": "Ice Cream Shop"}, "amenity/internet_cafe": {"icon": "temaki-antenna", "fields": ["name", "operator", "operator/type", "address", "building_area", "internet_access", "internet_access/fee", "internet_access/ssid"], "moreFields": ["air_conditioning", "email", "fax", "level", "min_age", "opening_hours", "outdoor_seating", "payment_multi", "phone", "smoking", "website", "wheelchair"], "geometry": ["point", "area"], "terms": ["cybercafe", "taxiphone", "teleboutique", "coffee", "cafe", "net", "lanhouse"], "tags": {"amenity": "internet_cafe"}, "name": "Internet Cafe"}, "amenity/karaoke": {"icon": "maki-karaoke", "fields": ["name", "operator", "address", "building_area", "opening_hours", "website"], "moreFields": ["air_conditioning", "email", "fax", "level", "min_age", "payment_multi", "phone", "smoking", "wheelchair"], "geometry": ["point", "area"], "terms": ["karaoke club", "karaoke room", "karaoke television", "KTV"], "tags": {"amenity": "karaoke_box"}, "name": "Karaoke Box"}, "amenity/kindergarten": {"icon": "maki-school", "fields": ["name", "operator", "address", "phone", "preschool"], "moreFields": ["email", "fax", "min_age", "max_age", "level", "opening_hours", "payment_multi", "website", "wheelchair"], "geometry": ["point", "area"], "terms": ["kindergarden", "pre-school"], "tags": {"amenity": "kindergarten"}, "name": "Preschool/Kindergarten Grounds"}, "amenity/language_school": {"icon": "maki-school", "fields": ["name", "operator", "operator/type", "address", "building_area", "opening_hours", "language_multi"], "moreFields": ["email", "fax", "internet_access", "internet_access/fee", "internet_access/ssid", "level", "payment_multi", "phone", "website", "wheelchair"], "geometry": ["point", "area"], "terms": ["esl"], "tags": {"amenity": "language_school"}, "name": "Language School"}, - "amenity/letter_box": {"icon": "temaki-letter_box", "fields": ["post", "access_simple", "collection_times", "height"], "moreFields": ["covered", "indoor", "level", "lit", "manufacturer", "material", "operator", "wheelchair"], "geometry": ["point", "vertex"], "tags": {"amenity": "letter_box"}, "terms": ["curbside delivery box", "home delivery box", "direct-to-door delivery box", "letter hole", "letter plate", "letter slot", "letterbox", "letterhole", "letterplate", "letterslot", "mail box", "mail hole", "mail slot", "mailbox", "mailhole", "mailslot", "through-door delivery box"], "name": "Letter Box"}, + "amenity/letter_box": {"icon": "temaki-letter_box", "fields": ["post", "access_simple", "collection_times", "height"], "moreFields": ["covered", "indoor", "level", "lit", "lockable", "manufacturer", "material", "operator", "wheelchair"], "geometry": ["point", "vertex"], "tags": {"amenity": "letter_box"}, "terms": ["curbside delivery box", "home delivery box", "direct-to-door delivery box", "letter hole", "letter plate", "letter slot", "letterbox", "letterhole", "letterplate", "letterslot", "mail box", "mail hole", "mail slot", "mailbox", "mailhole", "mailslot", "through-door delivery box"], "name": "Letter Box"}, "amenity/library": {"icon": "maki-library", "fields": ["name", "operator", "operator/type", "building_area", "address", "ref/isil", "internet_access", "internet_access/fee", "internet_access/ssid"], "moreFields": ["access_simple", "air_conditioning", "email", "fax", "opening_hours", "payment_multi", "level", "phone", "polling_station", "website", "wheelchair"], "geometry": ["point", "area"], "terms": ["book"], "tags": {"amenity": "library"}, "name": "Library"}, "amenity/loading_dock": {"icon": "fas-truck-loading", "fields": ["ref", "operator", "access_simple", "door", "width", "height"], "moreFields": ["address", "colour", "level", "lit", "wheelchair"], "geometry": ["vertex"], "terms": ["door", "loading bay", "shipping", "unloading", "warehouse"], "tags": {"amenity": "loading_dock"}, "name": "Loading Dock"}, "amenity/love_hotel": {"icon": "maki-heart", "fields": ["name", "operator", "address", "building_area", "rooms", "internet_access", "internet_access/fee", "internet_access/ssid"], "moreFields": ["email", "fax", "min_age", "payment_multi", "phone", "smoking", "website", "wheelchair"], "geometry": ["point", "area"], "tags": {"amenity": "love_hotel"}, "name": "Love Hotel"}, @@ -205,7 +205,7 @@ "amenity/restaurant/vietnamese": {"icon": "maki-restaurant-noodle", "geometry": ["point", "area"], "terms": ["bar", "breakfast", "cafe", "cafĆ©", "canteen", "dine", "dining", "dinner", "drive-in", "eat", "grill", "lunch", "table"], "tags": {"amenity": "restaurant", "cuisine": "vietnamese"}, "reference": {"key": "cuisine", "value": "vietnamese"}, "name": "Vietnamese Restaurant"}, "amenity/sanitary_dump_station": {"icon": "temaki-storage_tank", "fields": ["operator", "access_simple", "fee", "payment_multi_fee", "charge_fee", "water_point"], "moreFields": ["opening_hours"], "geometry": ["point", "vertex", "area"], "terms": ["Motor Home", "Camper", "Sanitary", "Dump Station", "Elsan", "CDP", "CTDP", "Chemical Toilet"], "tags": {"amenity": "sanitary_dump_station"}, "name": "RV Toilet Disposal"}, "amenity/school": {"icon": "maki-school", "fields": ["name", "operator", "operator/type", "address", "religion", "denomination", "website"], "moreFields": ["charge_fee", "email", "fax", "fee", "internet_access", "internet_access/ssid", "level", "phone", "polling_station", "wheelchair"], "geometry": ["point", "area"], "terms": ["academy", "elementary school", "middle school", "high school"], "tags": {"amenity": "school"}, "name": "School Grounds"}, - "amenity/shelter": {"icon": "maki-shelter", "fields": ["name", "shelter_type", "building_area", "bench", "bin"], "moreFields": ["lit", "wheelchair"], "geometry": ["point", "vertex", "area"], "terms": ["lean-to", "gazebo", "picnic"], "tags": {"amenity": "shelter"}, "name": "Shelter"}, + "amenity/shelter": {"icon": "maki-shelter", "fields": ["name", "shelter_type", "building_area", "bench", "bin"], "moreFields": ["lit", "lockable", "wheelchair"], "geometry": ["point", "vertex", "area"], "terms": ["lean-to", "gazebo", "picnic"], "tags": {"amenity": "shelter"}, "name": "Shelter"}, "amenity/shelter/gazebo": {"icon": "maki-shelter", "fields": ["name", "building_area", "bench", "lit"], "geometry": ["point", "area"], "tags": {"amenity": "shelter", "shelter_type": "gazebo"}, "name": "Gazebo"}, "amenity/shelter/lean_to": {"icon": "maki-shelter", "fields": ["name", "operator", "building_area"], "geometry": ["point", "area"], "tags": {"amenity": "shelter", "shelter_type": "lean_to"}, "name": "Lean-To"}, "amenity/shelter/picnic_shelter": {"icon": "maki-shelter", "fields": ["name", "shelter_type", "building_area", "lit", "bin"], "geometry": ["point", "area"], "tags": {"amenity": "shelter", "shelter_type": "picnic_shelter"}, "reference": {"key": "shelter_type", "value": "picnic_shelter"}, "terms": ["pavilion"], "name": "Picnic Shelter"}, @@ -357,7 +357,7 @@ "building/school": {"icon": "maki-building", "moreFields": ["{building}", "polling_station"], "geometry": ["area"], "terms": ["academy", "elementary school", "middle school", "high school"], "tags": {"building": "school"}, "matchScore": 0.5, "name": "School Building"}, "building/semidetached_house": {"icon": "maki-home", "geometry": ["area"], "tags": {"building": "semidetached_house"}, "terms": ["home", "double", "duplex", "twin", "family", "residence", "dwelling"], "matchScore": 0.5, "name": "Semi-Detached House"}, "building/service": {"icon": "maki-home", "geometry": ["area"], "tags": {"building": "service"}, "matchScore": 0.5, "name": "Service Building"}, - "building/shed": {"icon": "maki-home", "geometry": ["area"], "tags": {"building": "shed"}, "matchScore": 0.5, "name": "Shed"}, + "building/shed": {"icon": "maki-home", "fields": ["{building}", "lockable"], "geometry": ["area"], "tags": {"building": "shed"}, "matchScore": 0.5, "name": "Shed"}, "building/stable": {"icon": "maki-horse-riding", "geometry": ["area"], "tags": {"building": "stable"}, "matchScore": 0.5, "name": "Stable"}, "building/stadium": {"icon": "maki-stadium", "fields": ["{building}", "smoking"], "geometry": ["area"], "tags": {"building": "stadium"}, "matchScore": 0.5, "name": "Stadium Building"}, "building/static_caravan": {"icon": "maki-home", "geometry": ["area"], "tags": {"building": "static_caravan"}, "matchScore": 0.5, "name": "Static Mobile Home"}, diff --git a/data/presets/presets/amenity/hunting_stand.json b/data/presets/presets/amenity/hunting_stand.json index 00e3a754e..f77aa5c84 100644 --- a/data/presets/presets/amenity/hunting_stand.json +++ b/data/presets/presets/amenity/hunting_stand.json @@ -1,7 +1,8 @@ { "icon": "temaki-binoculars", "fields": [ - "access_simple" + "access_simple", + "lockable" ], "geometry": [ "point", diff --git a/data/presets/presets/amenity/letter_box.json b/data/presets/presets/amenity/letter_box.json index 5c23bb26c..8b95050a8 100644 --- a/data/presets/presets/amenity/letter_box.json +++ b/data/presets/presets/amenity/letter_box.json @@ -11,6 +11,7 @@ "indoor", "level", "lit", + "lockable", "manufacturer", "material", "operator", diff --git a/data/presets/presets/amenity/shelter.json b/data/presets/presets/amenity/shelter.json index 6230446ec..16f276840 100644 --- a/data/presets/presets/amenity/shelter.json +++ b/data/presets/presets/amenity/shelter.json @@ -9,6 +9,7 @@ ], "moreFields": [ "lit", + "lockable", "wheelchair" ], "geometry": [ diff --git a/data/presets/presets/amenity/shelter/picnic_shelter.json b/data/presets/presets/amenity/shelter/picnic_shelter.json index 2b7e08374..ff048a1a8 100644 --- a/data/presets/presets/amenity/shelter/picnic_shelter.json +++ b/data/presets/presets/amenity/shelter/picnic_shelter.json @@ -1,7 +1,16 @@ { "icon": "maki-shelter", - "fields": ["name", "shelter_type", "building_area", "lit", "bin"], - "geometry": ["point", "area"], + "fields": [ + "name", + "shelter_type", + "building_area", + "lit", + "bin" + ], + "geometry": [ + "point", + "area" + ], "tags": { "amenity": "shelter", "shelter_type": "picnic_shelter" @@ -10,6 +19,8 @@ "key": "shelter_type", "value": "picnic_shelter" }, - "terms": ["pavilion"], + "terms": [ + "pavilion" + ], "name": "Picnic Shelter" } diff --git a/data/presets/presets/building/shed.json b/data/presets/presets/building/shed.json index 77ad3935e..9c7241a1a 100644 --- a/data/presets/presets/building/shed.json +++ b/data/presets/presets/building/shed.json @@ -1,5 +1,9 @@ { "icon": "maki-home", + "fields": [ + "{building}", + "lockable" + ], "geometry": [ "area" ], diff --git a/data/taginfo.json b/data/taginfo.json index 8b7270bb6..6a549e9d5 100644 --- a/data/taginfo.json +++ b/data/taginfo.json @@ -1510,6 +1510,7 @@ {"key": "location", "value": "roof", "description": "šŸ„µ Location"}, {"key": "location", "description": "šŸ„µ Location"}, {"key": "lock", "description": "šŸ„µ Lock"}, + {"key": "lockable", "description": "šŸ„µ Lockable"}, {"key": "manufacturer", "description": "šŸ„µ Manufacturer"}, {"key": "map_size", "description": "šŸ„µ Coverage"}, {"key": "map_type", "description": "šŸ„µ Type"}, diff --git a/dist/locales/en.json b/dist/locales/en.json index 49aa6694d..333f96397 100644 --- a/dist/locales/en.json +++ b/dist/locales/en.json @@ -3627,6 +3627,10 @@ "label": "Lock", "terms": "" }, + "lockable": { + "label": "Lockable", + "terms": "" + }, "man_made": { "label": "Type", "terms": ""