From 1fe5e1e9be18d52f0fed3d09cd8efbbe02a4d939 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stephan=20B=C3=B6sch-Plepelits?= Date: Tue, 6 Feb 2018 22:24:44 +0100 Subject: [PATCH] lint - order names by language code - order queries by zoom level - end files with newline --- buildings.json | 4 ++-- car_maxspeed.json | 2 +- children.json | 2 +- communication.json | 2 +- cycle_amenities.json | 4 ++-- education.json | 2 +- emergency.json | 2 +- financial.json | 2 +- health.json | 2 +- hiking_routes.json | 4 ++-- historic.json | 2 +- index.json | 3 ++- natural.json | 14 +++++++------- pt_routes.json | 6 +++--- public.json | 2 +- railway-infrastructure.json | 4 ++-- tourism_attractions.json | 2 +- tourism_services.json | 2 +- walk_amenities.json | 4 ++-- water.json | 6 +++--- 20 files changed, 36 insertions(+), 35 deletions(-) diff --git a/buildings.json b/buildings.json index 5eb9cb3..ff4f674 100644 --- a/buildings.json +++ b/buildings.json @@ -1,8 +1,8 @@ { "type": "overpass", "name": { - "en": "Buildings", - "de": "Gebäude" + "de": "Gebäude", + "en": "Buildings" }, "query": { "16": [ diff --git a/car_maxspeed.json b/car_maxspeed.json index 3ca53a8..22741b0 100644 --- a/car_maxspeed.json +++ b/car_maxspeed.json @@ -5,8 +5,8 @@ }, "query": { "11": "way[highway~\"^(motorway|trunk)$\"];", - "15": "way[highway~\"^(motorway|motorway_link|trunk|trunk_link|primary|primary_link|secondary|secondary_link|tertiary|tertiary_link|residential|unclassified)$\"];", "13": "way[highway~\"^(motorway|motorway_link|trunk|trunk_link|primary|primary_link|secondary|tertiary)$\"];", + "15": "way[highway~\"^(motorway|motorway_link|trunk|trunk_link|primary|primary_link|secondary|secondary_link|tertiary|tertiary_link|residential|unclassified)$\"];", "17": "way[highway~\"^(motorway|motorway_link|trunk|trunk_link|primary|primary_link|secondary|secondary_link|tertiary|tertiary_link|residential|unclassified|service|living_street|pedestrian|track|road)$\"];" }, "feature": { diff --git a/children.json b/children.json index a093ffc..0bcbd72 100644 --- a/children.json +++ b/children.json @@ -79,4 +79,4 @@ " ", "" ] -} \ No newline at end of file +} diff --git a/communication.json b/communication.json index 1dce461..1762ae3 100644 --- a/communication.json +++ b/communication.json @@ -73,4 +73,4 @@ "zoom": 16 } } -} \ No newline at end of file +} diff --git a/cycle_amenities.json b/cycle_amenities.json index 22332c2..0d49ce6 100644 --- a/cycle_amenities.json +++ b/cycle_amenities.json @@ -1,8 +1,8 @@ { "type": "overpass", "name": { - "en": "Amenities", - "de": "Einrichtungen" + "de": "Einrichtungen", + "en": "Amenities" }, "query": { "13": [ diff --git a/education.json b/education.json index 86455f0..32b40a9 100644 --- a/education.json +++ b/education.json @@ -104,4 +104,4 @@ "zoom": 16 } } -} \ No newline at end of file +} diff --git a/emergency.json b/emergency.json index 062f4ad..f4e091e 100644 --- a/emergency.json +++ b/emergency.json @@ -72,4 +72,4 @@ "sign": "📞" } } -} \ No newline at end of file +} diff --git a/financial.json b/financial.json index 3f6a114..c8d47b4 100644 --- a/financial.json +++ b/financial.json @@ -61,4 +61,4 @@ "zoom": 15 } } -} \ No newline at end of file +} diff --git a/health.json b/health.json index 5995c6a..50b14b8 100644 --- a/health.json +++ b/health.json @@ -85,4 +85,4 @@ "social_facility": "", "veterinary": "" } -} \ No newline at end of file +} diff --git a/hiking_routes.json b/hiking_routes.json index 3c21642..c2cea7f 100644 --- a/hiking_routes.json +++ b/hiking_routes.json @@ -1,8 +1,8 @@ { "type": "overpass", "name": { - "en": "Hiking routes", - "de": "Wanderrouten" + "de": "Wanderrouten", + "en": "Hiking routes" }, "query": { "10": "relation[type=route][route=hiking][network~\"^(iwn)$\"]", diff --git a/historic.json b/historic.json index 07ce57a..19eb553 100644 --- a/historic.json +++ b/historic.json @@ -79,4 +79,4 @@ "zoom": 14 } } -} \ No newline at end of file +} diff --git a/index.json b/index.json index 9625293..cb865d7 100644 --- a/index.json +++ b/index.json @@ -278,5 +278,6 @@ } ] } - ] + ], + "name": {} } diff --git a/natural.json b/natural.json index fec35a4..cb78e28 100644 --- a/natural.json +++ b/natural.json @@ -20,19 +20,19 @@ "node[natural~\"^(peak|volcano)$\"];", ")" ], - "16": [ - "(", - "node[natural];", - "way[natural];", - "relation[natural];", - ")" - ], "13": [ "(", "node[natural~\"^(peak|volcano|wood|scrub|heath|grassland|fell|bare_rock|scree|shingle|sand|mud|water|wetland|glacier|bay|cape|beach|coastline|spring|hot_spring|geyser|valley|ridge|arete|cliff|saddle|rock|stone|sinkhole|cave_entrance)$\"];", "way[natural~\"^(peak|volcano|wood|scrub|heath|grassland|fell|bare_rock|scree|shingle|sand|mud|water|wetland|glacier|bay|cape|beach|coastline|spring|hot_spring|geyser|valley|ridge|arete|cliff|saddle|rock|stone|sinkhole|cave_entrance)$\"];", "relation[natural~\"^(peak|volcano|wood|scrub|heath|grassland|fell|bare_rock|scree|shingle|sand|mud|water|wetland|glacier|bay|cape|beach|coastline|spring|hot_spring|geyser|valley|ridge|arete|cliff|saddle|rock|stone|sinkhole|cave_entrance)$\"];", ")" + ], + "16": [ + "(", + "node[natural];", + "way[natural];", + "relation[natural];", + ")" ] }, "feature": { diff --git a/pt_routes.json b/pt_routes.json index 22fbb66..eed3ac9 100644 --- a/pt_routes.json +++ b/pt_routes.json @@ -1,8 +1,8 @@ { "type": "overpass", "name": { - "en": "Routes", - "de": "Routen" + "de": "Routen", + "en": "Routes" }, "query": { "12": "relation[type=route][route~\"^(subway|monorail|ferry|train)$\"];", @@ -76,4 +76,4 @@ "color": "#007fff" } } -} \ No newline at end of file +} diff --git a/public.json b/public.json index 2c53457..548bccd 100644 --- a/public.json +++ b/public.json @@ -72,4 +72,4 @@ "toilets": "", "townhall": "" } -} \ No newline at end of file +} diff --git a/railway-infrastructure.json b/railway-infrastructure.json index b68a5b3..f2876ae 100644 --- a/railway-infrastructure.json +++ b/railway-infrastructure.json @@ -1,8 +1,8 @@ { "type": "overpass", "name": { - "en": "Railway infrastructure", - "de": "Eisenbahn Infrastruktur" + "de": "Eisenbahn Infrastruktur", + "en": "Railway infrastructure" }, "query": { "11": "(way[railway=rail][usage~'^(main|branch)$'];node[railway~'^(station)$'];)", diff --git a/tourism_attractions.json b/tourism_attractions.json index f1226a6..5409208 100644 --- a/tourism_attractions.json +++ b/tourism_attractions.json @@ -52,4 +52,4 @@ "zoo": "🦁", "other": "" } -} \ No newline at end of file +} diff --git a/tourism_services.json b/tourism_services.json index 5deadcf..14b0c3b 100644 --- a/tourism_services.json +++ b/tourism_services.json @@ -95,4 +95,4 @@ "zoom": 16 } } -} \ No newline at end of file +} diff --git a/walk_amenities.json b/walk_amenities.json index 2ce5e87..52959f7 100644 --- a/walk_amenities.json +++ b/walk_amenities.json @@ -1,8 +1,8 @@ { "type": "overpass", "name": { - "en": "Amenities", - "de": "Einrichtungen" + "de": "Einrichtungen", + "en": "Amenities" }, "query": { "13": [ diff --git a/water.json b/water.json index accb122..1df53ae 100644 --- a/water.json +++ b/water.json @@ -1,8 +1,8 @@ { "type": "overpass", "name": { - "en": "Waterbodies", - "de": "Gewässer" + "de": "Gewässer", + "en": "Waterbodies" }, "query": { "10": [ @@ -116,4 +116,4 @@ " ", "" ] -} \ No newline at end of file +}