From 0b3fb1c20977a82355b9dca2933ec3ae14e485bb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stephan=20B=C3=B6sch-Plepelits?= <skunk@xover.mud.at>
Date: Tue, 27 Aug 2019 06:58:51 +0200
Subject: [PATCH] Restructure "Leisure, Sport & Shopping" top category

---
 index.json   | 44 +++++++++++++++++++-------------------------
 lang/en.json |  4 ++--
 leisure.json | 17 -----------------
 outdoor.json | 18 ------------------
 sport.json   | 16 ----------------
 5 files changed, 21 insertions(+), 78 deletions(-)
 delete mode 100644 outdoor.json

diff --git a/index.json b/index.json
index 85c4991..da2b5f2 100644
--- a/index.json
+++ b/index.json
@@ -2,28 +2,10 @@
     "type": "index",
     "subCategories": [
         {
-            "id": "leisure_sport_shopping",
+            "id": "gastro_shop",
             "type": "index",
             "name": {
-                "ast": "Recréu, deportes y compres",
-                "ca": "Oci, esport i compres",
-                "cs": "Volný čas, sporty a nákupy",
-                "de": "Freizeit, Sport und Einkauf",
-                "el": "Αναψυχή, Αθλητισμός και Αγορές",
-                "en": "Leisure, Sport and Shopping",
-                "es": "Ocio, deporte y compras",
-                "et": "Vaba aeg, sport ja ostmine",
-                "fr": "Vie quotidienne, loisirs et sports",
-                "hu": "Szabadidő, sport és vásárlás",
-                "it": "Tempo libero, sport e shopping",
-                "ja": "レジャー",
-                "nl": "Vrije tijd, Sport en Winkelen",
-                "pl": "Wypoczynek, Sport i Zakupy",
-                "ro": "Timp liber, Sport si Cumparaturi",
-                "ru": "Досуг",
-                "uk": "Дозвілля",
-                "pt-br": "Lazer, esportes e compras",
-                "pt": "Lazer, desporto e compras"
+                "en": "Gastronomy and Shopping"
             },
             "subCategories": [
                 {
@@ -34,21 +16,33 @@
                 },
                 {
                     "id": "craft"
+                }
+            ]
+        },
+        {
+            "id": "leisure_outdoor",
+            "type": "index",
+            "name": {
+                "en": "Leisure, Sport and Outdoor"
+            },
+            "subCategories": [
+                {
+                    "id": "children"
                 },
                 {
-                    "id": "leisure"
+                    "id": "swimming_bathing"
                 },
                 {
-                    "id": "sport"
+                    "id": "mtb-routes"
                 },
                 {
-                    "id": "children"
+                    "id": "climbing"
                 },
                 {
-                    "id": "outdoor"
+                    "id": "leisure"
                 },
                 {
-                    "id": "swimming_bathing"
+                    "id": "sport"
                 }
             ]
         },
diff --git a/lang/en.json b/lang/en.json
index 2728c67..b541595 100644
--- a/lang/en.json
+++ b/lang/en.json
@@ -38,7 +38,7 @@
     "category:infrastructure": "Infrastructure",
     "category:internet": "Internet access",
     "category:law": "Law",
-    "category:leisure": "Leisure",
+    "category:leisure": "All Leisure",
     "category:leisure_sport_shopping": "Leisure, Sport and Shopping",
     "category:memorial": "Memorials & Monuments",
     "category:military": "Military",
@@ -74,7 +74,7 @@
     "category:services": "Services",
     "category:shop": "Shopping",
     "category:special": "Special",
-    "category:sport": "Sport",
+    "category:sport": "All Sport",
     "category:swimming_bathing": "Swimming and bathing",
     "category:tourism_attractions": "Tourism",
     "category:tourism_services": "Tourism",
diff --git a/leisure.json b/leisure.json
index e39dd07..2fcf426 100644
--- a/leisure.json
+++ b/leisure.json
@@ -1,22 +1,5 @@
 {
     "type": "overpass",
-    "name": {
-        "ast": "Recréu",
-        "cs": "Volný čas",
-        "de": "Freizeit",
-        "el": "Αναψυχή",
-        "en": "Leisure",
-        "fr": "Loisirs",
-        "hu": "Szabadidő",
-        "it": "Tempo libero",
-        "ja": "レジャー",
-        "nl": "Vrije tijd",
-        "pt": "Lazer",
-        "pt-br": "Lazer",
-        "ro": "Timp liber",
-        "ru": "Досуг",
-        "uk": "Дозвілля"
-    },
     "query": {
         "15": [
             "(",
diff --git a/outdoor.json b/outdoor.json
deleted file mode 100644
index d6b7aa7..0000000
--- a/outdoor.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-    "type": "index",
-    "name": {
-        "de": "Freiluftaktivitäten",
-        "en": "Outdoor activities",
-        "fr": "Activités de plein air",
-        "hu": "Szabadtéri tevékenységek",
-        "pt-br": "Atividades ao ar livre"
-    },
-    "subCategories": [
-        {
-            "id": "mtb-routes"
-        },
-        {
-            "id": "climbing"
-        }
-    ]
-}
diff --git a/sport.json b/sport.json
index 1133f89..a477606 100644
--- a/sport.json
+++ b/sport.json
@@ -1,21 +1,5 @@
 {
     "type": "overpass",
-    "name": {
-        "ast": "Deportes",
-        "cs": "Sport",
-        "de": "Sport",
-        "el": "Άθληση",
-        "en": "Sport",
-        "fr": "Sports",
-        "hu": "Sport",
-        "it": "Sport",
-        "ja": "スポーツ",
-        "nl": "Sport",
-        "pt": "Desporto",
-        "pt-br": "Esportes",
-        "ru": "Спорт",
-        "uk": "Спорт. Інше."
-    },
     "query": {
         "14": "(node[sport];way[sport];relation[sport];)"
     },