revert some of the changes

This commit is contained in:
vcoppe
2026-05-25 10:40:38 +02:00
parent 443feb2bfa
commit 4b447a9b9d
+465 -2
View File
@@ -48,6 +48,33 @@
4, 4,
20, 20,
15 15
]
}
},
{
"id": "tunnel_service_track_casing",
"type": "line",
"source": "openmaptiles",
"source-layer": "transportation",
"filter": [
"all",
["==", ["get", "brunnel"], "tunnel"],
["match", ["get", "class"], ["service", "track"], true, false]
],
"layout": {"line-join": "round"},
"paint": {
"line-color": "#cfcdca",
"line-dasharray": [0.5, 0.25],
"line-width": [
"interpolate",
["exponential", 1.2],
["zoom"],
15,
1,
16,
4,
20,
11
], ],
"line-opacity":[ "line-opacity":[
"interpolate", ["linear"], ["zoom"], "interpolate", ["linear"], ["zoom"],
@@ -118,6 +145,35 @@
] ]
} }
}, },
{
"id": "tunnel_secondary_tertiary_casing",
"type": "line",
"source": "openmaptiles",
"source-layer": "transportation",
"filter": [
"all",
["==", ["get", "brunnel"], "tunnel"],
["match", ["get", "class"], ["secondary", "tertiary"], true, false]
],
"layout": {"line-join": "round"},
"paint": {
"line-color": "#e9ac77",
"line-width": [
"interpolate",
["exponential", 1.2],
["zoom"],
8,
1.5,
20,
17
],
"line-opacity":[
"interpolate", ["linear"], ["zoom"],
13, 0.5,
15, 0.3
]
}
},
{ {
"id": "tunnel_trunk_primary_casing", "id": "tunnel_trunk_primary_casing",
"type": "line", "type": "line",
@@ -256,6 +312,37 @@
] ]
} }
}, },
{
"id": "tunnel_service_track",
"type": "line",
"source": "openmaptiles",
"source-layer": "transportation",
"filter": [
"all",
["==", ["get", "brunnel"], "tunnel"],
["match", ["get", "class"], ["service", "track"], true, false]
],
"layout": {"line-join": "round"},
"paint": {
"line-color": "#fff",
"line-width": [
"interpolate",
["exponential", 1.2],
["zoom"],
15.5,
0,
16,
2,
20,
7.5
],
"line-opacity":[
"interpolate", ["linear"], ["zoom"],
13, 0.5,
15, 0.3
]
}
},
{ {
"id": "tunnel_link", "id": "tunnel_link",
"type": "line", "type": "line",
@@ -289,6 +376,68 @@
] ]
} }
}, },
{
"id": "tunnel_minor",
"type": "line",
"source": "openmaptiles",
"source-layer": "transportation",
"filter": [
"all",
["==", ["get", "brunnel"], "tunnel"],
["match", ["get", "class"], ["minor"], true, false]
],
"layout": {"line-join": "round"},
"paint": {
"line-color": "#fff",
"line-width": [
"interpolate",
["exponential", 1.2],
["zoom"],
13.5,
0,
14,
2.5,
20,
11.5
],
"line-opacity":[
"interpolate", ["linear"], ["zoom"],
13, 0.5,
15, 0.3
]
}
},
{
"id": "tunnel_secondary_tertiary",
"type": "line",
"source": "openmaptiles",
"source-layer": "transportation",
"filter": [
"all",
["==", ["get", "brunnel"], "tunnel"],
["match", ["get", "class"], ["secondary", "tertiary"], true, false]
],
"layout": {"line-join": "round"},
"paint": {
"line-color": "#fff4c6",
"line-width": [
"interpolate",
["exponential", 1.2],
["zoom"],
6.5,
0,
7,
0.5,
20,
10
],
"line-opacity":[
"interpolate", ["linear"], ["zoom"],
13, 0.5,
15, 0.3
]
}
},
{ {
"id": "tunnel_trunk_primary", "id": "tunnel_trunk_primary",
"type": "line", "type": "line",
@@ -530,6 +679,37 @@
] ]
} }
}, },
{
"id": "road_service_track_casing",
"type": "line",
"source": "openmaptiles",
"source-layer": "transportation",
"filter": [
"all",
["match", ["get", "brunnel"], ["bridge", "tunnel"], false, true],
["match", ["get", "class"], ["service", "track"], true, false]
],
"layout": {"line-cap": "round", "line-join": "round"},
"paint": {
"line-color": ["match", ["get", "class"], ["service"], "#cfcdca", "hsl(40,70%,60%,70%)"],
"line-width": [
"interpolate",
["exponential", 1.2],
["zoom"],
12,
1,
15,
4,
20,
11
],
"line-opacity":[
"interpolate", ["linear"], ["zoom"],
13, 0.5,
15, 0.3
]
}
},
{ {
"id": "road_link_casing", "id": "road_link_casing",
"type": "line", "type": "line",
@@ -571,6 +751,68 @@
] ]
} }
}, },
{
"id": "road_minor_casing",
"type": "line",
"source": "openmaptiles",
"source-layer": "transportation",
"filter": [
"all",
[
"match",
["geometry-type"],
["LineString", "MultiLineString"],
true,
false
],
["match", ["get", "brunnel"], ["bridge", "tunnel"], false, true],
["match", ["get", "class"], ["minor"], true, false],
["!=", ["get", "ramp"], 1]
],
"layout": {"line-cap": "round", "line-join": "round"},
"paint": {
"line-color": "#cfcdca",
"line-opacity": ["interpolate", ["linear"], ["zoom"], 12, 0, 12.5, 1],
"line-width": [
"interpolate",
["exponential", 1.2],
["zoom"],
12,
0.5,
13,
1,
14,
4,
20,
20
]
}
},
{
"id": "road_secondary_tertiary_casing",
"type": "line",
"source": "openmaptiles",
"source-layer": "transportation",
"filter": [
"all",
["match", ["get", "brunnel"], ["bridge", "tunnel"], false, true],
["match", ["get", "class"], ["secondary", "tertiary"], true, false],
["!=", ["get", "ramp"], 1]
],
"layout": {"line-cap": "round", "line-join": "round"},
"paint": {
"line-color": "#e9ac77",
"line-width": [
"interpolate",
["exponential", 1.2],
["zoom"],
8,
1.5,
20,
17
]
}
},
{ {
"id": "road_trunk_primary_casing", "id": "road_trunk_primary_casing",
"type": "line", "type": "line",
@@ -784,6 +1026,75 @@
] ]
} }
}, },
{
"id": "road_minor",
"type": "line",
"source": "openmaptiles",
"source-layer": "transportation",
"filter": [
"all",
[
"match",
["geometry-type"],
["LineString", "MultiLineString"],
true,
false
],
["match", ["get", "brunnel"], ["bridge", "tunnel"], false, true],
["match", ["get", "class"], ["minor"], true, false]
],
"layout": {"line-cap": "round", "line-join": "round"},
"paint": {
"line-color": "#fff",
"line-width": [
"interpolate",
["exponential", 1.2],
["zoom"],
13.5,
0,
14,
2.5,
20,
18
],
"line-opacity":[
"interpolate", ["linear"], ["zoom"],
13, 0.5,
15, 0.3
]
}
},
{
"id": "road_secondary_tertiary",
"type": "line",
"source": "openmaptiles",
"source-layer": "transportation",
"filter": [
"all",
["match", ["get", "brunnel"], ["bridge", "tunnel"], false, true],
["match", ["get", "class"], ["secondary", "tertiary"], true, false]
],
"layout": {"line-cap": "round", "line-join": "round"},
"paint": {
"line-color": "#fea",
"line-width": [
"interpolate",
["exponential", 1.2],
["zoom"],
6.5,
0,
8,
0.5,
20,
13
],
"line-opacity":[
"interpolate", ["linear"], ["zoom"],
13, 0.5,
15, 0.3
]
}
},
{ {
"id": "road_trunk_primary", "id": "road_trunk_primary",
"type": "line", "type": "line",
@@ -1034,6 +1345,37 @@
] ]
} }
}, },
{
"id": "bridge_service_track_casing",
"type": "line",
"source": "openmaptiles",
"source-layer": "transportation",
"filter": [
"all",
["==", ["get", "brunnel"], "bridge"],
["match", ["get", "class"], ["service", "track"], true, false]
],
"layout": {"line-join": "round"},
"paint": {
"line-color": "#cfcdca",
"line-width": [
"interpolate",
["exponential", 1.2],
["zoom"],
15,
1,
16,
4,
20,
11
],
"line-opacity":[
"interpolate", ["linear"], ["zoom"],
13, 0.5,
15, 0.3
]
}
},
{ {
"id": "bridge_link_casing", "id": "bridge_link_casing",
"type": "line", "type": "line",
@@ -1132,6 +1474,35 @@
] ]
} }
}, },
{
"id": "bridge_secondary_tertiary_casing",
"type": "line",
"source": "openmaptiles",
"source-layer": "transportation",
"filter": [
"all",
["==", ["get", "brunnel"], "bridge"],
["match", ["get", "class"], ["secondary", "tertiary"], true, false]
],
"layout": {"line-join": "round"},
"paint": {
"line-color": "#e9ac77",
"line-width": [
"interpolate",
["exponential", 1.2],
["zoom"],
8,
1.5,
20,
17
],
"line-opacity":[
"interpolate", ["linear"], ["zoom"],
13, 0.5,
15, 0.3
]
}
},
{ {
"id": "bridge_trunk_primary_casing", "id": "bridge_trunk_primary_casing",
"type": "line", "type": "line",
@@ -1214,8 +1585,7 @@
false false
], ],
["==", ["get", "brunnel"], "bridge"], ["==", ["get", "brunnel"], "bridge"],
["match", ["get", "class"], ["path", "pedestrian"], true, false], ["match", ["get", "class"], ["path", "pedestrian"], true, false]
["match", ["get", "subclass"], ["path", "footway"], false, true]
], ],
"paint": { "paint": {
"line-color": "hsl(0,0%,100%)", "line-color": "hsl(0,0%,100%)",
@@ -1270,6 +1640,37 @@
] ]
} }
}, },
{
"id": "bridge_service_track",
"type": "line",
"source": "openmaptiles",
"source-layer": "transportation",
"filter": [
"all",
["==", ["get", "brunnel"], "bridge"],
["match", ["get", "class"], ["service", "track"], true, false]
],
"layout": {"line-join": "round"},
"paint": {
"line-color": "#fff",
"line-width": [
"interpolate",
["exponential", 1.2],
["zoom"],
15.5,
0,
16,
2,
20,
7.5
],
"line-opacity":[
"interpolate", ["linear"], ["zoom"],
13, 0.5,
15, 0.3
]
}
},
{ {
"id": "bridge_link", "id": "bridge_link",
"type": "line", "type": "line",
@@ -1303,6 +1704,68 @@
] ]
} }
}, },
{
"id": "bridge_street",
"type": "line",
"source": "openmaptiles",
"source-layer": "transportation",
"filter": [
"all",
["==", ["get", "brunnel"], "bridge"],
["match", ["get", "class"], ["minor"], true, false]
],
"layout": {"line-join": "round"},
"paint": {
"line-color": "#fff",
"line-width": [
"interpolate",
["exponential", 1.2],
["zoom"],
13.5,
0,
14,
2.5,
20,
18
],
"line-opacity":[
"interpolate", ["linear"], ["zoom"],
13, 0.5,
15, 0.3
]
}
},
{
"id": "bridge_secondary_tertiary",
"type": "line",
"source": "openmaptiles",
"source-layer": "transportation",
"filter": [
"all",
["==", ["get", "brunnel"], "bridge"],
["match", ["get", "class"], ["secondary", "tertiary"], true, false]
],
"layout": {"line-join": "round"},
"paint": {
"line-color": "#fea",
"line-width": [
"interpolate",
["exponential", 1.2],
["zoom"],
6.5,
0,
7,
0.5,
20,
10
],
"line-opacity":[
"interpolate", ["linear"], ["zoom"],
13, 0.5,
15, 0.3
]
}
},
{ {
"id": "bridge_trunk_primary", "id": "bridge_trunk_primary",
"type": "line", "type": "line",