From b9725794ad7ef04e66ee160703821bbe76257598 Mon Sep 17 00:00:00 2001 From: Quincy Morgan Date: Mon, 3 Sep 2018 18:51:06 -0700 Subject: [PATCH] Shows the Lit field by default for the Swimming Pool preset Adds "aquatics" as a search term for the Swimming Pool preset --- data/presets.yaml | 2 +- data/presets/presets.json | 10 +++++----- data/presets/presets/leisure/swimming_pool.json | 6 ++++-- dist/locales/en.json | 2 +- 4 files changed, 11 insertions(+), 9 deletions(-) diff --git a/data/presets.yaml b/data/presets.yaml index 3d207fa6e..c0ddc84a2 100644 --- a/data/presets.yaml +++ b/data/presets.yaml @@ -4089,7 +4089,7 @@ en: leisure/swimming_pool: # leisure=swimming_pool name: Swimming Pool - # 'terms: dive,water' + # 'terms: dive,water,aquatics' terms: '' leisure/track: # leisure=track diff --git a/data/presets/presets.json b/data/presets/presets.json index afdc567ea..61c27e8f2 100644 --- a/data/presets/presets.json +++ b/data/presets/presets.json @@ -522,7 +522,7 @@ "leisure/sports_centre": {"icon": "maki-pitch", "fields": ["name", "sport", "building", "address", "opening_hours"], "geometry": ["point", "area"], "tags": {"leisure": "sports_centre"}, "terms": [], "name": "Sports Center / Complex"}, "leisure/sports_centre/swimming": {"icon": "maki-swimming", "fields": ["name", "access_simple", "operator", "address", "building"], "geometry": ["point", "area"], "terms": ["dive", "water"], "tags": {"leisure": "sports_centre", "sport": "swimming"}, "reference": {"key": "sport", "value": "swimming"}, "name": "Swimming Pool Facility"}, "leisure/stadium": {"icon": "maki-pitch", "fields": ["name", "sport", "address"], "geometry": ["point", "area"], "tags": {"leisure": "stadium"}, "name": "Stadium"}, - "leisure/swimming_pool": {"icon": "maki-swimming", "fields": ["name", "access_simple", "operator", "address"], "geometry": ["point", "area"], "terms": ["dive", "water"], "tags": {"leisure": "swimming_pool"}, "name": "Swimming Pool"}, + "leisure/swimming_pool": {"icon": "maki-swimming", "fields": ["name", "access_simple", "operator", "address", "lit"], "geometry": ["point", "area"], "terms": ["dive", "water", "aquatics"], "tags": {"leisure": "swimming_pool"}, "name": "Swimming Pool"}, "leisure/track": {"icon": "iD-highway-road", "fields": ["surface", "sport_racing_nonmotor", "lit", "width", "lanes"], "geometry": ["point", "line", "area"], "tags": {"leisure": "track"}, "terms": ["cycle", "dog", "greyhound", "horse", "race*", "track"], "name": "Racetrack (Non-Motorsport)"}, "leisure/water_park": {"icon": "maki-swimming", "fields": ["name", "operator", "address"], "geometry": ["point", "area"], "terms": ["swim", "pool", "dive"], "tags": {"leisure": "water_park"}, "name": "Water Park"}, "line": {"fields": ["name"], "geometry": ["line"], "tags": {}, "name": "Line", "matchScore": 0.1}, @@ -2786,10 +2786,10 @@ "leisure/sports_centre/ДЮСШ": {"tags": {"name": "ДЮСШ", "leisure": "sports_centre"}, "name": "ДЮСШ", "icon": "maki-pitch", "geometry": ["point", "area"], "fields": ["name", "sport", "building", "address", "opening_hours"], "suggestion": true}, "leisure/sports_centre/Ледовый дворец": {"tags": {"name": "Ледовый дворец", "leisure": "sports_centre"}, "name": "Ледовый дворец", "icon": "maki-pitch", "geometry": ["point", "area"], "fields": ["name", "sport", "building", "address", "opening_hours"], "suggestion": true}, "leisure/sports_centre/体育館": {"tags": {"name": "体育館", "leisure": "sports_centre"}, "name": "体育館", "icon": "maki-pitch", "geometry": ["point", "area"], "fields": ["name", "sport", "building", "address", "opening_hours"], "suggestion": true}, - "leisure/swimming_pool/Schwimmerbecken": {"tags": {"name": "Schwimmerbecken", "leisure": "swimming_pool"}, "name": "Schwimmerbecken", "icon": "maki-swimming", "geometry": ["point", "area"], "fields": ["name", "access_simple", "operator", "address"], "suggestion": true}, - "leisure/swimming_pool/Yüzme Havuzu": {"tags": {"name": "Yüzme Havuzu", "leisure": "swimming_pool"}, "name": "Yüzme Havuzu", "icon": "maki-swimming", "geometry": ["point", "area"], "fields": ["name", "access_simple", "operator", "address"], "suggestion": true}, - "leisure/swimming_pool/プール": {"tags": {"name": "プール", "leisure": "swimming_pool"}, "name": "プール", "icon": "maki-swimming", "geometry": ["point", "area"], "fields": ["name", "access_simple", "operator", "address"], "suggestion": true}, - "leisure/swimming_pool/游泳池": {"tags": {"name": "游泳池", "leisure": "swimming_pool"}, "name": "游泳池", "icon": "maki-swimming", "geometry": ["point", "area"], "fields": ["name", "access_simple", "operator", "address"], "suggestion": true}, + "leisure/swimming_pool/Schwimmerbecken": {"tags": {"name": "Schwimmerbecken", "leisure": "swimming_pool"}, "name": "Schwimmerbecken", "icon": "maki-swimming", "geometry": ["point", "area"], "fields": ["name", "access_simple", "operator", "address", "lit"], "suggestion": true}, + "leisure/swimming_pool/Yüzme Havuzu": {"tags": {"name": "Yüzme Havuzu", "leisure": "swimming_pool"}, "name": "Yüzme Havuzu", "icon": "maki-swimming", "geometry": ["point", "area"], "fields": ["name", "access_simple", "operator", "address", "lit"], "suggestion": true}, + "leisure/swimming_pool/プール": {"tags": {"name": "プール", "leisure": "swimming_pool"}, "name": "プール", "icon": "maki-swimming", "geometry": ["point", "area"], "fields": ["name", "access_simple", "operator", "address", "lit"], "suggestion": true}, + "leisure/swimming_pool/游泳池": {"tags": {"name": "游泳池", "leisure": "swimming_pool"}, "name": "游泳池", "icon": "maki-swimming", "geometry": ["point", "area"], "fields": ["name", "access_simple", "operator", "address", "lit"], "suggestion": true}, "man_made/windmill/De Hoop": {"tags": {"name": "De Hoop", "man_made": "windmill"}, "name": "De Hoop", "icon": "temaki-windmill", "geometry": ["point", "area"], "fields": ["building_area"], "suggestion": true}, "shop/alcohol/Alko": {"tags": {"name": "Alko", "shop": "alcohol"}, "name": "Alko", "icon": "maki-alcohol-shop", "geometry": ["point", "area"], "fields": ["name", "operator", "address", "building_area", "opening_hours", "payment_multi", "drive_through"], "suggestion": true}, "shop/alcohol/BC Liquor Store": {"tags": {"name": "BC Liquor Store", "shop": "alcohol"}, "name": "BC Liquor Store", "icon": "maki-alcohol-shop", "geometry": ["point", "area"], "fields": ["name", "operator", "address", "building_area", "opening_hours", "payment_multi", "drive_through"], "suggestion": true}, diff --git a/data/presets/presets/leisure/swimming_pool.json b/data/presets/presets/leisure/swimming_pool.json index 4c64b8278..0d868e43d 100644 --- a/data/presets/presets/leisure/swimming_pool.json +++ b/data/presets/presets/leisure/swimming_pool.json @@ -4,7 +4,8 @@ "name", "access_simple", "operator", - "address" + "address", + "lit" ], "geometry": [ "point", @@ -12,7 +13,8 @@ ], "terms": [ "dive", - "water" + "water", + "aquatics" ], "tags": { "leisure": "swimming_pool" diff --git a/dist/locales/en.json b/dist/locales/en.json index 5398ff08e..67c18e69e 100644 --- a/dist/locales/en.json +++ b/dist/locales/en.json @@ -5019,7 +5019,7 @@ }, "leisure/swimming_pool": { "name": "Swimming Pool", - "terms": "dive,water" + "terms": "dive,water,aquatics" }, "leisure/track": { "name": "Racetrack (Non-Motorsport)",