Remove nested filters and fix ramps

This commit is contained in:
Lukas Martinelli 2017-01-10 17:52:08 +01:00
parent 8daa75e986
commit 38a95e0d8f

View File

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