From 5555b1502ce8105d4694e2e414b9c4e28bd6417f Mon Sep 17 00:00:00 2001 From: Cj Malone Date: Fri, 15 Dec 2023 15:19:51 +0000 Subject: [PATCH] Add fhrs:id field (#987) Applicable presets copied from QA tool https://github.com/gregrs-uk/fhodot/blob/5a1faabe5ab719c755bc9bda4403864f832b4fa9/import/osm/imposm_mapping.yml#L17 --- data/fields/fhrs/id-GB.json | 17 +++++++++++++++++ data/presets/amenity/bar.json | 1 + data/presets/amenity/cafe.json | 1 + data/presets/amenity/childcare.json | 1 + data/presets/amenity/cinema.json | 1 + data/presets/amenity/events_venue.json | 1 + data/presets/amenity/fast_food.json | 1 + data/presets/amenity/ice_cream.json | 1 + data/presets/amenity/kindergarten.json | 1 + data/presets/amenity/nightclub.json | 1 + data/presets/amenity/pub.json | 1 + data/presets/amenity/restaurant.json | 1 + data/presets/amenity/school.json | 1 + data/presets/amenity/social_facility.json | 1 + data/presets/craft/caterer.json | 3 +++ data/presets/craft/confectionery.json | 3 +++ data/presets/craft/distillery.json | 1 + data/presets/craft/winery.json | 1 + data/presets/leisure/bowling_alley.json | 1 + data/presets/leisure/indoor_play.json | 1 + data/presets/shop/alcohol.json | 1 + data/presets/shop/bakery.json | 3 +++ data/presets/shop/butcher.json | 3 +++ data/presets/shop/cheese.json | 3 +++ data/presets/shop/chemist.json | 3 +++ data/presets/shop/confectionery.json | 3 +++ data/presets/shop/convenience.json | 1 + data/presets/shop/deli.json | 3 +++ data/presets/shop/department_store.json | 3 +++ data/presets/shop/farm.json | 3 +++ data/presets/shop/frozen_food.json | 3 +++ data/presets/shop/greengrocer.json | 3 +++ data/presets/shop/health_food.json | 3 +++ data/presets/shop/herbalist.json | 3 +++ data/presets/shop/newsagent.json | 3 +++ data/presets/shop/pastry.json | 3 +++ data/presets/shop/seafood.json | 3 +++ data/presets/shop/supermarket.json | 1 + data/presets/shop/tea.json | 3 +++ data/presets/shop/variety_store.json | 3 +++ data/presets/shop/wine.json | 1 + data/presets/tourism/chalet.json | 1 + data/presets/tourism/guest_house.json | 1 + data/presets/tourism/hostel.json | 1 + data/presets/tourism/hotel.json | 1 + 45 files changed, 99 insertions(+) create mode 100644 data/fields/fhrs/id-GB.json diff --git a/data/fields/fhrs/id-GB.json b/data/fields/fhrs/id-GB.json new file mode 100644 index 000000000..8fe9749ed --- /dev/null +++ b/data/fields/fhrs/id-GB.json @@ -0,0 +1,17 @@ +{ + "key": "fhrs:id", + "type": "identifier", + "label": "FHRS ID", + "urlFormat": "https://ratings.food.gov.uk/business/en-GB/{value}", + "pattern": "^[0-9]{1,}$", + "locationSet": { + "include": [ + "gb" + ] + }, + "terms": [ + "Food Hygiene Rating Scheme", + "Food Hygiene Rating System", + "Food Standards Agency" + ] +} diff --git a/data/presets/amenity/bar.json b/data/presets/amenity/bar.json index c532e3129..d5ef84e28 100644 --- a/data/presets/amenity/bar.json +++ b/data/presets/amenity/bar.json @@ -16,6 +16,7 @@ "operator", "outdoor_seating", "smoking", + "fhrs/id-GB", "sport/sport_pub" ], "geometry": [ diff --git a/data/presets/amenity/cafe.json b/data/presets/amenity/cafe.json index 992aa8c3d..5be7d03c0 100644 --- a/data/presets/amenity/cafe.json +++ b/data/presets/amenity/cafe.json @@ -29,6 +29,7 @@ "takeaway", "toilets", "toilets/wheelchair", + "fhrs/id-GB", "website/menu" ], "geometry": [ diff --git a/data/presets/amenity/childcare.json b/data/presets/amenity/childcare.json index 3fe836adb..6722eb7e8 100644 --- a/data/presets/amenity/childcare.json +++ b/data/presets/amenity/childcare.json @@ -14,6 +14,7 @@ "{@templates/internet_access}", "baby_feeding", "capacity", + "fhrs/id-GB", "gnis/feature_id-US", "level", "max_age", diff --git a/data/presets/amenity/cinema.json b/data/presets/amenity/cinema.json index 447fcd856..0149c75ce 100644 --- a/data/presets/amenity/cinema.json +++ b/data/presets/amenity/cinema.json @@ -13,6 +13,7 @@ "air_conditioning", "branch_brand", "brand", + "fhrs/id-GB", "min_age" ], "geometry": [ diff --git a/data/presets/amenity/events_venue.json b/data/presets/amenity/events_venue.json index de3cef87e..646702e84 100644 --- a/data/presets/amenity/events_venue.json +++ b/data/presets/amenity/events_venue.json @@ -12,6 +12,7 @@ "{@templates/internet_access}", "{@templates/poi}", "air_conditioning", + "fhrs/id-GB", "min_age", "smoking" ], diff --git a/data/presets/amenity/fast_food.json b/data/presets/amenity/fast_food.json index 6bfb5f52b..a402a2558 100644 --- a/data/presets/amenity/fast_food.json +++ b/data/presets/amenity/fast_food.json @@ -24,6 +24,7 @@ "outdoor_seating", "smoking", "takeaway", + "fhrs/id-GB", "website/menu" ], "geometry": [ diff --git a/data/presets/amenity/ice_cream.json b/data/presets/amenity/ice_cream.json index 0b83420cd..92564d6e8 100644 --- a/data/presets/amenity/ice_cream.json +++ b/data/presets/amenity/ice_cream.json @@ -14,6 +14,7 @@ "diet_multi", "drive_through", "takeaway", + "fhrs/id-GB", "website/menu" ], "geometry": [ diff --git a/data/presets/amenity/kindergarten.json b/data/presets/amenity/kindergarten.json index 0e662c182..59b49d227 100644 --- a/data/presets/amenity/kindergarten.json +++ b/data/presets/amenity/kindergarten.json @@ -11,6 +11,7 @@ "moreFields": [ "{@templates/contact}", "capacity", + "fhrs/id-GB", "gnis/feature_id-US", "internet_access", "internet_access/ssid", diff --git a/data/presets/amenity/nightclub.json b/data/presets/amenity/nightclub.json index b4724308d..cc0d1cd08 100644 --- a/data/presets/amenity/nightclub.json +++ b/data/presets/amenity/nightclub.json @@ -12,6 +12,7 @@ "moreFields": [ "{@templates/poi}", "air_conditioning", + "fhrs/id-GB", "fee" ], "geometry": [ diff --git a/data/presets/amenity/pub.json b/data/presets/amenity/pub.json index d5e4fd1eb..b0627207e 100644 --- a/data/presets/amenity/pub.json +++ b/data/presets/amenity/pub.json @@ -15,6 +15,7 @@ "cuisine", "diet_multi", "microbrewery", + "fhrs/id-GB", "min_age", "outdoor_seating", "real_fire-GB-IE", diff --git a/data/presets/amenity/restaurant.json b/data/presets/amenity/restaurant.json index 169b5795b..fc786ea5e 100644 --- a/data/presets/amenity/restaurant.json +++ b/data/presets/amenity/restaurant.json @@ -18,6 +18,7 @@ "branch_brand", "brand", "brewery", + "fhrs/id-GB", "capacity", "delivery", "highchair", diff --git a/data/presets/amenity/school.json b/data/presets/amenity/school.json index a3422c467..6822ad658 100644 --- a/data/presets/amenity/school.json +++ b/data/presets/amenity/school.json @@ -17,6 +17,7 @@ "capacity", "charge_fee", "fee", + "fhrs/id-GB", "gnis/feature_id-US", "internet_access", "internet_access/ssid", diff --git a/data/presets/amenity/social_facility.json b/data/presets/amenity/social_facility.json index 008c65ded..6d45263b0 100644 --- a/data/presets/amenity/social_facility.json +++ b/data/presets/amenity/social_facility.json @@ -12,6 +12,7 @@ "{@templates/internet_access}", "{@templates/poi}", "baby_feeding", + "fhrs/id-GB", "building_area" ], "geometry": [ diff --git a/data/presets/craft/caterer.json b/data/presets/craft/caterer.json index 226aba76a..9abd318bd 100644 --- a/data/presets/craft/caterer.json +++ b/data/presets/craft/caterer.json @@ -5,6 +5,9 @@ "cuisine", "{craft}" ], + "moreFields": [ + "fhrs/id-GB" + ], "geometry": [ "point", "area" diff --git a/data/presets/craft/confectionery.json b/data/presets/craft/confectionery.json index e6b28b896..3a2767f4c 100644 --- a/data/presets/craft/confectionery.json +++ b/data/presets/craft/confectionery.json @@ -8,6 +8,9 @@ "sweet", "candy" ], + "moreFields": [ + "fhrs/id-GB" + ], "tags": { "craft": "confectionery" }, diff --git a/data/presets/craft/distillery.json b/data/presets/craft/distillery.json index e5142e992..73d87339e 100644 --- a/data/presets/craft/distillery.json +++ b/data/presets/craft/distillery.json @@ -6,6 +6,7 @@ ], "moreFields": [ "{craft}", + "fhrs/id-GB", "min_age" ], "geometry": [ diff --git a/data/presets/craft/winery.json b/data/presets/craft/winery.json index 008cca977..29940ad72 100644 --- a/data/presets/craft/winery.json +++ b/data/presets/craft/winery.json @@ -2,6 +2,7 @@ "icon": "maki-alcohol-shop", "moreFields": [ "{craft}", + "fhrs/id-GB", "min_age" ], "geometry": [ diff --git a/data/presets/leisure/bowling_alley.json b/data/presets/leisure/bowling_alley.json index e9fa3afa1..66a6d538b 100644 --- a/data/presets/leisure/bowling_alley.json +++ b/data/presets/leisure/bowling_alley.json @@ -12,6 +12,7 @@ "{@templates/poi}", "air_conditioning", "min_age", + "fhrs/id-GB", "smoking" ], "geometry": [ diff --git a/data/presets/leisure/indoor_play.json b/data/presets/leisure/indoor_play.json index 4a4211793..5af9b8ec2 100644 --- a/data/presets/leisure/indoor_play.json +++ b/data/presets/leisure/indoor_play.json @@ -19,6 +19,7 @@ "fee", "max_age", "min_age", + "fhrs/id-GB", "operator" ], "geometry": [ diff --git a/data/presets/shop/alcohol.json b/data/presets/shop/alcohol.json index c93ab37f4..4c5886dab 100644 --- a/data/presets/shop/alcohol.json +++ b/data/presets/shop/alcohol.json @@ -6,6 +6,7 @@ ], "moreFields": [ "{shop}", + "fhrs/id-GB", "min_age" ], "geometry": [ diff --git a/data/presets/shop/bakery.json b/data/presets/shop/bakery.json index 5c51c5b89..1cda611df 100644 --- a/data/presets/shop/bakery.json +++ b/data/presets/shop/bakery.json @@ -12,5 +12,8 @@ "cakes", "rolls" ], + "moreFields": [ + "fhrs/id-GB" + ], "name": "Bakery" } diff --git a/data/presets/shop/butcher.json b/data/presets/shop/butcher.json index 98ca0bf55..00c41f01f 100644 --- a/data/presets/shop/butcher.json +++ b/data/presets/shop/butcher.json @@ -14,6 +14,9 @@ "tags": { "shop": "butcher" }, + "moreFields": [ + "fhrs/id-GB" + ], "name": "Butcher", "aliases": [ "Butcher Shop", diff --git a/data/presets/shop/cheese.json b/data/presets/shop/cheese.json index e872498bd..aa614907c 100644 --- a/data/presets/shop/cheese.json +++ b/data/presets/shop/cheese.json @@ -7,5 +7,8 @@ "tags": { "shop": "cheese" }, + "moreFields": [ + "fhrs/id-GB" + ], "name": "Cheese Store" } diff --git a/data/presets/shop/chemist.json b/data/presets/shop/chemist.json index f35832854..85398d0bc 100644 --- a/data/presets/shop/chemist.json +++ b/data/presets/shop/chemist.json @@ -21,5 +21,8 @@ "prescription", "tooth" ], + "moreFields": [ + "fhrs/id-GB" + ], "name": "Drugstore" } diff --git a/data/presets/shop/confectionery.json b/data/presets/shop/confectionery.json index 755ee14d8..cd88e45e9 100644 --- a/data/presets/shop/confectionery.json +++ b/data/presets/shop/confectionery.json @@ -13,6 +13,9 @@ "tags": { "shop": "confectionery" }, + "moreFields": [ + "fhrs/id-GB" + ], "name": "Candy Store", "aliases": [ "Candy Shop", diff --git a/data/presets/shop/convenience.json b/data/presets/shop/convenience.json index 1e47e445e..9775dafde 100644 --- a/data/presets/shop/convenience.json +++ b/data/presets/shop/convenience.json @@ -2,6 +2,7 @@ "icon": "fas-shopping-basket", "moreFields": [ "{shop}", + "fhrs/id-GB", "organic" ], "geometry": [ diff --git a/data/presets/shop/deli.json b/data/presets/shop/deli.json index a10de92d3..94b038ef0 100644 --- a/data/presets/shop/deli.json +++ b/data/presets/shop/deli.json @@ -10,6 +10,9 @@ "tags": { "shop": "deli" }, + "moreFields": [ + "fhrs/id-GB" + ], "name": "Delicatessen", "aliases": [ "Specialty Food Store", diff --git a/data/presets/shop/department_store.json b/data/presets/shop/department_store.json index f23ccd382..ad522a572 100644 --- a/data/presets/shop/department_store.json +++ b/data/presets/shop/department_store.json @@ -7,5 +7,8 @@ "tags": { "shop": "department_store" }, + "moreFields": [ + "fhrs/id-GB" + ], "name": "Department Store" } diff --git a/data/presets/shop/farm.json b/data/presets/shop/farm.json index 6da75969f..90112e6a9 100644 --- a/data/presets/shop/farm.json +++ b/data/presets/shop/farm.json @@ -4,6 +4,9 @@ "{shop}", "organic" ], + "moreFields": [ + "fhrs/id-GB" + ], "geometry": [ "point", "area" diff --git a/data/presets/shop/frozen_food.json b/data/presets/shop/frozen_food.json index 86f595f0c..f0c303eb8 100644 --- a/data/presets/shop/frozen_food.json +++ b/data/presets/shop/frozen_food.json @@ -4,6 +4,9 @@ "point", "area" ], + "moreFields": [ + "fhrs/id-GB" + ], "tags": { "shop": "frozen_food" }, diff --git a/data/presets/shop/greengrocer.json b/data/presets/shop/greengrocer.json index eac27802c..083aee6e8 100644 --- a/data/presets/shop/greengrocer.json +++ b/data/presets/shop/greengrocer.json @@ -4,6 +4,9 @@ "{shop}", "organic" ], + "moreFields": [ + "fhrs/id-GB" + ], "geometry": [ "point", "area" diff --git a/data/presets/shop/health_food.json b/data/presets/shop/health_food.json index 87ba6766a..049f7235c 100644 --- a/data/presets/shop/health_food.json +++ b/data/presets/shop/health_food.json @@ -18,6 +18,9 @@ "tags": { "shop": "health_food" }, + "moreFields": [ + "fhrs/id-GB" + ], "name": "Health Food Store", "aliases": [ "Health Food Shop" diff --git a/data/presets/shop/herbalist.json b/data/presets/shop/herbalist.json index 1e64f28a5..fb54efed0 100644 --- a/data/presets/shop/herbalist.json +++ b/data/presets/shop/herbalist.json @@ -16,5 +16,8 @@ "plant medicine", "traditional medicine" ], + "moreFields": [ + "fhrs/id-GB" + ], "name": "Herbalist" } diff --git a/data/presets/shop/newsagent.json b/data/presets/shop/newsagent.json index 2b0350a4c..a3f4d759f 100644 --- a/data/presets/shop/newsagent.json +++ b/data/presets/shop/newsagent.json @@ -4,6 +4,9 @@ "point", "area" ], + "moreFields": [ + "fhrs/id-GB" + ], "tags": { "shop": "newsagent" }, diff --git a/data/presets/shop/pastry.json b/data/presets/shop/pastry.json index b8595e06c..b7ddf8d42 100644 --- a/data/presets/shop/pastry.json +++ b/data/presets/shop/pastry.json @@ -12,5 +12,8 @@ "cake shop", "cakery" ], + "moreFields": [ + "fhrs/id-GB" + ], "name": "Pastry Shop" } diff --git a/data/presets/shop/seafood.json b/data/presets/shop/seafood.json index f6c7e2171..3c48730ff 100644 --- a/data/presets/shop/seafood.json +++ b/data/presets/shop/seafood.json @@ -10,5 +10,8 @@ "tags": { "shop": "seafood" }, + "moreFields": [ + "fhrs/id-GB" + ], "name": "Seafood Shop" } diff --git a/data/presets/shop/supermarket.json b/data/presets/shop/supermarket.json index 8d42dbfc8..af59f36f8 100644 --- a/data/presets/shop/supermarket.json +++ b/data/presets/shop/supermarket.json @@ -3,6 +3,7 @@ "moreFields": [ "{shop}", "diet_multi", + "fhrs/id-GB", "organic" ], "geometry": [ diff --git a/data/presets/shop/tea.json b/data/presets/shop/tea.json index 1cd06b40c..ef526838c 100644 --- a/data/presets/shop/tea.json +++ b/data/presets/shop/tea.json @@ -4,6 +4,9 @@ "point", "area" ], + "moreFields": [ + "fhrs/id-GB" + ], "tags": { "shop": "tea" }, diff --git a/data/presets/shop/variety_store.json b/data/presets/shop/variety_store.json index e6a0d24fa..9d4dc87fc 100644 --- a/data/presets/shop/variety_store.json +++ b/data/presets/shop/variety_store.json @@ -4,6 +4,9 @@ "point", "area" ], + "moreFields": [ + "fhrs/id-GB" + ], "tags": { "shop": "variety_store" }, diff --git a/data/presets/shop/wine.json b/data/presets/shop/wine.json index 3ab193ad7..a25637807 100644 --- a/data/presets/shop/wine.json +++ b/data/presets/shop/wine.json @@ -2,6 +2,7 @@ "icon": "maki-alcohol-shop", "moreFields": [ "{shop}", + "fhrs/id-GB", "min_age" ], "geometry": [ diff --git a/data/presets/tourism/chalet.json b/data/presets/tourism/chalet.json index 920b4cbaf..97dcfe7a7 100644 --- a/data/presets/tourism/chalet.json +++ b/data/presets/tourism/chalet.json @@ -17,6 +17,7 @@ "building/levels_building", "height_building", "payment_multi", + "fhrs/id-GB", "reservation", "smoking" ], diff --git a/data/presets/tourism/guest_house.json b/data/presets/tourism/guest_house.json index 3d18e1d93..62aa153b4 100644 --- a/data/presets/tourism/guest_house.json +++ b/data/presets/tourism/guest_house.json @@ -17,6 +17,7 @@ "{@templates/poi}", "air_conditioning", "building/levels_building", + "fhrs/id-GB", "height_building", "reservation", "smoking" diff --git a/data/presets/tourism/hostel.json b/data/presets/tourism/hostel.json index eb2508655..34eee70c8 100644 --- a/data/presets/tourism/hostel.json +++ b/data/presets/tourism/hostel.json @@ -4,6 +4,7 @@ "{tourism/guest_house}" ], "moreFields": [ + "fhrs/id-GB", "{tourism/guest_house}" ], "geometry": [ diff --git a/data/presets/tourism/hotel.json b/data/presets/tourism/hotel.json index 735338408..7300b3403 100644 --- a/data/presets/tourism/hotel.json +++ b/data/presets/tourism/hotel.json @@ -6,6 +6,7 @@ "moreFields": [ "{tourism/motel}", "bar", + "fhrs/id-GB", "ref/FR/siret-FR", "stars" ],