From 59f799aa594d51f55fb48e9ab659e246ef434911 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Stephan=20B=C3=B6sch-Plepelits?= <skunk@xover.mud.at>
Date: Mon, 31 Jul 2017 22:03:23 +0200
Subject: [PATCH] Fix indendation

---
 communication.json |  4 +--
 cycle_routes.json  |  3 +-
 education.json     |  8 ++---
 leisure.json       |  4 +--
 public.json        |  6 ++--
 shop.json          | 87 ++++++++++++++++++++++++++++++++++++----------
 6 files changed, 79 insertions(+), 33 deletions(-)

diff --git a/communication.json b/communication.json
index 62ac514..de06866 100644
--- a/communication.json
+++ b/communication.json
@@ -1,8 +1,8 @@
 {
     "type": "overpass",
     "query": {
-      "13": "(node[amenity~'^(post_office|internet_cafe)$'];way[amenity~'^(post_office|internet_cafe)$'];relation[amenity~'^(post_office|internet_cafe)$'];);",
-      "16": "(node[amenity~'^(post_office|internet_cafe|post_box|telephone)$'];way[amenity~'^(post_office|internet_cafe)$'];relation[amenity~'^(post_office|internet_cafe)$'];);"
+        "13": "(node[amenity~'^(post_office|internet_cafe)$'];way[amenity~'^(post_office|internet_cafe)$'];relation[amenity~'^(post_office|internet_cafe)$'];);",
+        "16": "(node[amenity~'^(post_office|internet_cafe|post_box|telephone)$'];way[amenity~'^(post_office|internet_cafe)$'];relation[amenity~'^(post_office|internet_cafe)$'];);"
     },
     "minZoom": 13,
     "feature": {
diff --git a/cycle_routes.json b/cycle_routes.json
index f8be9f4..a6c55dc 100644
--- a/cycle_routes.json
+++ b/cycle_routes.json
@@ -11,9 +11,8 @@
         "style": {
             "color": "{% if tags.network=='icn' %}#ff0000{% elseif tags.network=='ncn' %}#ff007f{% elseif tags.network=='rcn' %}#7f00ff{% else %}#0000ff{% endif %}",
             "weight": 4,
-            "opacity": 1.0
+            "opacity": 1
         },
         "priority": "{% if tags.network=='icn' %}0{% elseif tags.network=='ncn' %}1{% elseif tags.network=='rcn' %}2{% else %}3{% endif %}"
     }
 }
-
diff --git a/education.json b/education.json
index 1d92afa..6f7dc84 100644
--- a/education.json
+++ b/education.json
@@ -1,9 +1,9 @@
 {
     "type": "overpass",
     "query": {
-      "11": "(node[amenity~'^(college|university|library)$'];way[amenity~'^(college|university|library)$'];relation[amenity~'^(college|university|library)$'];)",
-      "14": "(node[amenity~'^(college|university|library|school|kindergarten|language_school)$'];way[amenity~'^(college|university|library|school|kindergarten|language_school)$'];relation[amenity~'^(college|university|library|school|kindergarten|language_school)$'];)",
-      "16": "(node[amenity~'^(college|university|library|school|kindergarten|public_bookcase)$'];way[amenity~'^(college|university|library|school|kindergarten|public_bookcase)$'];relation[amenity~'^(college|university|library|school|kindergarten|public_bookcase)$'];)"
+        "11": "(node[amenity~'^(college|university|library)$'];way[amenity~'^(college|university|library)$'];relation[amenity~'^(college|university|library)$'];)",
+        "14": "(node[amenity~'^(college|university|library|school|kindergarten|language_school)$'];way[amenity~'^(college|university|library|school|kindergarten|language_school)$'];relation[amenity~'^(college|university|library|school|kindergarten|language_school)$'];)",
+        "16": "(node[amenity~'^(college|university|library|school|kindergarten|public_bookcase)$'];way[amenity~'^(college|university|library|school|kindergarten|public_bookcase)$'];relation[amenity~'^(college|university|library|school|kindergarten|public_bookcase)$'];)"
     },
     "minZoom": 11,
     "feature": {
@@ -13,5 +13,3 @@
         "priority": "{% if tags.amenity == 'university' %}0{% elseif tags.amenity == 'college' %}1{% elseif tags.amenity == 'library' %}2{% elseif tags.amenity == 'school' or tags.amenity == 'language_school' %}3{% elseif tags.amenity == 'kindergarten' %}4{% elseif tags.amenity == 'public_bookcase' %}5{% endif %}"
     }
 }
-
-
diff --git a/leisure.json b/leisure.json
index f3640b3..fc93d56 100644
--- a/leisure.json
+++ b/leisure.json
@@ -1,8 +1,8 @@
 {
     "type": "overpass",
     "query": {
-      "14": "(way[leisure~'^(park|common)$'];relation[leisure='^(park|common)$'];)",
-      "16": "(node[amenity~'^(bench|swimming_pool)$'];way[leisure~'^(park|common|nature_reserve|swimming_pool)$'];relation[leisure='^(park|common|nature_reserve|swimming_pool)$'];)"
+        "14": "(way[leisure~'^(park|common)$'];relation[leisure='^(park|common)$'];)",
+        "16": "(node[amenity~'^(bench|swimming_pool)$'];way[leisure~'^(park|common|nature_reserve|swimming_pool)$'];relation[leisure='^(park|common|nature_reserve|swimming_pool)$'];)"
     },
     "minZoom": 14,
     "feature": {
diff --git a/public.json b/public.json
index b9a3763..8d20812 100644
--- a/public.json
+++ b/public.json
@@ -1,8 +1,8 @@
 {
     "type": "overpass",
     "query": {
-      "12": "(node[amenity~'^(court_house|embassy|public_building|townhall)$'];way[amenity~'^(court_house|embassy|public_building|townhall)$'];relation[amenity~'^(court_house|embassy|public_building|townhall)$'];node[amenity=recycling][recyling_type=centre];way[amenity=recycling][recyling_type=centre];relation[amenity=recycling][recyling_type=centre];);",
-      "16": "(node[amenity~'^(court_house|embassy|public_building|townhall|clock|drinking_water|recycling)$'];way[amenity~'^(court_house|embassy|public_building|townhall|recycling)$'];relation[amenity~'^(court_house|embassy|public_building|townhall|recycling)$'];node[drinking_water]);"
+        "12": "(node[amenity~'^(court_house|embassy|public_building|townhall)$'];way[amenity~'^(court_house|embassy|public_building|townhall)$'];relation[amenity~'^(court_house|embassy|public_building|townhall)$'];node[amenity=recycling][recyling_type=centre];way[amenity=recycling][recyling_type=centre];relation[amenity=recycling][recyling_type=centre];);",
+        "16": "(node[amenity~'^(court_house|embassy|public_building|townhall|clock|drinking_water|recycling)$'];way[amenity~'^(court_house|embassy|public_building|townhall|recycling)$'];relation[amenity~'^(court_house|embassy|public_building|townhall|recycling)$'];node[drinking_water]);"
     },
     "minZoom": 12,
     "feature": {
@@ -12,5 +12,3 @@
         "description": "{{ tagTrans('amenity', tags.amenity) }}"
     }
 }
-
-
diff --git a/shop.json b/shop.json
index 15a5a57..054254e 100644
--- a/shop.json
+++ b/shop.json
@@ -10,7 +10,6 @@
         "body": "{{ tagTransList('shop', tags.shop) }}",
         "description": "{{ tagTransList('shop', tags.shop) }}",
         "markerSign": "{% set c = current.sign %}{% if c|slice(0, 3) == 'fa-' %}<i class=\"fa {{ c }}\"></i>{% else %}{{ c|raw }}{% endif %}",
-        "__": "need better icons for: bakery, butcher, cheese, ice_cream, ",
         "__": "no icons for: brewing_supplies, charity, second_hand, variety_store"
     },
     "const": {
@@ -19,67 +18,119 @@
         },
         "shops": [
             {
-                "types": [ "alcohol", "beverages" ],
+                "types": [
+                    "alcohol",
+                    "beverages"
+                ],
                 "sign": "fa-beer"
             },
             {
-                "types": [ "baby_goods" ],
+                "types": [
+                    "baby_goods"
+                ],
                 "sign": "&#128700;"
             },
             {
-                "types": [ "bag", "general" ],
+                "types": [
+                    "bag",
+                    "general"
+                ],
                 "sign": "fa-shopping-bag"
             },
             {
-                "types": [ "bakery", "confectionery", "pastry" ],
+                "types": [
+                    "bakery",
+                    "confectionery",
+                    "pastry"
+                ],
                 "sign": "fa-birthday-cake"
             },
             {
-                "types": [ "boutique", "clothes", "fabric", "fashion", "leather", "sewing", "tailor" ],
+                "types": [
+                    "boutique",
+                    "clothes",
+                    "fabric",
+                    "fashion",
+                    "leather",
+                    "sewing",
+                    "tailor"
+                ],
                 "sign": "&#128090;"
             },
             {
-                "types": [ "butcher", "cheese", "chocolate", "deli", "dairy", "farm", "greengrocer", "pasta", "spices" ],
+                "types": [
+                    "butcher",
+                    "cheese",
+                    "chocolate",
+                    "deli",
+                    "dairy",
+                    "farm",
+                    "greengrocer",
+                    "pasta",
+                    "spices"
+                ],
                 "sign": "fa-cutlery"
             },
             {
-                 "types": [ "coffee", "tea" ],
-                 "sign": "fa-coffee"
+                "types": [
+                    "coffee",
+                    "tea"
+                ],
+                "sign": "fa-coffee"
             },
             {
-                "types": [ "convenience" ],
+                "types": [
+                    "convenience"
+                ],
                 "sign": "fa-shopping-basket"
             },
             {
-                "types": [ "department_store", "mall" ],
+                "types": [
+                    "department_store",
+                    "mall"
+                ],
                 "sign": "fa-building"
             },
             {
-                "types":  [ "hairdresser" ],
+                "types": [
+                    "hairdresser"
+                ],
                 "sign": "&#128113;"
             },
             {
-                "types": [ "ice_cream" ],
+                "types": [
+                    "ice_cream"
+                ],
                 "sign": "&#127848;"
             },
             {
-                "types": [ "jewelry" ],
+                "types": [
+                    "jewelry"
+                ],
                 "sign": "&#128141;"
             },
             {
-                "types": [ "kiosk" ],
+                "types": [
+                    "kiosk"
+                ],
                 "sign": "fa-newspaper-o"
             },
             {
-                "types": [ "shoes" ],
+                "types": [
+                    "shoes"
+                ],
                 "sign": "&#128095;"
             },
             {
-                "types": [ "supermarket" ],
+                "types": [
+                    "supermarket"
+                ],
                 "sign": "fa-shopping-cart"
             },
             {
-                "types": [ "watches" ],
+                "types": [
+                    "watches"
+                ],
                 "sign": "&#8986;"
             }
         ]