diff --git a/data/presets.yaml b/data/presets.yaml index 643710f5a..369a0eacf 100644 --- a/data/presets.yaml +++ b/data/presets.yaml @@ -3240,9 +3240,6 @@ en: name: Ice Cream Vending Machine # 'terms: chocolate,ice cream,frozen,popsicle,vanilla' terms: '' - amenity/vending_machine/news_papers: - # 'amenity=vending_machine, vending=news_papers' - name: Newspaper Vending Machine amenity/vending_machine/newspapers: # 'amenity=vending_machine, vending=newspapers' name: Newspaper Vending Machine diff --git a/data/presets/presets.json b/data/presets/presets.json index 4af781db2..5abfa8ebe 100644 --- a/data/presets/presets.json +++ b/data/presets/presets.json @@ -136,8 +136,8 @@ "amenity/nightclub/lgbtq": {"icon": "maki-bar", "geometry": ["point", "area"], "tags": {"amenity": "nightclub", "lgbtq": "primary"}, "terms": ["gay nightclub", "lesbian nightclub", "lgbtq nightclub", "lgbt nightclub", "lgb nightclub"], "name": "LGBTQ+ Nightclub"}, "amenity/parking_entrance": {"icon": "maki-entrance-alt1", "fields": ["access_simple", "ref"], "geometry": ["vertex"], "tags": {"amenity": "parking_entrance"}, "name": "Parking Garage Entrance/Exit"}, "amenity/parking_space": {"fields": ["capacity"], "geometry": ["point", "vertex", "area"], "terms": [], "tags": {"amenity": "parking_space"}, "matchScore": 0.95, "name": "Parking Space"}, - "amenity/parking": {"icon": "maki-car", "fields": ["operator", "parking", "capacity", "access_simple", "fee", "surface"], "moreFields": ["address", "covered", "email", "fax", "maxstay", "name", "opening_hours", "park_ride", "payment_multi_fee", "phone", "ref", "supervised", "website", "wheelchair"], "geometry": ["point", "vertex", "area"], "tags": {"amenity": "parking"}, "terms": ["automobile parking", "car lot", "car parking", "rv parking", "truck parking", "vehicle parking"], "name": "Parking Lot"}, - "amenity/parking/multi-storey": {"icon": "maki-car", "fields": ["{amenity/parking}", "building", "levels", "height"], "geometry": ["area"], "tags": {"amenity": "parking", "parking": "multi-storey"}, "addTags": {"building": "parking", "amenity": "parking", "parking": "multi-storey"}, "reference": {"key": "parking", "value": "multi-storey"}, "terms": ["car", "indoor parking", "multistorey car park", "parkade", "parking building", "parking deck", "parking garage", "parking ramp", "parking structure"], "name": "Multilevel Parking Garage"}, + "amenity/parking": {"icon": "maki-car", "fields": ["operator", "parking", "capacity", "access_simple", "fee", "payment_multi_fee", "surface"], "moreFields": ["address", "covered", "email", "fax", "maxstay", "name", "opening_hours", "park_ride", "phone", "ref", "supervised", "website", "wheelchair"], "geometry": ["point", "vertex", "area"], "tags": {"amenity": "parking"}, "terms": ["automobile parking", "car lot", "car parking", "rv parking", "truck parking", "vehicle parking"], "name": "Parking Lot"}, + "amenity/parking/multi-storey": {"icon": "maki-car", "fields": ["name", "{amenity/parking}", "building"], "moreFields": ["{amenity/parking}", "levels", "height"], "geometry": ["area"], "tags": {"amenity": "parking", "parking": "multi-storey"}, "addTags": {"building": "parking", "amenity": "parking", "parking": "multi-storey"}, "reference": {"key": "parking", "value": "multi-storey"}, "terms": ["car", "indoor parking", "multistorey car park", "parkade", "parking building", "parking deck", "parking garage", "parking ramp", "parking structure"], "name": "Multilevel Parking Garage"}, "amenity/parking/underground": {"icon": "maki-car", "fields": ["{amenity/parking}", "layer"], "geometry": ["point", "vertex", "area"], "tags": {"amenity": "parking", "parking": "underground"}, "addTags": {"amenity": "parking", "parking": "underground", "layer": "-1"}, "reference": {"key": "parking", "value": "underground"}, "terms": ["automobile parking", "car lot", "car parking", "rv parking", "subsurface parking", "truck parking", "vehicle parking"], "name": "Underground Parking"}, "amenity/payment_centre": {"icon": "maki-bank", "fields": ["name", "brand", "address", "building_area", "opening_hours", "payment_multi"], "moreFields": ["currency_multi", "website", "phone", "email", "fax", "wheelchair"], "geometry": ["point", "area"], "terms": ["check", "tax pay", "bill pay", "currency", "finance", "cash", "money"], "tags": {"amenity": "payment_centre"}, "name": "Payment Center"}, "amenity/payment_terminal": {"icon": "far-credit-card", "fields": ["name", "brand", "address", "opening_hours", "payment_multi"], "moreFields": ["currency_multi", "wheelchair"], "geometry": ["point"], "terms": ["interactive kiosk", "ekiosk", "atm", "bill pay", "tax pay", "phone pay", "finance", "cash", "money transfer", "card"], "tags": {"amenity": "payment_terminal"}, "name": "Payment Terminal"}, @@ -213,7 +213,6 @@ "amenity/university": {"icon": "maki-college", "fields": ["{amenity/college}"], "moreFields": ["{amenity/college}"], "geometry": ["point", "area"], "terms": ["college", "graduate school", "PhD program", "master's degree program"], "tags": {"amenity": "university"}, "name": "University Grounds"}, "amenity/vehicle_inspection": {"icon": "maki-car", "fields": ["name", "operator", "address", "building_area", "opening_hours"], "moreFields": ["payment_multi", "website", "phone", "email", "fax", "wheelchair"], "geometry": ["point", "area"], "terms": ["car inspection"], "tags": {"amenity": "vehicle_inspection"}, "name": "Vehicle Inspection"}, "amenity/vending_machine": {"icon": "temaki-vending_machine", "fields": ["vending", "operator", "payment_multi", "currency_multi"], "geometry": ["point"], "terms": [], "tags": {"amenity": "vending_machine"}, "matchScore": 0.9, "name": "Vending Machine"}, - "amenity/vending_machine/news_papers": {"icon": "temaki-vending_machine", "fields": ["{amenity/vending_machine/newspapers}"], "geometry": ["point"], "tags": {"amenity": "vending_machine", "vending": "news_papers"}, "reference": {"key": "vending", "value": "newspapers"}, "name": "Newspaper Vending Machine", "searchable": false}, "amenity/vending_machine/cigarettes": {"icon": "temaki-vending_machine", "geometry": ["point"], "terms": ["cigarette"], "tags": {"amenity": "vending_machine", "vending": "cigarettes"}, "reference": {"key": "vending", "value": "cigarettes"}, "name": "Cigarette Vending Machine"}, "amenity/vending_machine/coffee": {"icon": "temaki-vending_machine", "geometry": ["point"], "terms": ["coffee"], "tags": {"amenity": "vending_machine", "vending": "coffee"}, "reference": {"key": "vending", "value": "coffee"}, "name": "Coffee Vending Machine"}, "amenity/vending_machine/condoms": {"icon": "temaki-vending_machine", "geometry": ["point"], "terms": ["condom"], "tags": {"amenity": "vending_machine", "vending": "condoms"}, "reference": {"key": "vending", "value": "condoms"}, "name": "Condom Vending Machine"}, diff --git a/data/presets/presets/amenity/parking.json b/data/presets/presets/amenity/parking.json index 7c97294f1..a69f63d2b 100644 --- a/data/presets/presets/amenity/parking.json +++ b/data/presets/presets/amenity/parking.json @@ -6,6 +6,7 @@ "capacity", "access_simple", "fee", + "payment_multi_fee", "surface" ], "moreFields": [ @@ -17,7 +18,6 @@ "name", "opening_hours", "park_ride", - "payment_multi_fee", "phone", "ref", "supervised", diff --git a/data/presets/presets/amenity/parking/multi-storey.json b/data/presets/presets/amenity/parking/multi-storey.json index fdcf116b1..55a6519e3 100644 --- a/data/presets/presets/amenity/parking/multi-storey.json +++ b/data/presets/presets/amenity/parking/multi-storey.json @@ -1,8 +1,12 @@ { "icon": "maki-car", "fields": [ + "name", + "{amenity/parking}", + "building" + ], + "moreFields": [ "{amenity/parking}", - "building", "levels", "height" ], diff --git a/data/presets/presets/amenity/vending_machine/_news_papers.json b/data/presets/presets/amenity/vending_machine/_news_papers.json deleted file mode 100644 index 60a352933..000000000 --- a/data/presets/presets/amenity/vending_machine/_news_papers.json +++ /dev/null @@ -1,19 +0,0 @@ -{ - "icon": "temaki-vending_machine", - "fields": [ - "{amenity/vending_machine/newspapers}" - ], - "geometry": [ - "point" - ], - "tags": { - "amenity": "vending_machine", - "vending": "news_papers" - }, - "reference": { - "key": "vending", - "value": "newspapers" - }, - "name": "Newspaper Vending Machine", - "searchable": false -} diff --git a/data/taginfo.json b/data/taginfo.json index 02edafd92..5f2ba9ad8 100644 --- a/data/taginfo.json +++ b/data/taginfo.json @@ -210,7 +210,6 @@ {"key": "amenity", "value": "university", "description": "🄿 University Grounds", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/college-15.svg?sanitize=true"}, {"key": "amenity", "value": "vehicle_inspection", "description": "🄿 Vehicle Inspection", "object_types": ["node", "area"], "icon_url": "https://raw.githubusercontent.com/mapbox/maki/master/icons/car-15.svg?sanitize=true"}, {"key": "amenity", "value": "vending_machine", "description": "🄿 Vending Machine", "object_types": ["node"], "icon_url": "https://raw.githubusercontent.com/bhousel/temaki/master/icons/vending_machine.svg?sanitize=true"}, - {"key": "vending", "value": "news_papers", "description": "🄿 Newspaper Vending Machine (unsearchable)", "object_types": ["node"], "icon_url": "https://raw.githubusercontent.com/bhousel/temaki/master/icons/vending_machine.svg?sanitize=true"}, {"key": "vending", "value": "cigarettes", "description": "🄿 Cigarette Vending Machine", "object_types": ["node"], "icon_url": "https://raw.githubusercontent.com/bhousel/temaki/master/icons/vending_machine.svg?sanitize=true"}, {"key": "vending", "value": "coffee", "description": "🄿 Coffee Vending Machine", "object_types": ["node"], "icon_url": "https://raw.githubusercontent.com/bhousel/temaki/master/icons/vending_machine.svg?sanitize=true"}, {"key": "vending", "value": "condoms", "description": "🄿 Condom Vending Machine", "object_types": ["node"], "icon_url": "https://raw.githubusercontent.com/bhousel/temaki/master/icons/vending_machine.svg?sanitize=true"}, diff --git a/dist/locales/en.json b/dist/locales/en.json index d11763369..5ccfa0372 100644 --- a/dist/locales/en.json +++ b/dist/locales/en.json @@ -5122,10 +5122,6 @@ "name": "Vending Machine", "terms": "" }, - "amenity/vending_machine/news_papers": { - "name": "Newspaper Vending Machine", - "terms": "" - }, "amenity/vending_machine/cigarettes": { "name": "Cigarette Vending Machine", "terms": "cigarette"