From 24c56042a60adcd0d513a897cce7e423c6c3b5b5 Mon Sep 17 00:00:00 2001 From: Benoit Costamagna Date: Mon, 22 Jan 2018 13:11:04 +0100 Subject: [PATCH 1/4] added a water tank preset --- data/presets.yaml | 5 + data/presets/presets.json | 874 ++++++++++++++++++ .../presets/presets/emergency/water_tank.json | 20 + data/taginfo.json | 4 + dist/locales/en.json | 14 +- 5 files changed, 912 insertions(+), 5 deletions(-) create mode 100644 data/presets/presets/emergency/water_tank.json diff --git a/data/presets.yaml b/data/presets.yaml index 1b370b2cd..fd59e3ed4 100644 --- a/data/presets.yaml +++ b/data/presets.yaml @@ -2937,6 +2937,11 @@ en: emergency/private: # emergency=private name: Emergency Access Private + emergency/water_tank: + # emergency=water_tank + name: Water Tank + # 'terms: cistern,reservoir' + terms: '' emergency/yes: # emergency=yes name: Emergency Access Yes diff --git a/data/presets/presets.json b/data/presets/presets.json index 515a2ec5e..9ea97f9be 100644 --- a/data/presets/presets.json +++ b/data/presets/presets.json @@ -6161,6 +6161,26 @@ }, "name": "Emergency Phone" }, + "emergency/water_tank": { + "icon": "poi-fire-hydrant", + "fields": [ + "name", + "operator", + "ref" + ], + "geometry": [ + "point", + "vertex" + ], + "terms": [ + "cistern", + "reservoir" + ], + "tags": { + "emergency": "water_tank" + }, + "name": "Water Tank" + }, "entrance": { "icon": "entrance-alt1", "geometry": [ @@ -31375,6 +31395,31 @@ ], "suggestion": true }, + "amenity/cafe/Coffee Shop": { + "tags": { + "name": "Coffee Shop", + "amenity": "cafe" + }, + "name": "Coffee Shop", + "icon": "cafe", + "geometry": [ + "point", + "area" + ], + "fields": [ + "name", + "cuisine", + "address", + "building_area", + "opening_hours", + "internet_access", + "internet_access/fee", + "internet_access/ssid", + "smoking", + "outdoor_seating" + ], + "suggestion": true + }, "amenity/cafe/Coffee Time": { "tags": { "name": "Coffee Time", @@ -33429,6 +33474,50 @@ ], "suggestion": true }, + "amenity/dentist/Consultorio Dental": { + "tags": { + "name": "Consultorio Dental", + "healthcare": "dentist", + "amenity": "dentist" + }, + "name": "Consultorio Dental", + "icon": "dentist", + "geometry": [ + "point", + "area" + ], + "fields": [ + "name", + "operator", + "healthcare/speciality", + "address", + "building_area", + "opening_hours" + ], + "suggestion": true + }, + "amenity/dentist/Dentista": { + "tags": { + "name": "Dentista", + "healthcare": "dentist", + "amenity": "dentist" + }, + "name": "Dentista", + "icon": "dentist", + "geometry": [ + "point", + "area" + ], + "fields": [ + "name", + "operator", + "healthcare/speciality", + "address", + "building_area", + "opening_hours" + ], + "suggestion": true + }, "amenity/dentist/Family Dentistry": { "tags": { "name": "Family Dentistry", @@ -34627,6 +34716,32 @@ ], "suggestion": true }, + "amenity/fast_food/Food Court": { + "tags": { + "name": "Food Court", + "amenity": "fast_food" + }, + "name": "Food Court", + "icon": "fast-food", + "geometry": [ + "point", + "area" + ], + "fields": [ + "name", + "cuisine", + "operator", + "address", + "building_area", + "opening_hours", + "takeaway", + "delivery", + "drive_through", + "smoking", + "outdoor_seating" + ], + "suggestion": true + }, "amenity/fast_food/Greenwich": { "tags": { "name": "Greenwich", @@ -38763,6 +38878,48 @@ ], "suggestion": true }, + "amenity/fuel/GNV": { + "tags": { + "name": "GNV", + "amenity": "fuel" + }, + "name": "GNV", + "icon": "fuel", + "geometry": [ + "point", + "area" + ], + "fields": [ + "name", + "operator", + "address", + "fuel_multi", + "opening_hours", + "payment_multi" + ], + "suggestion": true + }, + "amenity/fuel/Gas": { + "tags": { + "name": "Gas", + "amenity": "fuel" + }, + "name": "Gas", + "icon": "fuel", + "geometry": [ + "point", + "area" + ], + "fields": [ + "name", + "operator", + "address", + "fuel_multi", + "opening_hours", + "payment_multi" + ], + "suggestion": true + }, "amenity/fuel/Gazprom": { "tags": { "name": "Gazprom", @@ -43424,6 +43581,24 @@ ], "suggestion": true }, + "amenity/kindergarten/Jardin Infantil": { + "tags": { + "name": "Jardin Infantil", + "amenity": "kindergarten" + }, + "name": "Jardin Infantil", + "icon": "school", + "geometry": [ + "point", + "area" + ], + "fields": [ + "name", + "operator", + "address" + ], + "suggestion": true + }, "amenity/kindergarten/Jean Piaget": { "tags": { "name": "Jean Piaget", @@ -44312,6 +44487,78 @@ ], "suggestion": true }, + "amenity/library/Biblioteca Municipal": { + "tags": { + "name": "Biblioteca Municipal", + "amenity": "library" + }, + "name": "Biblioteca Municipal", + "icon": "library", + "geometry": [ + "point", + "area" + ], + "fields": [ + "name", + "operator", + "building_area", + "address", + "opening_hours", + "internet_access", + "internet_access/fee", + "internet_access/ssid", + "ref/isil" + ], + "suggestion": true + }, + "amenity/library/Biblioteca Pública": { + "tags": { + "name": "Biblioteca Pública", + "amenity": "library" + }, + "name": "Biblioteca Pública", + "icon": "library", + "geometry": [ + "point", + "area" + ], + "fields": [ + "name", + "operator", + "building_area", + "address", + "opening_hours", + "internet_access", + "internet_access/fee", + "internet_access/ssid", + "ref/isil" + ], + "suggestion": true + }, + "amenity/library/Biblioteca Pública Municipal": { + "tags": { + "name": "Biblioteca Pública Municipal", + "amenity": "library" + }, + "name": "Biblioteca Pública Municipal", + "icon": "library", + "geometry": [ + "point", + "area" + ], + "fields": [ + "name", + "operator", + "building_area", + "address", + "opening_hours", + "internet_access", + "internet_access/fee", + "internet_access/ssid", + "ref/isil" + ], + "suggestion": true + }, "amenity/library/Biblioteca comunale": { "tags": { "name": "Biblioteca comunale", @@ -45941,6 +46188,29 @@ ], "suggestion": true }, + "amenity/pharmacy/Farmácia": { + "tags": { + "name": "Farmácia", + "healthcare": "pharmacy", + "amenity": "pharmacy" + }, + "name": "Farmácia", + "icon": "pharmacy", + "geometry": [ + "point", + "area" + ], + "fields": [ + "name", + "operator", + "address", + "building_area", + "drive_through", + "opening_hours", + "payment_multi" + ], + "suggestion": true + }, "amenity/pharmacy/Felicia": { "tags": { "name": "Felicia", @@ -50143,6 +50413,31 @@ ], "suggestion": true }, + "amenity/restaurant/Belvedere": { + "tags": { + "name": "Belvedere", + "amenity": "restaurant" + }, + "name": "Belvedere", + "icon": "restaurant", + "geometry": [ + "point", + "area" + ], + "fields": [ + "name", + "cuisine", + "address", + "building_area", + "opening_hours", + "capacity", + "takeaway", + "delivery", + "smoking", + "outdoor_seating" + ], + "suggestion": true + }, "amenity/restaurant/Big Boy": { "tags": { "name": "Big Boy", @@ -56931,6 +57226,42 @@ ], "suggestion": true }, + "amenity/school/Escola Estadual": { + "tags": { + "name": "Escola Estadual", + "amenity": "school" + }, + "name": "Escola Estadual", + "icon": "school", + "geometry": [ + "point", + "area" + ], + "fields": [ + "name", + "operator", + "address" + ], + "suggestion": true + }, + "amenity/school/Escola Municipal": { + "tags": { + "name": "Escola Municipal", + "amenity": "school" + }, + "name": "Escola Municipal", + "icon": "school", + "geometry": [ + "point", + "area" + ], + "fields": [ + "name", + "operator", + "address" + ], + "suggestion": true + }, "amenity/school/Fairview Elementary School": { "tags": { "name": "Fairview Elementary School", @@ -60081,6 +60412,25 @@ ], "suggestion": true }, + "amenity/theatre/Anfiteatro": { + "tags": { + "name": "Anfiteatro", + "amenity": "theatre" + }, + "name": "Anfiteatro", + "icon": "theatre", + "geometry": [ + "point", + "area" + ], + "fields": [ + "name", + "operator", + "address", + "building_area" + ], + "suggestion": true + }, "amenity/theatre/Freilichtbühne": { "tags": { "name": "Freilichtbühne", @@ -60119,6 +60469,65 @@ ], "suggestion": true }, + "amenity/theatre/Teatro Municipal": { + "tags": { + "name": "Teatro Municipal", + "amenity": "theatre" + }, + "name": "Teatro Municipal", + "icon": "theatre", + "geometry": [ + "point", + "area" + ], + "fields": [ + "name", + "operator", + "address", + "building_area" + ], + "suggestion": true + }, + "amenity/veterinary/Clinica Veterinaria": { + "tags": { + "name": "Clinica Veterinaria", + "amenity": "veterinary" + }, + "name": "Clinica Veterinaria", + "icon": "veterinary", + "geometry": [ + "point", + "area" + ], + "fields": [ + "name", + "operator", + "address", + "building_area", + "opening_hours" + ], + "suggestion": true + }, + "amenity/veterinary/Veterinaria": { + "tags": { + "name": "Veterinaria", + "amenity": "veterinary" + }, + "name": "Veterinaria", + "icon": "veterinary", + "geometry": [ + "point", + "area" + ], + "fields": [ + "name", + "operator", + "address", + "building_area", + "opening_hours" + ], + "suggestion": true + }, "leisure/fitness_centre/LA Fitness": { "tags": { "name": "LA Fitness", @@ -60481,6 +60890,26 @@ ], "suggestion": true }, + "leisure/sports_centre/Polideportivo": { + "tags": { + "name": "Polideportivo", + "leisure": "sports_centre" + }, + "name": "Polideportivo", + "icon": "pitch", + "geometry": [ + "point", + "area" + ], + "fields": [ + "name", + "sport", + "building", + "address", + "opening_hours" + ], + "suggestion": true + }, "leisure/sports_centre/Salle Omnisport": { "tags": { "name": "Salle Omnisport", @@ -62170,6 +62599,27 @@ ], "suggestion": true }, + "shop/bakery/Panaderia": { + "tags": { + "name": "Panaderia", + "shop": "bakery" + }, + "name": "Panaderia", + "icon": "bakery", + "geometry": [ + "point", + "area" + ], + "fields": [ + "name", + "operator", + "address", + "building_area", + "opening_hours", + "payment_multi" + ], + "suggestion": true + }, "shop/bakery/Paul": { "tags": { "name": "Paul", @@ -71723,6 +72173,27 @@ ], "suggestion": true }, + "shop/convenience/Minimarket": { + "tags": { + "name": "Minimarket", + "shop": "convenience" + }, + "name": "Minimarket", + "icon": "shop", + "geometry": [ + "point", + "area" + ], + "fields": [ + "name", + "operator", + "address", + "building_area", + "opening_hours", + "payment_multi" + ], + "suggestion": true + }, "shop/convenience/Minimercado": { "tags": { "name": "Minimercado", @@ -77798,6 +78269,27 @@ ], "suggestion": true }, + "shop/funeral_directors/Funeraria": { + "tags": { + "name": "Funeraria", + "shop": "funeral_directors" + }, + "name": "Funeraria", + "icon": "cemetery", + "geometry": [ + "point", + "area" + ], + "fields": [ + "name", + "operator", + "address", + "building_area", + "religion", + "denomination" + ], + "suggestion": true + }, "shop/funeral_directors/The Co-operative Funeralcare": { "tags": { "name": "The Co-operative Funeralcare", @@ -78449,6 +78941,27 @@ ], "suggestion": true }, + "shop/hairdresser/Barbershop": { + "tags": { + "name": "Barbershop", + "shop": "hairdresser" + }, + "name": "Barbershop", + "icon": "hairdresser", + "geometry": [ + "point", + "area" + ], + "fields": [ + "name", + "operator", + "address", + "building_area", + "opening_hours", + "payment_multi" + ], + "suggestion": true + }, "shop/hairdresser/Berber": { "tags": { "name": "Berber", @@ -78848,6 +79361,27 @@ ], "suggestion": true }, + "shop/hairdresser/Salon": { + "tags": { + "name": "Salon", + "shop": "hairdresser" + }, + "name": "Salon", + "icon": "hairdresser", + "geometry": [ + "point", + "area" + ], + "fields": [ + "name", + "operator", + "address", + "building_area", + "opening_hours", + "payment_multi" + ], + "suggestion": true + }, "shop/hairdresser/Salon fryzjerski": { "tags": { "name": "Salon fryzjerski", @@ -79898,6 +80432,27 @@ ], "suggestion": true }, + "shop/kiosk/Kiosco": { + "tags": { + "name": "Kiosco", + "shop": "kiosk" + }, + "name": "Kiosco", + "icon": "shop", + "geometry": [ + "point", + "area" + ], + "fields": [ + "name", + "operator", + "address", + "building_area", + "opening_hours", + "payment_multi" + ], + "suggestion": true + }, "shop/kiosk/Kiosko": { "tags": { "name": "Kiosko", @@ -80318,6 +80873,48 @@ ], "suggestion": true }, + "shop/kitchen/Kitchen": { + "tags": { + "name": "Kitchen", + "shop": "kitchen" + }, + "name": "Kitchen", + "icon": "shop", + "geometry": [ + "point", + "area" + ], + "fields": [ + "name", + "operator", + "address", + "building_area", + "opening_hours", + "payment_multi" + ], + "suggestion": true + }, + "shop/kitchen/kitchen": { + "tags": { + "name": "kitchen", + "shop": "kitchen" + }, + "name": "kitchen", + "icon": "shop", + "geometry": [ + "point", + "area" + ], + "fields": [ + "name", + "operator", + "address", + "building_area", + "opening_hours", + "payment_multi" + ], + "suggestion": true + }, "shop/laundry/Launderette": { "tags": { "name": "Launderette", @@ -80716,6 +81313,27 @@ ], "suggestion": true }, + "shop/mobile_phone/Cricket": { + "tags": { + "name": "Cricket", + "shop": "mobile_phone" + }, + "name": "Cricket", + "icon": "mobile-phone", + "geometry": [ + "point", + "area" + ], + "fields": [ + "name", + "operator", + "address", + "building_area", + "opening_hours", + "payment_multi" + ], + "suggestion": true + }, "shop/mobile_phone/Cricket Wireless": { "tags": { "name": "Cricket Wireless", @@ -82207,6 +82825,27 @@ ], "suggestion": true }, + "shop/optician/Optica": { + "tags": { + "name": "Optica", + "shop": "optician" + }, + "name": "Optica", + "icon": "shop", + "geometry": [ + "point", + "area" + ], + "fields": [ + "name", + "operator", + "address", + "building_area", + "opening_hours", + "payment_multi" + ], + "suggestion": true + }, "shop/optician/Optical Center": { "tags": { "name": "Optical Center", @@ -84057,6 +84696,27 @@ ], "suggestion": true }, + "shop/sports/Stadium": { + "tags": { + "name": "Stadium", + "shop": "sports" + }, + "name": "Stadium", + "icon": "shop", + "geometry": [ + "point", + "area" + ], + "fields": [ + "name", + "operator", + "address", + "building_area", + "opening_hours", + "payment_multi" + ], + "suggestion": true + }, "shop/sports/Спортмастер": { "tags": { "name": "Спортмастер", @@ -85065,6 +85725,27 @@ ], "suggestion": true }, + "shop/supermarket/Casino": { + "tags": { + "name": "Casino", + "shop": "supermarket" + }, + "name": "Casino", + "icon": "grocery", + "geometry": [ + "point", + "area" + ], + "fields": [ + "name", + "operator", + "address", + "building_area", + "opening_hours", + "payment_multi" + ], + "suggestion": true + }, "shop/supermarket/Centre Commercial E. Leclerc": { "tags": { "name": "Centre Commercial E. Leclerc", @@ -87711,6 +88392,27 @@ ], "suggestion": true }, + "shop/supermarket/Mercado": { + "tags": { + "name": "Mercado", + "shop": "supermarket" + }, + "name": "Mercado", + "icon": "grocery", + "geometry": [ + "point", + "area" + ], + "fields": [ + "name", + "operator", + "address", + "building_area", + "opening_hours", + "payment_multi" + ], + "suggestion": true + }, "shop/supermarket/Mercado Municipal": { "tags": { "name": "Mercado Municipal", @@ -91407,6 +92109,27 @@ ], "suggestion": true }, + "shop/tattoo/Tattoo": { + "tags": { + "name": "Tattoo", + "shop": "tattoo" + }, + "name": "Tattoo", + "icon": "shop", + "geometry": [ + "point", + "area" + ], + "fields": [ + "name", + "operator", + "address", + "building_area", + "opening_hours", + "payment_multi" + ], + "suggestion": true + }, "shop/ticket/Boutique Grandes Lignes": { "tags": { "name": "Boutique Grandes Lignes", @@ -92058,6 +92781,27 @@ ], "suggestion": true }, + "shop/tyres/Vulcanizing Shop": { + "tags": { + "name": "Vulcanizing Shop", + "shop": "tyres" + }, + "name": "Vulcanizing Shop", + "icon": "shop", + "geometry": [ + "point", + "area" + ], + "fields": [ + "name", + "operator", + "address", + "building_area", + "opening_hours", + "payment_multi" + ], + "suggestion": true + }, "shop/tyres/Вулканизация": { "tags": { "name": "Вулканизация", @@ -92730,6 +93474,25 @@ ], "suggestion": true }, + "tourism/attraction/Lavoir": { + "tags": { + "name": "Lavoir", + "tourism": "attraction" + }, + "name": "Lavoir", + "icon": "star", + "geometry": [ + "point", + "vertex", + "area" + ], + "fields": [ + "name", + "operator", + "address" + ], + "suggestion": true + }, "tourism/attraction/Maibaum": { "tags": { "name": "Maibaum", @@ -92825,6 +93588,25 @@ ], "suggestion": true }, + "tourism/attraction/path continues": { + "tags": { + "name": "path continues", + "tourism": "attraction" + }, + "name": "path continues", + "icon": "star", + "geometry": [ + "point", + "vertex", + "area" + ], + "fields": [ + "name", + "operator", + "address" + ], + "suggestion": true + }, "tourism/attraction/path contiunes": { "tags": { "name": "path contiunes", @@ -93044,6 +93826,54 @@ ], "suggestion": true }, + "tourism/camp_site/Campsite": { + "tags": { + "name": "Campsite", + "tourism": "camp_site" + }, + "name": "Campsite", + "icon": "campsite", + "geometry": [ + "point", + "vertex", + "area" + ], + "fields": [ + "name", + "operator", + "address", + "capacity", + "fee", + "internet_access", + "internet_access/fee", + "internet_access/ssid" + ], + "suggestion": true + }, + "tourism/guest_house/Guest House": { + "tags": { + "name": "Guest House", + "tourism": "guest_house" + }, + "name": "Guest House", + "icon": "lodging", + "geometry": [ + "point", + "area" + ], + "fields": [ + "name", + "operator", + "address", + "building_area", + "smoking", + "rooms", + "internet_access", + "internet_access/fee", + "internet_access/ssid" + ], + "suggestion": true + }, "tourism/guest_house/Home": { "tags": { "name": "Home", @@ -94787,6 +95617,30 @@ ], "suggestion": true }, + "tourism/motel/Motel": { + "tags": { + "name": "Motel", + "tourism": "motel" + }, + "name": "Motel", + "icon": "lodging", + "geometry": [ + "point", + "area" + ], + "fields": [ + "name", + "operator", + "address", + "building_area", + "smoking", + "rooms", + "internet_access", + "internet_access/fee", + "internet_access/ssid" + ], + "suggestion": true + }, "tourism/motel/Motel 6": { "tags": { "name": "Motel 6", @@ -94855,6 +95709,26 @@ ], "suggestion": true }, + "tourism/museum/Museum": { + "tags": { + "name": "Museum", + "tourism": "museum" + }, + "name": "Museum", + "icon": "museum", + "geometry": [ + "point", + "area" + ], + "fields": [ + "name", + "operator", + "address", + "building_area", + "opening_hours" + ], + "suggestion": true + }, "tourism/museum/Stadtmuseum": { "tags": { "name": "Stadtmuseum", diff --git a/data/presets/presets/emergency/water_tank.json b/data/presets/presets/emergency/water_tank.json new file mode 100644 index 000000000..2af55e826 --- /dev/null +++ b/data/presets/presets/emergency/water_tank.json @@ -0,0 +1,20 @@ +{ + "icon": "poi-fire-hydrant", + "fields": [ + "name", + "operator", + "ref" + ], + "geometry": [ + "point", + "vertex" + ], + "terms": [ + "cistern", + "reservoir" + ], + "tags": { + "emergency": "water_tank" + }, + "name": "Water Tank" +} diff --git a/data/taginfo.json b/data/taginfo.json index 704e48625..975eaa5d8 100644 --- a/data/taginfo.json +++ b/data/taginfo.json @@ -1198,6 +1198,10 @@ "key": "emergency", "value": "phone" }, + { + "key": "emergency", + "value": "water_tank" + }, { "key": "entrance" }, diff --git a/dist/locales/en.json b/dist/locales/en.json index 82690ebea..7b2ab99e6 100644 --- a/dist/locales/en.json +++ b/dist/locales/en.json @@ -3840,6 +3840,10 @@ "name": "Emergency Phone", "terms": "" }, + "emergency/water_tank": { + "name": "Water Tank", + "terms": "cistern,reservoir" + }, "entrance": { "name": "Entrance/Exit", "terms": "" @@ -6403,31 +6407,31 @@ }, "Waymarked_Trails-Cycling": { "attribution": { - "text": "© waymarkedtrails.org, OpenStreetMap contributors, CC by-SA 3.0" + "text": "© Sarah Hoffmann, CC by-SA 3.0, map data OpenStreetMap contributors, ODbL 1.0" }, "name": "Waymarked Trails: Cycling" }, "Waymarked_Trails-Hiking": { "attribution": { - "text": "© waymarkedtrails.org, OpenStreetMap contributors, CC by-SA 3.0" + "text": "© Sarah Hoffmann, CC by-SA 3.0, map data OpenStreetMap contributors, ODbL 1.0" }, "name": "Waymarked Trails: Hiking" }, "Waymarked_Trails-MTB": { "attribution": { - "text": "© waymarkedtrails.org, OpenStreetMap contributors, CC by-SA 3.0" + "text": "© Sarah Hoffmann, CC by-SA 3.0, map data OpenStreetMap contributors, ODbL 1.0" }, "name": "Waymarked Trails: MTB" }, "Waymarked_Trails-Skating": { "attribution": { - "text": "© waymarkedtrails.org, OpenStreetMap contributors, CC by-SA 3.0" + "text": "© Sarah Hoffmann, CC by-SA 3.0, map data OpenStreetMap contributors, ODbL 1.0" }, "name": "Waymarked Trails: Skating" }, "Waymarked_Trails-Winter_Sports": { "attribution": { - "text": "© waymarkedtrails.org, OpenStreetMap contributors, CC by-SA 3.0" + "text": "© Michael Spreng, CC by-SA 3.0, map data OpenStreetMap contributors, ODbL 1.0" }, "name": "Waymarked Trails: Winter Sports" }, From 03845510e89d35fcb40a9645586caf77e0ac4a82 Mon Sep 17 00:00:00 2001 From: Benoit Costamagna Date: Tue, 23 Jan 2018 08:38:43 +0100 Subject: [PATCH 2/4] changed icon to "water" --- data/presets/presets.json | 2 +- data/presets/presets/emergency/water_tank.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/data/presets/presets.json b/data/presets/presets.json index 9ea97f9be..36a1d0b7c 100644 --- a/data/presets/presets.json +++ b/data/presets/presets.json @@ -6162,7 +6162,7 @@ "name": "Emergency Phone" }, "emergency/water_tank": { - "icon": "poi-fire-hydrant", + "icon": "water", "fields": [ "name", "operator", diff --git a/data/presets/presets/emergency/water_tank.json b/data/presets/presets/emergency/water_tank.json index 2af55e826..3941c6ce7 100644 --- a/data/presets/presets/emergency/water_tank.json +++ b/data/presets/presets/emergency/water_tank.json @@ -1,5 +1,5 @@ { - "icon": "poi-fire-hydrant", + "icon": "water", "fields": [ "name", "operator", From 8104e9b9673119fe42ae9831c3159fe724ab7612 Mon Sep 17 00:00:00 2001 From: Benoit Costamagna Date: Tue, 23 Jan 2018 10:12:54 +0100 Subject: [PATCH 3/4] Corrected discrepancies between upstream and local files --- data/presets/presets.json | 854 -------------------------------------- dist/locales/en.json | 10 +- 2 files changed, 5 insertions(+), 859 deletions(-) diff --git a/data/presets/presets.json b/data/presets/presets.json index 36a1d0b7c..f3516b87a 100644 --- a/data/presets/presets.json +++ b/data/presets/presets.json @@ -31395,31 +31395,6 @@ ], "suggestion": true }, - "amenity/cafe/Coffee Shop": { - "tags": { - "name": "Coffee Shop", - "amenity": "cafe" - }, - "name": "Coffee Shop", - "icon": "cafe", - "geometry": [ - "point", - "area" - ], - "fields": [ - "name", - "cuisine", - "address", - "building_area", - "opening_hours", - "internet_access", - "internet_access/fee", - "internet_access/ssid", - "smoking", - "outdoor_seating" - ], - "suggestion": true - }, "amenity/cafe/Coffee Time": { "tags": { "name": "Coffee Time", @@ -33474,50 +33449,6 @@ ], "suggestion": true }, - "amenity/dentist/Consultorio Dental": { - "tags": { - "name": "Consultorio Dental", - "healthcare": "dentist", - "amenity": "dentist" - }, - "name": "Consultorio Dental", - "icon": "dentist", - "geometry": [ - "point", - "area" - ], - "fields": [ - "name", - "operator", - "healthcare/speciality", - "address", - "building_area", - "opening_hours" - ], - "suggestion": true - }, - "amenity/dentist/Dentista": { - "tags": { - "name": "Dentista", - "healthcare": "dentist", - "amenity": "dentist" - }, - "name": "Dentista", - "icon": "dentist", - "geometry": [ - "point", - "area" - ], - "fields": [ - "name", - "operator", - "healthcare/speciality", - "address", - "building_area", - "opening_hours" - ], - "suggestion": true - }, "amenity/dentist/Family Dentistry": { "tags": { "name": "Family Dentistry", @@ -34716,32 +34647,6 @@ ], "suggestion": true }, - "amenity/fast_food/Food Court": { - "tags": { - "name": "Food Court", - "amenity": "fast_food" - }, - "name": "Food Court", - "icon": "fast-food", - "geometry": [ - "point", - "area" - ], - "fields": [ - "name", - "cuisine", - "operator", - "address", - "building_area", - "opening_hours", - "takeaway", - "delivery", - "drive_through", - "smoking", - "outdoor_seating" - ], - "suggestion": true - }, "amenity/fast_food/Greenwich": { "tags": { "name": "Greenwich", @@ -38878,48 +38783,6 @@ ], "suggestion": true }, - "amenity/fuel/GNV": { - "tags": { - "name": "GNV", - "amenity": "fuel" - }, - "name": "GNV", - "icon": "fuel", - "geometry": [ - "point", - "area" - ], - "fields": [ - "name", - "operator", - "address", - "fuel_multi", - "opening_hours", - "payment_multi" - ], - "suggestion": true - }, - "amenity/fuel/Gas": { - "tags": { - "name": "Gas", - "amenity": "fuel" - }, - "name": "Gas", - "icon": "fuel", - "geometry": [ - "point", - "area" - ], - "fields": [ - "name", - "operator", - "address", - "fuel_multi", - "opening_hours", - "payment_multi" - ], - "suggestion": true - }, "amenity/fuel/Gazprom": { "tags": { "name": "Gazprom", @@ -43581,24 +43444,6 @@ ], "suggestion": true }, - "amenity/kindergarten/Jardin Infantil": { - "tags": { - "name": "Jardin Infantil", - "amenity": "kindergarten" - }, - "name": "Jardin Infantil", - "icon": "school", - "geometry": [ - "point", - "area" - ], - "fields": [ - "name", - "operator", - "address" - ], - "suggestion": true - }, "amenity/kindergarten/Jean Piaget": { "tags": { "name": "Jean Piaget", @@ -44487,78 +44332,6 @@ ], "suggestion": true }, - "amenity/library/Biblioteca Municipal": { - "tags": { - "name": "Biblioteca Municipal", - "amenity": "library" - }, - "name": "Biblioteca Municipal", - "icon": "library", - "geometry": [ - "point", - "area" - ], - "fields": [ - "name", - "operator", - "building_area", - "address", - "opening_hours", - "internet_access", - "internet_access/fee", - "internet_access/ssid", - "ref/isil" - ], - "suggestion": true - }, - "amenity/library/Biblioteca Pública": { - "tags": { - "name": "Biblioteca Pública", - "amenity": "library" - }, - "name": "Biblioteca Pública", - "icon": "library", - "geometry": [ - "point", - "area" - ], - "fields": [ - "name", - "operator", - "building_area", - "address", - "opening_hours", - "internet_access", - "internet_access/fee", - "internet_access/ssid", - "ref/isil" - ], - "suggestion": true - }, - "amenity/library/Biblioteca Pública Municipal": { - "tags": { - "name": "Biblioteca Pública Municipal", - "amenity": "library" - }, - "name": "Biblioteca Pública Municipal", - "icon": "library", - "geometry": [ - "point", - "area" - ], - "fields": [ - "name", - "operator", - "building_area", - "address", - "opening_hours", - "internet_access", - "internet_access/fee", - "internet_access/ssid", - "ref/isil" - ], - "suggestion": true - }, "amenity/library/Biblioteca comunale": { "tags": { "name": "Biblioteca comunale", @@ -46188,29 +45961,6 @@ ], "suggestion": true }, - "amenity/pharmacy/Farmácia": { - "tags": { - "name": "Farmácia", - "healthcare": "pharmacy", - "amenity": "pharmacy" - }, - "name": "Farmácia", - "icon": "pharmacy", - "geometry": [ - "point", - "area" - ], - "fields": [ - "name", - "operator", - "address", - "building_area", - "drive_through", - "opening_hours", - "payment_multi" - ], - "suggestion": true - }, "amenity/pharmacy/Felicia": { "tags": { "name": "Felicia", @@ -50413,31 +50163,6 @@ ], "suggestion": true }, - "amenity/restaurant/Belvedere": { - "tags": { - "name": "Belvedere", - "amenity": "restaurant" - }, - "name": "Belvedere", - "icon": "restaurant", - "geometry": [ - "point", - "area" - ], - "fields": [ - "name", - "cuisine", - "address", - "building_area", - "opening_hours", - "capacity", - "takeaway", - "delivery", - "smoking", - "outdoor_seating" - ], - "suggestion": true - }, "amenity/restaurant/Big Boy": { "tags": { "name": "Big Boy", @@ -57226,42 +56951,6 @@ ], "suggestion": true }, - "amenity/school/Escola Estadual": { - "tags": { - "name": "Escola Estadual", - "amenity": "school" - }, - "name": "Escola Estadual", - "icon": "school", - "geometry": [ - "point", - "area" - ], - "fields": [ - "name", - "operator", - "address" - ], - "suggestion": true - }, - "amenity/school/Escola Municipal": { - "tags": { - "name": "Escola Municipal", - "amenity": "school" - }, - "name": "Escola Municipal", - "icon": "school", - "geometry": [ - "point", - "area" - ], - "fields": [ - "name", - "operator", - "address" - ], - "suggestion": true - }, "amenity/school/Fairview Elementary School": { "tags": { "name": "Fairview Elementary School", @@ -60412,25 +60101,6 @@ ], "suggestion": true }, - "amenity/theatre/Anfiteatro": { - "tags": { - "name": "Anfiteatro", - "amenity": "theatre" - }, - "name": "Anfiteatro", - "icon": "theatre", - "geometry": [ - "point", - "area" - ], - "fields": [ - "name", - "operator", - "address", - "building_area" - ], - "suggestion": true - }, "amenity/theatre/Freilichtbühne": { "tags": { "name": "Freilichtbühne", @@ -60469,65 +60139,6 @@ ], "suggestion": true }, - "amenity/theatre/Teatro Municipal": { - "tags": { - "name": "Teatro Municipal", - "amenity": "theatre" - }, - "name": "Teatro Municipal", - "icon": "theatre", - "geometry": [ - "point", - "area" - ], - "fields": [ - "name", - "operator", - "address", - "building_area" - ], - "suggestion": true - }, - "amenity/veterinary/Clinica Veterinaria": { - "tags": { - "name": "Clinica Veterinaria", - "amenity": "veterinary" - }, - "name": "Clinica Veterinaria", - "icon": "veterinary", - "geometry": [ - "point", - "area" - ], - "fields": [ - "name", - "operator", - "address", - "building_area", - "opening_hours" - ], - "suggestion": true - }, - "amenity/veterinary/Veterinaria": { - "tags": { - "name": "Veterinaria", - "amenity": "veterinary" - }, - "name": "Veterinaria", - "icon": "veterinary", - "geometry": [ - "point", - "area" - ], - "fields": [ - "name", - "operator", - "address", - "building_area", - "opening_hours" - ], - "suggestion": true - }, "leisure/fitness_centre/LA Fitness": { "tags": { "name": "LA Fitness", @@ -60890,26 +60501,6 @@ ], "suggestion": true }, - "leisure/sports_centre/Polideportivo": { - "tags": { - "name": "Polideportivo", - "leisure": "sports_centre" - }, - "name": "Polideportivo", - "icon": "pitch", - "geometry": [ - "point", - "area" - ], - "fields": [ - "name", - "sport", - "building", - "address", - "opening_hours" - ], - "suggestion": true - }, "leisure/sports_centre/Salle Omnisport": { "tags": { "name": "Salle Omnisport", @@ -62599,27 +62190,6 @@ ], "suggestion": true }, - "shop/bakery/Panaderia": { - "tags": { - "name": "Panaderia", - "shop": "bakery" - }, - "name": "Panaderia", - "icon": "bakery", - "geometry": [ - "point", - "area" - ], - "fields": [ - "name", - "operator", - "address", - "building_area", - "opening_hours", - "payment_multi" - ], - "suggestion": true - }, "shop/bakery/Paul": { "tags": { "name": "Paul", @@ -72173,27 +71743,6 @@ ], "suggestion": true }, - "shop/convenience/Minimarket": { - "tags": { - "name": "Minimarket", - "shop": "convenience" - }, - "name": "Minimarket", - "icon": "shop", - "geometry": [ - "point", - "area" - ], - "fields": [ - "name", - "operator", - "address", - "building_area", - "opening_hours", - "payment_multi" - ], - "suggestion": true - }, "shop/convenience/Minimercado": { "tags": { "name": "Minimercado", @@ -78269,27 +77818,6 @@ ], "suggestion": true }, - "shop/funeral_directors/Funeraria": { - "tags": { - "name": "Funeraria", - "shop": "funeral_directors" - }, - "name": "Funeraria", - "icon": "cemetery", - "geometry": [ - "point", - "area" - ], - "fields": [ - "name", - "operator", - "address", - "building_area", - "religion", - "denomination" - ], - "suggestion": true - }, "shop/funeral_directors/The Co-operative Funeralcare": { "tags": { "name": "The Co-operative Funeralcare", @@ -78941,27 +78469,6 @@ ], "suggestion": true }, - "shop/hairdresser/Barbershop": { - "tags": { - "name": "Barbershop", - "shop": "hairdresser" - }, - "name": "Barbershop", - "icon": "hairdresser", - "geometry": [ - "point", - "area" - ], - "fields": [ - "name", - "operator", - "address", - "building_area", - "opening_hours", - "payment_multi" - ], - "suggestion": true - }, "shop/hairdresser/Berber": { "tags": { "name": "Berber", @@ -79361,27 +78868,6 @@ ], "suggestion": true }, - "shop/hairdresser/Salon": { - "tags": { - "name": "Salon", - "shop": "hairdresser" - }, - "name": "Salon", - "icon": "hairdresser", - "geometry": [ - "point", - "area" - ], - "fields": [ - "name", - "operator", - "address", - "building_area", - "opening_hours", - "payment_multi" - ], - "suggestion": true - }, "shop/hairdresser/Salon fryzjerski": { "tags": { "name": "Salon fryzjerski", @@ -80432,27 +79918,6 @@ ], "suggestion": true }, - "shop/kiosk/Kiosco": { - "tags": { - "name": "Kiosco", - "shop": "kiosk" - }, - "name": "Kiosco", - "icon": "shop", - "geometry": [ - "point", - "area" - ], - "fields": [ - "name", - "operator", - "address", - "building_area", - "opening_hours", - "payment_multi" - ], - "suggestion": true - }, "shop/kiosk/Kiosko": { "tags": { "name": "Kiosko", @@ -80873,48 +80338,6 @@ ], "suggestion": true }, - "shop/kitchen/Kitchen": { - "tags": { - "name": "Kitchen", - "shop": "kitchen" - }, - "name": "Kitchen", - "icon": "shop", - "geometry": [ - "point", - "area" - ], - "fields": [ - "name", - "operator", - "address", - "building_area", - "opening_hours", - "payment_multi" - ], - "suggestion": true - }, - "shop/kitchen/kitchen": { - "tags": { - "name": "kitchen", - "shop": "kitchen" - }, - "name": "kitchen", - "icon": "shop", - "geometry": [ - "point", - "area" - ], - "fields": [ - "name", - "operator", - "address", - "building_area", - "opening_hours", - "payment_multi" - ], - "suggestion": true - }, "shop/laundry/Launderette": { "tags": { "name": "Launderette", @@ -81313,27 +80736,6 @@ ], "suggestion": true }, - "shop/mobile_phone/Cricket": { - "tags": { - "name": "Cricket", - "shop": "mobile_phone" - }, - "name": "Cricket", - "icon": "mobile-phone", - "geometry": [ - "point", - "area" - ], - "fields": [ - "name", - "operator", - "address", - "building_area", - "opening_hours", - "payment_multi" - ], - "suggestion": true - }, "shop/mobile_phone/Cricket Wireless": { "tags": { "name": "Cricket Wireless", @@ -82825,27 +82227,6 @@ ], "suggestion": true }, - "shop/optician/Optica": { - "tags": { - "name": "Optica", - "shop": "optician" - }, - "name": "Optica", - "icon": "shop", - "geometry": [ - "point", - "area" - ], - "fields": [ - "name", - "operator", - "address", - "building_area", - "opening_hours", - "payment_multi" - ], - "suggestion": true - }, "shop/optician/Optical Center": { "tags": { "name": "Optical Center", @@ -84696,27 +84077,6 @@ ], "suggestion": true }, - "shop/sports/Stadium": { - "tags": { - "name": "Stadium", - "shop": "sports" - }, - "name": "Stadium", - "icon": "shop", - "geometry": [ - "point", - "area" - ], - "fields": [ - "name", - "operator", - "address", - "building_area", - "opening_hours", - "payment_multi" - ], - "suggestion": true - }, "shop/sports/Спортмастер": { "tags": { "name": "Спортмастер", @@ -85725,27 +85085,6 @@ ], "suggestion": true }, - "shop/supermarket/Casino": { - "tags": { - "name": "Casino", - "shop": "supermarket" - }, - "name": "Casino", - "icon": "grocery", - "geometry": [ - "point", - "area" - ], - "fields": [ - "name", - "operator", - "address", - "building_area", - "opening_hours", - "payment_multi" - ], - "suggestion": true - }, "shop/supermarket/Centre Commercial E. Leclerc": { "tags": { "name": "Centre Commercial E. Leclerc", @@ -88392,27 +87731,6 @@ ], "suggestion": true }, - "shop/supermarket/Mercado": { - "tags": { - "name": "Mercado", - "shop": "supermarket" - }, - "name": "Mercado", - "icon": "grocery", - "geometry": [ - "point", - "area" - ], - "fields": [ - "name", - "operator", - "address", - "building_area", - "opening_hours", - "payment_multi" - ], - "suggestion": true - }, "shop/supermarket/Mercado Municipal": { "tags": { "name": "Mercado Municipal", @@ -92109,27 +91427,6 @@ ], "suggestion": true }, - "shop/tattoo/Tattoo": { - "tags": { - "name": "Tattoo", - "shop": "tattoo" - }, - "name": "Tattoo", - "icon": "shop", - "geometry": [ - "point", - "area" - ], - "fields": [ - "name", - "operator", - "address", - "building_area", - "opening_hours", - "payment_multi" - ], - "suggestion": true - }, "shop/ticket/Boutique Grandes Lignes": { "tags": { "name": "Boutique Grandes Lignes", @@ -92781,27 +92078,6 @@ ], "suggestion": true }, - "shop/tyres/Vulcanizing Shop": { - "tags": { - "name": "Vulcanizing Shop", - "shop": "tyres" - }, - "name": "Vulcanizing Shop", - "icon": "shop", - "geometry": [ - "point", - "area" - ], - "fields": [ - "name", - "operator", - "address", - "building_area", - "opening_hours", - "payment_multi" - ], - "suggestion": true - }, "shop/tyres/Вулканизация": { "tags": { "name": "Вулканизация", @@ -93474,25 +92750,6 @@ ], "suggestion": true }, - "tourism/attraction/Lavoir": { - "tags": { - "name": "Lavoir", - "tourism": "attraction" - }, - "name": "Lavoir", - "icon": "star", - "geometry": [ - "point", - "vertex", - "area" - ], - "fields": [ - "name", - "operator", - "address" - ], - "suggestion": true - }, "tourism/attraction/Maibaum": { "tags": { "name": "Maibaum", @@ -93588,25 +92845,6 @@ ], "suggestion": true }, - "tourism/attraction/path continues": { - "tags": { - "name": "path continues", - "tourism": "attraction" - }, - "name": "path continues", - "icon": "star", - "geometry": [ - "point", - "vertex", - "area" - ], - "fields": [ - "name", - "operator", - "address" - ], - "suggestion": true - }, "tourism/attraction/path contiunes": { "tags": { "name": "path contiunes", @@ -93826,54 +93064,6 @@ ], "suggestion": true }, - "tourism/camp_site/Campsite": { - "tags": { - "name": "Campsite", - "tourism": "camp_site" - }, - "name": "Campsite", - "icon": "campsite", - "geometry": [ - "point", - "vertex", - "area" - ], - "fields": [ - "name", - "operator", - "address", - "capacity", - "fee", - "internet_access", - "internet_access/fee", - "internet_access/ssid" - ], - "suggestion": true - }, - "tourism/guest_house/Guest House": { - "tags": { - "name": "Guest House", - "tourism": "guest_house" - }, - "name": "Guest House", - "icon": "lodging", - "geometry": [ - "point", - "area" - ], - "fields": [ - "name", - "operator", - "address", - "building_area", - "smoking", - "rooms", - "internet_access", - "internet_access/fee", - "internet_access/ssid" - ], - "suggestion": true - }, "tourism/guest_house/Home": { "tags": { "name": "Home", @@ -95617,30 +94807,6 @@ ], "suggestion": true }, - "tourism/motel/Motel": { - "tags": { - "name": "Motel", - "tourism": "motel" - }, - "name": "Motel", - "icon": "lodging", - "geometry": [ - "point", - "area" - ], - "fields": [ - "name", - "operator", - "address", - "building_area", - "smoking", - "rooms", - "internet_access", - "internet_access/fee", - "internet_access/ssid" - ], - "suggestion": true - }, "tourism/motel/Motel 6": { "tags": { "name": "Motel 6", @@ -95709,26 +94875,6 @@ ], "suggestion": true }, - "tourism/museum/Museum": { - "tags": { - "name": "Museum", - "tourism": "museum" - }, - "name": "Museum", - "icon": "museum", - "geometry": [ - "point", - "area" - ], - "fields": [ - "name", - "operator", - "address", - "building_area", - "opening_hours" - ], - "suggestion": true - }, "tourism/museum/Stadtmuseum": { "tags": { "name": "Stadtmuseum", diff --git a/dist/locales/en.json b/dist/locales/en.json index 7b2ab99e6..7a18b2025 100644 --- a/dist/locales/en.json +++ b/dist/locales/en.json @@ -6407,31 +6407,31 @@ }, "Waymarked_Trails-Cycling": { "attribution": { - "text": "© Sarah Hoffmann, CC by-SA 3.0, map data OpenStreetMap contributors, ODbL 1.0" + "text": "© waymarkedtrails.org, OpenStreetMap contributors, CC by-SA 3.0" }, "name": "Waymarked Trails: Cycling" }, "Waymarked_Trails-Hiking": { "attribution": { - "text": "© Sarah Hoffmann, CC by-SA 3.0, map data OpenStreetMap contributors, ODbL 1.0" + "text": "© waymarkedtrails.org, OpenStreetMap contributors, CC by-SA 3.0" }, "name": "Waymarked Trails: Hiking" }, "Waymarked_Trails-MTB": { "attribution": { - "text": "© Sarah Hoffmann, CC by-SA 3.0, map data OpenStreetMap contributors, ODbL 1.0" + "text": "© waymarkedtrails.org, OpenStreetMap contributors, CC by-SA 3.0" }, "name": "Waymarked Trails: MTB" }, "Waymarked_Trails-Skating": { "attribution": { - "text": "© Sarah Hoffmann, CC by-SA 3.0, map data OpenStreetMap contributors, ODbL 1.0" + "text": "© waymarkedtrails.org, OpenStreetMap contributors, CC by-SA 3.0" }, "name": "Waymarked Trails: Skating" }, "Waymarked_Trails-Winter_Sports": { "attribution": { - "text": "© Michael Spreng, CC by-SA 3.0, map data OpenStreetMap contributors, ODbL 1.0" + "text": "© waymarkedtrails.org, OpenStreetMap contributors, CC by-SA 3.0" }, "name": "Waymarked Trails: Winter Sports" }, From c24c09df28b6540ebda81990fa1176a8da1bf2b0 Mon Sep 17 00:00:00 2001 From: Benoit Costamagna Date: Tue, 23 Jan 2018 14:52:05 +0100 Subject: [PATCH 4/4] changed "water tank" to "emergency water tank" --- data/presets.yaml | 6 +++--- data/presets/presets.json | 3 ++- data/presets/presets/emergency/water_tank.json | 3 ++- dist/locales/en.json | 4 ++-- 4 files changed, 9 insertions(+), 7 deletions(-) diff --git a/data/presets.yaml b/data/presets.yaml index fd59e3ed4..fe6bf5009 100644 --- a/data/presets.yaml +++ b/data/presets.yaml @@ -2939,9 +2939,9 @@ en: name: Emergency Access Private emergency/water_tank: # emergency=water_tank - name: Water Tank - # 'terms: cistern,reservoir' - terms: '' + name: Emergency Water Tank + # 'terms: water tank,cistern,reservoir' + terms: '' emergency/yes: # emergency=yes name: Emergency Access Yes diff --git a/data/presets/presets.json b/data/presets/presets.json index f3516b87a..9d11daac3 100644 --- a/data/presets/presets.json +++ b/data/presets/presets.json @@ -6173,13 +6173,14 @@ "vertex" ], "terms": [ + "water tank", "cistern", "reservoir" ], "tags": { "emergency": "water_tank" }, - "name": "Water Tank" + "name": "Emergency Water Tank" }, "entrance": { "icon": "entrance-alt1", diff --git a/data/presets/presets/emergency/water_tank.json b/data/presets/presets/emergency/water_tank.json index 3941c6ce7..83ce77908 100644 --- a/data/presets/presets/emergency/water_tank.json +++ b/data/presets/presets/emergency/water_tank.json @@ -10,11 +10,12 @@ "vertex" ], "terms": [ + "water tank", "cistern", "reservoir" ], "tags": { "emergency": "water_tank" }, - "name": "Water Tank" + "name": "Emergency Water Tank" } diff --git a/dist/locales/en.json b/dist/locales/en.json index 7a18b2025..1c309bc68 100644 --- a/dist/locales/en.json +++ b/dist/locales/en.json @@ -3841,8 +3841,8 @@ "terms": "" }, "emergency/water_tank": { - "name": "Water Tank", - "terms": "cistern,reservoir" + "name": "Emergency Water Tank", + "terms": "water tank,cistern,reservoir" }, "entrance": { "name": "Entrance/Exit",