From f8299cb205f5f59add7a8a4ea15e1b9ccbf81db5 Mon Sep 17 00:00:00 2001 From: Quincy Morgan Date: Fri, 19 Apr 2019 09:50:53 -0700 Subject: [PATCH] Add field for the guest_house subkey to tourism=guest_house --- data/deprecated.json | 2 +- data/presets.yaml | 3 +++ data/presets/fields.json | 1 + data/presets/fields/guest_house.json | 5 +++++ data/presets/presets.json | 2 +- data/presets/presets/tourism/guest_house.json | 1 + data/taginfo.json | 3 ++- dist/locales/en.json | 3 +++ 8 files changed, 17 insertions(+), 3 deletions(-) create mode 100644 data/presets/fields/guest_house.json diff --git a/data/deprecated.json b/data/deprecated.json index 596b7eb01..fb5d41408 100644 --- a/data/deprecated.json +++ b/data/deprecated.json @@ -661,7 +661,7 @@ }, { "old": {"tourism": "bed_and_breakfast"}, - "replace": {"tourism": "guest_house"} + "replace": {"tourism": "guest_house", "guest_house": "bed_and_breakfast"} }, { "old": {"type": "broad_leaved"}, diff --git a/data/presets.yaml b/data/presets.yaml index cb3b86b57..05d6bebdb 100644 --- a/data/presets.yaml +++ b/data/presets.yaml @@ -767,6 +767,9 @@ en: grape_variety: # grape_variety=* label: Grape Varieties + guest_house: + # guest_house=* + label: Type handicap: # handicap=* label: Handicap diff --git a/data/presets/fields.json b/data/presets/fields.json index 10c665f33..af7519aa7 100644 --- a/data/presets/fields.json +++ b/data/presets/fields.json @@ -147,6 +147,7 @@ "generator/type": {"key": "generator:type", "type": "combo", "label": "Type"}, "government": {"key": "government", "type": "typeCombo", "label": "Type"}, "grape_variety": {"key": "grape_variety", "type": "semiCombo", "label": "Grape Varieties"}, + "guest_house": {"key": "guest_house", "type": "combo", "label": "Type"}, "handicap": {"key": "handicap", "type": "number", "label": "Handicap", "placeholder": "1-18"}, "handrail": {"key": "handrail", "type": "check", "label": "Handrail"}, "hashtags": {"key": "hashtags", "type": "semiCombo", "label": "Suggested Hashtags", "placeholder": "#example"}, diff --git a/data/presets/fields/guest_house.json b/data/presets/fields/guest_house.json new file mode 100644 index 000000000..3ea296b12 --- /dev/null +++ b/data/presets/fields/guest_house.json @@ -0,0 +1,5 @@ +{ + "key": "guest_house", + "type": "combo", + "label": "Type" +} diff --git a/data/presets/presets.json b/data/presets/presets.json index f89f9882a..b993711aa 100644 --- a/data/presets/presets.json +++ b/data/presets/presets.json @@ -1058,7 +1058,7 @@ "tourism/caravan_site": {"icon": "temaki-rv_park", "fields": ["name", "address", "capacity", "sanitary_dump_station", "power_supply", "internet_access"], "moreFields": ["operator", "fee", "payment_multi_fee", "internet_access/fee", "internet_access/ssid", "smoking", "website", "phone", "email", "fax", "wheelchair", "reservation"], "geometry": ["point", "vertex", "area"], "terms": ["Motor Home", "Camper"], "tags": {"tourism": "caravan_site"}, "name": "RV Park"}, "tourism/chalet": {"icon": "maki-lodging", "fields": ["name", "operator", "address", "building_area", "internet_access"], "moreFields": ["air_conditioning", "smoking", "payment_multi", "internet_access/fee", "internet_access/ssid", "website", "phone", "email", "fax", "wheelchair", "reservation"], "geometry": ["point", "area"], "terms": ["holiday", "holiday cottage", "holiday home", "vacation", "vacation home"], "tags": {"tourism": "chalet"}, "name": "Holiday Cottage"}, "tourism/gallery": {"icon": "maki-art-gallery", "fields": ["name", "operator", "address", "building_area", "opening_hours"], "moreFields": ["payment_multi", "website", "phone", "email", "fax", "wheelchair"], "geometry": ["point", "area"], "terms": ["art*", "exhibit*", "paint*", "photo*", "sculpt*"], "tags": {"tourism": "gallery"}, "name": "Art Gallery"}, - "tourism/guest_house": {"icon": "maki-lodging", "fields": ["name", "operator", "address", "building_area", "rooms", "internet_access"], "moreFields": ["air_conditioning", "smoking", "payment_multi", "internet_access/fee", "internet_access/ssid", "website", "phone", "email", "fax", "wheelchair", "reservation"], "geometry": ["point", "area"], "tags": {"tourism": "guest_house"}, "terms": ["B&B", "Bed and Breakfast"], "name": "Guest House"}, + "tourism/guest_house": {"icon": "maki-lodging", "fields": ["name", "operator", "guest_house", "address", "building_area", "rooms", "internet_access"], "moreFields": ["air_conditioning", "smoking", "payment_multi", "internet_access/fee", "internet_access/ssid", "website", "phone", "email", "fax", "wheelchair", "reservation"], "geometry": ["point", "area"], "tags": {"tourism": "guest_house"}, "terms": ["B&B", "Bed and Breakfast"], "name": "Guest House"}, "tourism/hostel": {"icon": "maki-lodging", "fields": ["{tourism/guest_house}"], "moreFields": ["{tourism/guest_house}"], "geometry": ["point", "area"], "tags": {"tourism": "hostel"}, "name": "Hostel"}, "tourism/hotel": {"icon": "fas-concierge-bell", "fields": ["{tourism/motel}"], "moreFields": ["{tourism/motel}", "stars", "bar"], "geometry": ["point", "area"], "tags": {"tourism": "hotel"}, "name": "Hotel"}, "tourism/information": {"icon": "maki-information", "fields": ["information", "operator", "address", "building_area"], "geometry": ["point", "vertex", "area"], "tags": {"tourism": "information"}, "name": "Information"}, diff --git a/data/presets/presets/tourism/guest_house.json b/data/presets/presets/tourism/guest_house.json index 1beadb252..25f12144f 100644 --- a/data/presets/presets/tourism/guest_house.json +++ b/data/presets/presets/tourism/guest_house.json @@ -3,6 +3,7 @@ "fields": [ "name", "operator", + "guest_house", "address", "building_area", "rooms", diff --git a/data/taginfo.json b/data/taginfo.json index 586bdea8f..18df32f48 100644 --- a/data/taginfo.json +++ b/data/taginfo.json @@ -1332,6 +1332,7 @@ {"key": "generator:type", "description": "🄵 Type"}, {"key": "government", "description": "🄵 Type"}, {"key": "grape_variety", "description": "🄵 Grape Varieties"}, + {"key": "guest_house", "description": "🄵 Type"}, {"key": "handicap", "description": "🄵 Handicap"}, {"key": "handrail", "description": "🄵 Handrail"}, {"key": "hashtags", "description": "🄵 Suggested Hashtags"}, @@ -1841,7 +1842,7 @@ {"key": "theatre:type", "value": "amphitheatre", "description": "🄳 ➜ theatre:type=amphi"}, {"key": "toilets:disposal", "value": "longdrop", "description": "🄳 ➜ toilets:disposal=pitlatrine"}, {"key": "toilets:disposal", "value": "pit_latrine", "description": "🄳 ➜ toilets:disposal=pitlatrine"}, - {"key": "tourism", "value": "bed_and_breakfast", "description": "🄳 ➜ tourism=guest_house"}, + {"key": "tourism", "value": "bed_and_breakfast", "description": "🄳 ➜ tourism=guest_house + guest_house=bed_and_breakfast"}, {"key": "type", "value": "broad_leaved", "description": "🄳 ➜ leaf_type=broadleaved"}, {"key": "type", "value": "conifer", "description": "🄳 ➜ leaf_type=needleleaved"}, {"key": "type", "value": "deciduous", "description": "🄳 ➜ leaf_cycle=deciduous"}, diff --git a/dist/locales/en.json b/dist/locales/en.json index 7011b5598..29234efef 100644 --- a/dist/locales/en.json +++ b/dist/locales/en.json @@ -2860,6 +2860,9 @@ "grape_variety": { "label": "Grape Varieties" }, + "guest_house": { + "label": "Type" + }, "handicap": { "label": "Handicap", "placeholder": "1-18"