From bdae3f06ff6de93e78c7be9c24325e75b5ca7ceb Mon Sep 17 00:00:00 2001 From: Martin Raifer Date: Thu, 13 Apr 2023 21:18:08 +0200 Subject: [PATCH] consolidate optional fields of "POI" presets into template "presets" --- data/presets/@templates/contact.json | 25 ++++++++++++++ data/presets/@templates/internet_access.json | 27 +++++++++++++++ data/presets/@templates/poi.json | 33 +++++++++++++++++++ data/presets/_attraction.json | 6 ++-- data/presets/aeroway/aerodrome.json | 11 +++---- data/presets/aeroway/spaceport.json | 8 ++--- data/presets/amenity/_bus_station.json | 8 +++-- data/presets/amenity/_coworking_space.json | 5 ++- data/presets/amenity/_embassy.json | 4 +-- data/presets/amenity/animal_boarding.json | 10 +----- data/presets/amenity/animal_breeding.json | 10 +----- data/presets/amenity/animal_shelter.json | 9 +---- data/presets/amenity/arts_centre.json | 16 ++------- data/presets/amenity/bank.json | 17 ++-------- data/presets/amenity/bar.json | 18 ++-------- data/presets/amenity/bicycle_rental.json | 10 ++---- data/presets/amenity/boat_rental.json | 10 ++---- data/presets/amenity/bureau_de_change.json | 10 +----- data/presets/amenity/cafe.json | 19 +++-------- data/presets/amenity/car_pooling.json | 4 +-- data/presets/amenity/car_rental.json | 10 ++---- data/presets/amenity/car_sharing.json | 4 +-- data/presets/amenity/car_wash.json | 9 +---- data/presets/amenity/casino.json | 17 ++-------- data/presets/amenity/childcare.json | 8 ++--- data/presets/amenity/cinema.json | 12 ++----- data/presets/amenity/clinic.json | 12 ++----- data/presets/amenity/college.json | 15 +++------ data/presets/amenity/community_centre.json | 10 ++---- data/presets/amenity/conference_centre.json | 14 +++----- data/presets/amenity/courthouse.json | 4 +-- data/presets/amenity/crematorium.json | 9 +++-- data/presets/amenity/dentist.json | 10 +----- data/presets/amenity/dive_centre.json | 10 +----- data/presets/amenity/doctors.json | 10 +----- data/presets/amenity/dojo.json | 10 +----- data/presets/amenity/driver_training.json | 10 ++---- data/presets/amenity/driving_school.json | 13 ++------ data/presets/amenity/events_venue.json | 14 +++----- data/presets/amenity/exhibition_centre.json | 14 +++----- data/presets/amenity/fast_food.json | 17 ++-------- data/presets/amenity/fire_station.json | 4 +-- data/presets/amenity/food_court.json | 17 +++------- data/presets/amenity/fuel.json | 14 ++------ data/presets/amenity/grave_yard.json | 6 ++-- data/presets/amenity/hospital.json | 11 ++----- data/presets/amenity/ice_cream.json | 16 ++------- data/presets/amenity/internet_cafe.json | 18 +++------- data/presets/amenity/karaoke_box.json | 12 ++----- data/presets/amenity/kindergarten.json | 4 +-- data/presets/amenity/language_school.json | 8 ++--- data/presets/amenity/library.json | 18 +++------- data/presets/amenity/love_hotel.json | 15 +++------ data/presets/amenity/marketplace.json | 4 +-- data/presets/amenity/monastery.json | 4 +-- data/presets/amenity/money_transfer.json | 9 ++--- data/presets/amenity/motorcycle_rental.json | 8 ++--- data/presets/amenity/music_school.json | 9 +---- data/presets/amenity/nightclub.json | 11 +------ data/presets/amenity/parking.json | 4 +-- data/presets/amenity/payment_centre.json | 9 ++--- data/presets/amenity/pharmacy.json | 12 ++----- data/presets/amenity/place_of_worship.json | 4 +-- data/presets/amenity/planetarium.json | 10 ++---- data/presets/amenity/police.json | 4 +-- data/presets/amenity/polling_station.json | 8 ++--- data/presets/amenity/post_depot.json | 3 +- data/presets/amenity/post_office.json | 8 ++--- data/presets/amenity/prep_school.json | 9 +---- data/presets/amenity/prison.json | 4 +-- data/presets/amenity/pub.json | 18 ++-------- data/presets/amenity/public_bath.json | 14 ++------ data/presets/amenity/ranger_station.json | 8 ++--- data/presets/amenity/recycling_centre.json | 4 +-- data/presets/amenity/refugee_site.json | 4 +-- data/presets/amenity/research_institute.json | 11 +++---- data/presets/amenity/restaurant.json | 18 ++-------- data/presets/amenity/school.json | 5 ++- data/presets/amenity/social_centre.json | 13 ++------ data/presets/amenity/social_facility.json | 15 ++------- data/presets/amenity/stripclub.json | 11 +------ data/presets/amenity/studio.json | 8 ++--- data/presets/amenity/telephone.json | 4 +-- data/presets/amenity/theatre.json | 16 ++------- data/presets/amenity/townhall.json | 4 +-- data/presets/amenity/vehicle_inspection.json | 9 +---- data/presets/amenity/veterinary.json | 11 ++----- .../amenity/waste_transfer_station.json | 4 +-- data/presets/barrier/border_control.json | 6 ++-- data/presets/barrier/toll_booth.json | 6 ++-- data/presets/club.json | 14 ++------ data/presets/craft.json | 16 ++------- data/presets/emergency/ambulance_station.json | 4 +-- data/presets/emergency/lifeboat_station.json | 3 +- data/presets/emergency/mountain_rescue.json | 5 ++- data/presets/golf/clubhouse.json | 4 +-- data/presets/healthcare.json | 3 +- data/presets/highway/rest_area.json | 5 ++- data/presets/landuse/allotments.json | 6 ++-- data/presets/landuse/aquaculture.json | 6 ++-- data/presets/landuse/cemetery.json | 6 ++-- data/presets/landuse/commercial.json | 6 ++-- data/presets/landuse/construction.json | 6 ++-- data/presets/landuse/farmland.json | 6 ++-- data/presets/landuse/farmyard.json | 6 ++-- data/presets/landuse/forest.json | 6 ++-- data/presets/landuse/garages.json | 6 ++-- .../landuse/greenhouse_horticulture.json | 6 ++-- data/presets/landuse/harbour.json | 6 ++-- data/presets/landuse/industrial.json | 6 ++-- data/presets/landuse/landfill.json | 6 ++-- data/presets/landuse/military.json | 6 ++-- data/presets/landuse/orchard.json | 4 +-- data/presets/landuse/plant_nursery.json | 6 ++-- data/presets/landuse/quarry.json | 6 ++-- data/presets/landuse/recreation_ground.json | 6 ++-- data/presets/landuse/religious.json | 6 ++-- data/presets/landuse/retail.json | 6 ++-- data/presets/landuse/vineyard.json | 6 ++-- data/presets/leisure/amusement_arcade.json | 17 ++-------- data/presets/leisure/beach_resort.json | 4 +-- data/presets/leisure/bowling_alley.json | 16 ++------- data/presets/leisure/dance.json | 8 +---- data/presets/leisure/dancing_school.json | 8 +---- data/presets/leisure/disc_golf_course.json | 4 +-- data/presets/leisure/dog_park.json | 8 ++--- data/presets/leisure/escape_game.json | 14 +++----- data/presets/leisure/fitness_centre.json | 14 ++------ data/presets/leisure/garden.json | 6 ++-- data/presets/leisure/golf_course.json | 8 +---- data/presets/leisure/hackerspace.json | 15 +++------ data/presets/leisure/horse_riding.json | 6 ++-- data/presets/leisure/ice_rink.json | 10 ++---- data/presets/leisure/indoor_play.json | 13 ++------ data/presets/leisure/marina.json | 8 ++--- data/presets/leisure/miniature_golf.json | 6 ++-- data/presets/leisure/nature_reserve.json | 6 ++-- data/presets/leisure/park.json | 4 +-- data/presets/leisure/resort.json | 13 ++------ data/presets/leisure/sauna.json | 6 ++-- data/presets/leisure/sports_centre.json | 10 ++---- data/presets/leisure/stadium.json | 6 ++-- data/presets/leisure/swimming_pool.json | 1 - data/presets/leisure/trampoline_park.json | 12 ++----- data/presets/man_made/lighthouse.json | 4 +-- data/presets/man_made/observatory.json | 6 ++-- data/presets/man_made/wastewater_plant.json | 6 ++-- data/presets/man_made/works.json | 6 ++-- data/presets/office.json | 7 ++-- data/presets/office/coworking.json | 6 ++-- data/presets/polling_station.json | 7 ++-- data/presets/public_transport/station.json | 9 ++--- data/presets/shop.json | 17 ++-------- data/presets/tourism/alpine_hut.json | 13 +++----- data/presets/tourism/apartment.json | 13 +++----- data/presets/tourism/aquarium.json | 15 ++------- data/presets/tourism/camp_site.json | 8 ++--- data/presets/tourism/caravan_site.json | 14 +++----- data/presets/tourism/chalet.json | 12 +++---- data/presets/tourism/gallery.json | 15 ++------- data/presets/tourism/guest_house.json | 14 +++----- data/presets/tourism/information/office.json | 13 +++----- data/presets/tourism/motel.json | 9 ++--- data/presets/tourism/museum.json | 16 ++------- data/presets/tourism/picnic_site.json | 4 +-- data/presets/tourism/theme_park.json | 14 ++------ .../presets/tourism/trail_riding_station.json | 10 ++---- data/presets/tourism/wilderness_hut.json | 4 +-- data/presets/tourism/zoo.json | 16 ++------- data/presets/waterway/boatyard.json | 4 +-- data/presets/waterway/fuel.json | 4 +-- interim/source_strings.yaml | 6 ++++ 172 files changed, 451 insertions(+), 1166 deletions(-) create mode 100644 data/presets/@templates/contact.json create mode 100644 data/presets/@templates/internet_access.json create mode 100644 data/presets/@templates/poi.json diff --git a/data/presets/@templates/contact.json b/data/presets/@templates/contact.json new file mode 100644 index 00000000..6601c8d0 --- /dev/null +++ b/data/presets/@templates/contact.json @@ -0,0 +1,25 @@ +{ + "fields": [], + "moreFields": [ + "email", + "fax", + "phone", + "website" + ], + "geometry": [ + "point" + ], + "tags": { + "@template": "contact" + }, + "searchable": false, + "locationSet": { + "include": [ + "999" + ], + "exclude": [ + "999" + ] + }, + "name": "{point}" +} diff --git a/data/presets/@templates/internet_access.json b/data/presets/@templates/internet_access.json new file mode 100644 index 00000000..2733f888 --- /dev/null +++ b/data/presets/@templates/internet_access.json @@ -0,0 +1,27 @@ +{ + "fields": [ + "internet_access", + "internet_access/fee" + ], + "moreFields": [ + "internet_access", + "internet_access/fee", + "internet_access/ssid" + ], + "geometry": [ + "point" + ], + "tags": { + "@template": "internet_access" + }, + "searchable": false, + "locationSet": { + "include": [ + "999" + ], + "exclude": [ + "999" + ] + }, + "name": "{point}" +} diff --git a/data/presets/@templates/poi.json b/data/presets/@templates/poi.json new file mode 100644 index 00000000..204996f8 --- /dev/null +++ b/data/presets/@templates/poi.json @@ -0,0 +1,33 @@ +{ + "fields": [], + "moreFields": [ + "{@templates/contact}", + "address", + "contact/facebook", + "gnis/feature_id-US", + "level", + "not/name", + "opening_hours", + "opening_hours/covid19", + "payment_multi", + "ref/vatin", + "ref/FR/siret-FR", + "wheelchair" + ], + "geometry": [ + "point" + ], + "tags": { + "@template": "poi" + }, + "searchable": false, + "locationSet": { + "include": [ + "999" + ], + "exclude": [ + "999" + ] + }, + "name": "{point}" +} diff --git a/data/presets/_attraction.json b/data/presets/_attraction.json index d910ed29..7ae3f705 100644 --- a/data/presets/_attraction.json +++ b/data/presets/_attraction.json @@ -9,12 +9,10 @@ "charge_fee" ], "moreFields": [ + "{@templates/contact}", "address", - "email", - "fax", "opening_hours/covid19", - "payment_multi", - "phone" + "payment_multi" ], "geometry": [ "point", diff --git a/data/presets/aeroway/aerodrome.json b/data/presets/aeroway/aerodrome.json index 6d936321..b35f01ae 100644 --- a/data/presets/aeroway/aerodrome.json +++ b/data/presets/aeroway/aerodrome.json @@ -7,15 +7,12 @@ "address", "operator", "operator/type", - "internet_access", - "internet_access/fee", - "internet_access/ssid" + "{@templates/internet_access}" ], "moreFields": [ - "email", - "fax", - "gnis/feature_id-US", - "phone" + "{@templates/contact}", + "{@templates/internet_access}", + "gnis/feature_id-US" ], "geometry": [ "area", diff --git a/data/presets/aeroway/spaceport.json b/data/presets/aeroway/spaceport.json index 7255ed1f..8288e656 100644 --- a/data/presets/aeroway/spaceport.json +++ b/data/presets/aeroway/spaceport.json @@ -8,12 +8,8 @@ "wikidata" ], "moreFields": [ - "email", - "fax", - "internet_access", - "internet_access/fee", - "internet_access/ssid", - "phone" + "{@templates/contact}", + "{@templates/internet_access}" ], "geometry": [ "area", diff --git a/data/presets/amenity/_bus_station.json b/data/presets/amenity/_bus_station.json index 6547ee3c..61525472 100644 --- a/data/presets/amenity/_bus_station.json +++ b/data/presets/amenity/_bus_station.json @@ -4,9 +4,11 @@ "name", "building_area", "operator", - "internet_access", - "internet_access/fee", - "internet_access/ssid" + "{@templates/internet_access}" + ], + "moreFields": [ + "{@templates/internet_access}", + "{amenity}" ], "geometry": [ "point", diff --git a/data/presets/amenity/_coworking_space.json b/data/presets/amenity/_coworking_space.json index bece3761..3f18e712 100644 --- a/data/presets/amenity/_coworking_space.json +++ b/data/presets/amenity/_coworking_space.json @@ -5,11 +5,10 @@ "address", "building_area_yes", "opening_hours", - "internet_access", - "internet_access/fee", - "internet_access/ssid" + "{@templates/internet_access}" ], "moreFields": [ + "{@templates/internet_access}", "opening_hours/covid19", "ref/FR/siret-FR" ], diff --git a/data/presets/amenity/_embassy.json b/data/presets/amenity/_embassy.json index 28b08a15..2922a756 100644 --- a/data/presets/amenity/_embassy.json +++ b/data/presets/amenity/_embassy.json @@ -7,9 +7,7 @@ "building_area_yes" ], "moreFields": [ - "email", - "fax", - "phone", + "{@templates/contact}", "wheelchair" ], "geometry": [ diff --git a/data/presets/amenity/animal_boarding.json b/data/presets/amenity/animal_boarding.json index 77cb64dc..9c209013 100644 --- a/data/presets/amenity/animal_boarding.json +++ b/data/presets/amenity/animal_boarding.json @@ -9,15 +9,7 @@ "animal_boarding" ], "moreFields": [ - "contact/facebook", - "email", - "fax", - "gnis/feature_id-US", - "level", - "opening_hours/covid19", - "payment_multi", - "phone", - "wheelchair" + "{@templates/poi}" ], "geometry": [ "point", diff --git a/data/presets/amenity/animal_breeding.json b/data/presets/amenity/animal_breeding.json index 1aef9119..97cf7099 100644 --- a/data/presets/amenity/animal_breeding.json +++ b/data/presets/amenity/animal_breeding.json @@ -9,15 +9,7 @@ "animal_breeding" ], "moreFields": [ - "contact/facebook", - "email", - "fax", - "gnis/feature_id-US", - "level", - "opening_hours/covid19", - "ref/FR/siret-FR", - "phone", - "wheelchair" + "{@templates/poi}" ], "geometry": [ "point", diff --git a/data/presets/amenity/animal_shelter.json b/data/presets/amenity/animal_shelter.json index 3596cdc7..8879df29 100644 --- a/data/presets/amenity/animal_shelter.json +++ b/data/presets/amenity/animal_shelter.json @@ -9,14 +9,7 @@ "animal_shelter" ], "moreFields": [ - "contact/facebook", - "email", - "fax", - "gnis/feature_id-US", - "level", - "opening_hours/covid19", - "phone", - "wheelchair" + "{@templates/poi}" ], "geometry": [ "point", diff --git a/data/presets/amenity/arts_centre.json b/data/presets/amenity/arts_centre.json index e0a389ca..96771994 100644 --- a/data/presets/amenity/arts_centre.json +++ b/data/presets/amenity/arts_centre.json @@ -8,20 +8,10 @@ "website" ], "moreFields": [ + "{@templates/internet_access}", + "{@templates/poi}", "charge_fee", - "contact/facebook", - "email", - "fax", - "fee", - "gnis/feature_id-US", - "internet_access", - "internet_access/fee", - "internet_access/ssid", - "level", - "opening_hours/covid19", - "payment_multi", - "phone", - "wheelchair" + "fee" ], "geometry": [ "point", diff --git a/data/presets/amenity/bank.json b/data/presets/amenity/bank.json index b57c99a0..bb4102bb 100644 --- a/data/presets/amenity/bank.json +++ b/data/presets/amenity/bank.json @@ -10,23 +10,12 @@ "drive_through" ], "moreFields": [ + "{@templates/internet_access}", + "{@templates/poi}", "air_conditioning", "branch_brand", "brand", - "contact/facebook", - "currency_multi", - "email", - "fax", - "gnis/feature_id-US", - "internet_access", - "internet_access/fee", - "internet_access/ssid", - "level", - "opening_hours/covid19", - "phone", - "ref/vatin", - "ref/FR/siret-FR", - "wheelchair" + "currency_multi" ], "geometry": [ "point", diff --git a/data/presets/amenity/bar.json b/data/presets/amenity/bar.json index 8930dd1b..78d153b1 100644 --- a/data/presets/amenity/bar.json +++ b/data/presets/amenity/bar.json @@ -9,26 +9,14 @@ "brewery" ], "moreFields": [ + "{@templates/internet_access}", + "{@templates/poi}", "air_conditioning", - "contact/facebook", - "email", - "fax", - "gnis/feature_id-US", - "internet_access", - "internet_access/fee", - "internet_access/ssid", - "level", "microbrewery", - "opening_hours/covid19", "operator", "outdoor_seating", - "payment_multi", - "phone", - "ref/vatin", - "ref/FR/siret-FR", "smoking", - "sport_pub", - "wheelchair" + "sport_pub" ], "geometry": [ "point", diff --git a/data/presets/amenity/bicycle_rental.json b/data/presets/amenity/bicycle_rental.json index ab875653..5ffa97fb 100644 --- a/data/presets/amenity/bicycle_rental.json +++ b/data/presets/amenity/bicycle_rental.json @@ -10,15 +10,9 @@ "payment_multi_fee" ], "moreFields": [ + "{@templates/poi}", "address", - "covered", - "email", - "fax", - "level", - "opening_hours", - "opening_hours/covid19", - "phone", - "wheelchair" + "covered" ], "geometry": [ "point", diff --git a/data/presets/amenity/boat_rental.json b/data/presets/amenity/boat_rental.json index f5de3987..589093e2 100644 --- a/data/presets/amenity/boat_rental.json +++ b/data/presets/amenity/boat_rental.json @@ -10,15 +10,9 @@ "charge_fee" ], "moreFields": [ + "{@templates/poi}", "access_simple", - "address", - "contact/facebook", - "email", - "fax", - "opening_hours/covid19", - "ref/FR/siret-FR", - "phone", - "wheelchair" + "address" ], "geometry": [ "point", diff --git a/data/presets/amenity/bureau_de_change.json b/data/presets/amenity/bureau_de_change.json index d907aa3c..db81ccb5 100644 --- a/data/presets/amenity/bureau_de_change.json +++ b/data/presets/amenity/bureau_de_change.json @@ -9,15 +9,7 @@ "building_area" ], "moreFields": [ - "contact/facebook", - "email", - "fax", - "level", - "opening_hours", - "opening_hours/covid19", - "ref/FR/siret-FR", - "phone", - "wheelchair" + "{@templates/poi}" ], "geometry": [ "point", diff --git a/data/presets/amenity/cafe.json b/data/presets/amenity/cafe.json index eb2c97fe..992aa8c3 100644 --- a/data/presets/amenity/cafe.json +++ b/data/presets/amenity/cafe.json @@ -7,40 +7,29 @@ "building_area_yes", "opening_hours", "outdoor_seating", - "internet_access", - "internet_access/fee", - "internet_access/ssid", + "{@templates/internet_access}", "phone", "website" ], "moreFields": [ + "{@templates/internet_access}", + "{@templates/poi}", "air_conditioning", "bar", "branch_brand", "brand", "capacity", - "contact/facebook", "delivery", "diet_multi", "drive_through", - "email", - "fax", - "gnis/feature_id-US", "highchair", - "level", "min_age", - "not/name", - "opening_hours/covid19", - "payment_multi", - "ref/vatin", - "ref/FR/siret-FR", "reservation", "smoking", "takeaway", "toilets", "toilets/wheelchair", - "website/menu", - "wheelchair" + "website/menu" ], "geometry": [ "point", diff --git a/data/presets/amenity/car_pooling.json b/data/presets/amenity/car_pooling.json index 938981ac..2a880ab3 100644 --- a/data/presets/amenity/car_pooling.json +++ b/data/presets/amenity/car_pooling.json @@ -10,10 +10,8 @@ "lit" ], "moreFields": [ - "email", - "fax", + "{@templates/contact}", "opening_hours/covid19", - "phone", "wheelchair" ], "geometry": [ diff --git a/data/presets/amenity/car_rental.json b/data/presets/amenity/car_rental.json index ddc3de2b..8f0296aa 100644 --- a/data/presets/amenity/car_rental.json +++ b/data/presets/amenity/car_rental.json @@ -8,15 +8,9 @@ "payment_multi" ], "moreFields": [ + "{@templates/poi}", "branch_brand", - "brand", - "contact/facebook", - "email", - "fax", - "opening_hours/covid19", - "ref/FR/siret-FR", - "phone", - "wheelchair" + "brand" ], "geometry": [ "point", diff --git a/data/presets/amenity/car_sharing.json b/data/presets/amenity/car_sharing.json index a9660f7e..8f1c16eb 100644 --- a/data/presets/amenity/car_sharing.json +++ b/data/presets/amenity/car_sharing.json @@ -10,12 +10,10 @@ "supervised" ], "moreFields": [ + "{@templates/contact}", "branch_brand", "brand", - "email", - "fax", "lit", - "phone", "wheelchair" ], "geometry": [ diff --git a/data/presets/amenity/car_wash.json b/data/presets/amenity/car_wash.json index 7febec6c..b8e0f438 100644 --- a/data/presets/amenity/car_wash.json +++ b/data/presets/amenity/car_wash.json @@ -11,14 +11,7 @@ "automated" ], "moreFields": [ - "contact/facebook", - "email", - "fax", - "gnis/feature_id-US", - "opening_hours/covid19", - "ref/FR/siret-FR", - "phone", - "wheelchair" + "{@templates/poi}" ], "geometry": [ "point", diff --git a/data/presets/amenity/casino.json b/data/presets/amenity/casino.json index fdff33d8..72e6057d 100644 --- a/data/presets/amenity/casino.json +++ b/data/presets/amenity/casino.json @@ -10,22 +10,11 @@ "smoking" ], "moreFields": [ + "{@templates/internet_access}", + "{@templates/poi}", "air_conditioning", - "contact/facebook", - "email", - "fax", - "gnis/feature_id-US", - "internet_access", - "internet_access/fee", - "internet_access/ssid", "level", - "min_age", - "opening_hours/covid19", - "payment_multi", - "phone", - "ref/vatin", - "ref/FR/siret-FR", - "wheelchair" + "min_age" ], "geometry": [ "point", diff --git a/data/presets/amenity/childcare.json b/data/presets/amenity/childcare.json index 9f62a132..69ceca6f 100644 --- a/data/presets/amenity/childcare.json +++ b/data/presets/amenity/childcare.json @@ -10,21 +10,17 @@ "website" ], "moreFields": [ + "{@templates/contact}", + "{@templates/internet_access}", "baby_feeding", "capacity", - "email", - "fax", "gnis/feature_id-US", - "internet_access", - "internet_access/fee", - "internet_access/ssid", "level", "max_age", "min_age", "not/name", "opening_hours/covid19", "payment_multi", - "phone", "wheelchair" ], "geometry": [ diff --git a/data/presets/amenity/cinema.json b/data/presets/amenity/cinema.json index 159fdec1..447fcd85 100644 --- a/data/presets/amenity/cinema.json +++ b/data/presets/amenity/cinema.json @@ -9,19 +9,11 @@ "payment_multi" ], "moreFields": [ + "{@templates/poi}", "air_conditioning", "branch_brand", "brand", - "contact/facebook", - "email", - "fax", - "gnis/feature_id-US", - "level", - "min_age", - "opening_hours/covid19", - "ref/FR/siret-FR", - "phone", - "wheelchair" + "min_age" ], "geometry": [ "point", diff --git a/data/presets/amenity/clinic.json b/data/presets/amenity/clinic.json index 0c573e4b..aedf3186 100644 --- a/data/presets/amenity/clinic.json +++ b/data/presets/amenity/clinic.json @@ -10,18 +10,10 @@ "opening_hours" ], "moreFields": [ + "{@templates/poi}", "air_conditioning", "branch_brand", - "brand", - "contact/facebook", - "email", - "fax", - "gnis/feature_id-US", - "level", - "opening_hours/covid19", - "payment_multi", - "phone", - "wheelchair" + "brand" ], "geometry": [ "point", diff --git a/data/presets/amenity/college.json b/data/presets/amenity/college.json index ca456e1a..21de7a15 100644 --- a/data/presets/amenity/college.json +++ b/data/presets/amenity/college.json @@ -6,20 +6,13 @@ "operator/type", "address", "website", - "internet_access", - "internet_access/fee", - "internet_access/ssid" + "{@templates/internet_access}" ], "moreFields": [ + "{@templates/internet_access}", + "{@templates/poi}", "denomination", - "contact/facebook", - "email", - "fax", - "gnis/feature_id-US", - "not/name", - "phone", - "religion", - "wheelchair" + "religion" ], "geometry": [ "area", diff --git a/data/presets/amenity/community_centre.json b/data/presets/amenity/community_centre.json index 7f854856..e477d64d 100644 --- a/data/presets/amenity/community_centre.json +++ b/data/presets/amenity/community_centre.json @@ -10,16 +10,10 @@ "website" ], "moreFields": [ + "{@templates/poi}", "air_conditioning", "baby_feeding", - "contact/facebook", - "email", - "fax", - "gnis/feature_id-US", - "opening_hours/covid19", - "phone", - "polling_station", - "wheelchair" + "polling_station" ], "geometry": [ "point", diff --git a/data/presets/amenity/conference_centre.json b/data/presets/amenity/conference_centre.json index 833b7f97..1fa0b201 100644 --- a/data/presets/amenity/conference_centre.json +++ b/data/presets/amenity/conference_centre.json @@ -7,19 +7,13 @@ "building_area_yes", "address", "website", - "internet_access", - "internet_access/fee", - "internet_access/ssid" + "{@templates/internet_access}" ], "moreFields": [ + "{@templates/internet_access}", + "{@templates/poi}", "air_conditioning", - "email", - "fax", - "gnis/feature_id-US", - "not/name", - "phone", - "smoking", - "wheelchair" + "smoking" ], "geometry": [ "point", diff --git a/data/presets/amenity/courthouse.json b/data/presets/amenity/courthouse.json index 2579c251..83551cf4 100644 --- a/data/presets/amenity/courthouse.json +++ b/data/presets/amenity/courthouse.json @@ -7,11 +7,9 @@ "building_area_yes" ], "moreFields": [ - "email", - "fax", + "{@templates/contact}", "gnis/feature_id-US", "level", - "phone", "polling_station", "smoking", "wheelchair" diff --git a/data/presets/amenity/crematorium.json b/data/presets/amenity/crematorium.json index 48aec348..4f636b10 100644 --- a/data/presets/amenity/crematorium.json +++ b/data/presets/amenity/crematorium.json @@ -2,15 +2,14 @@ "icon": "maki-cemetery", "fields": [ "name", - "website", - "phone", "opening_hours", - "wheelchair" + "wheelchair", + "phone", + "website" ], "moreFields": [ + "{@templates/contact}", "address", - "email", - "fax", "gnis/feature_id-US", "level", "opening_hours/covid19", diff --git a/data/presets/amenity/dentist.json b/data/presets/amenity/dentist.json index a6655fa8..5261080b 100644 --- a/data/presets/amenity/dentist.json +++ b/data/presets/amenity/dentist.json @@ -9,15 +9,7 @@ "opening_hours" ], "moreFields": [ - "contact/facebook", - "email", - "fax", - "gnis/feature_id-US", - "level", - "opening_hours/covid19", - "payment_multi", - "phone", - "wheelchair" + "{@templates/poi}" ], "geometry": [ "point", diff --git a/data/presets/amenity/dive_centre.json b/data/presets/amenity/dive_centre.json index eddbb1b8..b2e591c5 100644 --- a/data/presets/amenity/dive_centre.json +++ b/data/presets/amenity/dive_centre.json @@ -9,15 +9,7 @@ "scuba_diving" ], "moreFields": [ - "contact/facebook", - "email", - "fax", - "gnis/feature_id-US", - "level", - "opening_hours/covid19", - "payment_multi", - "phone", - "wheelchair" + "{@templates/poi}" ], "geometry": [ "point", diff --git a/data/presets/amenity/doctors.json b/data/presets/amenity/doctors.json index 47a6ded5..523c7152 100644 --- a/data/presets/amenity/doctors.json +++ b/data/presets/amenity/doctors.json @@ -9,15 +9,7 @@ "opening_hours" ], "moreFields": [ - "contact/facebook", - "email", - "fax", - "gnis/feature_id-US", - "level", - "opening_hours/covid19", - "payment_multi", - "phone", - "wheelchair" + "{@templates/poi}" ], "geometry": [ "point", diff --git a/data/presets/amenity/dojo.json b/data/presets/amenity/dojo.json index dd55344b..e53df203 100644 --- a/data/presets/amenity/dojo.json +++ b/data/presets/amenity/dojo.json @@ -8,15 +8,7 @@ "opening_hours" ], "moreFields": [ - "contact/facebook", - "email", - "fax", - "gnis/feature_id-US", - "level", - "opening_hours/covid19", - "payment_multi", - "phone", - "wheelchair" + "{@templates/poi}" ], "geometry": [ "point", diff --git a/data/presets/amenity/driver_training.json b/data/presets/amenity/driver_training.json index d3d1f32c..80c4784a 100644 --- a/data/presets/amenity/driver_training.json +++ b/data/presets/amenity/driver_training.json @@ -8,14 +8,8 @@ "opening_hours" ], "moreFields": [ - "license_classes", - "email", - "fax", - "opening_hours/covid19", - "payment_multi", - "phone", - "website", - "wheelchair" + "{@templates/poi}", + "license_classes" ], "geometry": [ "point", diff --git a/data/presets/amenity/driving_school.json b/data/presets/amenity/driving_school.json index 3bdcdf8b..17b1b8f0 100644 --- a/data/presets/amenity/driving_school.json +++ b/data/presets/amenity/driving_school.json @@ -9,17 +9,8 @@ "opening_hours" ], "moreFields": [ - "contact/facebook", - "email", - "fax", - "gnis/feature_id-US", - "level", - "license_classes", - "opening_hours/covid19", - "payment_multi", - "ref/FR/siret-FR", - "phone", - "wheelchair" + "{@templates/poi}", + "license_classes" ], "geometry": [ "point", diff --git a/data/presets/amenity/events_venue.json b/data/presets/amenity/events_venue.json index 28ab4360..de3cef87 100644 --- a/data/presets/amenity/events_venue.json +++ b/data/presets/amenity/events_venue.json @@ -6,20 +6,14 @@ "building_area_yes", "address", "website", - "internet_access", - "internet_access/fee", - "internet_access/ssid" + "{@templates/internet_access}" ], "moreFields": [ + "{@templates/internet_access}", + "{@templates/poi}", "air_conditioning", - "email", - "fax", - "gnis/feature_id-US", - "level", "min_age", - "phone", - "smoking", - "wheelchair" + "smoking" ], "geometry": [ "point", diff --git a/data/presets/amenity/exhibition_centre.json b/data/presets/amenity/exhibition_centre.json index 69afcbff..b19ad668 100644 --- a/data/presets/amenity/exhibition_centre.json +++ b/data/presets/amenity/exhibition_centre.json @@ -7,19 +7,13 @@ "building_area_yes", "address", "website", - "internet_access", - "internet_access/fee", - "internet_access/ssid" + "{@templates/internet_access}" ], "moreFields": [ + "{@templates/internet_access}", + "{@templates/poi}", "air_conditioning", - "email", - "fax", - "gnis/feature_id-US", - "not/name", - "phone", - "smoking", - "wheelchair" + "smoking" ], "geometry": [ "point", diff --git a/data/presets/amenity/fast_food.json b/data/presets/amenity/fast_food.json index 06f9a38d..6bfb5f52 100644 --- a/data/presets/amenity/fast_food.json +++ b/data/presets/amenity/fast_food.json @@ -13,29 +13,18 @@ "website" ], "moreFields": [ + "{@templates/internet_access}", + "{@templates/poi}", "air_conditioning", "branch_brand", "brand", "capacity", - "contact/facebook", "delivery", - "email", - "fax", - "gnis/feature_id-US", "highchair", - "internet_access", - "internet_access/fee", - "internet_access/ssid", - "level", - "opening_hours/covid19", "outdoor_seating", - "payment_multi", - "ref/vatin", - "ref/FR/siret-FR", "smoking", "takeaway", - "website/menu", - "wheelchair" + "website/menu" ], "geometry": [ "point", diff --git a/data/presets/amenity/fire_station.json b/data/presets/amenity/fire_station.json index 66f97ef0..d2363f43 100644 --- a/data/presets/amenity/fire_station.json +++ b/data/presets/amenity/fire_station.json @@ -7,10 +7,8 @@ "building_area" ], "moreFields": [ - "email", - "fax", + "{@templates/contact}", "gnis/feature_id-US", - "phone", "polling_station", "smoking", "wheelchair" diff --git a/data/presets/amenity/food_court.json b/data/presets/amenity/food_court.json index 39f455c4..1c64ab75 100644 --- a/data/presets/amenity/food_court.json +++ b/data/presets/amenity/food_court.json @@ -6,25 +6,16 @@ "address", "building_area_yes", "opening_hours", - "internet_access", - "internet_access/fee", - "internet_access/ssid" + "{@templates/internet_access}" ], "moreFields": [ + "{@templates/internet_access}", + "{@templates/poi}", "capacity", - "contact/facebook", "diet_multi", - "email", - "fax", - "gnis/feature_id-US", - "level", - "not/name", - "opening_hours/covid19", "outdoor_seating", - "phone", "smoking", - "website/menu", - "wheelchair" + "website/menu" ], "geometry": [ "point", diff --git a/data/presets/amenity/fuel.json b/data/presets/amenity/fuel.json index fc522ebb..18f87eef 100644 --- a/data/presets/amenity/fuel.json +++ b/data/presets/amenity/fuel.json @@ -11,18 +11,8 @@ "building_area" ], "moreFields": [ - "branch_brand", - "email", - "contact/facebook", - "fax", - "gnis/feature_id-US", - "opening_hours", - "opening_hours/covid19", - "payment_multi", - "phone", - "ref/vatin", - "ref/FR/siret-FR", - "wheelchair" + "{@templates/poi}", + "branch_brand" ], "geometry": [ "point", diff --git a/data/presets/amenity/grave_yard.json b/data/presets/amenity/grave_yard.json index 37eaaa8b..656b670c 100644 --- a/data/presets/amenity/grave_yard.json +++ b/data/presets/amenity/grave_yard.json @@ -5,10 +5,8 @@ "address" ], "moreFields": [ - "email", - "fax", - "gnis/feature_id-US", - "phone" + "{@templates/contact}", + "gnis/feature_id-US" ], "geometry": [ "point", diff --git a/data/presets/amenity/hospital.json b/data/presets/amenity/hospital.json index 4521fcf9..1638a00d 100644 --- a/data/presets/amenity/hospital.json +++ b/data/presets/amenity/hospital.json @@ -9,15 +9,8 @@ "emergency" ], "moreFields": [ - "contact/facebook", - "email", - "fax", - "gnis/feature_id-US", - "internet_access", - "internet_access/fee", - "internet_access/ssid", - "phone", - "wheelchair" + "{@templates/internet_access}", + "{@templates/poi}" ], "geometry": [ "area", diff --git a/data/presets/amenity/ice_cream.json b/data/presets/amenity/ice_cream.json index ea4810a2..0b83420c 100644 --- a/data/presets/amenity/ice_cream.json +++ b/data/presets/amenity/ice_cream.json @@ -8,23 +8,13 @@ "outdoor_seating" ], "moreFields": [ + "{@templates/internet_access}", + "{@templates/poi}", "delivery", "diet_multi", "drive_through", - "email", - "fax", - "gnis/feature_id-US", - "internet_access", - "internet_access/fee", - "internet_access/ssid", - "level", - "opening_hours/covid19", - "payment_multi", - "ref/FR/siret-FR", - "phone", "takeaway", - "website/menu", - "wheelchair" + "website/menu" ], "geometry": [ "point", diff --git a/data/presets/amenity/internet_cafe.json b/data/presets/amenity/internet_cafe.json index c1065646..96b76368 100644 --- a/data/presets/amenity/internet_cafe.json +++ b/data/presets/amenity/internet_cafe.json @@ -6,27 +6,17 @@ "operator/type", "address", "building_area_yes", - "internet_access", - "internet_access/fee", - "internet_access/ssid", + "{@templates/internet_access}", "phone", "website" ], "moreFields": [ + "{@templates/internet_access}", + "{@templates/poi}", "air_conditioning", - "email", - "fax", - "gnis/feature_id-US", - "level", "min_age", - "opening_hours", - "opening_hours/covid19", "outdoor_seating", - "payment_multi", - "ref/vatin", - "ref/FR/siret-FR", - "smoking", - "wheelchair" + "smoking" ], "geometry": [ "point", diff --git a/data/presets/amenity/karaoke_box.json b/data/presets/amenity/karaoke_box.json index 7457386f..77b6ea9e 100644 --- a/data/presets/amenity/karaoke_box.json +++ b/data/presets/amenity/karaoke_box.json @@ -9,18 +9,10 @@ "website" ], "moreFields": [ + "{@templates/poi}", "air_conditioning", - "email", - "fax", - "gnis/feature_id-US", - "level", "min_age", - "opening_hours/covid19", - "payment_multi", - "phone", - "ref/vatin", - "smoking", - "wheelchair" + "smoking" ], "geometry": [ "point", diff --git a/data/presets/amenity/kindergarten.json b/data/presets/amenity/kindergarten.json index e593f376..6e7a08ef 100644 --- a/data/presets/amenity/kindergarten.json +++ b/data/presets/amenity/kindergarten.json @@ -9,12 +9,10 @@ "preschool" ], "moreFields": [ + "{@templates/contact}", "capacity", - "email", - "fax", "gnis/feature_id-US", "internet_access", - "internet_access/fee", "internet_access/ssid", "level", "max_age", diff --git a/data/presets/amenity/language_school.json b/data/presets/amenity/language_school.json index 3877fe2f..7be3f89a 100644 --- a/data/presets/amenity/language_school.json +++ b/data/presets/amenity/language_school.json @@ -10,16 +10,12 @@ "language_multi" ], "moreFields": [ - "email", - "fax", + "{@templates/contact}", + "{@templates/internet_access}", "gnis/feature_id-US", - "internet_access", - "internet_access/fee", - "internet_access/ssid", "level", "opening_hours/covid19", "payment_multi", - "phone", "wheelchair" ], "geometry": [ diff --git a/data/presets/amenity/library.json b/data/presets/amenity/library.json index 5023050c..2cce1914 100644 --- a/data/presets/amenity/library.json +++ b/data/presets/amenity/library.json @@ -8,25 +8,15 @@ "opening_hours", "address", "ref/isil", - "internet_access", - "internet_access/fee", - "internet_access/ssid" + "{@templates/internet_access}" ], "moreFields": [ + "{@templates/internet_access}", + "{@templates/poi}", "access_simple", "air_conditioning", "baby_feeding", - "contact/facebook", - "email", - "fax", - "gnis/feature_id-US", - "level", - "not/name", - "opening_hours/covid19", - "payment_multi", - "phone", - "polling_station", - "wheelchair" + "polling_station" ], "geometry": [ "point", diff --git a/data/presets/amenity/love_hotel.json b/data/presets/amenity/love_hotel.json index 840fb82c..713226b2 100644 --- a/data/presets/amenity/love_hotel.json +++ b/data/presets/amenity/love_hotel.json @@ -6,20 +6,13 @@ "address", "building_area_yes", "rooms", - "internet_access", - "internet_access/fee", - "internet_access/ssid" + "{@templates/internet_access}" ], "moreFields": [ - "email", - "fax", - "gnis/feature_id-US", + "{@templates/internet_access}", + "{@templates/poi}", "min_age", - "payment_multi", - "phone", - "ref/vatin", - "smoking", - "wheelchair" + "smoking" ], "geometry": [ "point", diff --git a/data/presets/amenity/marketplace.json b/data/presets/amenity/marketplace.json index dd37704a..91762c30 100644 --- a/data/presets/amenity/marketplace.json +++ b/data/presets/amenity/marketplace.json @@ -8,11 +8,9 @@ "opening_hours" ], "moreFields": [ - "email", - "fax", + "{@templates/contact}", "gnis/feature_id-US", "opening_hours/covid19", - "phone", "wheelchair" ], "geometry": [ diff --git a/data/presets/amenity/monastery.json b/data/presets/amenity/monastery.json index 7e642cf1..6dc5ffdb 100644 --- a/data/presets/amenity/monastery.json +++ b/data/presets/amenity/monastery.json @@ -7,10 +7,8 @@ "address" ], "moreFields": [ - "email", - "fax", + "{@templates/contact}", "gnis/feature_id-US", - "phone", "wheelchair" ], "geometry": [ diff --git a/data/presets/amenity/money_transfer.json b/data/presets/amenity/money_transfer.json index 780a34a0..36b9ff4e 100644 --- a/data/presets/amenity/money_transfer.json +++ b/data/presets/amenity/money_transfer.json @@ -10,13 +10,8 @@ "currency_multi" ], "moreFields": [ - "branch_brand", - "email", - "fax", - "level", - "opening_hours/covid19", - "phone", - "wheelchair" + "{@templates/poi}", + "branch_brand" ], "geometry": [ "point", diff --git a/data/presets/amenity/motorcycle_rental.json b/data/presets/amenity/motorcycle_rental.json index d4ba7199..a938cf48 100644 --- a/data/presets/amenity/motorcycle_rental.json +++ b/data/presets/amenity/motorcycle_rental.json @@ -8,13 +8,9 @@ "payment_multi" ], "moreFields": [ + "{@templates/poi}", "branch_brand", - "brand", - "email", - "fax", - "opening_hours/covid19", - "phone", - "wheelchair" + "brand" ], "geometry": [ "point", diff --git a/data/presets/amenity/music_school.json b/data/presets/amenity/music_school.json index 83f9c309..c4fcaa6c 100644 --- a/data/presets/amenity/music_school.json +++ b/data/presets/amenity/music_school.json @@ -8,14 +8,7 @@ "opening_hours" ], "moreFields": [ - "email", - "fax", - "gnis/feature_id-US", - "level", - "opening_hours/covid19", - "payment_multi", - "phone", - "wheelchair" + "{@templates/poi}" ], "geometry": [ "point", diff --git a/data/presets/amenity/nightclub.json b/data/presets/amenity/nightclub.json index 412da5aa..b4724308 100644 --- a/data/presets/amenity/nightclub.json +++ b/data/presets/amenity/nightclub.json @@ -10,17 +10,8 @@ "smoking" ], "moreFields": [ + "{@templates/poi}", "air_conditioning", - "contact/facebook", - "email", - "fax", - "gnis/feature_id-US", - "level", - "payment_multi", - "opening_hours/covid19", - "phone", - "ref/FR/siret-FR", - "wheelchair", "fee" ], "geometry": [ diff --git a/data/presets/amenity/parking.json b/data/presets/amenity/parking.json index e0c4d12d..a1f35980 100644 --- a/data/presets/amenity/parking.json +++ b/data/presets/amenity/parking.json @@ -13,15 +13,13 @@ "surface" ], "moreFields": [ + "{@templates/contact}", "address", "covered", - "email", - "fax", "maxstay", "opening_hours", "opening_hours/covid19", "park_ride", - "phone", "ref", "supervised", "wheelchair" diff --git a/data/presets/amenity/payment_centre.json b/data/presets/amenity/payment_centre.json index ddcfc60a..0cbc75d9 100644 --- a/data/presets/amenity/payment_centre.json +++ b/data/presets/amenity/payment_centre.json @@ -9,14 +9,9 @@ "payment_multi" ], "moreFields": [ + "{@templates/poi}", "branch_brand", - "currency_multi", - "email", - "fax", - "level", - "opening_hours/covid19", - "phone", - "wheelchair" + "currency_multi" ], "geometry": [ "point", diff --git a/data/presets/amenity/pharmacy.json b/data/presets/amenity/pharmacy.json index f823af76..a036b3bf 100644 --- a/data/presets/amenity/pharmacy.json +++ b/data/presets/amenity/pharmacy.json @@ -10,17 +10,9 @@ "drive_through" ], "moreFields": [ + "{@templates/poi}", "branch_brand", - "brand", - "email", - "fax", - "gnis/feature_id-US", - "level", - "opening_hours/covid19", - "ref/FR/siret-FR", - "payment_multi", - "phone", - "wheelchair" + "brand" ], "geometry": [ "point", diff --git a/data/presets/amenity/place_of_worship.json b/data/presets/amenity/place_of_worship.json index 90814658..f12ce5e2 100644 --- a/data/presets/amenity/place_of_worship.json +++ b/data/presets/amenity/place_of_worship.json @@ -9,17 +9,15 @@ "service_times" ], "moreFields": [ + "{@templates/contact}", "air_conditioning", "baby_feeding", - "email", - "fax", "gnis/feature_id-US", "internet_access", "internet_access/ssid", "level", "opening_hours", "opening_hours/covid19", - "phone", "polling_station", "wheelchair" ], diff --git a/data/presets/amenity/planetarium.json b/data/presets/amenity/planetarium.json index 0029097f..15cb4cfe 100644 --- a/data/presets/amenity/planetarium.json +++ b/data/presets/amenity/planetarium.json @@ -8,16 +8,10 @@ "opening_hours" ], "moreFields": [ + "{@templates/poi}", "air_conditioning", "charge_fee", - "email", - "fax", - "fee", - "gnis/feature_id-US", - "opening_hours/covid19", - "payment_multi_fee", - "phone", - "wheelchair" + "fee" ], "geometry": [ "point", diff --git a/data/presets/amenity/police.json b/data/presets/amenity/police.json index 2d6551a7..1e00e23b 100644 --- a/data/presets/amenity/police.json +++ b/data/presets/amenity/police.json @@ -8,12 +8,10 @@ "opening_hours" ], "moreFields": [ - "email", - "fax", + "{@templates/contact}", "gnis/feature_id-US", "level", "opening_hours/covid19", - "phone", "polling_station", "wheelchair" ], diff --git a/data/presets/amenity/polling_station.json b/data/presets/amenity/polling_station.json index a7bf9d19..26007eeb 100644 --- a/data/presets/amenity/polling_station.json +++ b/data/presets/amenity/polling_station.json @@ -9,16 +9,12 @@ "building_area_yes" ], "moreFields": [ + "{@templates/contact}", + "{@templates/internet_access}", "air_conditioning", - "email", - "fax", "gnis/feature_id-US", - "internet_access", - "internet_access/fee", - "internet_access/ssid", "level", "opening_hours/covid19", - "phone", "wheelchair" ], "geometry": [ diff --git a/data/presets/amenity/post_depot.json b/data/presets/amenity/post_depot.json index 2788ddf8..26043a45 100644 --- a/data/presets/amenity/post_depot.json +++ b/data/presets/amenity/post_depot.json @@ -8,8 +8,7 @@ "phone" ], "moreFields": [ - "email", - "fax", + "{@templates/contact}", "gnis/feature_id-US", "opening_hours", "opening_hours/covid19", diff --git a/data/presets/amenity/post_office.json b/data/presets/amenity/post_office.json index aa9c31b7..1376b1b6 100644 --- a/data/presets/amenity/post_office.json +++ b/data/presets/amenity/post_office.json @@ -8,19 +8,15 @@ "opening_hours" ], "moreFields": [ + "{@templates/contact}", + "{@templates/internet_access}", "branch_brand", "brand", - "email", - "fax", "gnis/feature_id-US", - "internet_access", - "internet_access/fee", - "internet_access/ssid", "level", "opening_hours/covid19", "ref/FR/siret-FR", "payment_multi", - "phone", "polling_station", "wheelchair" ], diff --git a/data/presets/amenity/prep_school.json b/data/presets/amenity/prep_school.json index 8273bf82..ca12aa7a 100644 --- a/data/presets/amenity/prep_school.json +++ b/data/presets/amenity/prep_school.json @@ -8,14 +8,7 @@ "opening_hours" ], "moreFields": [ - "email", - "fax", - "gnis/feature_id-US", - "level", - "opening_hours/covid19", - "payment_multi", - "phone", - "wheelchair" + "{@templates/poi}" ], "geometry": [ "point", diff --git a/data/presets/amenity/prison.json b/data/presets/amenity/prison.json index aba32c41..8ac60e2e 100644 --- a/data/presets/amenity/prison.json +++ b/data/presets/amenity/prison.json @@ -7,10 +7,8 @@ "address" ], "moreFields": [ - "email", - "fax", + "{@templates/contact}", "gnis/feature_id-US", - "phone", "wheelchair" ], "geometry": [ diff --git a/data/presets/amenity/pub.json b/data/presets/amenity/pub.json index 11ea55aa..3c208ca4 100644 --- a/data/presets/amenity/pub.json +++ b/data/presets/amenity/pub.json @@ -9,31 +9,19 @@ "brewery" ], "moreFields": [ + "{@templates/internet_access}", + "{@templates/poi}", "air_conditioning", - "contact/facebook", "cuisine", "diet_multi", - "email", - "fax", - "gnis/feature_id-US", - "internet_access", - "internet_access/fee", - "internet_access/ssid", - "level", "microbrewery", "min_age", - "opening_hours/covid19", "outdoor_seating", - "payment_multi", - "phone", - "ref/vatin", - "ref/FR/siret-FR", "real_fire-GB-IE", "sport_pub", "toilets", "toilets/wheelchair", - "website/menu", - "wheelchair" + "website/menu" ], "geometry": [ "point", diff --git a/data/presets/amenity/public_bath.json b/data/presets/amenity/public_bath.json index 33eb1884..4c836b28 100644 --- a/data/presets/amenity/public_bath.json +++ b/data/presets/amenity/public_bath.json @@ -11,18 +11,8 @@ "charge_fee" ], "moreFields": [ - "email", - "fax", - "gnis/feature_id-US", - "internet_access", - "internet_access/fee", - "internet_access/ssid", - "opening_hours", - "opening_hours/covid19", - "payment_multi_fee", - "ref/FR/siret-FR", - "phone", - "wheelchair" + "{@templates/internet_access}", + "{@templates/poi}" ], "geometry": [ "point", diff --git a/data/presets/amenity/ranger_station.json b/data/presets/amenity/ranger_station.json index 419bacc3..ac139d51 100644 --- a/data/presets/amenity/ranger_station.json +++ b/data/presets/amenity/ranger_station.json @@ -8,14 +8,10 @@ "opening_hours" ], "moreFields": [ - "email", - "fax", + "{@templates/contact}", + "{@templates/internet_access}", "gnis/feature_id-US", - "internet_access", - "internet_access/fee", - "internet_access/ssid", "opening_hours/covid19", - "phone", "wheelchair" ], "geometry": [ diff --git a/data/presets/amenity/recycling_centre.json b/data/presets/amenity/recycling_centre.json index c162e8d7..90725247 100644 --- a/data/presets/amenity/recycling_centre.json +++ b/data/presets/amenity/recycling_centre.json @@ -10,13 +10,11 @@ "recycling_accepts" ], "moreFields": [ + "{@templates/contact}", "charge_fee", - "email", - "fax", "fee", "opening_hours/covid19", "payment_multi_fee", - "phone", "wheelchair" ], "geometry": [ diff --git a/data/presets/amenity/refugee_site.json b/data/presets/amenity/refugee_site.json index 72e21d63..1591841a 100644 --- a/data/presets/amenity/refugee_site.json +++ b/data/presets/amenity/refugee_site.json @@ -12,9 +12,7 @@ "source/population" ], "moreFields": [ - "internet_access", - "internet_access/fee", - "internet_access/ssid" + "{@templates/internet_access}" ], "geometry": [ "point", diff --git a/data/presets/amenity/research_institute.json b/data/presets/amenity/research_institute.json index eef7ea8d..7fdc1dd4 100644 --- a/data/presets/amenity/research_institute.json +++ b/data/presets/amenity/research_institute.json @@ -6,15 +6,14 @@ "operator/type", "address", "website", - "internet_access", - "internet_access/fee" + "{@templates/internet_access}" ], "moreFields": [ - "email", - "fax", + "{@templates/contact}", + "{@templates/internet_access}", "gnis/feature_id-US", - "internet_access/ssid", - "phone", + "toilets", + "toilets/wheelchair", "wheelchair" ], "geometry": [ diff --git a/data/presets/amenity/restaurant.json b/data/presets/amenity/restaurant.json index 3d747657..18762bf9 100644 --- a/data/presets/amenity/restaurant.json +++ b/data/presets/amenity/restaurant.json @@ -11,30 +11,19 @@ "website" ], "moreFields": [ + "{@templates/internet_access}", + "{@templates/poi}", "air_conditioning", "bar", "branch_brand", "brand", "brewery", "capacity", - "contact/facebook", "delivery", - "email", - "fax", - "gnis/feature_id-US", "highchair", - "internet_access", - "internet_access/fee", - "internet_access/ssid", - "level", "microbrewery", "min_age", - "not/name", - "opening_hours/covid19", "outdoor_seating", - "payment_multi", - "ref/vatin", - "ref/FR/siret-FR", "reservation", "smoking", "sport_pub", @@ -42,8 +31,7 @@ "takeaway", "toilets", "toilets/wheelchair", - "website/menu", - "wheelchair" + "website/menu" ], "geometry": [ "point", diff --git a/data/presets/amenity/school.json b/data/presets/amenity/school.json index fbb5800c..a3422c46 100644 --- a/data/presets/amenity/school.json +++ b/data/presets/amenity/school.json @@ -12,16 +12,15 @@ "building_area" ], "moreFields": [ + "{@templates/contact}", + "{@templates/internet_access}", "capacity", "charge_fee", - "email", - "fax", "fee", "gnis/feature_id-US", "internet_access", "internet_access/ssid", "level", - "phone", "polling_station", "wheelchair" ], diff --git a/data/presets/amenity/social_centre.json b/data/presets/amenity/social_centre.json index 75a084c4..2a1a7ad1 100644 --- a/data/presets/amenity/social_centre.json +++ b/data/presets/amenity/social_centre.json @@ -9,19 +9,12 @@ "building_area_yes" ], "moreFields": [ + "{@templates/internet_access}", + "{@templates/poi}", "air_conditioning", "baby_feeding", "branch_brand", - "email", - "fax", - "gnis/feature_id-US", - "internet_access", - "internet_access/fee", - "internet_access/ssid", - "level", - "phone", - "polling_station", - "wheelchair" + "polling_station" ], "geometry": [ "point", diff --git a/data/presets/amenity/social_facility.json b/data/presets/amenity/social_facility.json index 26b6c1a0..008c65de 100644 --- a/data/presets/amenity/social_facility.json +++ b/data/presets/amenity/social_facility.json @@ -9,19 +9,10 @@ "social_facility_for" ], "moreFields": [ + "{@templates/internet_access}", + "{@templates/poi}", "baby_feeding", - "building_area", - "email", - "fax", - "gnis/feature_id-US", - "internet_access", - "internet_access/fee", - "internet_access/ssid", - "level", - "opening_hours", - "opening_hours/covid19", - "phone", - "wheelchair" + "building_area" ], "geometry": [ "point", diff --git a/data/presets/amenity/stripclub.json b/data/presets/amenity/stripclub.json index 8d22246c..fc0e7611 100644 --- a/data/presets/amenity/stripclub.json +++ b/data/presets/amenity/stripclub.json @@ -10,17 +10,8 @@ "smoking" ], "moreFields": [ + "{@templates/poi}", "air_conditioning", - "contact/facebook", - "email", - "fax", - "gnis/feature_id-US", - "level", - "payment_multi", - "opening_hours/covid19", - "phone", - "ref/FR/siret-FR", - "wheelchair", "fee" ], "geometry": [ diff --git a/data/presets/amenity/studio.json b/data/presets/amenity/studio.json index f5b5da80..5723d41d 100644 --- a/data/presets/amenity/studio.json +++ b/data/presets/amenity/studio.json @@ -8,14 +8,10 @@ "website" ], "moreFields": [ - "email", - "fax", + "{@templates/contact}", + "{@templates/internet_access}", "gnis/feature_id-US", - "internet_access", - "internet_access/fee", - "internet_access/ssid", "level", - "phone", "wheelchair" ], "geometry": [ diff --git a/data/presets/amenity/telephone.json b/data/presets/amenity/telephone.json index 0fb73efc..996dcf1e 100644 --- a/data/presets/amenity/telephone.json +++ b/data/presets/amenity/telephone.json @@ -7,12 +7,10 @@ "covered" ], "moreFields": [ + "{@templates/internet_access}", "booth", "fee", "indoor", - "internet_access", - "internet_access/fee", - "internet_access/ssid", "level", "lit", "model", diff --git a/data/presets/amenity/theatre.json b/data/presets/amenity/theatre.json index 3536b0e4..5de1e407 100644 --- a/data/presets/amenity/theatre.json +++ b/data/presets/amenity/theatre.json @@ -8,20 +8,10 @@ "website" ], "moreFields": [ + "{@templates/internet_access}", + "{@templates/poi}", "air_conditioning", - "contact/facebook", - "email", - "fax", - "gnis/feature_id-US", - "internet_access", - "internet_access/fee", - "internet_access/ssid", - "level", - "min_age", - "payment_multi", - "ref/FR/siret-FR", - "phone", - "wheelchair" + "min_age" ], "geometry": [ "point", diff --git a/data/presets/amenity/townhall.json b/data/presets/amenity/townhall.json index 65c672a5..455f7e27 100644 --- a/data/presets/amenity/townhall.json +++ b/data/presets/amenity/townhall.json @@ -9,10 +9,8 @@ ], "moreFields": [ "baby_feeding", - "email", - "fax", + "{@templates/contact}", "gnis/feature_id-US", - "phone", "polling_station", "smoking", "wheelchair" diff --git a/data/presets/amenity/vehicle_inspection.json b/data/presets/amenity/vehicle_inspection.json index c6af04d8..1e4c95a5 100644 --- a/data/presets/amenity/vehicle_inspection.json +++ b/data/presets/amenity/vehicle_inspection.json @@ -8,14 +8,7 @@ "opening_hours" ], "moreFields": [ - "email", - "fax", - "gnis/feature_id-US", - "opening_hours/covid19", - "payment_multi", - "ref/FR/siret-FR", - "phone", - "wheelchair" + "{@templates/poi}" ], "geometry": [ "point", diff --git a/data/presets/amenity/veterinary.json b/data/presets/amenity/veterinary.json index 65bde46a..b0a4de81 100644 --- a/data/presets/amenity/veterinary.json +++ b/data/presets/amenity/veterinary.json @@ -8,16 +8,9 @@ "opening_hours" ], "moreFields": [ + "{@templates/poi}", "charge_fee", - "email", - "fax", - "fee", - "gnis/feature_id-US", - "level", - "opening_hours/covid19", - "payment_multi_fee", - "phone", - "wheelchair" + "fee" ], "geometry": [ "point", diff --git a/data/presets/amenity/waste_transfer_station.json b/data/presets/amenity/waste_transfer_station.json index d0d98eb6..9992ee92 100644 --- a/data/presets/amenity/waste_transfer_station.json +++ b/data/presets/amenity/waste_transfer_station.json @@ -12,10 +12,8 @@ "charge_fee" ], "moreFields": [ - "email", - "fax", + "{@templates/contact}", "opening_hours/covid19", - "phone", "wheelchair" ], "geometry": [ diff --git a/data/presets/barrier/border_control.json b/data/presets/barrier/border_control.json index b44099f7..263a1e8e 100644 --- a/data/presets/barrier/border_control.json +++ b/data/presets/barrier/border_control.json @@ -5,10 +5,8 @@ "building_area_yes" ], "moreFields": [ - "address", - "email", - "fax", - "phone" + "{@templates/contact}", + "address" ], "geometry": [ "vertex", diff --git a/data/presets/barrier/toll_booth.json b/data/presets/barrier/toll_booth.json index 9b905d87..58aa6e06 100644 --- a/data/presets/barrier/toll_booth.json +++ b/data/presets/barrier/toll_booth.json @@ -7,12 +7,10 @@ "currency_multi" ], "moreFields": [ + "{@templates/contact}", "address", - "email", - "fax", "opening_hours", - "opening_hours/covid19", - "phone" + "opening_hours/covid19" ], "geometry": [ "vertex", diff --git a/data/presets/club.json b/data/presets/club.json index 447e0095..0d0d5f83 100644 --- a/data/presets/club.json +++ b/data/presets/club.json @@ -11,21 +11,13 @@ "website" ], "moreFields": [ + "{@templates/internet_access}", + "{@templates/poi}", "access_simple", "building/levels_building", - "contact/facebook", - "email", - "fax", - "gnis/feature_id-US", "height_building", - "internet_access", - "internet_access/fee", - "internet_access/ssid", - "level", "max_age", - "min_age", - "opening_hours/covid19", - "wheelchair" + "min_age" ], "geometry": [ "point", diff --git a/data/presets/craft.json b/data/presets/craft.json index 1f23d843..401e6c1d 100644 --- a/data/presets/craft.json +++ b/data/presets/craft.json @@ -11,22 +11,12 @@ "website" ], "moreFields": [ + "{@templates/internet_access}", + "{@templates/poi}", "air_conditioning", "building/levels_building", - "contact/facebook", - "ele", - "email", - "fax", - "gnis/feature_id-US", "height_building", - "internet_access", - "internet_access/fee", - "internet_access/ssid", - "level", - "opening_hours/covid19", - "product", - "ref/vatin", - "wheelchair" + "product" ], "geometry": [ "point", diff --git a/data/presets/emergency/ambulance_station.json b/data/presets/emergency/ambulance_station.json index 5bcef868..2a48857f 100644 --- a/data/presets/emergency/ambulance_station.json +++ b/data/presets/emergency/ambulance_station.json @@ -7,10 +7,8 @@ "address" ], "moreFields": [ - "email", - "fax", + "{@templates/contact}", "gnis/feature_id-US", - "phone", "wheelchair" ], "geometry": [ diff --git a/data/presets/emergency/lifeboat_station.json b/data/presets/emergency/lifeboat_station.json index bf1504cf..f3873c3d 100644 --- a/data/presets/emergency/lifeboat_station.json +++ b/data/presets/emergency/lifeboat_station.json @@ -10,8 +10,7 @@ "website" ], "moreFields": [ - "email", - "fax", + "{@templates/contact}", "gnis/feature_id-US", "wheelchair" ], diff --git a/data/presets/emergency/mountain_rescue.json b/data/presets/emergency/mountain_rescue.json index 5fee6d58..447d47c1 100644 --- a/data/presets/emergency/mountain_rescue.json +++ b/data/presets/emergency/mountain_rescue.json @@ -5,13 +5,12 @@ "address", "operator", "building_area_yes", - "email", + "phone", "website" ], "moreFields": [ - "fax", + "{@templates/contact}", "gnis/feature_id-US", - "phone", "wheelchair" ], "geometry": [ diff --git a/data/presets/golf/clubhouse.json b/data/presets/golf/clubhouse.json index eb968537..529d6d20 100644 --- a/data/presets/golf/clubhouse.json +++ b/data/presets/golf/clubhouse.json @@ -8,13 +8,11 @@ "access_simple" ], "moreFields": [ + "{@templates/internet_access}", "air_conditioning", "fee", "payment_multi_fee", "charge_fee", - "internet_access", - "internet_access/fee", - "internet_access/ssid", "level", "opening_hours", "opening_hours/covid19", diff --git a/data/presets/healthcare.json b/data/presets/healthcare.json index 0ffa0e7f..e4b43196 100644 --- a/data/presets/healthcare.json +++ b/data/presets/healthcare.json @@ -11,11 +11,10 @@ "website" ], "moreFields": [ + "{@templates/contact}", "branch_brand", "brand", "building/levels_building", - "email", - "fax", "gnis/feature_id-US", "height_building", "level", diff --git a/data/presets/highway/rest_area.json b/data/presets/highway/rest_area.json index 49fb2d95..730e83b7 100644 --- a/data/presets/highway/rest_area.json +++ b/data/presets/highway/rest_area.json @@ -6,14 +6,13 @@ "opening_hours" ], "moreFields": [ + "{@templates/contact}", + "{@templates/internet_access}", "address", "bin", "caravans", "drinking_water_available", - "email", - "fax", "opening_hours/covid19", - "phone", "picnic_table", "toilets", "wheelchair" diff --git a/data/presets/landuse/allotments.json b/data/presets/landuse/allotments.json index a95a7000..34ac6d10 100644 --- a/data/presets/landuse/allotments.json +++ b/data/presets/landuse/allotments.json @@ -9,10 +9,8 @@ "plots" ], "moreFields": [ - "address", - "email", - "fax", - "phone" + "{@templates/contact}", + "address" ], "tags": { "landuse": "allotments" diff --git a/data/presets/landuse/aquaculture.json b/data/presets/landuse/aquaculture.json index e6846e3b..9e367b3e 100644 --- a/data/presets/landuse/aquaculture.json +++ b/data/presets/landuse/aquaculture.json @@ -6,10 +6,8 @@ "produce" ], "moreFields": [ - "address", - "email", - "fax", - "phone" + "{@templates/contact}", + "address" ], "geometry": [ "area" diff --git a/data/presets/landuse/cemetery.json b/data/presets/landuse/cemetery.json index 0c8dcb47..d7555529 100644 --- a/data/presets/landuse/cemetery.json +++ b/data/presets/landuse/cemetery.json @@ -6,10 +6,8 @@ "denomination" ], "moreFields": [ - "address", - "email", - "fax", - "phone" + "{@templates/contact}", + "address" ], "geometry": [ "area", diff --git a/data/presets/landuse/commercial.json b/data/presets/landuse/commercial.json index f2022460..938089b1 100644 --- a/data/presets/landuse/commercial.json +++ b/data/presets/landuse/commercial.json @@ -4,10 +4,8 @@ "name" ], "moreFields": [ - "address", - "email", - "fax", - "phone" + "{@templates/contact}", + "address" ], "geometry": [ "area" diff --git a/data/presets/landuse/construction.json b/data/presets/landuse/construction.json index d999f24e..b421f141 100644 --- a/data/presets/landuse/construction.json +++ b/data/presets/landuse/construction.json @@ -9,10 +9,8 @@ "note" ], "moreFields": [ - "address", - "email", - "fax", - "phone" + "{@templates/contact}", + "address" ], "geometry": [ "area" diff --git a/data/presets/landuse/farmland.json b/data/presets/landuse/farmland.json index 513f1cf5..44bfa876 100644 --- a/data/presets/landuse/farmland.json +++ b/data/presets/landuse/farmland.json @@ -7,10 +7,8 @@ "produce" ], "moreFields": [ - "address", - "email", - "fax", - "phone" + "{@templates/contact}", + "address" ], "geometry": [ "area" diff --git a/data/presets/landuse/farmyard.json b/data/presets/landuse/farmyard.json index 88893bb4..be72f874 100644 --- a/data/presets/landuse/farmyard.json +++ b/data/presets/landuse/farmyard.json @@ -5,10 +5,8 @@ "operator" ], "moreFields": [ - "address", - "email", - "fax", - "phone" + "{@templates/contact}", + "address" ], "geometry": [ "area" diff --git a/data/presets/landuse/forest.json b/data/presets/landuse/forest.json index 58575d63..0da92454 100644 --- a/data/presets/landuse/forest.json +++ b/data/presets/landuse/forest.json @@ -7,10 +7,8 @@ "produce" ], "moreFields": [ - "address", - "email", - "fax", - "phone" + "{@templates/contact}", + "address" ], "geometry": [ "area" diff --git a/data/presets/landuse/garages.json b/data/presets/landuse/garages.json index 093b5ca9..6a4ac309 100644 --- a/data/presets/landuse/garages.json +++ b/data/presets/landuse/garages.json @@ -7,10 +7,8 @@ "name" ], "moreFields": [ - "address", - "email", - "fax", - "phone" + "{@templates/contact}", + "address" ], "tags": { "landuse": "garages" diff --git a/data/presets/landuse/greenhouse_horticulture.json b/data/presets/landuse/greenhouse_horticulture.json index c3cdcfca..8bf96cfe 100644 --- a/data/presets/landuse/greenhouse_horticulture.json +++ b/data/presets/landuse/greenhouse_horticulture.json @@ -5,10 +5,8 @@ "operator" ], "moreFields": [ - "address", - "email", - "fax", - "phone" + "{@templates/contact}", + "address" ], "geometry": [ "area" diff --git a/data/presets/landuse/harbour.json b/data/presets/landuse/harbour.json index 1bce18b2..380f2dc9 100644 --- a/data/presets/landuse/harbour.json +++ b/data/presets/landuse/harbour.json @@ -5,10 +5,8 @@ "operator" ], "moreFields": [ - "address", - "email", - "fax", - "phone" + "{@templates/contact}", + "address" ], "geometry": [ "area" diff --git a/data/presets/landuse/industrial.json b/data/presets/landuse/industrial.json index 4f8a9fd2..2cc9a8c2 100644 --- a/data/presets/landuse/industrial.json +++ b/data/presets/landuse/industrial.json @@ -5,11 +5,9 @@ "industrial" ], "moreFields": [ - "operator", + "{@templates/contact}", "address", - "email", - "fax", - "phone" + "operator" ], "geometry": [ "area" diff --git a/data/presets/landuse/landfill.json b/data/presets/landuse/landfill.json index 7c84159f..c821730e 100644 --- a/data/presets/landuse/landfill.json +++ b/data/presets/landuse/landfill.json @@ -8,10 +8,8 @@ "operator" ], "moreFields": [ - "address", - "email", - "fax", - "phone" + "{@templates/contact}", + "address" ], "tags": { "landuse": "landfill" diff --git a/data/presets/landuse/military.json b/data/presets/landuse/military.json index ea843049..6506218f 100644 --- a/data/presets/landuse/military.json +++ b/data/presets/landuse/military.json @@ -4,10 +4,8 @@ "name" ], "moreFields": [ - "address", - "email", - "fax", - "phone" + "{@templates/contact}", + "address" ], "geometry": [ "area" diff --git a/data/presets/landuse/orchard.json b/data/presets/landuse/orchard.json index 8c5a2d11..6ac03cca 100644 --- a/data/presets/landuse/orchard.json +++ b/data/presets/landuse/orchard.json @@ -6,10 +6,8 @@ "trees" ], "moreFields": [ + "{@templates/contact}", "address", - "email", - "fax", - "phone", "species/wikidata" ], "geometry": [ diff --git a/data/presets/landuse/plant_nursery.json b/data/presets/landuse/plant_nursery.json index eb3ead2d..c5b447ed 100644 --- a/data/presets/landuse/plant_nursery.json +++ b/data/presets/landuse/plant_nursery.json @@ -6,10 +6,8 @@ "plant" ], "moreFields": [ - "address", - "email", - "fax", - "phone" + "{@templates/contact}", + "address" ], "geometry": [ "area" diff --git a/data/presets/landuse/quarry.json b/data/presets/landuse/quarry.json index 5777e6ab..42ef460c 100644 --- a/data/presets/landuse/quarry.json +++ b/data/presets/landuse/quarry.json @@ -10,10 +10,8 @@ "resource" ], "moreFields": [ - "address", - "email", - "fax", - "phone" + "{@templates/contact}", + "address" ], "tags": { "landuse": "quarry" diff --git a/data/presets/landuse/recreation_ground.json b/data/presets/landuse/recreation_ground.json index 404fb4d2..c63c251a 100644 --- a/data/presets/landuse/recreation_ground.json +++ b/data/presets/landuse/recreation_ground.json @@ -7,10 +7,8 @@ "name" ], "moreFields": [ - "address", - "email", - "fax", - "phone" + "{@templates/contact}", + "address" ], "tags": { "landuse": "recreation_ground" diff --git a/data/presets/landuse/religious.json b/data/presets/landuse/religious.json index d4fd2d95..105c36ba 100644 --- a/data/presets/landuse/religious.json +++ b/data/presets/landuse/religious.json @@ -9,10 +9,8 @@ "denomination" ], "moreFields": [ - "address", - "email", - "fax", - "phone" + "{@templates/contact}", + "address" ], "tags": { "landuse": "religious" diff --git a/data/presets/landuse/retail.json b/data/presets/landuse/retail.json index 33785afb..d36a2f5b 100644 --- a/data/presets/landuse/retail.json +++ b/data/presets/landuse/retail.json @@ -7,10 +7,8 @@ "name" ], "moreFields": [ - "address", - "email", - "fax", - "phone" + "{@templates/contact}", + "address" ], "tags": { "landuse": "retail" diff --git a/data/presets/landuse/vineyard.json b/data/presets/landuse/vineyard.json index a913e40c..48c07a45 100644 --- a/data/presets/landuse/vineyard.json +++ b/data/presets/landuse/vineyard.json @@ -6,10 +6,8 @@ "grape_variety" ], "moreFields": [ - "address", - "email", - "fax", - "phone" + "{@templates/contact}", + "address" ], "geometry": [ "area" diff --git a/data/presets/leisure/amusement_arcade.json b/data/presets/leisure/amusement_arcade.json index 085c749c..2593a894 100644 --- a/data/presets/leisure/amusement_arcade.json +++ b/data/presets/leisure/amusement_arcade.json @@ -7,23 +7,12 @@ "building_area_yes" ], "moreFields": [ + "{@templates/internet_access}", + "{@templates/poi}", "air_conditioning", - "contact/facebook", - "email", - "fax", - "gnis/feature_id-US", - "internet_access", - "internet_access/fee", - "internet_access/ssid", - "level", "max_age", "min_age", - "opening_hours", - "opening_hours/covid19", - "payment_multi", - "phone", - "smoking", - "wheelchair" + "smoking" ], "geometry": [ "point", diff --git a/data/presets/leisure/beach_resort.json b/data/presets/leisure/beach_resort.json index f2999af6..177c0bfe 100644 --- a/data/presets/leisure/beach_resort.json +++ b/data/presets/leisure/beach_resort.json @@ -9,11 +9,9 @@ "charge_fee" ], "moreFields": [ - "email", - "fax", + "{@templates/contact}", "gnis/feature_id-US", "opening_hours/covid19", - "phone", "smoking" ], "geometry": [ diff --git a/data/presets/leisure/bowling_alley.json b/data/presets/leisure/bowling_alley.json index f1e8a165..e9fa3afa 100644 --- a/data/presets/leisure/bowling_alley.json +++ b/data/presets/leisure/bowling_alley.json @@ -8,21 +8,11 @@ "opening_hours" ], "moreFields": [ + "{@templates/internet_access}", + "{@templates/poi}", "air_conditioning", - "contact/facebook", - "email", - "fax", - "gnis/feature_id-US", - "internet_access", - "internet_access/fee", - "internet_access/ssid", - "level", "min_age", - "opening_hours/covid19", - "payment_multi", - "phone", - "smoking", - "wheelchair" + "smoking" ], "geometry": [ "point", diff --git a/data/presets/leisure/dance.json b/data/presets/leisure/dance.json index ea5d4285..485e67b9 100644 --- a/data/presets/leisure/dance.json +++ b/data/presets/leisure/dance.json @@ -10,13 +10,7 @@ "dance/teaching" ], "moreFields": [ - "email", - "fax", - "gnis/feature_id-US", - "level", - "opening_hours/covid19", - "payment_multi", - "phone" + "{@templates/poi}" ], "geometry": [ "point", diff --git a/data/presets/leisure/dancing_school.json b/data/presets/leisure/dancing_school.json index 2e37d633..83af628c 100644 --- a/data/presets/leisure/dancing_school.json +++ b/data/presets/leisure/dancing_school.json @@ -9,13 +9,7 @@ "dance/style" ], "moreFields": [ - "email", - "fax", - "gnis/feature_id-US", - "level", - "opening_hours/covid19", - "payment_multi", - "phone" + "{@templates/poi}" ], "geometry": [ "point", diff --git a/data/presets/leisure/disc_golf_course.json b/data/presets/leisure/disc_golf_course.json index a7fdd5e7..5925ae02 100644 --- a/data/presets/leisure/disc_golf_course.json +++ b/data/presets/leisure/disc_golf_course.json @@ -10,14 +10,12 @@ "opening_hours" ], "moreFields": [ + "{@templates/contact}", "address", "dog", - "email", - "fax", "gnis/feature_id-US", "lit", "opening_hours/covid19", - "phone", "wheelchair" ], "geometry": [ diff --git a/data/presets/leisure/dog_park.json b/data/presets/leisure/dog_park.json index d12c6071..9bfcf261 100644 --- a/data/presets/leisure/dog_park.json +++ b/data/presets/leisure/dog_park.json @@ -9,14 +9,10 @@ "website" ], "moreFields": [ + "{@templates/contact}", + "{@templates/internet_access}", "dog", - "email", - "fax", "gnis/feature_id-US", - "internet_access", - "internet_access/fee", - "internet_access/ssid", - "phone", "ref" ], "geometry": [ diff --git a/data/presets/leisure/escape_game.json b/data/presets/leisure/escape_game.json index d86a6d2f..b95e2d51 100644 --- a/data/presets/leisure/escape_game.json +++ b/data/presets/leisure/escape_game.json @@ -9,19 +9,13 @@ "fee", "payment_multi_fee", "charge_fee", - "internet_access", - "internet_access/fee", - "internet_access/ssid" + "{@templates/internet_access}" ], "moreFields": [ + "{@templates/internet_access}", + "{@templates/poi}", "air_conditioning", - "email", - "fax", - "level", - "opening_hours/covid19", - "phone", - "smoking", - "wheelchair" + "smoking" ], "geometry": [ "point", diff --git a/data/presets/leisure/fitness_centre.json b/data/presets/leisure/fitness_centre.json index 36a3701b..8a760fe6 100644 --- a/data/presets/leisure/fitness_centre.json +++ b/data/presets/leisure/fitness_centre.json @@ -10,20 +10,12 @@ "website" ], "moreFields": [ + "{@templates/internet_access}", + "{@templates/poi}", "branch_brand", "brand", "charge_fee", - "contact/facebook", - "email", - "fax", - "fee", - "gnis/feature_id-US", - "internet_access", - "internet_access/fee", - "internet_access/ssid", - "level", - "opening_hours/covid19", - "payment_multi" + "fee" ], "geometry": [ "point", diff --git a/data/presets/leisure/garden.json b/data/presets/leisure/garden.json index 959d3bf6..fc6bc7b9 100644 --- a/data/presets/leisure/garden.json +++ b/data/presets/leisure/garden.json @@ -11,10 +11,8 @@ "charge_fee" ], "moreFields": [ - "email", - "fax", - "gnis/feature_id-US", - "phone" + "{@templates/contact}", + "gnis/feature_id-US" ], "geometry": [ "point", diff --git a/data/presets/leisure/golf_course.json b/data/presets/leisure/golf_course.json index a9d12753..5f665764 100644 --- a/data/presets/leisure/golf_course.json +++ b/data/presets/leisure/golf_course.json @@ -7,13 +7,7 @@ "opening_hours" ], "moreFields": [ - "contact/facebook", - "email", - "fax", - "gnis/feature_id-US", - "opening_hours/covid19", - "payment_multi", - "phone" + "{@templates/poi}" ], "geometry": [ "area", diff --git a/data/presets/leisure/hackerspace.json b/data/presets/leisure/hackerspace.json index f86fd3b0..4c03e87e 100644 --- a/data/presets/leisure/hackerspace.json +++ b/data/presets/leisure/hackerspace.json @@ -9,20 +9,13 @@ "fee", "payment_multi_fee", "charge_fee", - "internet_access", - "internet_access/fee", - "internet_access/ssid" + "{@templates/internet_access}" ], "moreFields": [ + "{@templates/internet_access}", + "{@templates/poi}", "air_conditioning", - "email", - "fax", - "gnis/feature_id-US", - "level", - "opening_hours/covid19", - "phone", - "smoking", - "wheelchair" + "smoking" ], "geometry": [ "point", diff --git a/data/presets/leisure/horse_riding.json b/data/presets/leisure/horse_riding.json index fe154f01..535e4e98 100644 --- a/data/presets/leisure/horse_riding.json +++ b/data/presets/leisure/horse_riding.json @@ -7,13 +7,11 @@ "address" ], "moreFields": [ - "email", - "fax", + "{@templates/contact}", "gnis/feature_id-US", "opening_hours", "opening_hours/covid19", - "payment_multi", - "phone" + "payment_multi" ], "geometry": [ "point", diff --git a/data/presets/leisure/ice_rink.json b/data/presets/leisure/ice_rink.json index 03220009..8ec3a474 100644 --- a/data/presets/leisure/ice_rink.json +++ b/data/presets/leisure/ice_rink.json @@ -10,16 +10,12 @@ "opening_hours" ], "moreFields": [ - "email", - "fax", + "{@templates/contact}", + "{@templates/internet_access}", "gnis/feature_id-US", - "internet_access", - "internet_access/fee", - "internet_access/ssid", "level", "opening_hours/covid19", - "payment_multi", - "phone" + "payment_multi" ], "geometry": [ "area", diff --git a/data/presets/leisure/indoor_play.json b/data/presets/leisure/indoor_play.json index 7742d177..4a421179 100644 --- a/data/presets/leisure/indoor_play.json +++ b/data/presets/leisure/indoor_play.json @@ -9,24 +9,17 @@ "website" ], "moreFields": [ + "{@templates/internet_access}", + "{@templates/poi}", "blind", "branch_brand", "brand", "charge_fee", "dog", - "email", - "fax", "fee", - "gnis/feature_id-US", - "internet_access", - "internet_access/fee", - "internet_access/ssid", "max_age", "min_age", - "opening_hours/covid19", - "operator", - "payment_multi", - "wheelchair" + "operator" ], "geometry": [ "point", diff --git a/data/presets/leisure/marina.json b/data/presets/leisure/marina.json index 94fb1f95..8e8e52f2 100644 --- a/data/presets/leisure/marina.json +++ b/data/presets/leisure/marina.json @@ -11,14 +11,10 @@ "power_supply" ], "moreFields": [ + "{@templates/internet_access}", + "{@templates/contact}", "address", - "email", - "fax", "gnis/feature_id-US", - "internet_access", - "internet_access/fee", - "internet_access/ssid", - "phone", "seamark/type", "vhf" ], diff --git a/data/presets/leisure/miniature_golf.json b/data/presets/leisure/miniature_golf.json index 425127b9..971d6d10 100644 --- a/data/presets/leisure/miniature_golf.json +++ b/data/presets/leisure/miniature_golf.json @@ -10,11 +10,9 @@ "charge_fee" ], "moreFields": [ - "email", - "fax", + "{@templates/contact}", "gnis/feature_id-US", - "opening_hours/covid19", - "phone" + "opening_hours/covid19" ], "geometry": [ "area", diff --git a/data/presets/leisure/nature_reserve.json b/data/presets/leisure/nature_reserve.json index 9d8dbd85..2da30dd2 100644 --- a/data/presets/leisure/nature_reserve.json +++ b/data/presets/leisure/nature_reserve.json @@ -12,13 +12,11 @@ "opening_hours" ], "moreFields": [ + "{@templates/contact}", "access_simple", "dog", - "email", - "fax", "gnis/feature_id-US", - "opening_hours/covid19", - "phone" + "opening_hours/covid19" ], "tags": { "leisure": "nature_reserve" diff --git a/data/presets/leisure/park.json b/data/presets/leisure/park.json index f169c5f3..2e0baddd 100644 --- a/data/presets/leisure/park.json +++ b/data/presets/leisure/park.json @@ -8,13 +8,11 @@ "opening_hours" ], "moreFields": [ + "{@templates/contact}", "access_simple", "dog", - "email", - "fax", "gnis/feature_id-US", "opening_hours/covid19", - "phone", "smoking" ], "geometry": [ diff --git a/data/presets/leisure/resort.json b/data/presets/leisure/resort.json index cfd577fb..d65aa468 100644 --- a/data/presets/leisure/resort.json +++ b/data/presets/leisure/resort.json @@ -8,17 +8,10 @@ "opening_hours" ], "moreFields": [ + "{@templates/internet_access}", + "{@templates/poi}", "access_simple", - "contact/facebook", - "email", - "fax", - "gnis/feature_id-US", - "internet_access", - "internet_access/fee", - "internet_access/ssid", - "opening_hours/covid19", - "payment_multi", - "phone" + "opening_hours/covid19" ], "geometry": [ "point", diff --git a/data/presets/leisure/sauna.json b/data/presets/leisure/sauna.json index cf514ddc..2ddb4257 100644 --- a/data/presets/leisure/sauna.json +++ b/data/presets/leisure/sauna.json @@ -11,12 +11,10 @@ "charge_fee" ], "moreFields": [ - "email", - "fax", + "{@templates/contact}", "gnis/feature_id-US", "level", - "opening_hours/covid19", - "phone" + "opening_hours/covid19" ], "geometry": [ "point", diff --git a/data/presets/leisure/sports_centre.json b/data/presets/leisure/sports_centre.json index 74b4285c..86257433 100644 --- a/data/presets/leisure/sports_centre.json +++ b/data/presets/leisure/sports_centre.json @@ -13,14 +13,8 @@ "charge_fee" ], "moreFields": [ - "access_simple", - "contact/facebook", - "email", - "fax", - "gnis/feature_id-US", - "level", - "opening_hours/covid19", - "phone" + "{@templates/poi}", + "access_simple" ], "geometry": [ "point", diff --git a/data/presets/leisure/stadium.json b/data/presets/leisure/stadium.json index 8ad99ef0..6dbc332e 100644 --- a/data/presets/leisure/stadium.json +++ b/data/presets/leisure/stadium.json @@ -7,10 +7,8 @@ "address" ], "moreFields": [ - "email", - "fax", - "gnis/feature_id-US", - "phone" + "{@templates/contact}", + "gnis/feature_id-US" ], "geometry": [ "point", diff --git a/data/presets/leisure/swimming_pool.json b/data/presets/leisure/swimming_pool.json index deb0d98e..c2762578 100644 --- a/data/presets/leisure/swimming_pool.json +++ b/data/presets/leisure/swimming_pool.json @@ -10,7 +10,6 @@ ], "moreFields": [ "address", - "contact/facebook", "level", "gnis/feature_id-US", "opening_hours", diff --git a/data/presets/leisure/trampoline_park.json b/data/presets/leisure/trampoline_park.json index e53c934b..e04d9036 100644 --- a/data/presets/leisure/trampoline_park.json +++ b/data/presets/leisure/trampoline_park.json @@ -9,19 +9,13 @@ "website" ], "moreFields": [ + "{@templates/internet_access}", + "{@templates/poi}", "branch_brand", "brand", "charge_fee", - "email", - "fax", "fee", - "gnis/feature_id-US", - "internet_access", - "internet_access/fee", - "internet_access/ssid", - "opening_hours/covid19", - "operator", - "payment_multi" + "operator" ], "geometry": [ "point", diff --git a/data/presets/man_made/lighthouse.json b/data/presets/man_made/lighthouse.json index 2654e0b4..f118f116 100644 --- a/data/presets/man_made/lighthouse.json +++ b/data/presets/man_made/lighthouse.json @@ -7,11 +7,9 @@ "height" ], "moreFields": [ + "{@templates/contact}", "address", - "email", - "fax", "gnis/feature_id-US", - "phone", "seamark/type" ], "geometry": [ diff --git a/data/presets/man_made/observatory.json b/data/presets/man_made/observatory.json index 9e55af2f..e14e4682 100644 --- a/data/presets/man_made/observatory.json +++ b/data/presets/man_made/observatory.json @@ -8,10 +8,8 @@ "building_area_yes" ], "moreFields": [ - "email", - "fax", - "gnis/feature_id-US", - "phone" + "{@templates/contact}", + "gnis/feature_id-US" ], "geometry": [ "point", diff --git a/data/presets/man_made/wastewater_plant.json b/data/presets/man_made/wastewater_plant.json index 8220c453..fd140c0d 100644 --- a/data/presets/man_made/wastewater_plant.json +++ b/data/presets/man_made/wastewater_plant.json @@ -7,10 +7,8 @@ "ref" ], "moreFields": [ - "email", - "fax", - "gnis/feature_id-US", - "phone" + "{@templates/contact}", + "gnis/feature_id-US" ], "geometry": [ "point", diff --git a/data/presets/man_made/works.json b/data/presets/man_made/works.json index c4d05b51..d945dd27 100644 --- a/data/presets/man_made/works.json +++ b/data/presets/man_made/works.json @@ -8,10 +8,8 @@ "product" ], "moreFields": [ - "email", - "fax", - "gnis/feature_id-US", - "phone" + "{@templates/contact}", + "gnis/feature_id-US" ], "geometry": [ "point", diff --git a/data/presets/office.json b/data/presets/office.json index 474874b6..b9829b2e 100644 --- a/data/presets/office.json +++ b/data/presets/office.json @@ -10,17 +10,14 @@ "website" ], "moreFields": [ + "{@templates/contact}", + "{@templates/internet_access}", "air_conditioning", "baby_feeding", "building/levels_building", "ele", - "email", - "fax", "gnis/feature_id-US", "height_building", - "internet_access", - "internet_access/fee", - "internet_access/ssid", "level", "not/name", "opening_hours/covid19", diff --git a/data/presets/office/coworking.json b/data/presets/office/coworking.json index a5e707e8..c5857c3f 100644 --- a/data/presets/office/coworking.json +++ b/data/presets/office/coworking.json @@ -2,11 +2,11 @@ "icon": "maki-suitcase", "fields": [ "{office}", - "internet_access" + "{@templates/internet_access}" ], "moreFields": [ - "internet_access/fee", - "internet_access/ssid" + "{@templates/internet_access}", + "{@templates/poi}" ], "geometry": [ "point", diff --git a/data/presets/polling_station.json b/data/presets/polling_station.json index 8e015fcd..b75a5966 100644 --- a/data/presets/polling_station.json +++ b/data/presets/polling_station.json @@ -10,12 +10,9 @@ "phone" ], "moreFields": [ + "{@templates/contact}", + "{@templates/internet_access}", "air_conditioning", - "email", - "fax", - "internet_access", - "internet_access/fee", - "internet_access/ssid", "level", "opening_hours/covid19", "wheelchair" diff --git a/data/presets/public_transport/station.json b/data/presets/public_transport/station.json index 8f42ded6..c68c704e 100644 --- a/data/presets/public_transport/station.json +++ b/data/presets/public_transport/station.json @@ -7,18 +7,15 @@ "vehicles", "address", "building_area", - "internet_access" + "{@templates/internet_access}" ], "moreFields": [ + "{@templates/contact}", + "{@templates/internet_access}", "air_conditioning", "baby_feeding", - "email", - "fax", "gnis/feature_id-US", - "internet_access/fee", - "internet_access/ssid", "level", - "phone", "wheelchair" ], "geometry": [ diff --git a/data/presets/shop.json b/data/presets/shop.json index a05b5403..c7643e70 100644 --- a/data/presets/shop.json +++ b/data/presets/shop.json @@ -11,30 +11,19 @@ "phone" ], "moreFields": [ + "{@templates/internet_access}", + "{@templates/poi}", "air_conditioning", "branch_brand", "brand", "building/levels_building", - "contact/facebook", "currency_multi", "ele", - "email", - "fax", - "gnis/feature_id-US", "height_building", - "internet_access", - "internet_access/fee", - "internet_access/ssid", - "level", - "not/name", - "opening_hours/covid19", - "ref/vatin", - "ref/FR/siret-FR", "second_hand", "stroller", "toilets", - "toilets/wheelchair", - "wheelchair" + "toilets/wheelchair" ], "geometry": [ "point", diff --git a/data/presets/tourism/alpine_hut.json b/data/presets/tourism/alpine_hut.json index bf6198bf..4c93e67b 100644 --- a/data/presets/tourism/alpine_hut.json +++ b/data/presets/tourism/alpine_hut.json @@ -6,20 +6,15 @@ "address", "phone", "building_area_yes", - "internet_access", - "internet_access/fee", + "{@templates/internet_access}", "fee", "payment_multi_fee", "charge_fee" ], "moreFields": [ - "contact/facebook", - "email", - "fax", - "gnis/feature_id-US", - "internet_access/ssid", - "reservation", - "wheelchair" + "{@templates/internet_access}", + "{@templates/poi}", + "reservation" ], "geometry": [ "point", diff --git a/data/presets/tourism/apartment.json b/data/presets/tourism/apartment.json index f20de1d3..8afe89af 100644 --- a/data/presets/tourism/apartment.json +++ b/data/presets/tourism/apartment.json @@ -9,20 +9,15 @@ "phone", "building_area_yes", "rooms", - "internet_access", - "internet_access/fee" + "{@templates/internet_access}" ], "moreFields": [ + "{@templates/internet_access}", + "{@templates/poi}", "building/levels_building", - "contact/facebook", - "fax", "height_building", - "internet_access/ssid", - "level", - "payment_multi", "reservation", - "smoking", - "wheelchair" + "smoking" ], "geometry": [ "point", diff --git a/data/presets/tourism/aquarium.json b/data/presets/tourism/aquarium.json index 441037ab..ba221b5b 100644 --- a/data/presets/tourism/aquarium.json +++ b/data/presets/tourism/aquarium.json @@ -8,22 +8,13 @@ "opening_hours" ], "moreFields": [ + "{@templates/internet_access}", + "{@templates/poi}", "charge_fee", - "email", - "fax", "fee", - "gnis/feature_id-US", - "internet_access", - "internet_access/fee", - "internet_access/ssid", - "opening_hours/covid19", - "payment_multi_fee", - "phone", - "ref/vatin", "smoking", "toilets", - "toilets/wheelchair", - "wheelchair" + "toilets/wheelchair" ], "geometry": [ "point", diff --git a/data/presets/tourism/camp_site.json b/data/presets/tourism/camp_site.json index 316d5a5e..73b2654c 100644 --- a/data/presets/tourism/camp_site.json +++ b/data/presets/tourism/camp_site.json @@ -16,21 +16,17 @@ "charge_fee" ], "moreFields": [ + "{@templates/contact}", + "{@templates/internet_access}", "backcountry", "dog", "drinking_water_available", - "email", - "fax", "gnis/feature_id-US", "group_only", - "internet_access", - "internet_access/fee", - "internet_access/ssid", "nudism", "openfire", "opening_hours", "opening_hours/covid19", - "phone", "picnic_table", "power_supply", "ref/vatin", diff --git a/data/presets/tourism/caravan_site.json b/data/presets/tourism/caravan_site.json index 1b9142f0..74b275ee 100644 --- a/data/presets/tourism/caravan_site.json +++ b/data/presets/tourism/caravan_site.json @@ -6,22 +6,16 @@ "capacity/caravans", "sanitary_dump_station", "power_supply", - "internet_access", - "internet_access/fee" + "{@templates/internet_access}" ], "moreFields": [ + "{@templates/internet_access}", + "{@templates/poi}", "charge_fee", - "email", - "fax", "fee", - "gnis/feature_id-US", - "internet_access/ssid", "operator", - "payment_multi_fee", - "phone", "reservation", - "smoking", - "wheelchair" + "smoking" ], "geometry": [ "point", diff --git a/data/presets/tourism/chalet.json b/data/presets/tourism/chalet.json index d2fccb61..920b4cba 100644 --- a/data/presets/tourism/chalet.json +++ b/data/presets/tourism/chalet.json @@ -8,21 +8,17 @@ "email", "phone", "building_area_yes", - "internet_access", - "internet_access/fee" + "{@templates/internet_access}" ], "moreFields": [ + "{@templates/internet_access}", + "{@templates/poi}", "air_conditioning", "building/levels_building", - "contact/facebook", - "fax", - "gnis/feature_id-US", "height_building", - "internet_access/ssid", "payment_multi", "reservation", - "smoking", - "wheelchair" + "smoking" ], "geometry": [ "point", diff --git a/data/presets/tourism/gallery.json b/data/presets/tourism/gallery.json index 4755b087..2709d35f 100644 --- a/data/presets/tourism/gallery.json +++ b/data/presets/tourism/gallery.json @@ -8,19 +8,10 @@ "opening_hours" ], "moreFields": [ - "email", - "fax", - "gnis/feature_id-US", - "internet_access", - "internet_access/fee", - "internet_access/ssid", - "opening_hours/covid19", - "payment_multi", - "phone", - "ref/vatin", + "{@templates/internet_access}", + "{@templates/poi}", "toilets", - "toilets/wheelchair", - "wheelchair" + "toilets/wheelchair" ], "geometry": [ "point", diff --git a/data/presets/tourism/guest_house.json b/data/presets/tourism/guest_house.json index b6c69742..3d18e1d9 100644 --- a/data/presets/tourism/guest_house.json +++ b/data/presets/tourism/guest_house.json @@ -10,22 +10,16 @@ "phone", "building_area_yes", "rooms", - "internet_access", - "internet_access/fee" + "{@templates/internet_access}" ], "moreFields": [ + "{@templates/internet_access}", + "{@templates/poi}", "air_conditioning", "building/levels_building", - "contact/facebook", - "fax", - "gnis/feature_id-US", "height_building", - "internet_access/ssid", - "payment_multi", - "ref/vatin", "reservation", - "smoking", - "wheelchair" + "smoking" ], "geometry": [ "point", diff --git a/data/presets/tourism/information/office.json b/data/presets/tourism/information/office.json index b67653d4..ee263d4e 100644 --- a/data/presets/tourism/information/office.json +++ b/data/presets/tourism/information/office.json @@ -5,20 +5,15 @@ "operator", "address", "building_area_yes", - "internet_access", - "internet_access/fee" + "{@templates/internet_access}" ], "moreFields": [ + "{@templates/internet_access}", + "{@templates/poi}", "building/levels_building", - "email", - "fax", - "gnis/feature_id-US", "height_building", - "internet_access/ssid", - "phone", "toilets", - "toilets/wheelchair", - "wheelchair" + "toilets/wheelchair" ], "geometry": [ "point", diff --git a/data/presets/tourism/motel.json b/data/presets/tourism/motel.json index 11a6805a..9bdca6c0 100644 --- a/data/presets/tourism/motel.json +++ b/data/presets/tourism/motel.json @@ -9,18 +9,15 @@ "phone", "building_area_yes", "rooms", - "internet_access", - "internet_access/fee" + "{@templates/internet_access}" ], "moreFields": [ + "{@templates/internet_access}", + "{@templates/poi}", "air_conditioning", "branch_brand", "building/levels_building", - "contact/facebook", - "fax", - "gnis/feature_id-US", "height_building", - "internet_access/ssid", "operator", "payment_multi", "ref/vatin", diff --git a/data/presets/tourism/museum.json b/data/presets/tourism/museum.json index d79fc5d5..c510ea0f 100644 --- a/data/presets/tourism/museum.json +++ b/data/presets/tourism/museum.json @@ -10,25 +10,15 @@ "opening_hours" ], "moreFields": [ + "{@templates/internet_access}", + "{@templates/poi}", "air_conditioning", "building/levels_building", "charge_fee", - "contact/facebook", - "email", - "fax", "fee", - "gnis/feature_id-US", "height_building", - "internet_access", - "internet_access/fee", - "internet_access/ssid", - "level", - "opening_hours/covid19", - "payment_multi", - "phone", "toilets", - "toilets/wheelchair", - "wheelchair" + "toilets/wheelchair" ], "geometry": [ "point", diff --git a/data/presets/tourism/picnic_site.json b/data/presets/tourism/picnic_site.json index 7817f615..4afb288e 100644 --- a/data/presets/tourism/picnic_site.json +++ b/data/presets/tourism/picnic_site.json @@ -8,12 +8,10 @@ "capacity" ], "moreFields": [ + "{@templates/internet_access}", "charge_fee", "fee", "gnis/feature_id-US", - "internet_access", - "internet_access/fee", - "internet_access/ssid", "level", "payment_multi_fee", "phone", diff --git a/data/presets/tourism/theme_park.json b/data/presets/tourism/theme_park.json index 3da0412a..1ed1443f 100644 --- a/data/presets/tourism/theme_park.json +++ b/data/presets/tourism/theme_park.json @@ -8,19 +8,11 @@ "website" ], "moreFields": [ + "{@templates/internet_access}", + "{@templates/poi}", "branch_brand", "brand", - "contact/facebook", - "email", - "fax", - "gnis/feature_id-US", - "internet_access", - "internet_access/fee", - "internet_access/ssid", - "opening_hours/covid19", - "payment_multi", - "phone", - "wheelchair" + "opening_hours/covid19" ], "geometry": [ "point", diff --git a/data/presets/tourism/trail_riding_station.json b/data/presets/tourism/trail_riding_station.json index 0264093a..f168dbab 100644 --- a/data/presets/tourism/trail_riding_station.json +++ b/data/presets/tourism/trail_riding_station.json @@ -7,16 +7,12 @@ "horse_dressage" ], "moreFields": [ + "{@templates/contact}", + "{@templates/internet_access}", "address", - "email", - "fax", "gnis/feature_id-US", - "internet_access", - "internet_access/fee", - "internet_access/ssid", "opening_hours", - "opening_hours/covid19", - "phone" + "opening_hours/covid19" ], "geometry": [ "point", diff --git a/data/presets/tourism/wilderness_hut.json b/data/presets/tourism/wilderness_hut.json index 4d89d46e..714dfc0b 100644 --- a/data/presets/tourism/wilderness_hut.json +++ b/data/presets/tourism/wilderness_hut.json @@ -11,13 +11,11 @@ "fireplace" ], "moreFields": [ + "{@templates/internet_access}", "address", "capacity", "drinking_water_available", "gnis/feature_id-US", - "internet_access", - "internet_access/fee", - "internet_access/ssid", "kitchen", "mattress", "reservation", diff --git a/data/presets/tourism/zoo.json b/data/presets/tourism/zoo.json index d36a9ce1..b09f5659 100644 --- a/data/presets/tourism/zoo.json +++ b/data/presets/tourism/zoo.json @@ -9,20 +9,10 @@ "charge_fee" ], "moreFields": [ - "email", - "contact/facebook", - "fax", - "gnis/feature_id-US", - "internet_access", - "internet_access/fee", - "internet_access/ssid", - "payment_multi", - "opening_hours/covid19", - "phone", - "ref/vatin", + "{@templates/internet_access}", + "{@templates/poi}", "toilets", - "toilets/wheelchair", - "wheelchair" + "toilets/wheelchair" ], "geometry": [ "point", diff --git a/data/presets/waterway/boatyard.json b/data/presets/waterway/boatyard.json index 185e3e65..1d03317d 100644 --- a/data/presets/waterway/boatyard.json +++ b/data/presets/waterway/boatyard.json @@ -5,11 +5,9 @@ "operator" ], "moreFields": [ + "{@templates/contact}", "address", - "email", - "fax", "gnis/feature_id-US", - "phone", "wheelchair" ], "geometry": [ diff --git a/data/presets/waterway/fuel.json b/data/presets/waterway/fuel.json index 24cf2496..acc39e67 100644 --- a/data/presets/waterway/fuel.json +++ b/data/presets/waterway/fuel.json @@ -8,14 +8,12 @@ "fuel/fuel_multi" ], "moreFields": [ + "{@templates/contact}", "branch_brand", "brand", "building", - "email", - "fax", "payment_multi", "opening_hours/covid19", - "phone", "seamark/type", "wheelchair" ], diff --git a/interim/source_strings.yaml b/interim/source_strings.yaml index 6d278bc0..5f59d6b5 100644 --- a/interim/source_strings.yaml +++ b/interim/source_strings.yaml @@ -5505,6 +5505,12 @@ en: zigzag: Zig Zag terms: '[translate with synonyms or related terms for ''Windings Configuration'', separated by commas]' presets: + '@templates/contact': + # '@template=contact | Translate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key). | Local preset for countries "999"' + '@templates/internet_access': + # '@template=internet_access | Translate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key). | Local preset for countries "999"' + '@templates/poi': + # '@template=poi | Translate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key). | Local preset for countries "999"' addr/interpolation: # addr:interpolation=* | Translate the primary name. Optionally, add equivalent synonyms on newlines in order of preference (press the Return key). name: Address Interpolation