diff --git a/services/frontend/www-app/src/components/BaseMap.vue b/services/frontend/www-app/src/components/BaseMap.vue index e2e9c8aa4..9f11040a6 100644 --- a/services/frontend/www-app/src/components/BaseMap.vue +++ b/services/frontend/www-app/src/components/BaseMap.vue @@ -607,7 +607,7 @@ export default defineComponent({ } // Add 3-D buildings - const render3DZoomLevel = 17; + const render3DZoomLevel = 16; type LerpableValue = | maplibregl.ExpressionSpecification | maplibregl.ColorSpecification diff --git a/services/tileserver/styles/basic/style.json b/services/tileserver/styles/basic/style.json index e77e927d4..188c126da 100644 --- a/services/tileserver/styles/basic/style.json +++ b/services/tileserver/styles/basic/style.json @@ -24,14 +24,22 @@ { "id": "background", "type": "background", - "paint": {"background-color": "rgb(241,239,231)"} + "paint": { "background-color": "rgb(241,239,231)" } }, { "id": "natural_earth", "type": "raster", "source": "natural_earth_shaded_relief", "maxzoom": 6, - "paint": {"raster-opacity": {"base": 1.5, "stops": [[0, 0.6], [6, 0.1]]}} + "paint": { + "raster-opacity": { + "base": 1.5, + "stops": [ + [0, 0.6], + [6, 0.1] + ] + } + } }, { "id": "park", @@ -39,7 +47,7 @@ "source": "openmaptiles", "source-layer": "park", "paint": { - "fill-color": "#d8e8c8", + "fill-color": "hsl(101,62.6%,63.3%)", "fill-opacity": 0.7, "fill-outline-color": "rgba(95, 208, 100, 1)" } @@ -51,7 +59,7 @@ "source-layer": "park", "paint": { "line-dasharray": [1, 1.5], - "line-color": "rgba(228, 241, 215, 1)" + "line-color": "rgb(228, 241, 215)" } }, { @@ -79,8 +87,8 @@ "filter": ["all", ["==", "class", "wood"]], "paint": { "fill-antialias": false, - "fill-color": "hsla(98, 61%, 72%, 0.7)", - "fill-opacity": 0.4 + "fill-color": "hsl(101,62.6%,43.3%)", + "fill-opacity": 0.3 } }, { @@ -91,8 +99,8 @@ "filter": ["all", ["==", "class", "grass"]], "paint": { "fill-antialias": false, - "fill-color": "rgba(176, 213, 154, 1)", - "fill-opacity": 0.3 + "fill-color": "hsl(101,62.6%,63.3%)", + "fill-opacity": 0.5 } }, { @@ -113,7 +121,7 @@ "source": "openmaptiles", "source-layer": "landuse", "filter": ["==", "class", "cemetery"], - "paint": {"fill-color": "hsl(75, 37%, 81%)"} + "paint": { "fill-color": "hsl(75, 37%, 81%)" } }, { "id": "landuse_hospital", @@ -121,7 +129,7 @@ "source": "openmaptiles", "source-layer": "landuse", "filter": ["==", "class", "hospital"], - "paint": {"fill-color": "#fde"} + "paint": { "fill-color": "#fde" } }, { "id": "landuse_school", @@ -129,7 +137,7 @@ "source": "openmaptiles", "source-layer": "landuse", "filter": ["==", "class", "school"], - "paint": {"fill-color": "rgb(236,238,204)"} + "paint": { "fill-color": "rgb(236,238,204)" } }, { "id": "waterway_tunnel", @@ -138,11 +146,22 @@ "source-layer": "waterway", "filter": ["all", ["==", "brunnel", "tunnel"]], "paint": { - "line-color": "#a0c8f0", + "line-color": "rgb(141,220,248)", "line-dasharray": [3, 3], - "line-gap-width": {"stops": [[12, 0], [20, 6]]}, + "line-gap-width": { + "stops": [ + [12, 0], + [20, 6] + ] + }, "line-opacity": 1, - "line-width": {"base": 1.4, "stops": [[8, 1], [20, 2]]} + "line-width": { + "base": 1.4, + "stops": [ + [8, 1], + [20, 2] + ] + } } }, { @@ -151,7 +170,7 @@ "source": "openmaptiles", "source-layer": "landcover", "filter": ["all", ["==", "class", "sand"]], - "paint": {"fill-color": "rgba(247, 239, 195, 1)"} + "paint": { "fill-color": "rgba(247, 239, 195, 1)" } }, { "id": "water", @@ -159,7 +178,7 @@ "source": "openmaptiles", "source-layer": "water", "filter": ["all", ["!=", "brunnel", "tunnel"]], - "paint": {"fill-color": "rgb(141,220,248)"} + "paint": { "fill-color": "rgb(141,220,248)" } }, { "id": "waterway_river", @@ -167,10 +186,16 @@ "source": "openmaptiles", "source-layer": "waterway", "filter": ["all", ["==", "class", "river"], ["!=", "brunnel", "tunnel"]], - "layout": {"line-cap": "round"}, + "layout": { "line-cap": "round" }, "paint": { - "line-color": "#a0c8f0", - "line-width": {"base": 1.2, "stops": [[11, 0.5], [20, 6]]} + "line-color": "rgb(141,220,248)", + "line-width": { + "base": 1.2, + "stops": [ + [11, 0.5], + [20, 6] + ] + } } }, { @@ -179,10 +204,16 @@ "source": "openmaptiles", "source-layer": "waterway", "filter": ["all", ["!=", "class", "river"], ["!=", "brunnel", "tunnel"]], - "layout": {"line-cap": "round"}, + "layout": { "line-cap": "round" }, "paint": { - "line-color": "#a0c8f0", - "line-width": {"base": 1.3, "stops": [[13, 0.5], [20, 6]]} + "line-color": "rgb(141,220,248)", + "line-width": { + "base": 1.3, + "stops": [ + [13, 0.5], + [20, 6] + ] + } } }, { @@ -192,7 +223,7 @@ "source-layer": "aeroway", "minzoom": 11, "filter": ["==", "$type", "Polygon"], - "paint": {"fill-color": "rgba(229, 228, 224, 1)", "fill-opacity": 0.7} + "paint": { "fill-color": "rgba(229, 228, 224, 1)", "fill-opacity": 0.7 } }, { "id": "aeroway_runway", @@ -207,7 +238,13 @@ ], "paint": { "line-color": "#f0ede9", - "line-width": {"base": 1.2, "stops": [[11, 3], [20, 16]]} + "line-width": { + "base": 1.2, + "stops": [ + [11, 3], + [20, 16] + ] + } } }, { @@ -223,7 +260,13 @@ ], "paint": { "line-color": "#f0ede9", - "line-width": {"base": 1.2, "stops": [[11, 0.5], [20, 6]]} + "line-width": { + "base": 1.2, + "stops": [ + [11, 0.5], + [20, 6] + ] + } } }, { @@ -237,13 +280,18 @@ ["==", "ramp", 1], ["==", "brunnel", "tunnel"] ], - "layout": {"line-join": "round"}, + "layout": { "line-join": "round" }, "paint": { "line-color": "#e9ac77", "line-dasharray": [0.5, 0.25], "line-width": { "base": 1.2, - "stops": [[12, 1], [13, 3], [14, 4], [20, 15]] + "stops": [ + [12, 1], + [13, 3], + [14, 4], + [20, 15] + ] } } }, @@ -257,11 +305,18 @@ ["==", "brunnel", "tunnel"], ["in", "class", "service", "track"] ], - "layout": {"line-join": "round"}, + "layout": { "line-join": "round" }, "paint": { "line-color": "#cfcdca", "line-dasharray": [0.5, 0.25], - "line-width": {"base": 1.2, "stops": [[15, 1], [16, 4], [20, 11]]} + "line-width": { + "base": 1.2, + "stops": [ + [15, 1], + [16, 4], + [20, 11] + ] + } } }, { @@ -270,12 +325,17 @@ "source": "openmaptiles", "source-layer": "transportation", "filter": ["all", ["==", "ramp", 1], ["==", "brunnel", "tunnel"]], - "layout": {"line-join": "round"}, + "layout": { "line-join": "round" }, "paint": { "line-color": "#e9ac77", "line-width": { "base": 1.2, - "stops": [[12, 1], [13, 3], [14, 4], [20, 15]] + "stops": [ + [12, 1], + [13, 3], + [14, 4], + [20, 15] + ] } } }, @@ -289,13 +349,23 @@ ["==", "brunnel", "tunnel"], ["in", "class", "street", "street_limited"] ], - "layout": {"line-join": "round"}, + "layout": { "line-join": "round" }, "paint": { "line-color": "#cfcdca", - "line-opacity": {"stops": [[12, 0], [12.5, 1]]}, + "line-opacity": { + "stops": [ + [12, 0], + [12.5, 1] + ] + }, "line-width": { "base": 1.2, - "stops": [[12, 0.5], [13, 1], [14, 4], [20, 15]] + "stops": [ + [12, 0.5], + [13, 1], + [14, 4], + [20, 15] + ] } } }, @@ -309,10 +379,16 @@ ["==", "brunnel", "tunnel"], ["in", "class", "secondary", "tertiary"] ], - "layout": {"line-join": "round"}, + "layout": { "line-join": "round" }, "paint": { "line-color": "#e9ac77", - "line-width": {"base": 1.2, "stops": [[8, 1.5], [20, 17]]} + "line-width": { + "base": 1.2, + "stops": [ + [8, 1.5], + [20, 17] + ] + } } }, { @@ -325,12 +401,17 @@ ["==", "brunnel", "tunnel"], ["in", "class", "primary", "trunk"] ], - "layout": {"line-join": "round"}, + "layout": { "line-join": "round" }, "paint": { "line-color": "#e9ac77", "line-width": { "base": 1.2, - "stops": [[5, 0.4], [6, 0.7], [7, 1.75], [20, 22]] + "stops": [ + [5, 0.4], + [6, 0.7], + [7, 1.75], + [20, 22] + ] } } }, @@ -345,13 +426,18 @@ ["!=", "ramp", 1], ["==", "brunnel", "tunnel"] ], - "layout": {"line-join": "round"}, + "layout": { "line-join": "round" }, "paint": { "line-color": "#e9ac77", "line-dasharray": [0.5, 0.25], "line-width": { "base": 1.2, - "stops": [[5, 0.4], [6, 0.7], [7, 1.75], [20, 22]] + "stops": [ + [5, 0.4], + [6, 0.7], + [7, 1.75], + [20, 22] + ] } } }, @@ -369,7 +455,13 @@ "paint": { "line-color": "hsl(0, 0%, 100%)", "line-dasharray": [1, 0.75], - "line-width": {"base": 1.2, "stops": [[14, 0.5], [20, 10]]} + "line-width": { + "base": 1.2, + "stops": [ + [14, 0.5], + [20, 10] + ] + } } }, { @@ -383,12 +475,17 @@ ["==", "ramp", 1], ["==", "brunnel", "tunnel"] ], - "layout": {"line-join": "round"}, + "layout": { "line-join": "round" }, "paint": { "line-color": "#fc8", "line-width": { "base": 1.2, - "stops": [[12.5, 0], [13, 1.5], [14, 2.5], [20, 11.5]] + "stops": [ + [12.5, 0], + [13, 1.5], + [14, 2.5], + [20, 11.5] + ] } } }, @@ -402,10 +499,17 @@ ["==", "brunnel", "tunnel"], ["in", "class", "service", "track"] ], - "layout": {"line-join": "round"}, + "layout": { "line-join": "round" }, "paint": { "line-color": "#fff", - "line-width": {"base": 1.2, "stops": [[15.5, 0], [16, 2], [20, 7.5]]} + "line-width": { + "base": 1.2, + "stops": [ + [15.5, 0], + [16, 2], + [20, 7.5] + ] + } } }, { @@ -414,12 +518,17 @@ "source": "openmaptiles", "source-layer": "transportation", "filter": ["all", ["==", "ramp", 1], ["==", "brunnel", "tunnel"]], - "layout": {"line-join": "round"}, + "layout": { "line-join": "round" }, "paint": { "line-color": "#fff4c6", "line-width": { "base": 1.2, - "stops": [[12.5, 0], [13, 1.5], [14, 2.5], [20, 11.5]] + "stops": [ + [12.5, 0], + [13, 1.5], + [14, 2.5], + [20, 11.5] + ] } } }, @@ -429,10 +538,17 @@ "source": "openmaptiles", "source-layer": "transportation", "filter": ["all", ["==", "brunnel", "tunnel"], ["in", "class", "minor"]], - "layout": {"line-join": "round"}, + "layout": { "line-join": "round" }, "paint": { "line-color": "#fff", - "line-width": {"base": 1.2, "stops": [[13.5, 0], [14, 2.5], [20, 11.5]]} + "line-width": { + "base": 1.2, + "stops": [ + [13.5, 0], + [14, 2.5], + [20, 11.5] + ] + } } }, { @@ -445,10 +561,17 @@ ["==", "brunnel", "tunnel"], ["in", "class", "secondary", "tertiary"] ], - "layout": {"line-join": "round"}, + "layout": { "line-join": "round" }, "paint": { "line-color": "#fff4c6", - "line-width": {"base": 1.2, "stops": [[6.5, 0], [7, 0.5], [20, 10]]} + "line-width": { + "base": 1.2, + "stops": [ + [6.5, 0], + [7, 0.5], + [20, 10] + ] + } } }, { @@ -461,10 +584,17 @@ ["==", "brunnel", "tunnel"], ["in", "class", "primary", "trunk"] ], - "layout": {"line-join": "round"}, + "layout": { "line-join": "round" }, "paint": { "line-color": "#fff4c6", - "line-width": {"base": 1.2, "stops": [[5, 0], [7, 1], [20, 18]]} + "line-width": { + "base": 1.2, + "stops": [ + [5, 0], + [7, 1], + [20, 18] + ] + } } }, { @@ -478,10 +608,17 @@ ["!=", "ramp", 1], ["==", "brunnel", "tunnel"] ], - "layout": {"line-join": "round"}, + "layout": { "line-join": "round" }, "paint": { "line-color": "#ffdaa6", - "line-width": {"base": 1.2, "stops": [[5, 0], [7, 1], [20, 18]]} + "line-width": { + "base": 1.2, + "stops": [ + [5, 0], + [7, 1], + [20, 18] + ] + } } }, { @@ -492,7 +629,14 @@ "filter": ["all", ["==", "brunnel", "tunnel"], ["in", "class", "rail"]], "paint": { "line-color": "#bbb", - "line-width": {"base": 1.4, "stops": [[14, 0.4], [15, 0.75], [20, 2]]} + "line-width": { + "base": 1.4, + "stops": [ + [14, 0.4], + [15, 0.75], + [20, 2] + ] + } } }, { @@ -504,7 +648,14 @@ "paint": { "line-color": "#bbb", "line-dasharray": [0.2, 8], - "line-width": {"base": 1.4, "stops": [[14.5, 0], [15, 3], [20, 8]]} + "line-width": { + "base": 1.4, + "stops": [ + [14.5, 0], + [15, 3], + [20, 8] + ] + } } }, { @@ -519,7 +670,14 @@ ], "paint": { "line-color": "#bbb", - "line-width": {"base": 1.4, "stops": [[14, 0.4], [15, 0.75], [20, 2]]} + "line-width": { + "base": 1.4, + "stops": [ + [14, 0.4], + [15, 0.75], + [20, 2] + ] + } } }, { @@ -535,7 +693,14 @@ "paint": { "line-color": "#bbb", "line-dasharray": [0.2, 8], - "line-width": {"base": 1.4, "stops": [[14.5, 0], [15, 3], [20, 8]]} + "line-width": { + "base": 1.4, + "stops": [ + [14.5, 0], + [15, 3], + [20, 8] + ] + } } }, { @@ -544,7 +709,7 @@ "source": "openmaptiles", "source-layer": "transportation", "filter": ["all", ["==", "$type", "Polygon"]], - "paint": {"fill-pattern": "pedestrian_polygon"} + "paint": { "fill-pattern": "pedestrian_polygon" } }, { "id": "road_motorway_link_casing", @@ -558,12 +723,17 @@ ["==", "class", "motorway"], ["==", "ramp", 1] ], - "layout": {"line-cap": "round", "line-join": "round"}, + "layout": { "line-cap": "round", "line-join": "round" }, "paint": { "line-color": "#e9ac77", "line-width": { "base": 1.2, - "stops": [[12, 1], [13, 3], [14, 4], [20, 15]] + "stops": [ + [12, 1], + [13, 3], + [14, 4], + [20, 15] + ] } } }, @@ -577,10 +747,17 @@ ["!in", "brunnel", "bridge", "tunnel"], ["in", "class", "service", "track"] ], - "layout": {"line-cap": "round", "line-join": "round"}, + "layout": { "line-cap": "round", "line-join": "round" }, "paint": { "line-color": "#cfcdca", - "line-width": {"base": 1.2, "stops": [[15, 1], [16, 4], [20, 11]]} + "line-width": { + "base": 1.2, + "stops": [ + [15, 1], + [16, 4], + [20, 11] + ] + } } }, { @@ -595,12 +772,17 @@ ["!in", "class", "pedestrian", "path", "track", "service", "motorway"], ["==", "ramp", 1] ], - "layout": {"line-cap": "round", "line-join": "round"}, + "layout": { "line-cap": "round", "line-join": "round" }, "paint": { "line-color": "#e9ac77", "line-width": { "base": 1.2, - "stops": [[12, 1], [13, 3], [14, 4], [20, 15]] + "stops": [ + [12, 1], + [13, 3], + [14, 4], + [20, 15] + ] } } }, @@ -616,13 +798,23 @@ ["in", "class", "minor"], ["!=", "ramp", 1] ], - "layout": {"line-cap": "round", "line-join": "round"}, + "layout": { "line-cap": "round", "line-join": "round" }, "paint": { "line-color": "#cfcdca", - "line-opacity": {"stops": [[12, 0], [12.5, 1]]}, + "line-opacity": { + "stops": [ + [12, 0], + [12.5, 1] + ] + }, "line-width": { "base": 1.2, - "stops": [[12, 0.5], [13, 1], [14, 4], [20, 20]] + "stops": [ + [12, 0.5], + [13, 1], + [14, 4], + [20, 20] + ] } } }, @@ -637,10 +829,16 @@ ["in", "class", "secondary", "tertiary"], ["!=", "ramp", 1] ], - "layout": {"line-cap": "round", "line-join": "round"}, + "layout": { "line-cap": "round", "line-join": "round" }, "paint": { "line-color": "#e9ac77", - "line-width": {"base": 1.2, "stops": [[8, 1.5], [20, 17]]} + "line-width": { + "base": 1.2, + "stops": [ + [8, 1.5], + [20, 17] + ] + } } }, { @@ -653,12 +851,17 @@ ["!in", "brunnel", "bridge", "tunnel"], ["in", "class", "primary", "trunk"] ], - "layout": {"line-join": "round"}, + "layout": { "line-join": "round" }, "paint": { "line-color": "#e9ac77", "line-width": { "base": 1.2, - "stops": [[5, 0.4], [6, 0.7], [7, 1.75], [20, 22]] + "stops": [ + [5, 0.4], + [6, 0.7], + [7, 1.75], + [20, 22] + ] } } }, @@ -674,12 +877,17 @@ ["==", "class", "motorway"], ["!=", "ramp", 1] ], - "layout": {"line-cap": "round", "line-join": "round"}, + "layout": { "line-cap": "round", "line-join": "round" }, "paint": { "line-color": "#e9ac77", "line-width": { "base": 1.2, - "stops": [[5, 0.4], [6, 0.7], [7, 1.75], [20, 22]] + "stops": [ + [5, 0.4], + [6, 0.7], + [7, 1.75], + [20, 22] + ] } } }, @@ -695,11 +903,17 @@ ["!in", "brunnel", "bridge", "tunnel"], ["in", "class", "path", "pedestrian"] ], - "layout": {"line-join": "round"}, + "layout": { "line-join": "round" }, "paint": { "line-color": "hsl(0, 0%, 100%)", "line-dasharray": [1, 0.7], - "line-width": {"base": 1.2, "stops": [[14, 1], [20, 10]]} + "line-width": { + "base": 1.2, + "stops": [ + [14, 1], + [20, 10] + ] + } } }, { @@ -714,12 +928,17 @@ ["==", "class", "motorway"], ["==", "ramp", 1] ], - "layout": {"line-cap": "round", "line-join": "round"}, + "layout": { "line-cap": "round", "line-join": "round" }, "paint": { "line-color": "#fc8", "line-width": { "base": 1.2, - "stops": [[12.5, 0], [13, 1.5], [14, 2.5], [20, 11.5]] + "stops": [ + [12.5, 0], + [13, 1.5], + [14, 2.5], + [20, 11.5] + ] } } }, @@ -733,10 +952,17 @@ ["!in", "brunnel", "bridge", "tunnel"], ["in", "class", "service", "track"] ], - "layout": {"line-cap": "round", "line-join": "round"}, + "layout": { "line-cap": "round", "line-join": "round" }, "paint": { "line-color": "#fff", - "line-width": {"base": 1.2, "stops": [[15.5, 0], [16, 2], [20, 7.5]]} + "line-width": { + "base": 1.2, + "stops": [ + [15.5, 0], + [16, 2], + [20, 7.5] + ] + } } }, { @@ -751,12 +977,17 @@ ["==", "ramp", 1], ["!in", "class", "pedestrian", "path", "track", "service", "motorway"] ], - "layout": {"line-cap": "round", "line-join": "round"}, + "layout": { "line-cap": "round", "line-join": "round" }, "paint": { "line-color": "#fea", "line-width": { "base": 1.2, - "stops": [[12.5, 0], [13, 1.5], [14, 2.5], [20, 11.5]] + "stops": [ + [12.5, 0], + [13, 1.5], + [14, 2.5], + [20, 11.5] + ] } } }, @@ -771,10 +1002,17 @@ ["!in", "brunnel", "bridge", "tunnel"], ["in", "class", "minor"] ], - "layout": {"line-cap": "round", "line-join": "round"}, + "layout": { "line-cap": "round", "line-join": "round" }, "paint": { "line-color": "#fff", - "line-width": {"base": 1.2, "stops": [[13.5, 0], [14, 2.5], [20, 18]]} + "line-width": { + "base": 1.2, + "stops": [ + [13.5, 0], + [14, 2.5], + [20, 18] + ] + } } }, { @@ -787,10 +1025,17 @@ ["!in", "brunnel", "bridge", "tunnel"], ["in", "class", "secondary", "tertiary"] ], - "layout": {"line-cap": "round", "line-join": "round"}, + "layout": { "line-cap": "round", "line-join": "round" }, "paint": { "line-color": "#fea", - "line-width": {"base": 1.2, "stops": [[6.5, 0], [8, 0.5], [20, 13]]} + "line-width": { + "base": 1.2, + "stops": [ + [6.5, 0], + [8, 0.5], + [20, 13] + ] + } } }, { @@ -803,10 +1048,17 @@ ["!in", "brunnel", "bridge", "tunnel"], ["in", "class", "primary", "trunk"] ], - "layout": {"line-join": "round"}, + "layout": { "line-join": "round" }, "paint": { "line-color": "#fea", - "line-width": {"base": 1.2, "stops": [[5, 0], [7, 1], [20, 18]]} + "line-width": { + "base": 1.2, + "stops": [ + [5, 0], + [7, 1], + [20, 18] + ] + } } }, { @@ -821,13 +1073,23 @@ ["==", "class", "motorway"], ["!=", "ramp", 1] ], - "layout": {"line-cap": "round", "line-join": "round"}, + "layout": { "line-cap": "round", "line-join": "round" }, "paint": { "line-color": { "base": 1, - "stops": [[5, "hsl(26, 87%, 62%)"], [6, "#fc8"]] + "stops": [ + [5, "hsl(26, 87%, 62%)"], + [6, "#fc8"] + ] }, - "line-width": {"base": 1.2, "stops": [[5, 0], [7, 1], [20, 18]]} + "line-width": { + "base": 1.2, + "stops": [ + [5, 0], + [7, 1], + [20, 18] + ] + } } }, { @@ -842,7 +1104,14 @@ ], "paint": { "line-color": "#bbb", - "line-width": {"base": 1.4, "stops": [[14, 0.4], [15, 0.75], [20, 2]]} + "line-width": { + "base": 1.4, + "stops": [ + [14, 0.4], + [15, 0.75], + [20, 2] + ] + } } }, { @@ -858,7 +1127,14 @@ "paint": { "line-color": "#bbb", "line-dasharray": [0.2, 8], - "line-width": {"base": 1.4, "stops": [[14.5, 0], [15, 3], [20, 8]]} + "line-width": { + "base": 1.4, + "stops": [ + [14.5, 0], + [15, 3], + [20, 8] + ] + } } }, { @@ -873,7 +1149,14 @@ ], "paint": { "line-color": "#bbb", - "line-width": {"base": 1.4, "stops": [[14, 0.4], [15, 0.75], [20, 2]]} + "line-width": { + "base": 1.4, + "stops": [ + [14, 0.4], + [15, 0.75], + [20, 2] + ] + } } }, { @@ -889,7 +1172,14 @@ "paint": { "line-color": "#bbb", "line-dasharray": [0.2, 8], - "line-width": {"base": 1.4, "stops": [[14.5, 0], [15, 3], [20, 8]]} + "line-width": { + "base": 1.4, + "stops": [ + [14.5, 0], + [15, 3], + [20, 8] + ] + } } }, { @@ -903,12 +1193,17 @@ ["==", "ramp", 1], ["==", "brunnel", "bridge"] ], - "layout": {"line-join": "round"}, + "layout": { "line-join": "round" }, "paint": { "line-color": "#e9ac77", "line-width": { "base": 1.2, - "stops": [[12, 1], [13, 3], [14, 4], [20, 15]] + "stops": [ + [12, 1], + [13, 3], + [14, 4], + [20, 15] + ] } } }, @@ -922,10 +1217,17 @@ ["==", "brunnel", "bridge"], ["in", "class", "service", "track"] ], - "layout": {"line-join": "round"}, + "layout": { "line-join": "round" }, "paint": { "line-color": "#cfcdca", - "line-width": {"base": 1.2, "stops": [[15, 1], [16, 4], [20, 11]]} + "line-width": { + "base": 1.2, + "stops": [ + [15, 1], + [16, 4], + [20, 11] + ] + } } }, { @@ -934,12 +1236,17 @@ "source": "openmaptiles", "source-layer": "transportation", "filter": ["all", ["==", "class", "link"], ["==", "brunnel", "bridge"]], - "layout": {"line-join": "round"}, + "layout": { "line-join": "round" }, "paint": { "line-color": "#e9ac77", "line-width": { "base": 1.2, - "stops": [[12, 1], [13, 3], [14, 4], [20, 15]] + "stops": [ + [12, 1], + [13, 3], + [14, 4], + [20, 15] + ] } } }, @@ -953,13 +1260,23 @@ ["==", "brunnel", "bridge"], ["in", "class", "street", "street_limited"] ], - "layout": {"line-join": "round"}, + "layout": { "line-join": "round" }, "paint": { "line-color": "hsl(36, 6%, 74%)", - "line-opacity": {"stops": [[12, 0], [12.5, 1]]}, + "line-opacity": { + "stops": [ + [12, 0], + [12.5, 1] + ] + }, "line-width": { "base": 1.2, - "stops": [[12, 0.5], [13, 1], [14, 4], [20, 25]] + "stops": [ + [12, 0.5], + [13, 1], + [14, 4], + [20, 25] + ] } } }, @@ -977,7 +1294,13 @@ "paint": { "line-color": "hsl(35, 6%, 80%)", "line-dasharray": [1, 0], - "line-width": {"base": 1.2, "stops": [[14, 1.5], [20, 18]]} + "line-width": { + "base": 1.2, + "stops": [ + [14, 1.5], + [20, 18] + ] + } } }, { @@ -990,10 +1313,16 @@ ["==", "brunnel", "bridge"], ["in", "class", "secondary", "tertiary"] ], - "layout": {"line-join": "round"}, + "layout": { "line-join": "round" }, "paint": { "line-color": "#e9ac77", - "line-width": {"base": 1.2, "stops": [[8, 1.5], [20, 17]]} + "line-width": { + "base": 1.2, + "stops": [ + [8, 1.5], + [20, 17] + ] + } } }, { @@ -1006,12 +1335,17 @@ ["==", "brunnel", "bridge"], ["in", "class", "primary", "trunk"] ], - "layout": {"line-join": "round"}, + "layout": { "line-join": "round" }, "paint": { "line-color": "#e9ac77", "line-width": { "base": 1.2, - "stops": [[5, 0.4], [6, 0.7], [7, 1.75], [20, 22]] + "stops": [ + [5, 0.4], + [6, 0.7], + [7, 1.75], + [20, 22] + ] } } }, @@ -1026,12 +1360,17 @@ ["!=", "ramp", 1], ["==", "brunnel", "bridge"] ], - "layout": {"line-join": "round"}, + "layout": { "line-join": "round" }, "paint": { "line-color": "#e9ac77", "line-width": { "base": 1.2, - "stops": [[5, 0.4], [6, 0.7], [7, 1.75], [20, 22]] + "stops": [ + [5, 0.4], + [6, 0.7], + [7, 1.75], + [20, 22] + ] } } }, @@ -1049,7 +1388,13 @@ "paint": { "line-color": "hsl(0, 0%, 100%)", "line-dasharray": [1, 0.3], - "line-width": {"base": 1.2, "stops": [[14, 0.5], [20, 10]]} + "line-width": { + "base": 1.2, + "stops": [ + [14, 0.5], + [20, 10] + ] + } } }, { @@ -1063,12 +1408,17 @@ ["==", "ramp", 1], ["==", "brunnel", "bridge"] ], - "layout": {"line-join": "round"}, + "layout": { "line-join": "round" }, "paint": { "line-color": "#fc8", "line-width": { "base": 1.2, - "stops": [[12.5, 0], [13, 1.5], [14, 2.5], [20, 11.5]] + "stops": [ + [12.5, 0], + [13, 1.5], + [14, 2.5], + [20, 11.5] + ] } } }, @@ -1082,10 +1432,17 @@ ["==", "brunnel", "bridge"], ["in", "class", "service", "track"] ], - "layout": {"line-join": "round"}, + "layout": { "line-join": "round" }, "paint": { "line-color": "#fff", - "line-width": {"base": 1.2, "stops": [[15.5, 0], [16, 2], [20, 7.5]]} + "line-width": { + "base": 1.2, + "stops": [ + [15.5, 0], + [16, 2], + [20, 7.5] + ] + } } }, { @@ -1094,12 +1451,17 @@ "source": "openmaptiles", "source-layer": "transportation", "filter": ["all", ["==", "class", "link"], ["==", "brunnel", "bridge"]], - "layout": {"line-join": "round"}, + "layout": { "line-join": "round" }, "paint": { "line-color": "#fea", "line-width": { "base": 1.2, - "stops": [[12.5, 0], [13, 1.5], [14, 2.5], [20, 11.5]] + "stops": [ + [12.5, 0], + [13, 1.5], + [14, 2.5], + [20, 11.5] + ] } } }, @@ -1109,10 +1471,17 @@ "source": "openmaptiles", "source-layer": "transportation", "filter": ["all", ["==", "brunnel", "bridge"], ["in", "class", "minor"]], - "layout": {"line-join": "round"}, + "layout": { "line-join": "round" }, "paint": { "line-color": "#fff", - "line-width": {"base": 1.2, "stops": [[13.5, 0], [14, 2.5], [20, 18]]} + "line-width": { + "base": 1.2, + "stops": [ + [13.5, 0], + [14, 2.5], + [20, 18] + ] + } } }, { @@ -1125,10 +1494,17 @@ ["==", "brunnel", "bridge"], ["in", "class", "secondary", "tertiary"] ], - "layout": {"line-join": "round"}, + "layout": { "line-join": "round" }, "paint": { "line-color": "#fea", - "line-width": {"base": 1.2, "stops": [[6.5, 0], [7, 0.5], [20, 10]]} + "line-width": { + "base": 1.2, + "stops": [ + [6.5, 0], + [7, 0.5], + [20, 10] + ] + } } }, { @@ -1141,10 +1517,17 @@ ["==", "brunnel", "bridge"], ["in", "class", "primary", "trunk"] ], - "layout": {"line-join": "round"}, + "layout": { "line-join": "round" }, "paint": { "line-color": "#fea", - "line-width": {"base": 1.2, "stops": [[5, 0], [7, 1], [20, 18]]} + "line-width": { + "base": 1.2, + "stops": [ + [5, 0], + [7, 1], + [20, 18] + ] + } } }, { @@ -1158,10 +1541,17 @@ ["!=", "ramp", 1], ["==", "brunnel", "bridge"] ], - "layout": {"line-join": "round"}, + "layout": { "line-join": "round" }, "paint": { "line-color": "#fc8", - "line-width": {"base": 1.2, "stops": [[5, 0], [7, 1], [20, 18]]} + "line-width": { + "base": 1.2, + "stops": [ + [5, 0], + [7, 1], + [20, 18] + ] + } } }, { @@ -1172,7 +1562,14 @@ "filter": ["all", ["==", "class", "rail"], ["==", "brunnel", "bridge"]], "paint": { "line-color": "#bbb", - "line-width": {"base": 1.4, "stops": [[14, 0.4], [15, 0.75], [20, 2]]} + "line-width": { + "base": 1.4, + "stops": [ + [14, 0.4], + [15, 0.75], + [20, 2] + ] + } } }, { @@ -1184,7 +1581,14 @@ "paint": { "line-color": "#bbb", "line-dasharray": [0.2, 8], - "line-width": {"base": 1.4, "stops": [[14.5, 0], [15, 3], [20, 8]]} + "line-width": { + "base": 1.4, + "stops": [ + [14.5, 0], + [15, 3], + [20, 8] + ] + } } }, { @@ -1199,7 +1603,14 @@ ], "paint": { "line-color": "#bbb", - "line-width": {"base": 1.4, "stops": [[14, 0.4], [15, 0.75], [20, 2]]} + "line-width": { + "base": 1.4, + "stops": [ + [14, 0.4], + [15, 0.75], + [20, 2] + ] + } } }, { @@ -1215,7 +1626,14 @@ "paint": { "line-color": "#bbb", "line-dasharray": [0.2, 8], - "line-width": {"base": 1.4, "stops": [[14.5, 0], [15, 3], [20, 8]]} + "line-width": { + "base": 1.4, + "stops": [ + [14.5, 0], + [15, 3], + [20, 8] + ] + } } }, { @@ -1228,7 +1646,10 @@ "fill-color": "hsl(40, 5.5%, 89.2%)", "fill-outline-color": { "base": 1, - "stops": [[13, "hsla(40, 6%, 79%, 0.32)"], [14, "hsl(40, 6%, 79%)"]] + "stops": [ + [13, "hsla(40, 6%, 79%, 0.32)"], + [14, "hsl(40, 6%, 79%)"] + ] } } }, @@ -1239,11 +1660,18 @@ "source-layer": "boundary", "minzoom": 8, "filter": ["all", ["in", "admin_level", 3, 4]], - "layout": {"line-join": "round"}, + "layout": { "line-join": "round" }, "paint": { "line-color": "#9e9cab", "line-dasharray": [5, 1], - "line-width": {"base": 1, "stops": [[4, 0.4], [5, 1], [12, 1.8]]} + "line-width": { + "base": 1, + "stops": [ + [4, 0.4], + [5, 1], + [12, 1.8] + ] + } } }, { @@ -1253,11 +1681,24 @@ "source-layer": "boundary", "maxzoom": 5, "filter": ["all", ["==", "admin_level", 2], ["!has", "claimed_by"]], - "layout": {"line-cap": "round", "line-join": "round"}, + "layout": { "line-cap": "round", "line-join": "round" }, "paint": { "line-color": "hsl(248, 1%, 41%)", - "line-opacity": {"base": 1, "stops": [[0, 0.4], [4, 1]]}, - "line-width": {"base": 1, "stops": [[3, 1], [5, 1.2], [12, 3]]} + "line-opacity": { + "base": 1, + "stops": [ + [0, 0.4], + [4, 1] + ] + }, + "line-width": { + "base": 1, + "stops": [ + [3, 1], + [5, 1.2], + [12, 3] + ] + } } }, { @@ -1267,11 +1708,24 @@ "source-layer": "boundary", "minzoom": 5, "filter": ["all", ["==", "admin_level", 2]], - "layout": {"line-cap": "round", "line-join": "round"}, + "layout": { "line-cap": "round", "line-join": "round" }, "paint": { "line-color": "hsl(248, 1%, 41%)", - "line-opacity": {"base": 1, "stops": [[0, 0.4], [4, 1]]}, - "line-width": {"base": 1, "stops": [[3, 1], [5, 1.2], [12, 3]]} + "line-opacity": { + "base": 1, + "stops": [ + [0, 0.4], + [4, 1] + ] + }, + "line-width": { + "base": 1, + "stops": [ + [3, 1], + [5, 1.2], + [12, 3] + ] + } } }, { @@ -1281,7 +1735,7 @@ "source-layer": "transportation", "minzoom": 15, "filter": ["==", "oneway", 1], - "layout": {"icon-image": "arrow", "symbol-placement": "line"} + "layout": { "icon-image": "arrow", "symbol-placement": "line" } }, { "id": "road_one_way_arrow_opposite", @@ -1307,10 +1761,7 @@ ["==", "$type", "LineString"], ["in", "class", "ferry"] ], - "layout": { - "line-cap": "round", - "line-join": "round" - }, + "layout": { "line-cap": "round", "line-join": "round" }, "paint": { "line-color": "#99d", "line-width": 2, @@ -1467,7 +1918,13 @@ "text-field": "{name}", "text-font": ["Roboto Regular"], "text-offset": [0, 0.15], - "text-size": {"base": 1, "stops": [[13, 12], [14, 13]]} + "text-size": { + "base": 1, + "stops": [ + [13, 12], + [14, 13] + ] + } }, "paint": { "text-color": "#765", @@ -1486,7 +1943,13 @@ "layout": { "icon-image": "default_{ref_length}", "icon-rotation-alignment": "viewport", - "symbol-placement": {"base": 1, "stops": [[10, "point"], [11, "line"]]}, + "symbol-placement": { + "base": 1, + "stops": [ + [10, "point"], + [11, "line"] + ] + }, "symbol-spacing": 500, "text-field": "{ref}", "text-font": ["Roboto Regular"], @@ -1519,7 +1982,13 @@ "text-font": ["Roboto Condensed Italic"], "text-letter-spacing": 0.1, "text-max-width": 9, - "text-size": {"base": 1.2, "stops": [[12, 10], [15, 14]]}, + "text-size": { + "base": 1.2, + "stops": [ + [12, 10], + [15, 14] + ] + }, "text-transform": "uppercase" }, "paint": { @@ -1538,7 +2007,13 @@ "text-field": "{name_en}", "text-font": ["Roboto Regular"], "text-max-width": 8, - "text-size": {"base": 1.2, "stops": [[10, 12], [15, 22]]} + "text-size": { + "base": 1.2, + "stops": [ + [10, 12], + [15, 22] + ] + } }, "paint": { "text-color": "#333", @@ -1553,13 +2028,25 @@ "source-layer": "place", "filter": ["all", ["==", "class", "town"]], "layout": { - "icon-image": {"base": 1, "stops": [[0, "dot_9"], [8, ""]]}, + "icon-image": { + "base": 1, + "stops": [ + [0, "dot_9"], + [8, ""] + ] + }, "text-anchor": "bottom", "text-field": "{name_en}", "text-font": ["Roboto Regular"], "text-max-width": 8, "text-offset": [0, 0], - "text-size": {"base": 1.2, "stops": [[7, 12], [11, 16]]} + "text-size": { + "base": 1.2, + "stops": [ + [7, 12], + [11, 16] + ] + } }, "paint": { "text-color": "#333", @@ -1575,13 +2062,25 @@ "minzoom": 5, "filter": ["all", ["==", "class", "city"]], "layout": { - "icon-image": {"base": 1, "stops": [[0, "dot_9"], [8, ""]]}, + "icon-image": { + "base": 1, + "stops": [ + [0, "dot_9"], + [8, ""] + ] + }, "text-anchor": "bottom", "text-field": "{name_en}", "text-font": ["Roboto Medium"], "text-max-width": 8, "text-offset": [0, 0], - "text-size": {"base": 1.2, "stops": [[7, 14], [11, 24]]}, + "text-size": { + "base": 1.2, + "stops": [ + [7, 14], + [11, 24] + ] + }, "icon-allow-overlap": true, "icon-optional": false }, @@ -1601,7 +2100,12 @@ "layout": { "text-field": "{name_en}", "text-font": ["Roboto Condensed Italic"], - "text-size": {"stops": [[4, 11], [6, 15]]}, + "text-size": { + "stops": [ + [4, 11], + [6, 15] + ] + }, "text-transform": "uppercase" }, "paint": { @@ -1620,7 +2124,12 @@ "text-field": "{name_en}", "text-font": ["Roboto Condensed Italic"], "text-max-width": 6.25, - "text-size": {"stops": [[3, 11], [7, 17]]}, + "text-size": { + "stops": [ + [3, 11], + [7, 17] + ] + }, "text-transform": "none" }, "paint": { @@ -1640,7 +2149,12 @@ "text-field": "{name_en}", "text-font": ["Roboto Condensed Italic"], "text-max-width": 6.25, - "text-size": {"stops": [[2, 11], [5, 17]]}, + "text-size": { + "stops": [ + [2, 11], + [5, 17] + ] + }, "text-transform": "none" }, "paint": { @@ -1660,7 +2174,12 @@ "text-field": "{name_en}", "text-font": ["Roboto Condensed Italic"], "text-max-width": 6.25, - "text-size": {"stops": [[1, 11], [4, 17]]}, + "text-size": { + "stops": [ + [1, 11], + [4, 17] + ] + }, "text-transform": "none" }, "paint": {