From c7526573b99411e94407b123ceebaff07b4807de Mon Sep 17 00:00:00 2001
From: Robin van der Linde <robin.vanderlinde@gmail.com>
Date: Sat, 27 Aug 2022 11:57:42 +0200
Subject: [PATCH] Add label and sport shops

---
 .../layers/fitness_centre/fitness_centre.json |  9 +++----
 .../fitness_station/fitness_station.json      |  6 ++---
 assets/themes/sports/sports.json              | 27 ++++++++++++++++++-
 3 files changed, 33 insertions(+), 9 deletions(-)

diff --git a/assets/layers/fitness_centre/fitness_centre.json b/assets/layers/fitness_centre/fitness_centre.json
index 056e07f68f..1ce8b8330f 100644
--- a/assets/layers/fitness_centre/fitness_centre.json
+++ b/assets/layers/fitness_centre/fitness_centre.json
@@ -9,7 +9,7 @@
   "source": {
     "osmTags": "leisure=fitness_centre"
   },
-  "minzoom": 13,
+  "minzoom": 12,
   "title": {
     "render": {
       "en": "Fitness Centre"
@@ -17,9 +17,7 @@
     "mappings": [
       {
         "if": "name~*",
-        "then": {
-          "en": "Fitness Centre {name}"
-        }
+        "then": "{name}"
       }
     ]
   },
@@ -75,7 +73,8 @@
         "centroid"
       ],
       "icon": "circle:white;./assets/layers/fitness_centre/gym.svg",
-      "iconSize": "40,40,center"
+      "iconSize": "40,40,center",
+      "label": "{name}"
     }
   ]
 }
\ No newline at end of file
diff --git a/assets/layers/fitness_station/fitness_station.json b/assets/layers/fitness_station/fitness_station.json
index b30c5db348..7f58076e9f 100644
--- a/assets/layers/fitness_station/fitness_station.json
+++ b/assets/layers/fitness_station/fitness_station.json
@@ -9,7 +9,7 @@
   "source": {
     "osmTags": "leisure=fitness_station"
   },
-  "minzoom": 13,
+  "minzoom": 12,
   "title": {
     "render": {
       "en": "Fitness Station"
@@ -18,7 +18,7 @@
       {
         "if": "name~*",
         "then": {
-          "en": "Fitness Station{name}"
+          "en": "Fitness Station {name}"
         }
       }
     ]
@@ -350,7 +350,7 @@
         "sport=fitness"
       ],
       "title": {
-        "en": "a Fitness Station"
+        "en": "a fitness station"
       },
       "icon": "./assets/layers/fitness_station/fitness.svg"
     }
diff --git a/assets/themes/sports/sports.json b/assets/themes/sports/sports.json
index 70c4035b24..56e0a22e36 100644
--- a/assets/themes/sports/sports.json
+++ b/assets/themes/sports/sports.json
@@ -16,6 +16,31 @@
   "layers": [
     "sport_pitch",
     "fitness_centre",
-    "fitness_station"
+    "fitness_station",
+    {
+      "builtin": "shops",
+      "override": {
+        "source": {
+          "osmTags": "shop=sports"
+        },
+        "presets": [
+          {
+            "tags": [
+              "shop=sports"
+            ],
+            "title": {
+              "en": "a sports shop"
+            },
+            "description": {
+              "en": "Add a new shop selling sports goods."
+            }
+          }
+        ],
+        "minzoom": 12
+      },
+      "hideTagRenderingsWithLabels": [
+        "shop_types"
+      ]
+    }
   ]
 }
\ No newline at end of file