From 38a95e0d8f852c76279ed8d923e2875757502f5e Mon Sep 17 00:00:00 2001
From: Lukas Martinelli <me@lukasmartinelli.ch>
Date: Tue, 10 Jan 2017 17:52:08 +0100
Subject: [PATCH] Remove nested filters and fix ramps

---
 style.json | 159 +++++++++++++++++++++++++++++++----------------------
 1 file changed, 92 insertions(+), 67 deletions(-)

diff --git a/style.json b/style.json
index 6c80287..29d9ede 100644
--- a/style.json
+++ b/style.json
@@ -740,18 +740,15 @@
           "LineString"
         ],
         [
-          "all",
-          [
-            "==",
-            "brunnel",
-            "tunnel"
-          ],
-          [
-            "in",
-            "class",
-            "path",
-            "pedestrian"
-          ]
+          "==",
+          "brunnel",
+          "tunnel"
+        ],
+        [
+          "in",
+          "class",
+          "path",
+          "pedestrian"
         ]
       ],
       "paint": {
@@ -1283,7 +1280,7 @@
         [
           "==",
           "class",
-          "motorway_link"
+          "motorway"
         ],
         [
           "==",
@@ -1383,9 +1380,17 @@
           "tunnel"
         ],
         [
-          "==",
+          "!in",
           "class",
-          "link"
+          "pedestrian",
+          "path",
+          "track",
+          "service"
+        ],
+        [
+          "==",
+          "ramp",
+          "1"
         ]
       ],
       "layout": {
@@ -1433,18 +1438,20 @@
           "LineString"
         ],
         [
-          "all",
-          [
-            "!in",
-            "brunnel",
-            "bridge",
-            "tunnel"
-          ],
-          [
-            "in",
-            "class",
-            "minor"
-          ]
+          "!in",
+          "brunnel",
+          "bridge",
+          "tunnel"
+        ],
+        [
+          "in",
+          "class",
+          "minor"
+        ],
+        [
+          "!=",
+          "ramp",
+          "1"
         ]
       ],
       "layout": {
@@ -1507,6 +1514,11 @@
           "class",
           "secondary",
           "tertiary"
+        ],
+        [
+          "!=",
+          "ramp",
+          1
         ]
       ],
       "layout": {
@@ -1551,6 +1563,11 @@
           "class",
           "primary",
           "trunk"
+        ],
+        [
+          "!=",
+          "ramp",
+          1
         ]
       ],
       "layout": {
@@ -1603,6 +1620,11 @@
           "==",
           "class",
           "motorway"
+        ],
+        [
+          "!=",
+          "ramp",
+          "1"
         ]
       ],
       "layout": {
@@ -1650,19 +1672,16 @@
           "LineString"
         ],
         [
-          "all",
-          [
-            "!in",
-            "brunnel",
-            "bridge",
-            "tunnel"
-          ],
-          [
-            "in",
-            "class",
-            "path",
-            "pedestrian"
-          ]
+          "!in",
+          "brunnel",
+          "bridge",
+          "tunnel"
+        ],
+        [
+          "in",
+          "class",
+          "path",
+          "pedestrian"
         ]
       ],
       "layout": {
@@ -1731,7 +1750,7 @@
         [
           "==",
           "class",
-          "motorway_link"
+          "motorway"
         ],
         [
           "==",
@@ -1833,6 +1852,14 @@
           "==",
           "ramp",
           1
+        ],
+        [
+          "!in",
+          "class",
+          "pedestrian",
+          "path",
+          "track",
+          "service"
         ]
       ],
       "layout": {
@@ -2007,6 +2034,11 @@
           "==",
           "class",
           "motorway"
+        ],
+        [
+          "!=",
+          "ramp",
+          1
         ]
       ],
       "layout": {
@@ -2374,18 +2406,15 @@
           "LineString"
         ],
         [
-          "all",
-          [
-            "==",
-            "brunnel",
-            "bridge"
-          ],
-          [
-            "in",
-            "class",
-            "path",
-            "pedestrian"
-          ]
+          "==",
+          "brunnel",
+          "bridge"
+        ],
+        [
+          "in",
+          "class",
+          "path",
+          "pedestrian"
         ]
       ],
       "layout": {
@@ -2563,18 +2592,15 @@
           "LineString"
         ],
         [
-          "all",
-          [
-            "==",
-            "brunnel",
-            "bridge"
-          ],
-          [
-            "in",
-            "class",
-            "path",
-            "pedestrian"
-          ]
+          "==",
+          "brunnel",
+          "bridge"
+        ],
+        [
+          "in",
+          "class",
+          "path",
+          "pedestrian"
         ]
       ],
       "paint": {
@@ -2778,8 +2804,7 @@
         [
           "in",
           "class",
-          "street",
-          "street_limited"
+          "minor"
         ]
       ],
       "layout": {