From 283f91a930f04367214d0792e0a8a2e25a1380a8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stephan=20B=C3=B6sch-Plepelits?= <skunk@xover.mud.at>
Date: Sun, 25 Nov 2018 08:23:40 +0100
Subject: [PATCH] swimming_bathing: append additional info, show all beaches
---
swimming_bathing.json | 11 ++++++++---
1 file changed, 8 insertions(+), 3 deletions(-)
diff --git a/swimming_bathing.json b/swimming_bathing.json
index 5ae2e13..76ce3e3 100644
--- a/swimming_bathing.json
+++ b/swimming_bathing.json
@@ -8,7 +8,8 @@
"13": [
"(",
"nwr[leisure=swimming_area];",
- "nwr[natural~\"^(water|beach)\"][sport~\"^(|.*;)swimming(.*|)$\"];",
+ "nwr[natural~\"^(water)\"][sport~\"^(|.*;)swimming(.*|)$\"];",
+ "nwr[natural~\"^(beach)\"];",
"nwr[leisure~\"^(water_park|beach_resort)$\"];",
"nwr[leisure=sports_centre][sport~\"^(|.*;)swimming(.*|)$\"];",
"nwr[amenity=public_bath];",
@@ -18,7 +19,8 @@
"16": [
"(",
"nwr[leisure=swimming_area];",
- "nwr[natural~\"^(water|beach)\"][sport~\"^(|.*;)swimming(;.*|)$\"];",
+ "nwr[natural~\"^(water)\"][sport~\"^(|.*;)swimming(.*|)$\"];",
+ "nwr[natural~\"^(beach)\"];",
"nwr[leisure~\"^(water_park|beach_resort)$\"];",
"nwr[leisure=sports_centre][sport~\"^(|.*;)swimming(;.*|)$\"];",
"nwr[amenity=public_bath];",
@@ -69,7 +71,7 @@
"{% if data.zoom <= map.zoom %}",
" <tr>",
" <td>{{ markerCircle({})|raw }}<div class='sign'>{{ data.sign|raw }}</div></td>",
- " <td>{{ keyTrans(value) }}</td>",
+ " <td>{{ keyTrans(value) }} {% if data.append %}({{ trans(data.append) }}){% endif %}</td>",
" </tr>",
"{% endif %}",
"{% endfor %}",
@@ -90,10 +92,12 @@
},
"leisure=sports_centre": {
"zoom": 13,
+ "append": "tag:sport=swimming",
"sign": "<img data-src='maki:basketball'>"
},
"natural=water": {
"zoom": 13,
+ "append": "tag:sport=swimming",
"sign": "<img data-src='maki:swimming?fill=blue'>"
},
"natural=beach": {
@@ -110,6 +114,7 @@
},
"leisure=swimming_pool": {
"zoom": 16,
+ "append": "tag:access!=private",
"sign": "<img data-src='maki:swimming?size=11'>"
},
"leisure=sauna": {