From 4de347dd48b01206266b86e9fc35cc492e36fa4e Mon Sep 17 00:00:00 2001 From: Martin Raifer Date: Fri, 20 May 2022 17:08:19 +0200 Subject: [PATCH] Phase out opening_hours:covid19 field (#401) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit …by making the field an optional field which is not displayed by default when selecting a preset. This approach allows mapeprs to easily see now potentially outdated pandemic opening hours and check/update/fix/convert them accordinly. --- data/presets/_attraction.json | 1 - data/presets/amenity/_coworking_space.json | 4 +++- data/presets/amenity/animal_boarding.json | 2 +- data/presets/amenity/animal_breeding.json | 2 +- data/presets/amenity/animal_shelter.json | 2 +- data/presets/amenity/arts_centre.json | 2 +- data/presets/amenity/bank.json | 2 +- data/presets/amenity/bar.json | 2 +- data/presets/amenity/bicycle_parking/building.json | 5 ++++- data/presets/amenity/bicycle_repair_station.json | 4 ++-- data/presets/amenity/biergarten.json | 4 ++-- data/presets/amenity/boat_rental.json | 2 +- data/presets/amenity/cafe.json | 2 +- data/presets/amenity/car_pooling.json | 2 +- data/presets/amenity/car_rental.json | 2 +- data/presets/amenity/car_wash.json | 2 +- data/presets/amenity/casino.json | 2 +- data/presets/amenity/childcare.json | 2 +- data/presets/amenity/cinema.json | 2 +- data/presets/amenity/clinic.json | 4 ++-- data/presets/amenity/community_centre.json | 2 +- data/presets/amenity/crematorium.json | 2 +- data/presets/amenity/dentist.json | 4 ++-- data/presets/amenity/dive_centre.json | 2 +- data/presets/amenity/doctors.json | 4 ++-- data/presets/amenity/dojo.json | 4 ++-- data/presets/amenity/driving_school.json | 4 ++-- data/presets/amenity/fast_food.json | 2 -- data/presets/amenity/food_court.json | 2 +- data/presets/amenity/give_box.json | 2 +- data/presets/amenity/ice_cream.json | 2 +- data/presets/amenity/karaoke_box.json | 2 +- data/presets/amenity/kneipp_water_cure.json | 4 +++- data/presets/amenity/language_school.json | 2 +- data/presets/amenity/library.json | 2 +- data/presets/amenity/marketplace.json | 4 ++-- data/presets/amenity/money_transfer.json | 2 +- data/presets/amenity/motorcycle_rental.json | 2 +- data/presets/amenity/music_school.json | 4 ++-- data/presets/amenity/nightclub.json | 2 +- data/presets/amenity/payment_centre.json | 2 +- data/presets/amenity/payment_terminal.json | 2 +- data/presets/amenity/pharmacy.json | 2 +- data/presets/amenity/planetarium.json | 4 ++-- data/presets/amenity/police.json | 4 ++-- data/presets/amenity/polling_station.json | 2 +- data/presets/amenity/post_office.json | 4 ++-- data/presets/amenity/prep_school.json | 4 ++-- data/presets/amenity/pub.json | 2 +- data/presets/amenity/public_bookcase.json | 4 ++-- data/presets/amenity/ranger_station.json | 4 ++-- data/presets/amenity/recycling_centre.json | 2 +- data/presets/amenity/recycling_container.json | 2 +- data/presets/amenity/restaurant.json | 2 +- data/presets/amenity/shower.json | 2 +- data/presets/amenity/smoking_area.json | 4 ++-- data/presets/amenity/toy_library.json | 4 ++-- data/presets/amenity/vehicle_inspection.json | 4 ++-- data/presets/amenity/veterinary.json | 4 ++-- data/presets/amenity/waste_transfer_station.json | 2 +- data/presets/amenity/water_point.json | 4 ++-- data/presets/amenity/watering_place.json | 4 +++- data/presets/barrier/gate.json | 2 +- data/presets/barrier/lift_gate.json | 5 ++++- data/presets/club.json | 2 +- data/presets/craft.json | 2 +- data/presets/emergency/lifeguard.json | 4 +++- data/presets/healthcare/laboratory.json | 5 ++++- data/presets/healthcare/sample_collection.json | 5 ++++- data/presets/highway/rest_area.json | 4 ++-- data/presets/highway/toll_gantry.json | 2 +- data/presets/landuse/industrial/scrap_yard.json | 5 ++++- data/presets/landuse/industrial/slaughterhouse.json | 5 ++++- data/presets/leisure/beach_resort.json | 2 +- data/presets/leisure/bird_hide.json | 4 ++-- data/presets/leisure/bowling_alley.json | 4 ++-- data/presets/leisure/dance.json | 2 +- data/presets/leisure/dancing_school.json | 2 +- data/presets/leisure/disc_golf_course.json | 4 ++-- data/presets/leisure/escape_game.json | 2 +- data/presets/leisure/fitness_centre.json | 2 +- data/presets/leisure/golf_course.json | 4 ++-- data/presets/leisure/hackerspace.json | 2 +- data/presets/leisure/ice_rink.json | 4 ++-- data/presets/leisure/indoor_play.json | 2 +- data/presets/leisure/miniature_golf.json | 2 +- data/presets/leisure/nature_reserve.json | 4 ++-- data/presets/leisure/park.json | 4 ++-- data/presets/leisure/resort.json | 4 ++-- data/presets/leisure/sauna.json | 2 +- data/presets/leisure/sports_centre.json | 2 +- data/presets/leisure/sports_hall.json | 2 +- data/presets/leisure/trampoline_park.json | 2 +- data/presets/office.json | 2 +- data/presets/polling_station.json | 2 +- data/presets/shop.json | 2 +- data/presets/tourism/aquarium.json | 4 ++-- data/presets/tourism/gallery.json | 4 ++-- data/presets/tourism/museum.json | 4 ++-- data/presets/tourism/theme_park.json | 2 +- data/presets/tourism/zoo.json | 2 +- data/presets/waterway/fuel.json | 2 +- 102 files changed, 158 insertions(+), 135 deletions(-) diff --git a/data/presets/_attraction.json b/data/presets/_attraction.json index a93e24c9..e96d5bd9 100644 --- a/data/presets/_attraction.json +++ b/data/presets/_attraction.json @@ -5,7 +5,6 @@ "attraction", "operator", "opening_hours", - "opening_hours/covid19", "fee", "charge_fee" ], diff --git a/data/presets/amenity/_coworking_space.json b/data/presets/amenity/_coworking_space.json index 278bc117..54c1bd3a 100644 --- a/data/presets/amenity/_coworking_space.json +++ b/data/presets/amenity/_coworking_space.json @@ -5,11 +5,13 @@ "address", "building_area", "opening_hours", - "opening_hours/covid19", "internet_access", "internet_access/fee", "internet_access/ssid" ], + "moreFields": [ + "opening_hours/covid19" + ], "geometry": [ "point", "area" diff --git a/data/presets/amenity/animal_boarding.json b/data/presets/amenity/animal_boarding.json index 02784576..e12b8b9a 100644 --- a/data/presets/amenity/animal_boarding.json +++ b/data/presets/amenity/animal_boarding.json @@ -6,7 +6,6 @@ "address", "building_area", "opening_hours", - "opening_hours/covid19", "animal_boarding" ], "moreFields": [ @@ -14,6 +13,7 @@ "fax", "gnis/feature_id-US", "level", + "opening_hours/covid19", "payment_multi", "phone", "website", diff --git a/data/presets/amenity/animal_breeding.json b/data/presets/amenity/animal_breeding.json index caa4970f..55e68ae8 100644 --- a/data/presets/amenity/animal_breeding.json +++ b/data/presets/amenity/animal_breeding.json @@ -6,7 +6,6 @@ "address", "building_area", "opening_hours", - "opening_hours/covid19", "animal_breeding" ], "moreFields": [ @@ -14,6 +13,7 @@ "fax", "gnis/feature_id-US", "level", + "opening_hours/covid19", "phone", "website", "wheelchair" diff --git a/data/presets/amenity/animal_shelter.json b/data/presets/amenity/animal_shelter.json index 5272b251..801c3a51 100644 --- a/data/presets/amenity/animal_shelter.json +++ b/data/presets/amenity/animal_shelter.json @@ -6,7 +6,6 @@ "address", "building_area", "opening_hours", - "opening_hours/covid19", "animal_shelter" ], "moreFields": [ @@ -14,6 +13,7 @@ "fax", "gnis/feature_id-US", "level", + "opening_hours/covid19", "phone", "website", "wheelchair" diff --git a/data/presets/amenity/arts_centre.json b/data/presets/amenity/arts_centre.json index b21633d1..e261c209 100644 --- a/data/presets/amenity/arts_centre.json +++ b/data/presets/amenity/arts_centre.json @@ -5,7 +5,6 @@ "address", "building_area", "opening_hours", - "opening_hours/covid19", "website" ], "moreFields": [ @@ -18,6 +17,7 @@ "internet_access/fee", "internet_access/ssid", "level", + "opening_hours/covid19", "payment_multi", "phone", "website", diff --git a/data/presets/amenity/bank.json b/data/presets/amenity/bank.json index e774d5b4..58c9609d 100644 --- a/data/presets/amenity/bank.json +++ b/data/presets/amenity/bank.json @@ -6,7 +6,6 @@ "address", "building_area", "opening_hours", - "opening_hours/covid19", "atm", "drive_through" ], @@ -22,6 +21,7 @@ "internet_access/fee", "internet_access/ssid", "level", + "opening_hours/covid19", "phone", "ref/vatin", "website", diff --git a/data/presets/amenity/bar.json b/data/presets/amenity/bar.json index 026b768d..919cad63 100644 --- a/data/presets/amenity/bar.json +++ b/data/presets/amenity/bar.json @@ -5,7 +5,6 @@ "address", "building_area", "opening_hours", - "opening_hours/covid19", "min_age", "brewery" ], @@ -19,6 +18,7 @@ "internet_access/ssid", "level", "microbrewery", + "opening_hours/covid19", "operator", "outdoor_seating", "payment_multi", diff --git a/data/presets/amenity/bicycle_parking/building.json b/data/presets/amenity/bicycle_parking/building.json index dd409197..17c27e4c 100644 --- a/data/presets/amenity/bicycle_parking/building.json +++ b/data/presets/amenity/bicycle_parking/building.json @@ -3,9 +3,12 @@ "fields": [ "{amenity/bicycle_parking}", "opening_hours", - "opening_hours/covid19", "building_area" ], + "moreFields": [ + "{amenity/bicycle_parking}", + "opening_hours/covid19" + ], "geometry": [ "point", "vertex", diff --git a/data/presets/amenity/bicycle_repair_station.json b/data/presets/amenity/bicycle_repair_station.json index 8da11cf1..edc98ef7 100644 --- a/data/presets/amenity/bicycle_repair_station.json +++ b/data/presets/amenity/bicycle_repair_station.json @@ -4,7 +4,6 @@ "operator", "brand", "opening_hours", - "opening_hours/covid19", "fee", "payment_multi_fee", "charge_fee", @@ -16,7 +15,8 @@ "covered", "indoor", "level", - "manufacturer" + "manufacturer", + "opening_hours/covid19" ], "geometry": [ "point", diff --git a/data/presets/amenity/biergarten.json b/data/presets/amenity/biergarten.json index 75547974..63991950 100644 --- a/data/presets/amenity/biergarten.json +++ b/data/presets/amenity/biergarten.json @@ -4,14 +4,14 @@ "name", "address", "opening_hours", - "opening_hours/covid19", "outdoor_seating", "brewery" ], "moreFields": [ "{amenity/bar}", "building_area", - "cuisine" + "cuisine", + "opening_hours/covid19" ], "geometry": [ "point", diff --git a/data/presets/amenity/boat_rental.json b/data/presets/amenity/boat_rental.json index 75e394de..4e847b7f 100644 --- a/data/presets/amenity/boat_rental.json +++ b/data/presets/amenity/boat_rental.json @@ -5,7 +5,6 @@ "operator", "operator/type", "opening_hours", - "opening_hours/covid19", "fee", "payment_multi_fee", "charge_fee" @@ -15,6 +14,7 @@ "address", "email", "fax", + "opening_hours/covid19", "phone", "website", "wheelchair" diff --git a/data/presets/amenity/cafe.json b/data/presets/amenity/cafe.json index 99901f9f..4053e441 100644 --- a/data/presets/amenity/cafe.json +++ b/data/presets/amenity/cafe.json @@ -6,7 +6,6 @@ "address", "building_area", "opening_hours", - "opening_hours/covid19", "outdoor_seating", "internet_access", "internet_access/fee", @@ -28,6 +27,7 @@ "level", "min_age", "not/name", + "opening_hours/covid19", "payment_multi", "ref/vatin", "reservation", diff --git a/data/presets/amenity/car_pooling.json b/data/presets/amenity/car_pooling.json index 5e6fd12a..0748342c 100644 --- a/data/presets/amenity/car_pooling.json +++ b/data/presets/amenity/car_pooling.json @@ -7,12 +7,12 @@ "capacity", "address", "opening_hours", - "opening_hours/covid19", "lit" ], "moreFields": [ "email", "fax", + "opening_hours/covid19", "phone", "website", "wheelchair" diff --git a/data/presets/amenity/car_rental.json b/data/presets/amenity/car_rental.json index 63f38283..b511ab29 100644 --- a/data/presets/amenity/car_rental.json +++ b/data/presets/amenity/car_rental.json @@ -5,7 +5,6 @@ "operator", "address", "opening_hours", - "opening_hours/covid19", "payment_multi" ], "moreFields": [ @@ -13,6 +12,7 @@ "brand", "email", "fax", + "opening_hours/covid19", "phone", "website", "wheelchair" diff --git a/data/presets/amenity/car_wash.json b/data/presets/amenity/car_wash.json index 4d220793..f1aa2d23 100644 --- a/data/presets/amenity/car_wash.json +++ b/data/presets/amenity/car_wash.json @@ -6,7 +6,6 @@ "address", "building_area", "opening_hours", - "opening_hours/covid19", "payment_multi", "self_service", "automated" @@ -15,6 +14,7 @@ "email", "fax", "gnis/feature_id-US", + "opening_hours/covid19", "phone", "website", "wheelchair" diff --git a/data/presets/amenity/casino.json b/data/presets/amenity/casino.json index 0d9cbdfb..8dbea4be 100644 --- a/data/presets/amenity/casino.json +++ b/data/presets/amenity/casino.json @@ -6,7 +6,6 @@ "address", "building_area", "opening_hours", - "opening_hours/covid19", "gambling", "smoking" ], @@ -20,6 +19,7 @@ "internet_access/ssid", "level", "min_age", + "opening_hours/covid19", "payment_multi", "phone", "ref/vatin", diff --git a/data/presets/amenity/childcare.json b/data/presets/amenity/childcare.json index 079940d3..fbb51745 100644 --- a/data/presets/amenity/childcare.json +++ b/data/presets/amenity/childcare.json @@ -7,7 +7,6 @@ "address", "building_area", "opening_hours", - "opening_hours/covid19", "website" ], "moreFields": [ @@ -23,6 +22,7 @@ "max_age", "min_age", "not/name", + "opening_hours/covid19", "payment_multi", "phone", "wheelchair" diff --git a/data/presets/amenity/cinema.json b/data/presets/amenity/cinema.json index b343ad26..8c905f65 100644 --- a/data/presets/amenity/cinema.json +++ b/data/presets/amenity/cinema.json @@ -6,7 +6,6 @@ "screen", "building_area", "opening_hours", - "opening_hours/covid19", "payment_multi" ], "moreFields": [ @@ -18,6 +17,7 @@ "gnis/feature_id-US", "level", "min_age", + "opening_hours/covid19", "phone", "website", "wheelchair" diff --git a/data/presets/amenity/clinic.json b/data/presets/amenity/clinic.json index 6d419f48..441c7a85 100644 --- a/data/presets/amenity/clinic.json +++ b/data/presets/amenity/clinic.json @@ -7,8 +7,7 @@ "healthcare/speciality", "address", "building_area", - "opening_hours", - "opening_hours/covid19" + "opening_hours" ], "moreFields": [ "air_conditioning", @@ -18,6 +17,7 @@ "fax", "gnis/feature_id-US", "level", + "opening_hours/covid19", "payment_multi", "phone", "website", diff --git a/data/presets/amenity/community_centre.json b/data/presets/amenity/community_centre.json index b0f86ea5..975d5ae0 100644 --- a/data/presets/amenity/community_centre.json +++ b/data/presets/amenity/community_centre.json @@ -7,7 +7,6 @@ "address", "building_area", "opening_hours", - "opening_hours/covid19", "website" ], "moreFields": [ @@ -16,6 +15,7 @@ "email", "fax", "gnis/feature_id-US", + "opening_hours/covid19", "phone", "polling_station", "wheelchair" diff --git a/data/presets/amenity/crematorium.json b/data/presets/amenity/crematorium.json index a3000c19..e734a257 100644 --- a/data/presets/amenity/crematorium.json +++ b/data/presets/amenity/crematorium.json @@ -5,7 +5,6 @@ "website", "phone", "opening_hours", - "opening_hours/covid19", "wheelchair" ], "moreFields": [ @@ -14,6 +13,7 @@ "fax", "gnis/feature_id-US", "level", + "opening_hours/covid19", "phone", "website", "wheelchair" diff --git a/data/presets/amenity/dentist.json b/data/presets/amenity/dentist.json index 03874d4c..06a59580 100644 --- a/data/presets/amenity/dentist.json +++ b/data/presets/amenity/dentist.json @@ -6,14 +6,14 @@ "healthcare/speciality", "address", "building_area", - "opening_hours", - "opening_hours/covid19" + "opening_hours" ], "moreFields": [ "email", "fax", "gnis/feature_id-US", "level", + "opening_hours/covid19", "payment_multi", "phone", "website", diff --git a/data/presets/amenity/dive_centre.json b/data/presets/amenity/dive_centre.json index 75ba1191..96800910 100644 --- a/data/presets/amenity/dive_centre.json +++ b/data/presets/amenity/dive_centre.json @@ -6,7 +6,6 @@ "address", "building_area", "opening_hours", - "opening_hours/covid19", "scuba_diving" ], "moreFields": [ @@ -14,6 +13,7 @@ "fax", "gnis/feature_id-US", "level", + "opening_hours/covid19", "payment_multi", "phone", "website", diff --git a/data/presets/amenity/doctors.json b/data/presets/amenity/doctors.json index f81525e1..187c9b40 100644 --- a/data/presets/amenity/doctors.json +++ b/data/presets/amenity/doctors.json @@ -6,14 +6,14 @@ "healthcare/speciality", "address", "building_area", - "opening_hours", - "opening_hours/covid19" + "opening_hours" ], "moreFields": [ "email", "fax", "gnis/feature_id-US", "level", + "opening_hours/covid19", "payment_multi", "phone", "website", diff --git a/data/presets/amenity/dojo.json b/data/presets/amenity/dojo.json index 4d775b02..9d61f101 100644 --- a/data/presets/amenity/dojo.json +++ b/data/presets/amenity/dojo.json @@ -5,14 +5,14 @@ "sport", "address", "building_area", - "opening_hours", - "opening_hours/covid19" + "opening_hours" ], "moreFields": [ "email", "fax", "gnis/feature_id-US", "level", + "opening_hours/covid19", "payment_multi", "phone", "website", diff --git a/data/presets/amenity/driving_school.json b/data/presets/amenity/driving_school.json index 45e714de..7fdd6662 100644 --- a/data/presets/amenity/driving_school.json +++ b/data/presets/amenity/driving_school.json @@ -6,14 +6,14 @@ "operator/type", "address", "building_area", - "opening_hours", - "opening_hours/covid19" + "opening_hours" ], "moreFields": [ "email", "fax", "gnis/feature_id-US", "level", + "opening_hours/covid19", "payment_multi", "phone", "website", diff --git a/data/presets/amenity/fast_food.json b/data/presets/amenity/fast_food.json index 885c1341..e31a8a30 100644 --- a/data/presets/amenity/fast_food.json +++ b/data/presets/amenity/fast_food.json @@ -8,7 +8,6 @@ "address", "building_area", "opening_hours", - "opening_hours/covid19", "drive_through", "phone", "website" @@ -26,7 +25,6 @@ "internet_access/fee", "internet_access/ssid", "level", - "opening_hours", "opening_hours/covid19", "outdoor_seating", "payment_multi", diff --git a/data/presets/amenity/food_court.json b/data/presets/amenity/food_court.json index 473695b9..12088073 100644 --- a/data/presets/amenity/food_court.json +++ b/data/presets/amenity/food_court.json @@ -6,7 +6,6 @@ "address", "building_area", "opening_hours", - "opening_hours/covid19", "internet_access", "internet_access/fee", "internet_access/ssid" @@ -19,6 +18,7 @@ "gnis/feature_id-US", "level", "not/name", + "opening_hours/covid19", "outdoor_seating", "phone", "smoking", diff --git a/data/presets/amenity/give_box.json b/data/presets/amenity/give_box.json index b0d284fe..91710d55 100644 --- a/data/presets/amenity/give_box.json +++ b/data/presets/amenity/give_box.json @@ -4,7 +4,6 @@ "name", "operator", "opening_hours", - "opening_hours/covid19", "access_simple", "website" ], @@ -19,6 +18,7 @@ "level", "lit", "location", + "opening_hours/covid19", "phone", "ref", "wheelchair" diff --git a/data/presets/amenity/ice_cream.json b/data/presets/amenity/ice_cream.json index e01fb4ee..1eb5e81d 100644 --- a/data/presets/amenity/ice_cream.json +++ b/data/presets/amenity/ice_cream.json @@ -5,7 +5,6 @@ "address", "building_area", "opening_hours", - "opening_hours/covid19", "outdoor_seating" ], "moreFields": [ @@ -19,6 +18,7 @@ "internet_access/fee", "internet_access/ssid", "level", + "opening_hours/covid19", "payment_multi", "phone", "takeaway", diff --git a/data/presets/amenity/karaoke_box.json b/data/presets/amenity/karaoke_box.json index 9029dea0..81b161fb 100644 --- a/data/presets/amenity/karaoke_box.json +++ b/data/presets/amenity/karaoke_box.json @@ -6,7 +6,6 @@ "address", "building_area", "opening_hours", - "opening_hours/covid19", "website" ], "moreFields": [ @@ -16,6 +15,7 @@ "gnis/feature_id-US", "level", "min_age", + "opening_hours/covid19", "payment_multi", "phone", "ref/vatin", diff --git a/data/presets/amenity/kneipp_water_cure.json b/data/presets/amenity/kneipp_water_cure.json index 46859f57..9f6af963 100644 --- a/data/presets/amenity/kneipp_water_cure.json +++ b/data/presets/amenity/kneipp_water_cure.json @@ -3,9 +3,11 @@ "fields": [ "kneipp_water_cure_multi", "opening_hours", - "opening_hours/covid19", "fee" ], + "moreFields": [ + "opening_hours/covid19" + ], "geometry": [ "point", "area" diff --git a/data/presets/amenity/language_school.json b/data/presets/amenity/language_school.json index ed2fc279..66aa9d5b 100644 --- a/data/presets/amenity/language_school.json +++ b/data/presets/amenity/language_school.json @@ -7,7 +7,6 @@ "address", "building_area", "opening_hours", - "opening_hours/covid19", "language_multi" ], "moreFields": [ @@ -18,6 +17,7 @@ "internet_access/fee", "internet_access/ssid", "level", + "opening_hours/covid19", "payment_multi", "phone", "website", diff --git a/data/presets/amenity/library.json b/data/presets/amenity/library.json index 919cd9b4..045fe4ba 100644 --- a/data/presets/amenity/library.json +++ b/data/presets/amenity/library.json @@ -5,6 +5,7 @@ "operator", "operator/type", "building_area", + "opening_hours", "address", "ref/isil", "internet_access", @@ -20,7 +21,6 @@ "gnis/feature_id-US", "level", "not/name", - "opening_hours", "opening_hours/covid19", "payment_multi", "phone", diff --git a/data/presets/amenity/marketplace.json b/data/presets/amenity/marketplace.json index db66ff76..0ac7bd34 100644 --- a/data/presets/amenity/marketplace.json +++ b/data/presets/amenity/marketplace.json @@ -5,13 +5,13 @@ "operator", "address", "building", - "opening_hours", - "opening_hours/covid19" + "opening_hours" ], "moreFields": [ "email", "fax", "gnis/feature_id-US", + "opening_hours/covid19", "phone", "website", "wheelchair" diff --git a/data/presets/amenity/money_transfer.json b/data/presets/amenity/money_transfer.json index 0d17ca5e..6390410c 100644 --- a/data/presets/amenity/money_transfer.json +++ b/data/presets/amenity/money_transfer.json @@ -5,6 +5,7 @@ "brand", "address", "building_area", + "opening_hours", "payment_multi", "currency_multi" ], @@ -13,7 +14,6 @@ "email", "fax", "level", - "opening_hours", "opening_hours/covid19", "phone", "website", diff --git a/data/presets/amenity/motorcycle_rental.json b/data/presets/amenity/motorcycle_rental.json index 4e12da39..e11f9e08 100644 --- a/data/presets/amenity/motorcycle_rental.json +++ b/data/presets/amenity/motorcycle_rental.json @@ -5,7 +5,6 @@ "operator", "address", "opening_hours", - "opening_hours/covid19", "payment_multi" ], "moreFields": [ @@ -13,6 +12,7 @@ "brand", "email", "fax", + "opening_hours/covid19", "phone", "website", "wheelchair" diff --git a/data/presets/amenity/music_school.json b/data/presets/amenity/music_school.json index e134dbbd..b723cc6a 100644 --- a/data/presets/amenity/music_school.json +++ b/data/presets/amenity/music_school.json @@ -5,14 +5,14 @@ "operator", "address", "building_area", - "opening_hours", - "opening_hours/covid19" + "opening_hours" ], "moreFields": [ "email", "fax", "gnis/feature_id-US", "level", + "opening_hours/covid19", "payment_multi", "phone", "website", diff --git a/data/presets/amenity/nightclub.json b/data/presets/amenity/nightclub.json index faa8f9a7..b2e8d407 100644 --- a/data/presets/amenity/nightclub.json +++ b/data/presets/amenity/nightclub.json @@ -6,7 +6,6 @@ "address", "building_area", "opening_hours", - "opening_hours/covid19", "min_age", "smoking" ], @@ -17,6 +16,7 @@ "gnis/feature_id-US", "level", "payment_multi", + "opening_hours/covid19", "phone", "website", "wheelchair", diff --git a/data/presets/amenity/payment_centre.json b/data/presets/amenity/payment_centre.json index fcd6ee48..970170f8 100644 --- a/data/presets/amenity/payment_centre.json +++ b/data/presets/amenity/payment_centre.json @@ -6,7 +6,6 @@ "address", "building_area", "opening_hours", - "opening_hours/covid19", "payment_multi" ], "moreFields": [ @@ -15,6 +14,7 @@ "email", "fax", "level", + "opening_hours/covid19", "phone", "website", "wheelchair" diff --git a/data/presets/amenity/payment_terminal.json b/data/presets/amenity/payment_terminal.json index 78832388..cdebc8be 100644 --- a/data/presets/amenity/payment_terminal.json +++ b/data/presets/amenity/payment_terminal.json @@ -5,7 +5,6 @@ "brand", "address", "opening_hours", - "opening_hours/covid19", "payment_multi" ], "moreFields": [ @@ -15,6 +14,7 @@ "currency_multi", "indoor", "level", + "opening_hours/covid19", "wheelchair" ], "geometry": [ diff --git a/data/presets/amenity/pharmacy.json b/data/presets/amenity/pharmacy.json index e5171671..86309cd0 100644 --- a/data/presets/amenity/pharmacy.json +++ b/data/presets/amenity/pharmacy.json @@ -6,7 +6,6 @@ "address", "building_area", "opening_hours", - "opening_hours/covid19", "dispensing", "drive_through" ], @@ -17,6 +16,7 @@ "fax", "gnis/feature_id-US", "level", + "opening_hours/covid19", "payment_multi", "phone", "website", diff --git a/data/presets/amenity/planetarium.json b/data/presets/amenity/planetarium.json index 3e60d756..eef52e08 100644 --- a/data/presets/amenity/planetarium.json +++ b/data/presets/amenity/planetarium.json @@ -5,8 +5,7 @@ "operator", "address", "building_area", - "opening_hours", - "opening_hours/covid19" + "opening_hours" ], "moreFields": [ "air_conditioning", @@ -15,6 +14,7 @@ "fax", "fee", "gnis/feature_id-US", + "opening_hours/covid19", "payment_multi_fee", "phone", "website", diff --git a/data/presets/amenity/police.json b/data/presets/amenity/police.json index 3711d2cc..c425ed98 100644 --- a/data/presets/amenity/police.json +++ b/data/presets/amenity/police.json @@ -5,14 +5,14 @@ "operator", "address", "building_area", - "opening_hours", - "opening_hours/covid19" + "opening_hours" ], "moreFields": [ "email", "fax", "gnis/feature_id-US", "level", + "opening_hours/covid19", "phone", "polling_station", "website", diff --git a/data/presets/amenity/polling_station.json b/data/presets/amenity/polling_station.json index 969c36fc..d7799155 100644 --- a/data/presets/amenity/polling_station.json +++ b/data/presets/amenity/polling_station.json @@ -6,7 +6,6 @@ "operator", "address", "opening_hours", - "opening_hours/covid19", "building_area" ], "moreFields": [ @@ -18,6 +17,7 @@ "internet_access/fee", "internet_access/ssid", "level", + "opening_hours/covid19", "phone", "website", "wheelchair" diff --git a/data/presets/amenity/post_office.json b/data/presets/amenity/post_office.json index 99966e6f..fdc8a268 100644 --- a/data/presets/amenity/post_office.json +++ b/data/presets/amenity/post_office.json @@ -5,8 +5,7 @@ "operator", "address", "building_area", - "opening_hours", - "opening_hours/covid19" + "opening_hours" ], "moreFields": [ "branch_brand", @@ -18,6 +17,7 @@ "internet_access/fee", "internet_access/ssid", "level", + "opening_hours/covid19", "payment_multi", "phone", "polling_station", diff --git a/data/presets/amenity/prep_school.json b/data/presets/amenity/prep_school.json index be4e7335..fd50bc5e 100644 --- a/data/presets/amenity/prep_school.json +++ b/data/presets/amenity/prep_school.json @@ -5,14 +5,14 @@ "operator", "address", "building_area", - "opening_hours", - "opening_hours/covid19" + "opening_hours" ], "moreFields": [ "email", "fax", "gnis/feature_id-US", "level", + "opening_hours/covid19", "payment_multi", "phone", "website", diff --git a/data/presets/amenity/pub.json b/data/presets/amenity/pub.json index 194dff5a..9d9ae734 100644 --- a/data/presets/amenity/pub.json +++ b/data/presets/amenity/pub.json @@ -5,7 +5,6 @@ "address", "building_area", "opening_hours", - "opening_hours/covid19", "smoking", "brewery" ], @@ -22,6 +21,7 @@ "level", "microbrewery", "min_age", + "opening_hours/covid19", "outdoor_seating", "payment_multi", "phone", diff --git a/data/presets/amenity/public_bookcase.json b/data/presets/amenity/public_bookcase.json index f4864ea7..7ffb2050 100644 --- a/data/presets/amenity/public_bookcase.json +++ b/data/presets/amenity/public_bookcase.json @@ -4,8 +4,6 @@ "name", "public_bookcase/type", "operator", - "opening_hours", - "opening_hours/covid19", "capacity", "website", "lit" @@ -20,6 +18,8 @@ "indoor", "level", "location", + "opening_hours", + "opening_hours/covid19", "phone", "ref", "wheelchair" diff --git a/data/presets/amenity/ranger_station.json b/data/presets/amenity/ranger_station.json index adc67542..414fd039 100644 --- a/data/presets/amenity/ranger_station.json +++ b/data/presets/amenity/ranger_station.json @@ -5,8 +5,7 @@ "operator", "address", "building_area", - "opening_hours", - "opening_hours/covid19" + "opening_hours" ], "moreFields": [ "email", @@ -15,6 +14,7 @@ "internet_access", "internet_access/fee", "internet_access/ssid", + "opening_hours/covid19", "phone", "website", "wheelchair" diff --git a/data/presets/amenity/recycling_centre.json b/data/presets/amenity/recycling_centre.json index 0c7277f3..f062cf97 100644 --- a/data/presets/amenity/recycling_centre.json +++ b/data/presets/amenity/recycling_centre.json @@ -7,7 +7,6 @@ "address", "building", "opening_hours", - "opening_hours/covid19", "recycling_accepts" ], "moreFields": [ @@ -15,6 +14,7 @@ "email", "fax", "fee", + "opening_hours/covid19", "payment_multi_fee", "phone", "website", diff --git a/data/presets/amenity/recycling_container.json b/data/presets/amenity/recycling_container.json index 7b787eea..340cb003 100644 --- a/data/presets/amenity/recycling_container.json +++ b/data/presets/amenity/recycling_container.json @@ -4,7 +4,6 @@ "operator", "recycling_accepts", "opening_hours", - "opening_hours/covid19", "collection_times" ], "moreFields": [ @@ -14,6 +13,7 @@ "level", "manufacturer", "material", + "opening_hours/covid19", "ref" ], "geometry": [ diff --git a/data/presets/amenity/restaurant.json b/data/presets/amenity/restaurant.json index db1b70ce..14e67cfd 100644 --- a/data/presets/amenity/restaurant.json +++ b/data/presets/amenity/restaurant.json @@ -7,7 +7,6 @@ "address", "building_area", "opening_hours", - "opening_hours/covid19", "phone", "website" ], @@ -29,6 +28,7 @@ "microbrewery", "min_age", "not/name", + "opening_hours/covid19", "outdoor_seating", "payment_multi", "ref/vatin", diff --git a/data/presets/amenity/shower.json b/data/presets/amenity/shower.json index db5d14c4..7eddee04 100644 --- a/data/presets/amenity/shower.json +++ b/data/presets/amenity/shower.json @@ -2,7 +2,6 @@ "icon": "temaki-shower", "fields": [ "opening_hours", - "opening_hours/covid19", "access_simple", "fee", "payment_multi_fee", @@ -16,6 +15,7 @@ "address", "gender", "level", + "opening_hours/covid19", "operator" ], "geometry": [ diff --git a/data/presets/amenity/smoking_area.json b/data/presets/amenity/smoking_area.json index 44c4843a..3004beba 100644 --- a/data/presets/amenity/smoking_area.json +++ b/data/presets/amenity/smoking_area.json @@ -5,13 +5,13 @@ "shelter", "bin", "bench", - "opening_hours", - "opening_hours/covid19" + "opening_hours" ], "moreFields": [ "covered", "level", "lit", + "opening_hours/covid19", "wheelchair" ], "geometry": [ diff --git a/data/presets/amenity/toy_library.json b/data/presets/amenity/toy_library.json index c08b8de7..2859b87f 100644 --- a/data/presets/amenity/toy_library.json +++ b/data/presets/amenity/toy_library.json @@ -4,11 +4,11 @@ "operator", "address", "building_area", - "opening_hours", - "opening_hours/covid19" + "opening_hours" ], "moreFields": [ "level", + "opening_hours/covid19", "website", "wheelchair" ], diff --git a/data/presets/amenity/vehicle_inspection.json b/data/presets/amenity/vehicle_inspection.json index 018304f2..70386674 100644 --- a/data/presets/amenity/vehicle_inspection.json +++ b/data/presets/amenity/vehicle_inspection.json @@ -5,13 +5,13 @@ "operator", "address", "building_area", - "opening_hours", - "opening_hours/covid19" + "opening_hours" ], "moreFields": [ "email", "fax", "gnis/feature_id-US", + "opening_hours/covid19", "payment_multi", "phone", "website", diff --git a/data/presets/amenity/veterinary.json b/data/presets/amenity/veterinary.json index 77bfe06d..048851d8 100644 --- a/data/presets/amenity/veterinary.json +++ b/data/presets/amenity/veterinary.json @@ -5,8 +5,7 @@ "operator", "address", "building_area", - "opening_hours", - "opening_hours/covid19" + "opening_hours" ], "moreFields": [ "charge_fee", @@ -15,6 +14,7 @@ "fee", "gnis/feature_id-US", "level", + "opening_hours/covid19", "payment_multi_fee", "phone", "website", diff --git a/data/presets/amenity/waste_transfer_station.json b/data/presets/amenity/waste_transfer_station.json index b30329b8..e25320e8 100644 --- a/data/presets/amenity/waste_transfer_station.json +++ b/data/presets/amenity/waste_transfer_station.json @@ -7,7 +7,6 @@ "waste", "address", "opening_hours", - "opening_hours/covid19", "fee", "payment_multi_fee", "charge_fee" @@ -15,6 +14,7 @@ "moreFields": [ "email", "fax", + "opening_hours/covid19", "phone", "website", "wheelchair" diff --git a/data/presets/amenity/water_point.json b/data/presets/amenity/water_point.json index 4bbaca0e..03b358b5 100644 --- a/data/presets/amenity/water_point.json +++ b/data/presets/amenity/water_point.json @@ -6,13 +6,13 @@ "fee", "payment_multi_fee", "charge_fee", - "opening_hours", - "opening_hours/covid19" + "opening_hours" ], "moreFields": [ "covered", "drinking_water", "lit", + "opening_hours/covid19", "ref" ], "geometry": [ diff --git a/data/presets/amenity/watering_place.json b/data/presets/amenity/watering_place.json index c4dbdd8f..690d5284 100644 --- a/data/presets/amenity/watering_place.json +++ b/data/presets/amenity/watering_place.json @@ -5,7 +5,9 @@ "fee", "payment_multi_fee", "charge_fee", - "opening_hours", + "opening_hours" + ], + "moreFields": [ "opening_hours/covid19" ], "geometry": [ diff --git a/data/presets/barrier/gate.json b/data/presets/barrier/gate.json index 2a814ad4..b5280656 100644 --- a/data/presets/barrier/gate.json +++ b/data/presets/barrier/gate.json @@ -5,13 +5,13 @@ "locked", "wheelchair", "opening_hours", - "opening_hours/covid19", "height", "material" ], "moreFields": [ "colour", "manufacturer", + "opening_hours/covid19", "operator", "ref" ], diff --git a/data/presets/barrier/lift_gate.json b/data/presets/barrier/lift_gate.json index 3ae61116..b3094052 100644 --- a/data/presets/barrier/lift_gate.json +++ b/data/presets/barrier/lift_gate.json @@ -3,7 +3,10 @@ "fields": [ "access", "locked", - "opening_hours", + "opening_hours" + ], + "moreFields": [ + "{barrier}", "opening_hours/covid19" ], "geometry": [ diff --git a/data/presets/club.json b/data/presets/club.json index fc63a0d7..1ec69ec2 100644 --- a/data/presets/club.json +++ b/data/presets/club.json @@ -7,7 +7,6 @@ "address", "building_area", "opening_hours", - "opening_hours/covid19", "phone", "website" ], @@ -24,6 +23,7 @@ "level", "max_age", "min_age", + "opening_hours/covid19", "phone", "website", "wheelchair" diff --git a/data/presets/craft.json b/data/presets/craft.json index ed1e8317..90e1d30c 100644 --- a/data/presets/craft.json +++ b/data/presets/craft.json @@ -7,7 +7,6 @@ "address", "building_area", "opening_hours", - "opening_hours/covid19", "phone", "website" ], @@ -23,6 +22,7 @@ "internet_access/fee", "internet_access/ssid", "level", + "opening_hours/covid19", "product", "ref/vatin", "wheelchair" diff --git a/data/presets/emergency/lifeguard.json b/data/presets/emergency/lifeguard.json index 3e952041..8618bd74 100644 --- a/data/presets/emergency/lifeguard.json +++ b/data/presets/emergency/lifeguard.json @@ -4,7 +4,9 @@ "ref", "operator", "building_area", - "opening_hours", + "opening_hours" + ], + "moreFields": [ "opening_hours/covid19" ], "geometry": [ diff --git a/data/presets/healthcare/laboratory.json b/data/presets/healthcare/laboratory.json index dcab56f6..24003ff4 100644 --- a/data/presets/healthcare/laboratory.json +++ b/data/presets/healthcare/laboratory.json @@ -8,7 +8,10 @@ "phone", "ref", "address", - "opening_hours", + "opening_hours" + ], + "moreFields": [ + "{healthcare}", "opening_hours/covid19" ], "geometry": [ diff --git a/data/presets/healthcare/sample_collection.json b/data/presets/healthcare/sample_collection.json index 718e4ccc..79f0f7e0 100644 --- a/data/presets/healthcare/sample_collection.json +++ b/data/presets/healthcare/sample_collection.json @@ -8,7 +8,10 @@ "website", "phone", "address", - "opening_hours", + "opening_hours" + ], + "moreFields": [ + "{healthcare}", "opening_hours/covid19" ], "geometry": [ diff --git a/data/presets/highway/rest_area.json b/data/presets/highway/rest_area.json index 797a99be..80c1b6d0 100644 --- a/data/presets/highway/rest_area.json +++ b/data/presets/highway/rest_area.json @@ -3,13 +3,13 @@ "fields": [ "name", "operator", - "opening_hours", - "opening_hours/covid19" + "opening_hours" ], "moreFields": [ "address", "email", "fax", + "opening_hours/covid19", "phone", "website", "wheelchair" diff --git a/data/presets/highway/toll_gantry.json b/data/presets/highway/toll_gantry.json index caf6a787..c8b22e22 100644 --- a/data/presets/highway/toll_gantry.json +++ b/data/presets/highway/toll_gantry.json @@ -11,10 +11,10 @@ "access", "maxheight", "opening_hours", - "opening_hours/covid19", "payment_multi" ], "moreFields": [ + "opening_hours/covid19", "website" ], "geometry": [ diff --git a/data/presets/landuse/industrial/scrap_yard.json b/data/presets/landuse/industrial/scrap_yard.json index 1567c2c6..3dba13c8 100644 --- a/data/presets/landuse/industrial/scrap_yard.json +++ b/data/presets/landuse/industrial/scrap_yard.json @@ -4,7 +4,10 @@ "name", "operator", "address", - "opening_hours", + "opening_hours" + ], + "moreFields": [ + "{landuse/industrial}", "opening_hours/covid19" ], "geometry": [ diff --git a/data/presets/landuse/industrial/slaughterhouse.json b/data/presets/landuse/industrial/slaughterhouse.json index 0452d75c..937022b1 100644 --- a/data/presets/landuse/industrial/slaughterhouse.json +++ b/data/presets/landuse/industrial/slaughterhouse.json @@ -5,7 +5,10 @@ "operator", "address", "building_area", - "opening_hours", + "opening_hours" + ], + "moreFields": [ + "{landuse/industrial}", "opening_hours/covid19" ], "geometry": [ diff --git a/data/presets/leisure/beach_resort.json b/data/presets/leisure/beach_resort.json index 538e521db..f68ba9bd 100644 --- a/data/presets/leisure/beach_resort.json +++ b/data/presets/leisure/beach_resort.json @@ -4,7 +4,6 @@ "name", "address", "opening_hours", - "opening_hours/covid19", "fee", "payment_multi_fee", "charge_fee" @@ -13,6 +12,7 @@ "email", "fax", "gnis/feature_id-US", + "opening_hours/covid19", "phone", "smoking", "website" diff --git a/data/presets/leisure/bird_hide.json b/data/presets/leisure/bird_hide.json index 28e71d0c..f1a4cbbb 100644 --- a/data/presets/leisure/bird_hide.json +++ b/data/presets/leisure/bird_hide.json @@ -4,10 +4,10 @@ "name", "building_area", "address", - "opening_hours", - "opening_hours/covid19" + "opening_hours" ], "moreFields": [ + "opening_hours/covid19", "website" ], "geometry": [ diff --git a/data/presets/leisure/bowling_alley.json b/data/presets/leisure/bowling_alley.json index f9210813..54ba1bda 100644 --- a/data/presets/leisure/bowling_alley.json +++ b/data/presets/leisure/bowling_alley.json @@ -4,7 +4,8 @@ "name", "operator", "address", - "building_area" + "building_area", + "opening_hours" ], "moreFields": [ "air_conditioning", @@ -16,7 +17,6 @@ "internet_access/ssid", "level", "min_age", - "opening_hours", "opening_hours/covid19", "payment_multi", "phone", diff --git a/data/presets/leisure/dance.json b/data/presets/leisure/dance.json index ed797991..f2ef084e 100644 --- a/data/presets/leisure/dance.json +++ b/data/presets/leisure/dance.json @@ -5,6 +5,7 @@ "operator", "address", "building_area", + "opening_hours", "dance/style" ], "moreFields": [ @@ -12,7 +13,6 @@ "fax", "gnis/feature_id-US", "level", - "opening_hours", "opening_hours/covid19", "payment_multi", "phone", diff --git a/data/presets/leisure/dancing_school.json b/data/presets/leisure/dancing_school.json index 7cbfd289..8effce83 100644 --- a/data/presets/leisure/dancing_school.json +++ b/data/presets/leisure/dancing_school.json @@ -5,6 +5,7 @@ "operator", "address", "building_area", + "opening_hours", "dance/style" ], "moreFields": [ @@ -12,7 +13,6 @@ "fax", "gnis/feature_id-US", "level", - "opening_hours", "opening_hours/covid19", "payment_multi", "phone", diff --git a/data/presets/leisure/disc_golf_course.json b/data/presets/leisure/disc_golf_course.json index d13e5d9b..ce254e70 100644 --- a/data/presets/leisure/disc_golf_course.json +++ b/data/presets/leisure/disc_golf_course.json @@ -7,8 +7,7 @@ "fee", "payment_multi_fee", "charge_fee", - "opening_hours", - "opening_hours/covid19" + "opening_hours" ], "moreFields": [ "address", @@ -17,6 +16,7 @@ "fax", "gnis/feature_id-US", "lit", + "opening_hours/covid19", "phone", "website", "wheelchair" diff --git a/data/presets/leisure/escape_game.json b/data/presets/leisure/escape_game.json index d15415d0..c2217945 100644 --- a/data/presets/leisure/escape_game.json +++ b/data/presets/leisure/escape_game.json @@ -5,7 +5,6 @@ "address", "building_area", "opening_hours", - "opening_hours/covid19", "website", "fee", "payment_multi_fee", @@ -19,6 +18,7 @@ "email", "fax", "level", + "opening_hours/covid19", "phone", "smoking", "wheelchair" diff --git a/data/presets/leisure/fitness_centre.json b/data/presets/leisure/fitness_centre.json index 7daa6541..7466aee2 100644 --- a/data/presets/leisure/fitness_centre.json +++ b/data/presets/leisure/fitness_centre.json @@ -6,7 +6,6 @@ "address", "building_area", "opening_hours", - "opening_hours/covid19", "phone", "website" ], @@ -22,6 +21,7 @@ "internet_access/fee", "internet_access/ssid", "level", + "opening_hours/covid19", "payment_multi" ], "geometry": [ diff --git a/data/presets/leisure/golf_course.json b/data/presets/leisure/golf_course.json index cbe6f991..f1be9fdb 100644 --- a/data/presets/leisure/golf_course.json +++ b/data/presets/leisure/golf_course.json @@ -4,13 +4,13 @@ "name", "operator", "address", - "opening_hours", - "opening_hours/covid19" + "opening_hours" ], "moreFields": [ "email", "fax", "gnis/feature_id-US", + "opening_hours/covid19", "payment_multi", "phone", "website" diff --git a/data/presets/leisure/hackerspace.json b/data/presets/leisure/hackerspace.json index 2d4f69f6..edc7ee9f 100644 --- a/data/presets/leisure/hackerspace.json +++ b/data/presets/leisure/hackerspace.json @@ -5,7 +5,6 @@ "address", "building_area", "opening_hours", - "opening_hours/covid19", "website", "fee", "payment_multi_fee", @@ -20,6 +19,7 @@ "fax", "gnis/feature_id-US", "level", + "opening_hours/covid19", "phone", "smoking", "wheelchair" diff --git a/data/presets/leisure/ice_rink.json b/data/presets/leisure/ice_rink.json index 91b6dfa4..511a9f53 100644 --- a/data/presets/leisure/ice_rink.json +++ b/data/presets/leisure/ice_rink.json @@ -6,7 +6,8 @@ "sport_ice", "operator", "address", - "building" + "building", + "opening_hours" ], "moreFields": [ "email", @@ -16,7 +17,6 @@ "internet_access/fee", "internet_access/ssid", "level", - "opening_hours", "opening_hours/covid19", "payment_multi", "phone", diff --git a/data/presets/leisure/indoor_play.json b/data/presets/leisure/indoor_play.json index f22d184a..3e7a497c 100644 --- a/data/presets/leisure/indoor_play.json +++ b/data/presets/leisure/indoor_play.json @@ -5,7 +5,6 @@ "address", "building_area", "opening_hours", - "opening_hours/covid19", "phone", "website" ], @@ -24,6 +23,7 @@ "internet_access/ssid", "max_age", "min_age", + "opening_hours/covid19", "operator", "payment_multi", "wheelchair" diff --git a/data/presets/leisure/miniature_golf.json b/data/presets/leisure/miniature_golf.json index d9baf881..f8a89b33 100644 --- a/data/presets/leisure/miniature_golf.json +++ b/data/presets/leisure/miniature_golf.json @@ -5,7 +5,6 @@ "operator", "address", "opening_hours", - "opening_hours/covid19", "fee", "payment_multi_fee", "charge_fee" @@ -14,6 +13,7 @@ "email", "fax", "gnis/feature_id-US", + "opening_hours/covid19", "phone", "website" ], diff --git a/data/presets/leisure/nature_reserve.json b/data/presets/leisure/nature_reserve.json index c13be2ba..c03c01d8 100644 --- a/data/presets/leisure/nature_reserve.json +++ b/data/presets/leisure/nature_reserve.json @@ -8,14 +8,14 @@ "name", "operator", "address", - "opening_hours", - "opening_hours/covid19" + "opening_hours" ], "moreFields": [ "dog", "email", "fax", "gnis/feature_id-US", + "opening_hours/covid19", "phone", "website" ], diff --git a/data/presets/leisure/park.json b/data/presets/leisure/park.json index 0383edd7..2361b928 100644 --- a/data/presets/leisure/park.json +++ b/data/presets/leisure/park.json @@ -4,14 +4,14 @@ "name", "operator", "address", - "opening_hours", - "opening_hours/covid19" + "opening_hours" ], "moreFields": [ "dog", "email", "fax", "gnis/feature_id-US", + "opening_hours/covid19", "phone", "smoking", "website" diff --git a/data/presets/leisure/resort.json b/data/presets/leisure/resort.json index 358f7e05..0acf3089 100644 --- a/data/presets/leisure/resort.json +++ b/data/presets/leisure/resort.json @@ -5,8 +5,7 @@ "operator", "resort", "address", - "opening_hours", - "opening_hours/covid19" + "opening_hours" ], "moreFields": [ "access_simple", @@ -16,6 +15,7 @@ "internet_access", "internet_access/fee", "internet_access/ssid", + "opening_hours/covid19", "payment_multi", "phone", "website" diff --git a/data/presets/leisure/sauna.json b/data/presets/leisure/sauna.json index c408119b..d88cd386 100644 --- a/data/presets/leisure/sauna.json +++ b/data/presets/leisure/sauna.json @@ -5,7 +5,6 @@ "operator", "address", "opening_hours", - "opening_hours/covid19", "access_simple", "fee", "payment_multi_fee", @@ -16,6 +15,7 @@ "fax", "gnis/feature_id-US", "level", + "opening_hours/covid19", "phone", "website" ], diff --git a/data/presets/leisure/sports_centre.json b/data/presets/leisure/sports_centre.json index adc3b583..43923ee5 100644 --- a/data/presets/leisure/sports_centre.json +++ b/data/presets/leisure/sports_centre.json @@ -6,6 +6,7 @@ "building", "address", "fee", + "opening_hours", "payment_multi_fee", "charge_fee" ], @@ -14,7 +15,6 @@ "fax", "gnis/feature_id-US", "level", - "opening_hours", "opening_hours/covid19", "phone", "website" diff --git a/data/presets/leisure/sports_hall.json b/data/presets/leisure/sports_hall.json index 092dd379..afc16ab0 100644 --- a/data/presets/leisure/sports_hall.json +++ b/data/presets/leisure/sports_hall.json @@ -6,12 +6,12 @@ "sport", "address", "building_area", + "opening_hours", "access_simple" ], "moreFields": [ "air_conditioning", "level", - "opening_hours", "opening_hours/covid19", "fee", "payment_multi_fee", diff --git a/data/presets/leisure/trampoline_park.json b/data/presets/leisure/trampoline_park.json index 14db1300..62b602db 100644 --- a/data/presets/leisure/trampoline_park.json +++ b/data/presets/leisure/trampoline_park.json @@ -5,7 +5,6 @@ "address", "building_area", "opening_hours", - "opening_hours/covid19", "phone", "website" ], @@ -20,6 +19,7 @@ "internet_access", "internet_access/fee", "internet_access/ssid", + "opening_hours/covid19", "operator", "payment_multi" ], diff --git a/data/presets/office.json b/data/presets/office.json index 0e649ae4..068342fe 100644 --- a/data/presets/office.json +++ b/data/presets/office.json @@ -6,7 +6,6 @@ "address", "building_area", "opening_hours", - "opening_hours/covid19", "phone", "website" ], @@ -24,6 +23,7 @@ "internet_access/ssid", "level", "not/name", + "opening_hours/covid19", "operator", "ref/vatin", "smoking", diff --git a/data/presets/polling_station.json b/data/presets/polling_station.json index 8070894f..5565fbd5 100644 --- a/data/presets/polling_station.json +++ b/data/presets/polling_station.json @@ -6,7 +6,6 @@ "operator", "address", "opening_hours", - "opening_hours/covid19", "building_area", "phone", "website" @@ -19,6 +18,7 @@ "internet_access/fee", "internet_access/ssid", "level", + "opening_hours/covid19", "wheelchair" ], "geometry": [ diff --git a/data/presets/shop.json b/data/presets/shop.json index fff36e7a..2f5786c5 100644 --- a/data/presets/shop.json +++ b/data/presets/shop.json @@ -7,7 +7,6 @@ "address", "building_area", "opening_hours", - "opening_hours/covid19", "payment_multi", "phone", "website" @@ -28,6 +27,7 @@ "internet_access/ssid", "level", "not/name", + "opening_hours/covid19", "ref/vatin", "second_hand", "stroller", diff --git a/data/presets/tourism/aquarium.json b/data/presets/tourism/aquarium.json index 2f58cb0d..b2b4872e 100644 --- a/data/presets/tourism/aquarium.json +++ b/data/presets/tourism/aquarium.json @@ -5,8 +5,7 @@ "operator", "address", "building_area", - "opening_hours", - "opening_hours/covid19" + "opening_hours" ], "moreFields": [ "charge_fee", @@ -17,6 +16,7 @@ "internet_access", "internet_access/fee", "internet_access/ssid", + "opening_hours/covid19", "payment_multi_fee", "phone", "ref/vatin", diff --git a/data/presets/tourism/gallery.json b/data/presets/tourism/gallery.json index 1a1c8ec1..2b35fcf2 100644 --- a/data/presets/tourism/gallery.json +++ b/data/presets/tourism/gallery.json @@ -5,8 +5,7 @@ "operator", "address", "building_area", - "opening_hours", - "opening_hours/covid19" + "opening_hours" ], "moreFields": [ "email", @@ -15,6 +14,7 @@ "internet_access", "internet_access/fee", "internet_access/ssid", + "opening_hours/covid19", "payment_multi", "phone", "ref/vatin", diff --git a/data/presets/tourism/museum.json b/data/presets/tourism/museum.json index 3ebd4a0c..04d6b343 100644 --- a/data/presets/tourism/museum.json +++ b/data/presets/tourism/museum.json @@ -7,8 +7,7 @@ "museum", "address", "building_area", - "opening_hours", - "opening_hours/covid19" + "opening_hours" ], "moreFields": [ "air_conditioning", @@ -23,6 +22,7 @@ "internet_access/fee", "internet_access/ssid", "level", + "opening_hours/covid19", "payment_multi", "phone", "website", diff --git a/data/presets/tourism/theme_park.json b/data/presets/tourism/theme_park.json index 8e7529fe..4c7d05b4 100644 --- a/data/presets/tourism/theme_park.json +++ b/data/presets/tourism/theme_park.json @@ -5,7 +5,6 @@ "operator", "address", "opening_hours", - "opening_hours/covid19", "website" ], "moreFields": [ @@ -17,6 +16,7 @@ "internet_access", "internet_access/fee", "internet_access/ssid", + "opening_hours/covid19", "payment_multi", "phone", "wheelchair" diff --git a/data/presets/tourism/zoo.json b/data/presets/tourism/zoo.json index 7cd18ce4..770a20d0 100644 --- a/data/presets/tourism/zoo.json +++ b/data/presets/tourism/zoo.json @@ -5,7 +5,6 @@ "operator", "address", "opening_hours", - "opening_hours/covid19", "fee", "charge_fee" ], @@ -17,6 +16,7 @@ "internet_access/fee", "internet_access/ssid", "payment_multi", + "opening_hours/covid19", "phone", "ref/vatin", "website", diff --git a/data/presets/waterway/fuel.json b/data/presets/waterway/fuel.json index 0a10c89d..2516bc5a 100644 --- a/data/presets/waterway/fuel.json +++ b/data/presets/waterway/fuel.json @@ -5,7 +5,6 @@ "operator", "address", "opening_hours", - "opening_hours/covid19", "fuel_multi" ], "moreFields": [ @@ -15,6 +14,7 @@ "email", "fax", "payment_multi", + "opening_hours/covid19", "phone", "seamark/type", "website",