diff --git a/src/assets/swisstopo.json b/src/assets/swisstopo.json index 7e290a9..32e86cf 100644 --- a/src/assets/swisstopo.json +++ b/src/assets/swisstopo.json @@ -9,7 +9,7 @@ "sources": { "swissmaptiles": { "type": "vector", - "url": "https://vectortiles.geo.admin.ch/tiles/ch.swisstopo.leichte-basiskarte.vt/v1.0.0/tiles.json" + "url": "https://vectortiles.geo.admin.ch/tiles/ch.swisstopo.leichte-basiskarte.vt/v2.0.0/tiles.json" }, "relief_shading": { "type": "raster", @@ -18,7 +18,7 @@ ], "tileSize": 256, "minzoom": 0, - "maxzoom": 19, + "maxzoom": 22, "bounds": [5.140242, 45.398181, 11.47757, 48.230651] }, "hiking_trails_raster": { @@ -91,15 +91,19 @@ "url": "https://1.{mapServer}.map.sotl.as/data/az.json" } }, - "sprite": "https://vectortiles.geo.admin.ch/styles/ch.swisstopo.leichte-basiskarte.vt/v1.0.0/sprite/sprite", + "sprite": "https://vectortiles.geo.admin.ch/styles/ch.swisstopo.leichte-basiskarte.vt/sprite/sprite", "glyphs": "https://vectortiles.geo.admin.ch/fonts/{fontstack}/{range}.pbf", "transition": {}, "layers": [ { "id": "background", "type": "background", - "layout": {"visibility": "visible"}, - "paint": {"background-color": "rgba(255, 255, 255, 1)"} + "layout": { + "visibility": "visible" + }, + "paint": { + "background-color": "rgba(255, 255, 255, 1)" + } }, { "id": "relief_shading", @@ -108,9 +112,16 @@ "sotlas-map-option": "hillshading" }, "source": "relief_shading", - "layout": {"visibility": "visible"}, + "layout": { + "visibility": "visible" + }, "paint": { - "raster-opacity": {"stops": [[15.5, 1], [17, 0.6]]}, + "raster-opacity": { + "stops": [ + [15.5,1], + [17,0.6] + ] + }, "raster-brightness-min": [ "interpolate", ["linear"], @@ -129,7 +140,15 @@ 12, -0.2 ], - "raster-contrast": ["interpolate", ["linear"], ["zoom"], 6, 0.1, 12, 0], + "raster-contrast": [ + "interpolate", + ["linear"], + ["zoom"], + 6, + 0.1, + 12, + 0 + ], "raster-resampling": "nearest" } }, @@ -180,57 +199,109 @@ }, "source": "swissmaptiles", "source-layer": "contour_line", - "minzoom": 13, - "filter": ["all", ["!in", "class", "rock", "ice", "water"]], - "layout": {"visibility": "visible"}, + "minzoom": 13.0, + "layout": { + "visibility": "visible" + }, "paint": { "line-blur": 0.4, "line-color": [ "match", - ["get", "class"], - ["ice", "water"], + ["get","class"], + ["ice","water"], "rgb(0,136,208)", ["scree"], "rgb(0,0,0)", "rgb(191,138,64)" ], - "line-opacity": [ - "interpolate", - ["linear"], - ["zoom"], - 13, - ["match", ["get", "class"], ["scree", "ice", "water"], 0.25, 0.45], - 14, - ["match", ["get", "class"], ["scree", "ice", "water"], 0.3, 0.55] - ], "line-width": [ "interpolate", - ["exponential", 1], + ["exponential",1], ["zoom"], 12, [ "case", - ["==", ["%", ["to-number", ["get", "ele"]], 100], 0], + [ + "==", + [ + "%", + [ + "to-number", + ["get","ele"] + ], + 100 + ], + 0 + ], 0.75, 0 ], 13, [ "case", - ["==", ["%", ["to-number", ["get", "ele"]], 100], 0], + [ + "==", + [ + "%", + [ + "to-number", + ["get","ele"] + ], + 100 + ], + 0 + ], 0.75, 0 ], 14, - ["case", ["==", ["%", ["to-number", ["get", "ele"]], 100], 0], 1, 0], + [ + "case", + [ + "==", + [ + "%", + [ + "to-number", + ["get","ele"] + ], + 100 + ], + 0 + ], + 1, + 0 + ], 14.5, [ "case", - ["==", ["%", ["to-number", ["get", "ele"]], 100], 0], + [ + "==", + [ + "%", + [ + "to-number", + ["get","ele"] + ], + 100 + ], + 0 + ], 1.5, [ "case", - ["==", ["%", ["to-number", ["get", "ele"]], 20], 0], + [ + "==", + [ + "%", + [ + "to-number", + ["get","ele"] + ], + 20 + ], + 0 + ], 0.75, 0 ] @@ -238,51 +309,118 @@ 15, [ "case", - ["==", ["%", ["to-number", ["get", "ele"]], 100], 0], + [ + "==", + [ + "%", + [ + "to-number", + ["get","ele"] + ], + 100 + ], + 0 + ], 1.75, - ["case", ["==", ["%", ["to-number", ["get", "ele"]], 20], 0], 1, 0] + [ + "case", + [ + "==", + [ + "%", + [ + "to-number", + ["get","ele"] + ], + 20 + ], + 0 + ], + 1, + 0 + ] ], 16.5, [ "case", - ["==", ["%", ["to-number", ["get", "ele"]], 100], 0], + [ + "==", + [ + "%", + [ + "to-number", + ["get","ele"] + ], + 100 + ], + 0 + ], 2, - ["case", ["==", ["%", ["to-number", ["get", "ele"]], 10], 0], 1, 0] + [ + "case", + [ + "==", + [ + "%", + [ + "to-number", + ["get","ele"] + ], + 10 + ], + 0 + ], + 1, + 0 + ] + ] + ], + "line-opacity": [ + "interpolate", + ["linear"], + ["zoom"], + 13, + [ + "match", + ["get","class"], + ["scree","ice","water"], + 0.25, + 0.45 + ], + 14, + [ + "match", + ["get","class"], + ["scree","ice","water"], + 0.3, + 0.55 ] ] - } + }, + "metadata": { + "maputnik:comment": "color: rgb(191,138,64)" + }, + "filter": [ + "all", + ["!in","class","rock","ice","water"] + ] }, { "id": "landcover", "type": "fill", "source": "swissmaptiles", "source-layer": "landcover", - "minzoom": 5, - "filter": [ - "any", - [ - "in", - "subclass", - "wood", - "scrub", - "recreation_ground", - "park", - "golf_course", - "allotments", - "plant_nursery", - "forest", - "glacier" - ], - ["==", "class", "sand"] - ], - "layout": {"visibility": "visible"}, + "minzoom": 5.0, + "layout": { + "visibility": "visible" + }, "paint": { "fill-color": [ "match", - ["get", "class"], - ["forest", "wood"], + ["get","class"], + ["forest","wood"], "rgb(186, 210, 172)", - ["ice", "glacier"], + ["ice","glacier"], "rgb(205, 232, 244)", ["wetland"], "rgb(204, 229, 245)", @@ -292,58 +430,98 @@ ], "fill-opacity": [ "interpolate", - ["exponential", 1.5], + ["exponential",1.5], ["zoom"], 5, 0, 6, - ["match", ["get", "class"], ["ice", "glacier"], 0.3, 0], + [ + "match", + ["get","class"], + ["ice","glacier"], + 0.3, + 0 + ], 10, - ["match", ["get", "class"], ["ice", "glacier"], 0.2, 0], + [ + "match", + ["get","class"], + ["ice","glacier"], + 0.2, + 0 + ], 11, - ["match", ["get", "class"], ["ice", "glacier"], 0.2, 0.3], + [ + "match", + ["get","class"], + ["ice","glacier"], + 0.2, + 0.3 + ], 14, - ["match", ["get", "class"], ["ice", "glacier"], 0, 0.3] + [ + "match", + ["get","class"], + ["ice","glacier"], + 0, + 0.3 + ] ] - } + }, + "filter": [ + "any", + [ + "match", + ["get","subclass"], + [ + "allotments", + "forest", + "glacier", + "golf_course", + "park", + "plant_nursery", + "recreation_ground", + "scrub", + "woody_plant", + "loose_forest" + ], + true, + false + ], + [ + "case", + [ + "==", + [ + "typeof", + ["get","class"] + ], + "string" + ], + [ + "==", + ["get","class"], + "sand" + ], + false + ] + ] }, { "id": "landcover_casing", "type": "line", "source": "swissmaptiles", "source-layer": "landcover", - "minzoom": 10, - "filter": [ - "all", - [ - "in", - "subclass", - "wood", - "scrub", - "recreation_ground", - "park", - "golf_course", - "allotments", - "plant_nursery", - "forest" - ] - ], - "layout": {"visibility": "visible"}, + "minzoom": 10.0, + "layout": { + "visibility": "visible" + }, "paint": { "line-blur": 0.5, "line-color": "rgb(186, 199, 172)", - "line-opacity": [ - "interpolate", - ["exponential", 1.5], - ["zoom"], - 12, - 0, - 14, - 1 - ], "line-width": [ "interpolate", - ["exponential", 1.5], + ["exponential",1.5], ["zoom"], 6, 0, @@ -351,106 +529,140 @@ 0.25, 16, 0.75 + ], + "line-opacity": [ + "interpolate", + ["exponential",1.5], + ["zoom"], + 12, + 0, + 14, + 1 ] - } + }, + "filter": [ + "all", + ["in","subclass","wood","scrub","recreation_ground","park","golf_course","allotments","plant_nursery","forest"] + ] }, { "id": "landuse", "type": "fill", "source": "swissmaptiles", "source-layer": "landuse", - "filter": [ - "all", - ["in", "class", "landfill", "cemetery", "quarry", "zoo", "pitch"] - ], - "layout": {"visibility": "visible"}, + "layout": { + "visibility": "visible" + }, "paint": { "fill-color": [ "match", - ["get", "class"], + ["get","class"], ["pitch"], "rgb(224,234,221)", - ["landfill", "quarry"], + ["landfill","quarry"], "rgb(240, 218, 188)", - ["cemetery", "zoo"], + ["cemetery","zoo"], "rgb(215, 224, 209)", ["parking"], "rgb(255, 255, 255)", "rgb(215, 224, 209)" ], - "fill-opacity": ["match", ["get", "class"], ["pitch"], 1, 0.3] - } + "fill-opacity": [ + "match", + ["get","class"], + ["pitch"], + 1, + 0.3 + ] + }, + "filter": [ + "all", + ["in","class","landfill","cemetery","quarry","zoo","pitch"] + ] }, { "id": "landuse_outline", "type": "line", "source": "swissmaptiles", "source-layer": "landuse", - "filter": ["all", ["in", "class", "cemetery", "zoo", "pitch"]], - "layout": {"visibility": "visible"}, + "layout": { + "visibility": "visible" + }, "paint": { "line-color": [ "match", - ["get", "class"], + ["get","class"], ["pitch"], "rgb(130, 130, 130)", "rgba(186, 199, 172, 1)" ], - "line-opacity": {"stops": [[14, 0], [15, 1]]}, "line-width": [ "interpolate", - ["exponential", 1.5], + ["exponential",1.5], ["zoom"], 11, 0.25, 16, 0.75 - ] - } + ], + "line-opacity": { + "stops": [ + [14,0], + [15,1] + ] + } + }, + "filter": [ + "all", + ["in","class","cemetery","zoo","pitch"] + ] }, { "id": "water_line_intermittent", "type": "line", "source": "swissmaptiles", "source-layer": "waterway", - "minzoom": 12, - "filter": ["all", ["==", "intermittent", 1]], - "layout": {"visibility": "visible"}, + "minzoom": 12.0, + "layout": { + "visibility": "visible" + }, "paint": { "line-blur": 0, "line-color": "rgba(48, 48, 48, 1)", - "line-dasharray": { - "stops": [ - [13, [0.5, 3]], - [14, [0.75, 4.5]], - [15, [1, 6]], - [16, [1.25, 7.5]] - ] - }, - "line-offset": 0, - "line-opacity": {"stops": [[13, 0.25], [16, 0.35]]}, "line-width": [ "interpolate", - ["exponential", 1.5], + ["exponential",1.5], ["zoom"], 13, [ "match", - ["to-string", ["get", "width"]], - ["10", "9", "8"], + [ + "to-string", + ["get","width"] + ], + ["10","9","8"], 3.5, - ["7", "6", "5"], + ["7","6","5"], 2.5, - ["4", "3"], + ["4","3"], 1.5, - ["1", "2"], + ["1","2"], 1, - ["match", ["get", "class"], ["river", "canal"], 3.5, 1] + [ + "match", + ["get","class"], + ["river","canal"], + 3.5, + 1 + ] ], 16, [ "match", - ["to-string", ["get", "width"]], + [ + "to-string", + ["get","width"] + ], "10", 5, "9", @@ -459,7 +671,7 @@ 4, "7", 3.5, - ["6", "5"], + ["6","5"], 3, "4", 2.5, @@ -469,12 +681,21 @@ 1.5, "1", 1, - ["match", ["get", "class"], ["river", "canal"], 5, 1.5] + [ + "match", + ["get","class"], + ["river","canal"], + 5, + 1.5 + ] ], 20, [ "match", - ["to-string", ["get", "width"]], + [ + "to-string", + ["get","width"] + ], "10", 10, "9", @@ -495,19 +716,57 @@ 4.7, "1", 4, - ["match", ["get", "class"], ["river", "canal"], 10, 4] + [ + "match", + ["get","class"], + ["river","canal"], + 10, + 4 + ] ] - ] - } + ], + "line-offset": 0, + "line-opacity": { + "stops": [ + [13,0.25], + [16,0.35] + ] + }, + "line-dasharray": { + "stops": [ + [ + 13, + [0.5,3] + ], + [ + 14, + [0.75,4.5] + ], + [ + 15, + [1,6] + ], + [ + 16, + [1.25,7.5] + ] + ] + } + }, + "filter": [ + "all", + ["==","intermittent",1] + ] }, { "id": "water_line", "type": "line", "source": "swissmaptiles", "source-layer": "waterway", - "minzoom": 7, - "filter": ["all", ["!=", "intermittent", 1]], - "layout": {"visibility": "visible"}, + "minzoom": 7.0, + "layout": { + "visibility": "visible" + }, "paint": { "line-blur": 0, "line-color": [ @@ -519,48 +778,67 @@ 16, [ "match", - ["get", "class"], - ["river", "canal"], + ["get","class"], + ["river","canal"], "rgba(160, 205, 236, 1)", "rgba(140, 185, 226, 1)" ] ], - "line-offset": 0, - "line-opacity": 0.7, "line-width": [ "interpolate", - ["exponential", 1.5], + ["exponential",1.5], ["zoom"], 7, 1, 10, [ "match", - ["to-string", ["get", "width"]], - ["10", "9", "8", "7", "6"], + [ + "to-string", + ["get","width"] + ], + ["10","9","8","7","6"], 1.5, - ["5", "4", "3", "2", "1"], + ["5","4","3","2","1"], 1, - ["match", ["get", "class"], ["river", "canal"], 1.5, 1] + [ + "match", + ["get","class"], + ["river","canal"], + 1.5, + 1 + ] ], 13, [ "match", - ["to-string", ["get", "width"]], - ["10", "9", "8"], + [ + "to-string", + ["get","width"] + ], + ["10","9","8"], 3.5, - ["7", "6", "5"], + ["7","6","5"], 2.5, - ["4", "3"], + ["4","3"], 1.5, - ["1", "2"], + ["1","2"], 1, - ["match", ["get", "class"], ["river", "canal"], 3.5, 1] + [ + "match", + ["get","class"], + ["river","canal"], + 3.5, + 1 + ] ], 16, [ "match", - ["to-string", ["get", "width"]], + [ + "to-string", + ["get","width"] + ], "10", 5, "9", @@ -569,7 +847,7 @@ 4, "7", 3.5, - ["6", "5"], + ["6","5"], 3, "4", 2.5, @@ -579,12 +857,21 @@ 1.5, "1", 1, - ["match", ["get", "class"], ["river", "canal"], 5, 1.5] + [ + "match", + ["get","class"], + ["river","canal"], + 5, + 1.5 + ] ], 20, [ "match", - ["to-string", ["get", "width"]], + [ + "to-string", + ["get","width"] + ], "10", 10, "9", @@ -605,21 +892,35 @@ 4.7, "1", 4, - ["match", ["get", "class"], ["river", "canal"], 10, 4] + [ + "match", + ["get","class"], + ["river","canal"], + 10, + 4 + ] ] - ] - } + ], + "line-offset": 0, + "line-opacity": 0.7 + }, + "filter": [ + "all", + ["!=","intermittent",1] + ] }, { "id": "water_polygon", "type": "fill", "source": "swissmaptiles", "source-layer": "water", - "layout": {"visibility": "visible"}, + "layout": { + "visibility": "visible" + }, "paint": { "fill-color": [ "interpolate", - ["exponential", 1.5], + ["exponential",1.5], ["zoom"], 4, "rgb(209, 228, 240)", @@ -636,49 +937,101 @@ }, "source": "swissmaptiles", "source-layer": "contour_line", - "minzoom": 13, - "filter": ["all", ["in", "class", "ice", "water"]], - "layout": {"visibility": "visible"}, + "minzoom": 13.0, + "layout": { + "visibility": "visible" + }, "paint": { "line-blur": 0.4, "line-color": "rgb(0,136,208)", - "line-opacity": [ - "interpolate", - ["linear"], - ["zoom"], - 13, - ["match", ["get", "class"], ["scree", "ice", "water"], 0.25, 0.45], - 14, - ["match", ["get", "class"], ["scree", "ice", "water"], 0.3, 0.55] - ], "line-width": [ "interpolate", - ["exponential", 1], + ["exponential",1], ["zoom"], 12, [ "case", - ["==", ["%", ["to-number", ["get", "ele"]], 100], 0], + [ + "==", + [ + "%", + [ + "to-number", + ["get","ele"] + ], + 100 + ], + 0 + ], 0.75, 0 ], 13, [ "case", - ["==", ["%", ["to-number", ["get", "ele"]], 100], 0], + [ + "==", + [ + "%", + [ + "to-number", + ["get","ele"] + ], + 100 + ], + 0 + ], 0.75, 0 ], 14, - ["case", ["==", ["%", ["to-number", ["get", "ele"]], 100], 0], 1, 0], + [ + "case", + [ + "==", + [ + "%", + [ + "to-number", + ["get","ele"] + ], + 100 + ], + 0 + ], + 1, + 0 + ], 14.5, [ "case", - ["==", ["%", ["to-number", ["get", "ele"]], 100], 0], + [ + "==", + [ + "%", + [ + "to-number", + ["get","ele"] + ], + 100 + ], + 0 + ], 1.5, [ "case", - ["==", ["%", ["to-number", ["get", "ele"]], 20], 0], + [ + "==", + [ + "%", + [ + "to-number", + ["get","ele"] + ], + 20 + ], + 0 + ], 0.75, 0 ] @@ -686,19 +1039,98 @@ 16, [ "case", - ["==", ["%", ["to-number", ["get", "ele"]], 100], 0], + [ + "==", + [ + "%", + [ + "to-number", + ["get","ele"] + ], + 100 + ], + 0 + ], 1.75, - ["case", ["==", ["%", ["to-number", ["get", "ele"]], 20], 0], 1, 0] + [ + "case", + [ + "==", + [ + "%", + [ + "to-number", + ["get","ele"] + ], + 20 + ], + 0 + ], + 1, + 0 + ] ], 16.5, [ "case", - ["==", ["%", ["to-number", ["get", "ele"]], 100], 0], + [ + "==", + [ + "%", + [ + "to-number", + ["get","ele"] + ], + 100 + ], + 0 + ], 2, - ["case", ["==", ["%", ["to-number", ["get", "ele"]], 10], 0], 1, 0] + [ + "case", + [ + "==", + [ + "%", + [ + "to-number", + ["get","ele"] + ], + 10 + ], + 0 + ], + 1, + 0 + ] + ] + ], + "line-opacity": [ + "interpolate", + ["linear"], + ["zoom"], + 13, + [ + "match", + ["get","class"], + ["scree","ice","water"], + 0.25, + 0.45 + ], + 14, + [ + "match", + ["get","class"], + ["scree","ice","water"], + 0.3, + 0.55 ] ] - } + }, + "filter": [ + "all", + ["in","class","ice","water"] + ] }, { "id": "label_contour_line_20_grey", @@ -708,26 +1140,13 @@ }, "source": "swissmaptiles", "source-layer": "contour_line", - "minzoom": 16, - "filter": [ - "all", - ["==", ["%", ["to-number", ["get", "ele"]], 20], 0], - ["!=", ["%", ["to-number", ["get", "ele"]], 100], 0], - ["match", ["get", "class"], ["scree"], true, false] - ], + "minzoom": 16.0, "layout": { - "symbol-avoid-edges": true, - "symbol-placement": "line", - "symbol-spacing": 550, - "symbol-z-order": "auto", - "text-allow-overlap": false, - "text-field": "{ele} ", "text-font": ["Frutiger Neue Italic"], - "text-ignore-placement": false, + "text-size": 12, + "text-field": "{ele} ", + "visibility": "visible", "text-justify": "center", - "text-keep-upright": true, - "text-letter-spacing": 0.1, - "text-max-angle": 40, "text-padding": [ "interpolate", ["linear"], @@ -739,17 +1158,21 @@ 16, 80 ], - "text-pitch-alignment": "map", - "text-rotation-alignment": "map", - "text-size": 12, + "symbol-spacing": 550, + "symbol-z-order": "auto", + "text-max-angle": 40, "text-transform": "none", - "visibility": "visible" + "symbol-placement": "line", + "text-keep-upright": true, + "symbol-avoid-edges": true, + "text-allow-overlap": false, + "text-letter-spacing": 0.1, + "text-pitch-alignment": "map", + "text-ignore-placement": false, + "text-rotation-alignment": "map" }, "paint": { "text-color": "rgba(64,64,64, 1)", - "text-halo-blur": 0.5, - "text-halo-color": "rgba(238, 238, 238, .8)", - "text-halo-width": 2, "text-opacity": [ "step", ["zoom"], @@ -757,14 +1180,78 @@ 12, [ "case", - ["==", ["%", ["to-number", ["get", "ele"]], 100], 0], + [ + "==", + [ + "%", + [ + "to-number", + ["get","ele"] + ], + 100 + ], + 0 + ], 0.75, 0 ], 16, - ["case", ["==", ["%", ["to-number", ["get", "ele"]], 20], 0], 0.75, 0] + [ + "case", + [ + "==", + [ + "%", + [ + "to-number", + ["get","ele"] + ], + 20 + ], + 0 + ], + 0.75, + 0 + ] + ], + "text-halo-blur": 0.5, + "text-halo-color": "rgba(238, 238, 238, .8)", + "text-halo-width": 2 + }, + "filter": [ + "all", + [ + "==", + [ + "%", + [ + "to-number", + ["get","ele"] + ], + 20 + ], + 0 + ], + [ + "!=", + [ + "%", + [ + "to-number", + ["get","ele"] + ], + 100 + ], + 0 + ], + [ + "match", + ["get","class"], + ["scree"], + true, + false ] - } + ] }, { "id": "label_contour_line_20_blue", @@ -774,26 +1261,13 @@ }, "source": "swissmaptiles", "source-layer": "contour_line", - "minzoom": 16, - "filter": [ - "all", - ["==", ["%", ["to-number", ["get", "ele"]], 20], 0], - ["!=", ["%", ["to-number", ["get", "ele"]], 100], 0], - ["match", ["get", "class"], ["ice", "water"], true, false] - ], + "minzoom": 16.0, "layout": { - "symbol-avoid-edges": true, - "symbol-placement": "line", - "symbol-spacing": 550, - "symbol-z-order": "auto", - "text-allow-overlap": false, - "text-field": "{ele} ", "text-font": ["Frutiger Neue Italic"], - "text-ignore-placement": false, + "text-size": 12, + "text-field": "{ele} ", + "visibility": "visible", "text-justify": "center", - "text-keep-upright": true, - "text-letter-spacing": 0.1, - "text-max-angle": 40, "text-padding": [ "interpolate", ["linear"], @@ -805,17 +1279,21 @@ 16, 80 ], - "text-pitch-alignment": "map", - "text-rotation-alignment": "map", - "text-size": 12, + "symbol-spacing": 550, + "symbol-z-order": "auto", + "text-max-angle": 40, "text-transform": "none", - "visibility": "visible" + "symbol-placement": "line", + "text-keep-upright": true, + "symbol-avoid-edges": true, + "text-allow-overlap": false, + "text-letter-spacing": 0.1, + "text-pitch-alignment": "map", + "text-ignore-placement": false, + "text-rotation-alignment": "map" }, "paint": { "text-color": "rgba(0,136,208, 1)", - "text-halo-blur": 0.5, - "text-halo-color": "rgba(238, 238, 238, .8)", - "text-halo-width": 2, "text-opacity": [ "step", ["zoom"], @@ -823,14 +1301,78 @@ 12, [ "case", - ["==", ["%", ["to-number", ["get", "ele"]], 100], 0], + [ + "==", + [ + "%", + [ + "to-number", + ["get","ele"] + ], + 100 + ], + 0 + ], 0.75, 0 ], 16, - ["case", ["==", ["%", ["to-number", ["get", "ele"]], 20], 0], 0.75, 0] + [ + "case", + [ + "==", + [ + "%", + [ + "to-number", + ["get","ele"] + ], + 20 + ], + 0 + ], + 0.75, + 0 + ] + ], + "text-halo-blur": 0.5, + "text-halo-color": "rgba(238, 238, 238, .8)", + "text-halo-width": 2 + }, + "filter": [ + "all", + [ + "==", + [ + "%", + [ + "to-number", + ["get","ele"] + ], + 20 + ], + 0 + ], + [ + "!=", + [ + "%", + [ + "to-number", + ["get","ele"] + ], + 100 + ], + 0 + ], + [ + "match", + ["get","class"], + ["ice","water"], + true, + false ] - } + ] }, { "id": "label_contour_line_20_brown", @@ -840,26 +1382,13 @@ }, "source": "swissmaptiles", "source-layer": "contour_line", - "minzoom": 16, - "filter": [ - "all", - ["==", ["%", ["to-number", ["get", "ele"]], 20], 0], - ["!=", ["%", ["to-number", ["get", "ele"]], 100], 0], - ["match", ["get", "class"], ["land"], true, false] - ], + "minzoom": 16.0, "layout": { - "symbol-avoid-edges": true, - "symbol-placement": "line", - "symbol-spacing": 550, - "symbol-z-order": "auto", - "text-allow-overlap": false, - "text-field": "{ele} ", "text-font": ["Frutiger Neue Italic"], - "text-ignore-placement": false, + "text-size": 12, + "text-field": "{ele} ", + "visibility": "visible", "text-justify": "center", - "text-keep-upright": true, - "text-letter-spacing": 0.1, - "text-max-angle": 40, "text-padding": [ "interpolate", ["linear"], @@ -871,17 +1400,21 @@ 16, 80 ], - "text-pitch-alignment": "map", - "text-rotation-alignment": "map", - "text-size": 12, + "symbol-spacing": 550, + "symbol-z-order": "auto", + "text-max-angle": 40, "text-transform": "none", - "visibility": "visible" + "symbol-placement": "line", + "text-keep-upright": true, + "symbol-avoid-edges": true, + "text-allow-overlap": false, + "text-letter-spacing": 0.1, + "text-pitch-alignment": "map", + "text-ignore-placement": false, + "text-rotation-alignment": "map" }, "paint": { "text-color": "rgba(185,132,58, 1)", - "text-halo-blur": 0.5, - "text-halo-color": "rgba(238, 238, 238, .8)", - "text-halo-width": 2, "text-opacity": [ "step", ["zoom"], @@ -889,14 +1422,78 @@ 12, [ "case", - ["==", ["%", ["to-number", ["get", "ele"]], 100], 0], + [ + "==", + [ + "%", + [ + "to-number", + ["get","ele"] + ], + 100 + ], + 0 + ], 0.75, 0 ], 16, - ["case", ["==", ["%", ["to-number", ["get", "ele"]], 20], 0], 0.75, 0] + [ + "case", + [ + "==", + [ + "%", + [ + "to-number", + ["get","ele"] + ], + 20 + ], + 0 + ], + 0.75, + 0 + ] + ], + "text-halo-blur": 0.5, + "text-halo-color": "rgba(238, 238, 238, .8)", + "text-halo-width": 2 + }, + "filter": [ + "all", + [ + "==", + [ + "%", + [ + "to-number", + ["get","ele"] + ], + 20 + ], + 0 + ], + [ + "!=", + [ + "%", + [ + "to-number", + ["get","ele"] + ], + 100 + ], + 0 + ], + [ + "match", + ["get","class"], + ["land"], + true, + false ] - } + ] }, { "id": "label_contour_line_100_grey", @@ -906,25 +1503,21 @@ }, "source": "swissmaptiles", "source-layer": "contour_line", - "minzoom": 14, - "filter": [ - "all", - ["==", ["%", ["to-number", ["get", "ele"]], 100], 0], - ["match", ["get", "class"], ["scree"], true, false] - ], + "minzoom": 14.0, "layout": { - "symbol-avoid-edges": true, - "symbol-placement": "line", - "symbol-spacing": {"stops": [[14, 250], [16, 450]]}, - "symbol-z-order": "auto", - "text-allow-overlap": false, - "text-field": "{ele} ", "text-font": ["Frutiger Neue Italic"], - "text-ignore-placement": false, + "text-size": [ + "interpolate", + ["exponential",2], + ["zoom"], + 14, + 10.5, + 16, + 14 + ], + "text-field": "{ele} ", + "visibility": "visible", "text-justify": "center", - "text-keep-upright": true, - "text-letter-spacing": 0.1, - "text-max-angle": 35, "text-padding": [ "interpolate", ["linear"], @@ -936,25 +1529,26 @@ 16, 80 ], - "text-pitch-alignment": "map", - "text-rotation-alignment": "map", - "text-size": [ - "interpolate", - ["exponential", 2], - ["zoom"], - 14, - 10.5, - 16, - 14 - ], + "symbol-spacing": { + "stops": [ + [14,250], + [16,450] + ] + }, + "symbol-z-order": "auto", + "text-max-angle": 35, "text-transform": "none", - "visibility": "visible" + "symbol-placement": "line", + "text-keep-upright": true, + "symbol-avoid-edges": true, + "text-allow-overlap": false, + "text-letter-spacing": 0.1, + "text-pitch-alignment": "map", + "text-ignore-placement": false, + "text-rotation-alignment": "map" }, "paint": { "text-color": "rgba(64,64,64, 1)", - "text-halo-blur": 0.5, - "text-halo-color": "rgba(238, 238, 238, 0.8)", - "text-halo-width": 2, "text-opacity": [ "step", ["zoom"], @@ -962,14 +1556,66 @@ 12, [ "case", - ["==", ["%", ["to-number", ["get", "ele"]], 100], 0], + [ + "==", + [ + "%", + [ + "to-number", + ["get","ele"] + ], + 100 + ], + 0 + ], 0.75, 0 ], 16, - ["case", ["==", ["%", ["to-number", ["get", "ele"]], 20], 0], 0.75, 0] + [ + "case", + [ + "==", + [ + "%", + [ + "to-number", + ["get","ele"] + ], + 20 + ], + 0 + ], + 0.75, + 0 + ] + ], + "text-halo-blur": 0.5, + "text-halo-color": "rgba(238, 238, 238, 0.8)", + "text-halo-width": 2 + }, + "filter": [ + "all", + [ + "==", + [ + "%", + [ + "to-number", + ["get","ele"] + ], + 100 + ], + 0 + ], + [ + "match", + ["get","class"], + ["scree"], + true, + false ] - } + ] }, { "id": "label_contour_line_100_blue", @@ -979,25 +1625,21 @@ }, "source": "swissmaptiles", "source-layer": "contour_line", - "minzoom": 14, - "filter": [ - "all", - ["==", ["%", ["to-number", ["get", "ele"]], 100], 0], - ["match", ["get", "class"], ["ice", "water"], true, false] - ], + "minzoom": 14.0, "layout": { - "symbol-avoid-edges": true, - "symbol-placement": "line", - "symbol-spacing": {"stops": [[14, 250], [16, 450]]}, - "symbol-z-order": "auto", - "text-allow-overlap": false, - "text-field": "{ele} ", "text-font": ["Frutiger Neue Italic"], - "text-ignore-placement": false, + "text-size": [ + "interpolate", + ["exponential",2], + ["zoom"], + 14, + 10.5, + 16, + 14 + ], + "text-field": "{ele} ", + "visibility": "visible", "text-justify": "center", - "text-keep-upright": true, - "text-letter-spacing": 0.1, - "text-max-angle": 35, "text-padding": [ "interpolate", ["linear"], @@ -1009,25 +1651,26 @@ 16, 80 ], - "text-pitch-alignment": "map", - "text-rotation-alignment": "map", - "text-size": [ - "interpolate", - ["exponential", 2], - ["zoom"], - 14, - 10.5, - 16, - 14 - ], + "symbol-spacing": { + "stops": [ + [14,250], + [16,450] + ] + }, + "symbol-z-order": "auto", + "text-max-angle": 35, "text-transform": "none", - "visibility": "visible" + "symbol-placement": "line", + "text-keep-upright": true, + "symbol-avoid-edges": true, + "text-allow-overlap": false, + "text-letter-spacing": 0.1, + "text-pitch-alignment": "map", + "text-ignore-placement": false, + "text-rotation-alignment": "map" }, "paint": { "text-color": "rgba(0,136,208, 1)", - "text-halo-blur": 0.5, - "text-halo-color": "rgba(238, 238, 238, 0.8)", - "text-halo-width": 2, "text-opacity": [ "step", ["zoom"], @@ -1035,14 +1678,66 @@ 12, [ "case", - ["==", ["%", ["to-number", ["get", "ele"]], 100], 0], + [ + "==", + [ + "%", + [ + "to-number", + ["get","ele"] + ], + 100 + ], + 0 + ], 0.75, 0 ], 16, - ["case", ["==", ["%", ["to-number", ["get", "ele"]], 20], 0], 0.75, 0] + [ + "case", + [ + "==", + [ + "%", + [ + "to-number", + ["get","ele"] + ], + 20 + ], + 0 + ], + 0.75, + 0 + ] + ], + "text-halo-blur": 0.5, + "text-halo-color": "rgba(238, 238, 238, 0.8)", + "text-halo-width": 2 + }, + "filter": [ + "all", + [ + "==", + [ + "%", + [ + "to-number", + ["get","ele"] + ], + 100 + ], + 0 + ], + [ + "match", + ["get","class"], + ["ice","water"], + true, + false ] - } + ] }, { "id": "label_contour_line_100_brown", @@ -1052,25 +1747,21 @@ }, "source": "swissmaptiles", "source-layer": "contour_line", - "minzoom": 14, - "filter": [ - "all", - ["==", ["%", ["to-number", ["get", "ele"]], 100], 0], - ["match", ["get", "class"], ["land"], true, false] - ], + "minzoom": 14.0, "layout": { - "symbol-avoid-edges": true, - "symbol-placement": "line", - "symbol-spacing": {"stops": [[14, 250], [16, 450]]}, - "symbol-z-order": "auto", - "text-allow-overlap": false, - "text-field": "{ele} ", "text-font": ["Frutiger Neue Italic"], - "text-ignore-placement": false, + "text-size": [ + "interpolate", + ["exponential",2], + ["zoom"], + 14, + 10.5, + 16, + 14 + ], + "text-field": "{ele} ", + "visibility": "visible", "text-justify": "center", - "text-keep-upright": true, - "text-letter-spacing": 0.1, - "text-max-angle": 35, "text-padding": [ "interpolate", ["linear"], @@ -1082,25 +1773,26 @@ 16, 80 ], - "text-pitch-alignment": "map", - "text-rotation-alignment": "map", - "text-size": [ - "interpolate", - ["exponential", 2], - ["zoom"], - 14, - 10.5, - 16, - 14 - ], + "symbol-spacing": { + "stops": [ + [14,250], + [16,450] + ] + }, + "symbol-z-order": "auto", + "text-max-angle": 35, "text-transform": "none", - "visibility": "visible" + "symbol-placement": "line", + "text-keep-upright": true, + "symbol-avoid-edges": true, + "text-allow-overlap": false, + "text-letter-spacing": 0.1, + "text-pitch-alignment": "map", + "text-ignore-placement": false, + "text-rotation-alignment": "map" }, "paint": { "text-color": "rgba(185,132,58, 1)", - "text-halo-blur": 0.5, - "text-halo-color": "rgba(238, 238, 238, 0.8)", - "text-halo-width": 2, "text-opacity": [ "step", ["zoom"], @@ -1108,28 +1800,82 @@ 12, [ "case", - ["==", ["%", ["to-number", ["get", "ele"]], 100], 0], + [ + "==", + [ + "%", + [ + "to-number", + ["get","ele"] + ], + 100 + ], + 0 + ], 0.75, 0 ], 16, - ["case", ["==", ["%", ["to-number", ["get", "ele"]], 20], 0], 0.75, 0] + [ + "case", + [ + "==", + [ + "%", + [ + "to-number", + ["get","ele"] + ], + 20 + ], + 0 + ], + 0.75, + 0 + ] + ], + "text-halo-blur": 0.5, + "text-halo-color": "rgba(238, 238, 238, 0.8)", + "text-halo-width": 2 + }, + "filter": [ + "all", + [ + "==", + [ + "%", + [ + "to-number", + ["get","ele"] + ], + 100 + ], + 0 + ], + [ + "match", + ["get","class"], + ["land"], + true, + false ] - } + ] }, { "id": "water_outline", "type": "line", "source": "swissmaptiles", "source-layer": "water", - "filter": ["all", ["!=", "class", "ocean"]], - "layout": {"visibility": "visible"}, + "layout": { + "visibility": "visible" + }, "paint": { "line-blur": 0.5, "line-color": "rgba(133, 189, 224, 1)", + "line-width": 0.5, "line-opacity": [ "interpolate", - ["exponential", 1.5], + ["exponential",1.5], ["zoom"], 0, 0, @@ -1137,21 +1883,23 @@ 1, 14, 0 - ], - "line-width": 0.5 - } + ] + }, + "filter": [ + "all", + ["!=","class","ocean"] + ] }, { "id": "pattern_landcover_vineyard", "type": "fill", "source": "swissmaptiles", "source-layer": "landcover", - "minzoom": 13, - "filter": ["all", ["==", "subclass", "vineyard"]], + "minzoom": 13.0, "paint": { "fill-opacity": [ "interpolate", - ["exponential", 2], + ["exponential",2], ["zoom"], 13, 0, @@ -1161,21 +1909,23 @@ 1 ], "fill-pattern": "vinyard_green" - } + }, + "filter": [ + "all", + ["==","subclass","vineyard"] + ] }, { "id": "pattern_landcover_wetlands", "type": "fill", "source": "swissmaptiles", "source-layer": "landcover", - "minzoom": 13, - "filter": ["all", ["==", "class", "wetland"]], + "minzoom": 13.0, "paint": { - "fill-antialias": true, "fill-color": "#000000", "fill-opacity": [ "interpolate", - ["exponential", 2], + ["exponential",2], ["zoom"], 13, 0, @@ -1184,20 +1934,24 @@ 17, 1 ], - "fill-pattern": "wetland_blue" - } + "fill-pattern": "wetland_blue", + "fill-antialias": true + }, + "filter": [ + "all", + ["==","class","wetland"] + ] }, { "id": "pattern_landcover_orchard", "type": "fill", "source": "swissmaptiles", "source-layer": "landcover", - "minzoom": 13, - "filter": ["all", ["==", "subclass", "orchard"]], + "minzoom": 13.0, "paint": { "fill-opacity": [ "interpolate", - ["exponential", 2], + ["exponential",2], ["zoom"], 13, 0, @@ -1207,17 +1961,31 @@ 1 ], "fill-pattern": "orchard_green" - } + }, + "filter": [ + "all", + ["==","subclass","orchard"] + ] }, { "id": "park", "type": "line", "source": "swissmaptiles", "source-layer": "park", - "minzoom": 7, - "filter": ["all", ["in", "class", "national_park"]], + "minzoom": 7.0, "paint": { "line-color": "rgba(171, 197, 159, 1)", + "line-width": [ + "interpolate", + ["exponential",1.5], + ["zoom"], + 9, + 1.5, + 15, + 8, + 18, + 12 + ], "line-opacity": [ "interpolate", ["linear"], @@ -1230,33 +1998,19 @@ 1, 14, 0.6 - ], - "line-width": [ - "interpolate", - ["exponential", 1.5], - ["zoom"], - 9, - 1.5, - 15, - 8, - 18, - 12 ] - } + }, + "filter": [ + "all", + ["in","class","national_park"] + ] }, { "id": "boundary_disputed", "type": "line", "source": "swissmaptiles", "source-layer": "boundary", - "minzoom": 0, - "filter": [ - "all", - ["in", "admin_level", 2, 4], - ["!=", "maritime", 1], - ["==", "disputed", 1], - ["==", "$type", "LineString"] - ], + "minzoom": 0.0, "layout": { "line-cap": "square", "line-join": "miter", @@ -1265,63 +2019,134 @@ "paint": { "line-blur": 1, "line-color": { - "stops": [[6, "hsl(300, 55%, 80%)"], [9, "hsl(315, 40%, 85%)"]] + "stops": [ + [6,"hsl(300, 55%, 80%)"], + [9,"hsl(315, 40%, 85%)"] + ] }, - "line-dasharray": [1.5, 2.5], - "line-opacity": {"stops": [[13, 1], [14, 0.7]]}, "line-width": [ "interpolate", ["linear"], ["zoom"], 2, - ["match", ["get", "admin_level"], 2, 1, 0], + [ + "match", + ["get","admin_level"], + 2, + 1, + 0 + ], 3, - ["match", ["get", "admin_level"], 2, 2, 1], + [ + "match", + ["get","admin_level"], + 2, + 2, + 1 + ], 7, - ["match", ["get", "admin_level"], 2, 4, 1.5], + [ + "match", + ["get","admin_level"], + 2, + 4, + 1.5 + ], 18, - ["match", ["get", "admin_level"], 2, 16, 10] - ] - } + [ + "match", + ["get","admin_level"], + 2, + 16, + 10 + ] + ], + "line-opacity": { + "stops": [ + [13,1], + [14,0.7] + ] + }, + "line-dasharray": [1.5,2.5] + }, + "filter": [ + "all", + ["in","admin_level",2,4], + ["!=","maritime",1], + ["==","disputed",1], + ["==","$type","LineString"] + ] }, { "id": "boundary", "type": "line", "source": "swissmaptiles", "source-layer": "boundary", - "minzoom": 0, - "filter": [ - "all", - ["in", "admin_level", 2, 4], - ["!=", "maritime", 1], - ["!=", "disputed", 1], - ["==", "$type", "LineString"] - ], + "minzoom": 0.0, "layout": { - "line-cap": ["literal", "round"], - "line-join": ["literal", "miter"], + "line-cap": ["literal","round"], + "line-join": ["literal","miter"], "visibility": "visible" }, "paint": { "line-blur": 1, "line-color": { - "stops": [[6, "hsl(300, 55%, 80%)"], [9, "hsl(315, 40%, 85%)"]] + "stops": [ + [6,"hsl(300, 55%, 80%)"], + [9,"hsl(315, 40%, 85%)"] + ] }, - "line-opacity": {"stops": [[13, 1], [14, 0.8]]}, "line-width": [ "interpolate", ["linear"], ["zoom"], 2, - ["match", ["get", "admin_level"], 2, 1, 0], + [ + "match", + ["get","admin_level"], + 2, + 1, + 0 + ], 3, - ["match", ["get", "admin_level"], 2, 2, 1], + [ + "match", + ["get","admin_level"], + 2, + 2, + 1 + ], 7, - ["match", ["get", "admin_level"], 2, 3, 1], + [ + "match", + ["get","admin_level"], + 2, + 3, + 1 + ], 18, - ["match", ["get", "admin_level"], 2, 16, 10] - ] - } + [ + "match", + ["get","admin_level"], + 2, + 16, + 10 + ] + ], + "line-opacity": { + "stops": [ + [13,1], + [14,0.8] + ] + } + }, + "filter": [ + "all", + ["in","admin_level",2,4], + ["!=","maritime",1], + ["!=","disputed",1], + ["==","$type","LineString"] + ] }, { "id": "summits_az", @@ -1360,13 +2185,7 @@ "type": "line", "source": "swissmaptiles", "source-layer": "transportation", - "minzoom": 8, - "filter": [ - "all", - ["==", "brunnel", "tunnel"], - ["in", "class", "rail", "transit", "cable_car", "gondola"], - ["==", "$type", "LineString"] - ], + "minzoom": 8.0, "layout": { "line-cap": "butt", "line-join": "miter", @@ -1380,13 +2199,19 @@ 8, [ "match", - ["get", "class"], + ["get","class"], ["rail"], [ "match", - ["get", "subclass"], - ["rail", "narrow_gauge"], - ["match", ["get", "service"], ["yard", "siding"], 2.5, 0.6], + ["get","subclass"], + ["rail","narrow_gauge","rack_rail"], + [ + "match", + ["get","service"], + ["yard","siding"], + 2.5, + 0.6 + ], 0.6 ], 0.6 @@ -1394,13 +2219,19 @@ 14, [ "match", - ["get", "class"], + ["get","class"], ["rail"], [ "match", - ["get", "subclass"], - ["rail", "narrow_gauge"], - ["match", ["get", "service"], ["yard", "siding"], 2.5, 0.6], + ["get","subclass"], + ["rail","narrow_gauge","rack_rail"], + [ + "match", + ["get","service"], + ["yard","siding"], + 2.5, + 0.6 + ], 0.6 ], 0.6 @@ -1409,43 +2240,11 @@ 0.4 ], "line-color": { - "stops": [[7, "rgba(255, 50, 50, 1)"], [15, "rgba(255, 80, 80, 1)"]] - }, - "line-dasharray": { "stops": [ - [13, [4, 2.5]], - [14, [6, 3.75]], - [15, [10, 6.25]], - [16, [14, 8.75]] + [7,"rgba(255, 50, 50, 1)"], + [15,"rgba(255, 80, 80, 1)"] ] }, - "line-opacity": [ - "interpolate", - ["linear"], - ["zoom"], - 8, - 0, - 9, - ["match", ["get", "class"], ["rail"], 0.8, 0], - 13, - [ - "match", - ["get", "subclass"], - ["rail", "subway", "funicular", "narrow_gauge"], - 0.8, - 0 - ], - 14, - [ - "match", - ["get", "subclass"], - ["rail", "narrow_gauge", "funicular", "subway"], - ["match", ["get", "service"], ["yard", "siding"], 0, 0.8], - 0 - ], - 14.5, - 0.8 - ], "line-width": [ "interpolate", ["linear"], @@ -1453,13 +2252,19 @@ 8, [ "match", - ["get", "class"], + ["get","class"], ["rail"], [ "match", - ["get", "subclass"], - ["rail", "narrow_gauge"], - ["match", ["get", "service"], ["yard", "siding"], 0.2, 0.75], + ["get","subclass"], + ["rail","narrow_gauge","rack_rail"], + [ + "match", + ["get","service"], + ["yard","siding"], + 0.2, + 0.75 + ], 0.2 ], 0.2 @@ -1467,13 +2272,19 @@ 14, [ "match", - ["get", "class"], + ["get","class"], ["rail"], [ "match", - ["get", "subclass"], - ["rail", "narrow_gauge"], - ["match", ["get", "service"], ["yard", "siding"], 0.1, 1.25], + ["get","subclass"], + ["rail","narrow_gauge","rack_rail"], + [ + "match", + ["get","service"], + ["yard","siding"], + 0.1, + 1.25 + ], 1 ], ["cable_car"], @@ -1483,44 +2294,99 @@ 18, [ "match", - ["get", "class"], + ["get","class"], ["rail"], [ "match", - ["get", "subclass"], - ["rail", "narrow_gauge"], - ["match", ["get", "service"], ["yard", "siding"], 1, 2], + ["get","subclass"], + ["rail","narrow_gauge","rack_rail"], + [ + "match", + ["get","service"], + ["yard","siding"], + 1, + 2 + ], 2 ], ["cable_car"], 2, 1.5 ] - ] - } + ], + "line-opacity": [ + "interpolate", + ["linear"], + ["zoom"], + 8, + 0, + 9, + [ + "match", + ["get","class"], + ["rail"], + 0.8, + 0 + ], + 13, + [ + "match", + ["get","subclass"], + ["rail","subway","funicular","rack_rail","narrow_gauge"], + 0.8, + 0 + ], + 14, + [ + "match", + ["get","subclass"], + ["rail","narrow_gauge","funicular","rack_rail","subway"], + [ + "match", + ["get","service"], + ["yard","siding"], + 0, + 0.8 + ], + 0 + ], + 14.5, + 0.8 + ], + "line-dasharray": { + "stops": [ + [ + 13, + [4,2.5] + ], + [ + 14, + [6,3.75] + ], + [ + 15, + [10,6.25] + ], + [ + 16, + [14,8.75] + ] + ] + } + }, + "filter": [ + "all", + ["==","brunnel","tunnel"], + ["in","class","rail","transit","cable_car","gondola"], + ["==","$type","LineString"] + ] }, { "id": "tunnel_road", "type": "line", - "metadata": {"maputnik:comment": "casing color for motorway is brown"}, "source": "swissmaptiles", "source-layer": "transportation", - "minzoom": 7, - "filter": [ - "all", - ["==", "brunnel", "tunnel"], - [ - "!in", - "class", - "rail", - "ferry", - "transit", - "cable_car", - "gondola", - "path" - ], - ["==", "$type", "LineString"] - ], + "minzoom": 7.0, "layout": { "line-cap": "butt", "line-join": "miter", @@ -1532,40 +2398,46 @@ ["linear"], ["zoom"], 7, - ["literal", 3], + ["literal",2], 8, - ["literal", 1], + ["literal",1], 9, - ["match", ["get", "class"], ["motorway", "trunk", "primary"], 0.4, 3], + [ + "match", + ["get","class"], + ["motorway","trunk","primary"], + 0.4, + 3 + ], 10, [ "match", - ["get", "class"], - ["motorway", "trunk", "primary", "secondary"], + ["get","class"], + ["motorway","trunk","primary","secondary"], 0.4, 3 ], 11, [ "match", - ["get", "class"], - ["motorway", "trunk", "primary", "secondary"], + ["get","class"], + ["motorway","trunk","primary","secondary"], 0.4, 3 ], 12, [ "match", - ["get", "class"], - ["motorway", "trunk", "primary", "secondary", "tertiary"], + ["get","class"], + ["motorway","trunk","primary","secondary","tertiary"], 0.4, 3 ], 13, [ "match", - ["get", "class"], - ["motorway", "trunk", "primary", "secondary", "tertiary"], + ["get","class"], + ["motorway","trunk","primary","secondary","tertiary"], 0.4, ["minor"], 1, @@ -1574,91 +2446,123 @@ 15, 0.4 ], - "line-color": "rgba(170, 170, 170, 1)", - "line-dasharray": { + "line-color": { "stops": [ - [13, [3, 1.875]], - [14, [4, 2.5]], - [15, [5, 3.125]], - [16, [6, 3.75]] + [6,"rgba(170, 170, 170, 1)"], + [11,"rgba(130, 130, 130, 1)"] ] }, - "line-offset": 0, - "line-opacity": 1, "line-width": [ "interpolate", ["linear"], ["zoom"], - 7, - ["literal", 0], 8, - ["match", ["get", "class"], ["motorway", "trunk", "primary"], 1, 0], - 9, - ["match", ["get", "class"], ["motorway", "trunk", "primary"], 1.1, 0], + 1, 10, [ "match", - ["get", "class"], - ["motorway", "trunk", "primary", "secondary"], + ["get","class"], + ["motorway","trunk"], 1.2, + ["primary","secondary","tertiary","minor"], + 1, 0 ], 11, [ "match", - ["get", "class"], - ["motorway", "trunk", "primary", "secondary"], + ["get","class"], + ["motorway","trunk"], 1.3, - 0 - ], - 12, - [ - "match", - ["get", "class"], - ["motorway", "trunk", "primary", "secondary", "tertiary"], - 1.4, + ["primary","secondary","tertiary","minor"], + 1, 0 ], 13, [ "match", - ["get", "class"], - ["motorway", "trunk"], + ["get","class"], + ["motorway","trunk"], 1.5, - ["primary", "secondary", "tertiary", "minor"], + ["primary","secondary","tertiary","minor"], 1, 0 ], 14, [ "match", - ["get", "class"], - ["motorway", "trunk"], + ["get","class"], + ["motorway","trunk"], 2, - ["primary", "secondary", "tertiary", "minor"], + ["primary","secondary","tertiary","minor"], 1.5, 0 ], 15, - ["match", ["get", "class"], ["motorway", "trunk"], 3, 2], + [ + "match", + ["get","class"], + ["motorway","trunk"], + 3, + 2 + ], 20, - ["match", ["get", "class"], ["motorway", "trunk"], 5, 2.5] - ] - } - }, - { - "id": "tunnel_road_path", - "type": "line", - "metadata": {"maputnik:comment": "casing color for motorway is brown"}, - "source": "swissmaptiles", - "source-layer": "transportation", - "minzoom": 6, + [ + "match", + ["get","class"], + ["motorway","trunk"], + 5, + 2.5 + ] + ], + "line-offset": 0, + "line-opacity": [ + "step", + ["zoom"], + [ + "match", + ["get","oneway"], + 2, + 0, + 1 + ], + 12, + 1 + ], + "line-dasharray": { + "stops": [ + [ + 13, + [3,1.875] + ], + [ + 14, + [4,2.5] + ], + [ + 15, + [5,3.125] + ], + [ + 16, + [6,3.75] + ] + ] + } + }, "filter": [ "all", - ["==", "brunnel", "tunnel"], - ["==", "class", "path"], - ["==", "$type", "LineString"] - ], + ["==","brunnel","tunnel"], + ["!in","class","rail","ferry","transit","cable_car","gondola","path"], + ["==","$type","LineString"] + ] + }, + { + "id": "tunnel_road_path_footway", + "type": "line", + "source": "swissmaptiles", + "source-layer": "transportation", + "minzoom": 6.0, "layout": { "line-cap": "butt", "line-join": "miter", @@ -1667,58 +2571,96 @@ "paint": { "line-blur": 0.4, "line-color": "rgba(140, 140, 140, 1)", - "line-dasharray": { - "stops": [ - [14, [1, 0.6]], - [15, [1.5, 0.9]], - [16, [2, 1.2]], - [17, [3, 1.8]], - [18, [6, 3.6]] - ] - }, - "line-offset": 0, - "line-opacity": {"stops": [[14, 0], [15, 1]]}, "line-width": [ "interpolate", - ["exponential", 1.5], + ["exponential",1.5], ["zoom"], 15, 1.1, 20, 3 - ] - } + ], + "line-offset": 0, + "line-opacity": { + "stops": [ + [14,0], + [15,1] + ] + }, + "line-dasharray": { + "stops": [ + [ + 14, + [1,0.6] + ], + [ + 15, + [1.5,0.9] + ], + [ + 16, + [2,1.2] + ], + [ + 17, + [3,1.8] + ], + [ + 18, + [6,3.6] + ] + ] + } + }, + "filter": [ + "all", + ["==","brunnel","tunnel"], + ["in","class","path","footway"], + ["==","$type","LineString"] + ] }, { "id": "construct_line", "type": "line", "source": "swissmaptiles", "source-layer": "construct", - "minzoom": 14, - "filter": ["all", ["==", "class", "lock"]], + "minzoom": 14.0, "paint": { "line-blur": 0.4, "line-color": "hsl(220, 10%, 67%)", - "line-opacity": {"stops": [[14, 0], [15, 1]]}, - "line-width": {"stops": [[15, 1], [18, 4]]} - } + "line-width": { + "stops": [ + [15,1], + [18,4] + ] + }, + "line-opacity": { + "stops": [ + [14,0], + [15,1] + ] + } + }, + "filter": [ + "all", + ["==","class","lock"] + ] }, { "id": "construct", "type": "fill", "source": "swissmaptiles", "source-layer": "construct", - "minzoom": 13, - "filter": ["all", ["!=", "class", "lock"]], + "minzoom": 13.0, "paint": { "fill-color": [ "interpolate", - ["exponential", 1], + ["exponential",1], ["zoom"], 13, [ "match", - ["get", "class"], + ["get","class"], "weir", "hsl(220, 10%, 82%)", "hsl(220, 10%, 86%)" @@ -1726,7 +2668,7 @@ 17, [ "match", - ["get", "class"], + ["get","class"], "weir", "hsl(220, 10%, 75%)", "dam", @@ -1736,30 +2678,41 @@ ], "fill-opacity": [ "interpolate", - ["exponential", 1], + ["exponential",1], ["zoom"], 12, 0, 13, - ["match", ["get", "class"], "dam", 1, 0], + [ + "match", + ["get","class"], + "dam", + 1, + 0 + ], 14, - ["match", ["get", "class"], "dam", 1, 0], + [ + "match", + ["get","class"], + "dam", + 1, + 0 + ], 15, 1 ] - } + }, + "filter": [ + "all", + ["!=","class","lock"] + ] }, { "id": "aeroway_polygon_casing", "type": "line", "source": "swissmaptiles", "source-layer": "aeroway", - "minzoom": 11, - "filter": [ - "all", - ["in", "class", "runway", "taxiway", "apron", "runway_grass"], - ["==", "$type", "Polygon"] - ], + "minzoom": 11.0, "layout": { "line-cap": "round", "line-join": "round", @@ -1768,17 +2721,28 @@ "paint": { "line-blur": 0.4, "line-color": "rgb(190, 190, 190)", - "line-opacity": 1, - "line-width": {"base": 1.5, "stops": [[13, 3], [15, 4], [17, 5]]} - } + "line-width": { + "base": 1.5, + "stops": [ + [13,3], + [15,4], + [17,5] + ] + }, + "line-opacity": 1 + }, + "filter": [ + "all", + ["in","class","runway","taxiway","apron","runway_grass"], + ["==","$type","Polygon"] + ] }, { "id": "aeroway_line_casing", "type": "line", "source": "swissmaptiles", "source-layer": "aeroway", - "minzoom": 11, - "filter": ["all", ["==", "$type", "LineString"]], + "minzoom": 11.0, "layout": { "line-cap": "butt", "line-join": "miter", @@ -1787,10 +2751,9 @@ "paint": { "line-blur": 0.4, "line-color": "rgba(110, 110, 110, 1)", - "line-opacity": 1, "line-width": [ "interpolate", - ["exponential", 2], + ["exponential",2], ["zoom"], 11.5, 0, @@ -1800,103 +2763,187 @@ 11.25, 20, 153 - ] - } - }, - { - "id": "road_via_ferrata", - "type": "line", - "metadata": { - "maputnik:comment": "cannot be in the same layer as road_casings because dasharray doesn't support expressions" + ], + "line-opacity": 1 }, - "source": "swissmaptiles", - "source-layer": "transportation", - "minzoom": 14, "filter": [ "all", - ["in", "class", "via_ferrata"], - ["!in", "brunnel", "bridge", "tunnel"], - ["==", "$type", "LineString"] - ], + ["==","$type","LineString"] + ] + }, + { + "id": "road_via_ferrata_trail", + "type": "line", + "source": "swissmaptiles", + "source-layer": "transportation", + "minzoom": 14.0, "layout": { "line-cap": "butt", "line-join": "bevel", "visibility": "visible" }, "paint": { - "line-blur": {"stops": [[15, 0.1], [20, 0.4]]}, - "line-color": { - "stops": [[15, "rgba(20, 20, 20, 1)"], [18, "rgba(90, 90, 90, 1)"]] - }, - "line-dasharray": { + "line-blur": { "stops": [ - [15, [0.75, 2]], - [16, [1.125, 3]], - [17, [1.5, 4]], - [18, [1.875, 5]] + [15,0.1], + [20,0.4] + ] + }, + "line-color": { + "stops": [ + [15,"rgba(20, 20, 20, 1)"], + [18,"rgba(90, 90, 90, 1)"] ] }, - "line-opacity": {"stops": [[14, 0], [15, 1]]}, "line-width": [ "interpolate", - ["exponential", 1.5], + ["exponential",1.5], ["zoom"], 15, 1.1, 20, 3 - ] - } - }, - { - "id": "road_path", - "type": "line", + ], + "line-opacity": { + "stops": [ + [14,0], + [15,1] + ] + }, + "line-dasharray": { + "stops": [ + [ + 15, + [0.75,2] + ], + [ + 16, + [1.125,3] + ], + [ + 17, + [1.5,4] + ], + [ + 18, + [1.875,5] + ] + ] + } + }, + "metadata": { + "maputnik:comment": "cannot be in the same layer as road_casings because dasharray doesn't support expressions" + }, + "filter": [ + "all", + ["in","class","via_ferrata","trail"], + ["!in","brunnel","bridge","tunnel"], + ["==","$type","LineString"] + ] + }, + { + "id": "road_path_footway", + "type": "line", + "source": "swissmaptiles", + "source-layer": "transportation", + "minzoom": 11.0, + "layout": { + "line-cap": "butt", + "line-join": "bevel", + "visibility": "visible" + }, + "paint": { + "line-blur": [ + "interpolate", + ["linear"], + ["zoom"], + 15, + 0.1, + 20, + 0.4 + ], + "line-color": "rgba(115, 115, 115, 1)", + "line-width": [ + "interpolate", + ["exponential",1.5], + ["zoom"], + 13, + 0.5, + 15, + 1.1, + 20, + 3 + ], + "line-opacity": [ + "interpolate", + ["linear"], + ["zoom"], + 12, + [ + "match", + ["get","class"], + ["path","track","footway"], + 0.5, + 1 + ], + 15, + 1 + ], + "line-dasharray": [ + "step", + ["zoom"], + [ + "literal", + [6,2] + ], + 16, + [ + "literal", + [9,3] + ], + 17, + [ + "literal", + [12,4] + ], + 18, + [ + "literal", + [15,5] + ] + ] + }, "metadata": { "maputnik:comment": "cannot be in the same layer as road_casings because dasharray doesn't support expressions" }, - "source": "swissmaptiles", - "source-layer": "transportation", - "minzoom": 14, "filter": [ "all", - ["match", ["get", "class"], ["path"], true, false], [ "match", - ["get", "brunnel"], - ["bridge", "tunnel"], - ["match", ["get", "subclass"], "covered_bridge", true, false], + ["get","class"], + ["path","footway"], + true, + false + ], + [ + "match", + ["get","brunnel"], + ["bridge","tunnel"], + [ + "match", + ["get","subclass"], + "covered_bridge", + true, + false + ], true ], - ["==", ["geometry-type"], "LineString"] - ], - "layout": { - "line-cap": "butt", - "line-join": "bevel", - "visibility": "visible" - }, - "paint": { - "line-blur": {"stops": [[15, 0.1], [20, 0.4]]}, - "line-color": "rgba(115, 115, 115, 1)", - "line-dasharray": { - "stops": [ - [14, [3, 1]], - [15, [6, 2]], - [16, [9, 3]], - [17, [12, 4]], - [18, [15, 5]] - ] - }, - "line-opacity": {"stops": [[14, 0], [15, 1]]}, - "line-width": [ - "interpolate", - ["exponential", 1.5], - ["zoom"], - 15, - 1.1, - 20, - 3 + [ + "==", + ["geometry-type"], + "LineString" ] - } + ] }, { "id": "road_path_pedestrian_sac", @@ -1984,126 +3031,242 @@ "type": "line", "source": "swissmaptiles", "source-layer": "building_ln", - "minzoom": 13, + "minzoom": 13.0, "paint": { "line-blur": 0.4, "line-color": [ "match", - ["get", "class"], + ["get","class"], "weir", "rgb(20, 136, 205)", "rgb(130, 130, 130)" ], - "line-opacity": ["match", ["get", "class"], "weir", 0.2, 1], - "line-width": {"stops": [[13, 0], [16, 2], [18, 3]]} + "line-width": { + "stops": [ + [13,0], + [16,2], + [18,3] + ] + }, + "line-opacity": [ + "match", + ["get","class"], + "weir", + 0.2, + 1 + ] } }, { "id": "road_casing", "type": "line", - "metadata": {"maputnik:comment": "casing color for motorway is brown"}, "source": "swissmaptiles", "source-layer": "transportation", - "minzoom": 7, - "filter": [ - "all", - [ - "match", - ["get", "class"], - [ - "cable_car", - "car_ferry", - "chair_lift", - "ferry", - "gondola", - "path", - "rail", - "transit", - "via_ferrata" - ], - false, - true - ], - [ - "match", - ["get", "brunnel"], - ["bridge", "tunnel"], - ["match", ["get", "subclass"], "covered_bridge", true, false], - true - ], - ["==", ["geometry-type"], "LineString"] - ], + "minzoom": 7.0, "layout": { "line-cap": "round", "line-join": "round", "visibility": "visible" }, "paint": { - "line-blur": {"stops": [[7, 3], [8, 0.4]]}, + "line-blur": [ + "interpolate", + ["linear"], + ["zoom"], + 7, + 3, + 8, + 0.4, + 12, + [ + "match", + ["get","is_route"], + [11], + 2, + 0.4 + ], + 13, + [ + "match", + ["get","class"], + "track", + 2, + 0.4 + ], + 14, + 0.4 + ], "line-color": [ "interpolate", - ["exponential", 1.7], + ["exponential",1.7], ["zoom"], 9, [ "match", - ["get", "class"], - ["motorway", "trunk"], + ["get","class"], + ["motorway","trunk"], "rgb(170, 136, 30)", "rgb(80, 80, 80)" ], 15, [ "match", - ["get", "class"], - ["motorway", "trunk"], + ["get","class"], + ["motorway","trunk"], "rgb(139, 107, 63)", "rgb(90, 90, 90)" ] ], - "line-offset": 0, "line-width": [ "interpolate", - ["exponential", 2], + ["exponential",2], ["zoom"], 7, - ["literal", 0], + ["literal",0], 8, - ["match", ["get", "ramp"], 1, 1.5, 3], + [ + "match", + ["get","ramp"], + 1, + 1.5, + 3 + ], 10, [ "match", - ["get", "class"], + ["get","class"], ["motorway"], - ["match", ["get", "ramp"], 1, 2.5, 4], + [ + "match", + ["get","ramp"], + 1, + 2.5, + 4 + ], ["trunk"], 4, - 3 + [ + "match", + ["get","is_route"], + 11, + 0, + 3 + ] + ], + 11, + [ + "match", + ["get","class"], + ["motorway"], + [ + "match", + ["get","ramp"], + 1, + 2.5, + 4 + ], + ["trunk"], + 4, + [ + "match", + ["get","is_route"], + 11, + 0, + 3 + ] ], 12, [ "match", - ["get", "class"], + ["get","class"], ["motorway"], - ["match", ["get", "ramp"], 1, 2.5, 5], + [ + "match", + ["get","ramp"], + 1, + 3, + 5 + ], ["trunk"], - ["match", ["get", "oneway"], 1, 5, 5], + [ + "match", + ["get","oneway"], + 1, + 5, + 5 + ], ["primary"], - 5, + [ + "match", + ["get","is_route"], + [11], + 0.75, + [5,6,7,8,9,10,99], + 5, + 0 + ], ["secondary"], - 4.5, + [ + "match", + ["get","is_route"], + [11], + 0.75, + [5,6,7,8,9,10,99], + 4.5, + 0 + ], ["tertiary"], - 3.25, + [ + "match", + ["get","is_route"], + [11], + 0.75, + [5,6,7,8,9,10,99], + 3.25, + 0 + ], + ["track"], + [ + "match", + ["get","is_route"], + [11], + 0.75, + [5,6,7,8,9,10,99], + 0.75, + 0 + ], + ["minor"], + [ + "match", + ["get","is_route"], + [11], + 0.75, + [5,6,7,8,9,10,99], + 3, + 0 + ], 0 ], 13, [ "match", - ["get", "class"], + ["get","class"], ["motorway"], - ["match", ["get", "ramp"], 1, 3.5, 5.5], + [ + "match", + ["get","ramp"], + 1, + 3.5, + 5.5 + ], ["trunk"], - ["match", ["get", "oneway"], 1, 5.5, 5.5], + [ + "match", + ["get","oneway"], + 1, + 5.5, + 5.5 + ], ["primary"], 5.5, ["secondary"], @@ -2112,16 +3275,30 @@ 4, ["minor"], 3, + ["track"], + 0.5, 0 ], 15, [ "match", - ["get", "class"], + ["get","class"], ["motorway"], - ["match", ["get", "ramp"], 1, 6.5, 8], + [ + "match", + ["get","ramp"], + 1, + 6.5, + 8 + ], ["trunk"], - ["match", ["get", "oneway"], 1, 8, 9], + [ + "match", + ["get","oneway"], + 1, + 8, + 9 + ], ["primary"], 9, ["secondary"], @@ -2137,11 +3314,23 @@ 16, [ "match", - ["get", "class"], + ["get","class"], ["motorway"], - ["match", ["get", "ramp"], 1, 10, 12], + [ + "match", + ["get","ramp"], + 1, + 10, + 12 + ], ["trunk"], - ["match", ["get", "oneway"], 1, 12, 15], + [ + "match", + ["get","oneway"], + 1, + 12, + 15 + ], ["primary"], 15, ["secondary"], @@ -2157,8 +3346,8 @@ 20, [ "match", - ["get", "class"], - ["motorway", "trunk", "primary", "rail"], + ["get","class"], + ["motorway","trunk","primary","rail"], 120, ["secondary"], 115, @@ -2170,147 +3359,266 @@ 3, 95 ] + ], + "line-offset": 0, + "line-opacity": 1 + }, + "metadata": { + "maputnik:comment": "casing color for motorway is brown" + }, + "filter": [ + "all", + [ + "match", + ["get","class"], + ["cable_car","car_ferry","chair_lift","ferry","gondola","path","footway","trail","rail","transit","via_ferrata"], + false, + true + ], + [ + "match", + ["get","brunnel"], + ["bridge","tunnel"], + [ + "match", + ["get","subclass"], + "covered_bridge", + true, + false + ], + true + ], + [ + "==", + ["geometry-type"], + "LineString" ] - } + ] }, { "id": "landuse_parking", "type": "fill", "source": "swissmaptiles", "source-layer": "landuse", - "filter": ["all", ["in", "class", "parking"]], - "layout": {"visibility": "visible"}, + "layout": { + "visibility": "visible" + }, "paint": { "fill-color": "rgba(255, 255, 255, 1)", - "fill-opacity": {"stops": [[14, 0], [15, 1]]} - } + "fill-opacity": { + "stops": [ + [14,0], + [15,1] + ] + } + }, + "filter": [ + "all", + ["in","class","parking"] + ] }, { "id": "landuse_parking_outline", "type": "line", "source": "swissmaptiles", "source-layer": "landuse", - "filter": ["all", ["in", "class", "parking"]], - "layout": {"visibility": "visible"}, + "layout": { + "visibility": "visible" + }, "paint": { "line-color": "rgba(130, 130, 130, 1)", - "line-opacity": {"stops": [[14, 0], [15, 1]]}, "line-width": [ "interpolate", - ["exponential", 1.5], + ["exponential",1.5], ["zoom"], 11, 0.25, 16, 0.75 - ] - } + ], + "line-opacity": { + "stops": [ + [14,0], + [15,1] + ] + } + }, + "filter": [ + "all", + ["in","class","parking"] + ] }, { "id": "road_fill", "type": "line", "source": "swissmaptiles", "source-layer": "transportation", - "minzoom": 7, - "filter": [ - "all", - [ - "match", - ["get", "class"], - [ - "cable_car", - "car_ferry", - "chair_lift", - "ferry", - "gondola", - "path", - "rail", - "track", - "transit", - "via_ferrata" - ], - false, - true - ], - [ - "match", - ["get", "brunnel"], - ["bridge", "tunnel"], - ["match", ["get", "subclass"], "covered_bridge", true, false], - true - ], - ["==", ["geometry-type"], "LineString"] - ], + "minzoom": 7.0, "layout": { "line-cap": "round", "line-join": "round", "visibility": "visible" }, "paint": { - "line-blur": {"stops": [[8, 0.4], [14, 0.1]]}, + "line-blur": { + "stops": [ + [8,0.4], + [14,0.1] + ] + }, "line-color": [ "interpolate", - ["exponential", 1], + ["exponential",1], ["zoom"], 9, [ "match", - ["get", "class"], - ["motorway", "trunk"], + ["get","class"], + ["motorway","trunk"], "rgb(255,230,160)", "rgb(255,255,255)" ], 15, [ "match", - ["get", "class"], - ["motorway", "trunk"], + ["get","class"], + ["motorway","trunk"], "rgb(255, 224, 138)", "rgb(255,255,255)" ] ], "line-width": [ "interpolate", - ["exponential", 2], + ["exponential",2], ["zoom"], 7, - ["literal", 0], + ["literal",0], 8, - ["match", ["get", "ramp"], 1, 0.5, 2], + [ + "match", + ["get","ramp"], + 1, + 0.5, + 2 + ], 10, [ "match", - ["get", "class"], + ["get","class"], ["motorway"], - ["match", ["get", "ramp"], 1, 1.5, 2.75], + [ + "match", + ["get","ramp"], + 1, + 1.5, + 2.75 + ], ["trunk"], 2.75, - 2 + [ + "match", + ["get","is_route"], + 11, + 0, + 2 + ] + ], + 11, + [ + "match", + ["get","class"], + ["motorway"], + [ + "match", + ["get","ramp"], + 1, + 1.5, + 2.75 + ], + ["trunk"], + 2.75, + [ + "match", + ["get","is_route"], + 11, + 0, + 2 + ] ], 12, [ "match", - ["get", "class"], + ["get","class"], ["motorway"], - ["match", ["get", "ramp"], 1, 1.5, 3.75], + [ + "match", + ["get","ramp"], + 1, + 1.5, + 3.75 + ], ["trunk"], - ["match", ["get", "oneway"], 1, 3.75, 3.75], + [ + "match", + ["get","oneway"], + 1, + 3.75, + 3.75 + ], ["primary"], - 3.75, + [ + "match", + ["get","is_route"], + [5,6,7,8,9,10,99], + 3.75, + 0 + ], ["secondary"], - 3.25, + [ + "match", + ["get","is_route"], + [5,6,7,8,9,10,99], + 3.25, + 0 + ], ["tertiary"], - 2.25, + [ + "match", + ["get","is_route"], + [5,6,7,8,9,10,99], + 2.25, + 0 + ], + ["minor","path","track","footway"], + [ + "match", + ["get","is_route"], + [5,6,7,8,9,10,99], + 2, + 0 + ], 0 ], 13, [ "match", - ["get", "class"], + ["get","class"], ["motorway"], - ["match", ["get", "ramp"], 1, 2.75, 4.25], + [ + "match", + ["get","ramp"], + 1, + 2.75, + 4.25 + ], ["trunk"], - ["match", ["get", "oneway"], 1, 4.25, 4.25], + [ + "match", + ["get","oneway"], + 1, + 4.25, + 4.25 + ], ["primary"], 4.25, ["secondary"], @@ -2324,16 +3632,28 @@ 15, [ "match", - ["get", "class"], + ["get","class"], ["motorway"], - ["match", ["get", "ramp"], 1, 5, 6.5], + [ + "match", + ["get","ramp"], + 1, + 5, + 6.5 + ], ["trunk"], - ["match", ["get", "oneway"], 1, 6.5, 7.5], + [ + "match", + ["get","oneway"], + 1, + 6.5, + 7.5 + ], ["primary"], 7.5, ["secondary"], 6.5, - ["tertiary", "rail"], + ["tertiary","rail"], 5.5, ["minor"], 3.5, @@ -2342,16 +3662,28 @@ 16, [ "match", - ["get", "class"], + ["get","class"], ["motorway"], - ["match", ["get", "ramp"], 1, 8.5, 10.5], + [ + "match", + ["get","ramp"], + 1, + 8.5, + 10.5 + ], ["trunk"], - ["match", ["get", "oneway"], 1, 10.5, 13.5], + [ + "match", + ["get","oneway"], + 1, + 10.5, + 13.5 + ], ["primary"], 13.5, ["secondary"], 11.5, - ["tertiary", "rail"], + ["tertiary","rail"], 9.5, ["minor"], 7.5, @@ -2360,8 +3692,8 @@ 20, [ "match", - ["get", "class"], - ["motorway", "trunk", "primary", "rail"], + ["get","class"], + ["motorway","trunk","primary","rail"], 117, ["secondary"], 112, @@ -2372,15 +3704,42 @@ 92 ] ] - } + }, + "filter": [ + "all", + [ + "match", + ["get","class"], + ["cable_car","car_ferry","chair_lift","ferry","gondola","path","footway","trail","rail","track","transit","via_ferrata"], + false, + true + ], + [ + "match", + ["get","brunnel"], + ["bridge","tunnel"], + [ + "match", + ["get","subclass"], + "covered_bridge", + true, + false + ], + true + ], + [ + "==", + ["geometry-type"], + "LineString" + ] + ] }, { "id": "aeroway_line_fill", "type": "line", "source": "swissmaptiles", "source-layer": "aeroway", - "minzoom": 11, - "filter": ["all", ["==", "$type", "LineString"]], + "minzoom": 11.0, "layout": { "line-cap": "butt", "line-join": "miter", @@ -2390,15 +3749,14 @@ "line-blur": 0.4, "line-color": [ "match", - ["get", "class"], + ["get","class"], ["runway_grass"], "rgb(224,234,221)", "rgb(255, 255, 255)" ], - "line-opacity": 1, "line-width": [ "interpolate", - ["exponential", 2], + ["exponential",2], ["zoom"], 11, 0, @@ -2408,51 +3766,57 @@ 10, 20, 150 - ] - } + ], + "line-opacity": 1 + }, + "filter": [ + "all", + ["==","$type","LineString"] + ] }, { "id": "aeroway_polygon_fill", "type": "fill", "source": "swissmaptiles", "source-layer": "aeroway", - "minzoom": 11, - "filter": [ - "all", - ["in", "class", "runway", "taxiway", "apron", "runway_grass"], - ["==", "$type", "Polygon"] - ], - "layout": {"visibility": "visible"}, + "minzoom": 11.0, + "layout": { + "visibility": "visible" + }, "paint": { - "fill-antialias": true, "fill-color": [ "match", - ["get", "class"], + ["get","class"], ["runway_grass"], "rgb(224,234,221)", "rgb(255, 255, 255)" ], - "fill-opacity": 1 - } + "fill-opacity": 1, + "fill-antialias": true + }, + "filter": [ + "all", + ["in","class","runway","taxiway","apron","runway_grass"], + ["==","$type","Polygon"] + ] }, { "id": "car_ferry", "type": "line", "source": "swissmaptiles", "source-layer": "transportation", - "minzoom": 9, - "filter": ["all", ["==", "class", "car_ferry"]], - "layout": {"visibility": "visible"}, + "minzoom": 9.0, + "layout": { + "visibility": "visible" + }, "paint": { "line-blur": 0.4, "line-color": "rgba(105, 187, 218, 1)", - "line-dasharray": { + "line-width": { "stops": [ - [12, [6, 2]], - [13, [9, 3]], - [14, [12, 4]], - [15, [15, 5]], - [16, [18, 6]] + [8,0.4], + [14,1], + [18,2] ] }, "line-opacity": [ @@ -2462,51 +3826,118 @@ 9, 0, 11, - ["match", ["get", "class"], ["car_ferry"], 1, 0], + [ + "match", + ["get","class"], + ["car_ferry"], + 1, + 0 + ], 12, - ["match", ["get", "class"], ["car_ferry"], 1, 0], + [ + "match", + ["get","class"], + ["car_ferry"], + 1, + 0 + ], 13, 1 ], - "line-width": {"stops": [[8, 0.4], [14, 1], [18, 2]]} - } + "line-dasharray": { + "stops": [ + [ + 12, + [6,2] + ], + [ + 13, + [9,3] + ], + [ + 14, + [12,4] + ], + [ + 15, + [15,5] + ], + [ + 16, + [18,6] + ] + ] + } + }, + "filter": [ + "all", + ["==","class","car_ferry"] + ] }, { "id": "ferry", "type": "line", "source": "swissmaptiles", "source-layer": "transportation", - "minzoom": 12, - "filter": ["all", ["==", "class", "ferry"]], - "layout": {"visibility": "visible"}, + "minzoom": 12.0, + "layout": { + "visibility": "visible" + }, "paint": { "line-blur": 0.4, "line-color": "rgba(105, 187, 218, 1)", - "line-dasharray": { + "line-width": { "stops": [ - [12, [3, 1]], - [13, [6, 2]], - [14, [9, 3]], - [15, [12, 4]], - [16, [15, 5]] + [8,0.4], + [14,1], + [18,2] ] }, - "line-opacity": {"stops": [[12, 0], [13, 1]]}, - "line-width": {"stops": [[8, 0.4], [14, 1], [18, 2]]} - } + "line-opacity": { + "stops": [ + [12,0], + [13,1] + ] + }, + "line-dasharray": { + "stops": [ + [ + 12, + [3,1] + ], + [ + 13, + [6,2] + ], + [ + 14, + [9,3] + ], + [ + 15, + [12,4] + ], + [ + 16, + [15,5] + ] + ] + } + }, + "filter": [ + "all", + ["==","class","ferry"] + ] }, { "id": "public_transport", "type": "line", "source": "swissmaptiles", "source-layer": "transportation", - "minzoom": 8, - "filter": [ - "all", - ["in", "class", "rail", "transit"], - ["!in", "brunnel", "bridge", "tunnel"] - ], - "layout": {"visibility": "visible"}, + "minzoom": 8.0, + "layout": { + "visibility": "visible" + }, "paint": { "line-blur": [ "interpolate", @@ -2515,13 +3946,19 @@ 8, [ "match", - ["get", "class"], + ["get","class"], ["rail"], [ "match", - ["get", "subclass"], - ["rail", "narrow_gauge"], - ["match", ["get", "service"], ["yard", "siding"], 2.5, 0.6], + ["get","subclass"], + ["rail","narrow_gauge","rack_rail"], + [ + "match", + ["get","service"], + ["yard","siding"], + 2.5, + 0.6 + ], 0.6 ], 0.6 @@ -2529,13 +3966,19 @@ 14, [ "match", - ["get", "class"], + ["get","class"], ["rail"], [ "match", - ["get", "subclass"], - ["rail", "narrow_gauge"], - ["match", ["get", "service"], ["yard", "siding"], 2.5, 0.6], + ["get","subclass"], + ["rail","narrow_gauge","rack_rail"], + [ + "match", + ["get","service"], + ["yard","siding"], + 2.5, + 0.6 + ], 0.6 ], 0.6 @@ -2544,37 +3987,11 @@ 0.4 ], "line-color": { - "stops": [[7, "rgba(255, 50, 50, 1)"], [15, "rgba(255, 80, 80, 1)"]] + "stops": [ + [7,"rgba(255, 50, 50, 1)"], + [15,"rgba(255, 80, 80, 1)"] + ] }, - "line-opacity": [ - "interpolate", - ["linear"], - ["zoom"], - 8, - 0, - 9, - ["match", ["get", "class"], ["rail"], 1, 0], - 12, - ["match", ["get", "class"], ["rail"], 1, 0], - 13, - ["match", ["get", "class"], ["rail"], 1, 0], - 14, - [ - "match", - ["get", "class"], - ["rail"], - [ - "match", - ["get", "subclass"], - ["rail", "narrow_gauge", "funicular"], - ["match", ["get", "service"], ["yard", "siding"], 0, 1], - 0 - ], - 0 - ], - 14.5, - 1 - ], "line-width": [ "interpolate", ["linear"], @@ -2582,13 +3999,19 @@ 8, [ "match", - ["get", "class"], + ["get","class"], ["rail"], [ "match", - ["get", "subclass"], - ["rail", "narrow_gauge"], - ["match", ["get", "service"], ["yard", "siding"], 0.2, 0.5], + ["get","subclass"], + ["rail","narrow_gauge","rack_rail"], + [ + "match", + ["get","service"], + ["yard","siding"], + 0.2, + 0.5 + ], 0.2 ], 0.2 @@ -2596,13 +4019,19 @@ 14, [ "match", - ["get", "class"], + ["get","class"], ["rail"], [ "match", - ["get", "subclass"], - ["rail", "narrow_gauge"], - ["match", ["get", "service"], ["yard", "siding"], 0.2, 1], + ["get","subclass"], + ["rail","narrow_gauge","rack_rail"], + [ + "match", + ["get","service"], + ["yard","siding"], + 0.2, + 1 + ], 1 ], ["cable_car"], @@ -2612,88 +4041,159 @@ 18, [ "match", - ["get", "class"], + ["get","class"], ["rail"], [ "match", - ["get", "subclass"], - ["rail", "narrow_gauge"], - ["match", ["get", "service"], ["yard", "siding"], 1.5, 2], + ["get","subclass"], + ["rail","narrow_gauge","rack_rail"], + [ + "match", + ["get","service"], + ["yard","siding"], + 1.5, + 2 + ], 2 ], 1.5 ] + ], + "line-opacity": [ + "interpolate", + ["linear"], + ["zoom"], + 8, + 0, + 9, + [ + "match", + ["get","class"], + ["rail"], + 1, + 0 + ], + 12, + [ + "match", + ["get","class"], + ["rail"], + 1, + 0 + ], + 13, + [ + "match", + ["get","class"], + ["rail"], + 1, + 0 + ], + 14, + [ + "match", + ["get","class"], + ["rail"], + [ + "match", + ["get","subclass"], + ["rail","narrow_gauge","rack_rail","funicular"], + [ + "match", + ["get","service"], + ["yard","siding"], + 0, + 1 + ], + 0 + ], + 0 + ], + 14.5, + 1 ] - } + }, + "filter": [ + "all", + ["in","class","rail","transit"], + ["!in","brunnel","bridge","tunnel"] + ] }, { "id": "sinkhole", "type": "symbol", "source": "swissmaptiles", "source-layer": "spot_elevation", - "minzoom": 14, - "filter": [ - "all", - [ - "in", - "class", - "sinkhole", - "sinkhole_rock", - "sinkhole_scree", - "sinkhole_water", - "sinkhole_ice" - ] - ], + "minzoom": 14.0, "layout": { - "icon-anchor": "bottom", + "icon-size": 1, + "text-font": [], + "text-size": 16, "icon-image": [ "match", - ["get", "class"], + ["get","class"], "sinkhole", "arrow_brown", - ["sinkhole_rock", "sinkhole_scree"], + ["sinkhole_rock","sinkhole_scree"], "arrow_grey", - ["sinkhole_ice", "sinkhole_water"], + ["sinkhole_ice","sinkhole_water"], "arrow_blue", "" ], - "icon-offset": [0, 0], - "icon-optional": false, - "icon-padding": 30, - "icon-rotate": 15, - "icon-size": 1, - "symbol-placement": "point", - "text-allow-overlap": false, - "text-anchor": "center", "text-field": "", - "text-font": [], - "text-ignore-placement": false, - "text-keep-upright": false, + "visibility": "visible", + "icon-anchor": "bottom", + "icon-offset": [0,0], + "icon-rotate": 15, + "text-anchor": "center", + "icon-padding": 30, + "icon-optional": false, "text-optional": false, - "text-size": 16, - "visibility": "visible" + "symbol-placement": "point", + "text-keep-upright": false, + "text-allow-overlap": false, + "text-ignore-placement": false }, "paint": { "icon-color": "#000000", - "icon-opacity": {"stops": [[14, 0], [15, 0.6]]}, "text-color": "#000000", + "icon-opacity": { + "stops": [ + [14,0], + [15,0.6] + ] + }, + "text-opacity": 1, "text-halo-blur": 1, - "text-halo-width": 0, - "text-opacity": 1 - } + "text-halo-width": 0 + }, + "filter": [ + "all", + ["in","class","sinkhole","sinkhole_rock","sinkhole_scree","sinkhole_water","sinkhole_ice"] + ] }, { "id": "building_2d", "type": "fill", "source": "swissmaptiles", "source-layer": "building", - "minzoom": 13, - "layout": {"visibility": "visible"}, + "minzoom": 13.0, + "layout": { + "visibility": "visible" + }, "paint": { "fill-color": { - "stops": [[13, "hsl(220, 10%, 82%)"], [17, "hsl(220, 10%, 75%)"]] + "stops": [ + [13,"hsl(220, 10%, 82%)"], + [17,"hsl(220, 10%, 75%)"] + ] }, - "fill-opacity": {"stops": [[13, 0], [13.5, 1]]} + "fill-opacity": { + "stops": [ + [13,0], + [13.5,1] + ] + } } }, { @@ -2701,10 +4201,21 @@ "type": "line", "source": "swissmaptiles", "source-layer": "building", - "minzoom": 15, - "layout": {"visibility": "visible"}, + "minzoom": 15.0, + "layout": { + "visibility": "visible" + }, "paint": { "line-color": "hsl(220, 10%, 67%)", + "line-width": [ + "interpolate", + ["linear"], + ["zoom"], + 15, + 0.2, + 18, + 1.2 + ], "line-opacity": [ "interpolate", ["linear"], @@ -2715,8 +4226,7 @@ 0.5, 19, 1 - ], - "line-width": ["interpolate", ["linear"], ["zoom"], 15, 0.2, 18, 1.2] + ] } }, { @@ -2724,150 +4234,309 @@ "type": "symbol", "source": "swissmaptiles", "source-layer": "spot_elevation", - "minzoom": 12, - "filter": ["all", ["==", "class", "lake_elevation"]], + "minzoom": 12.0, "layout": { - "icon-allow-overlap": true, - "icon-ignore-placement": true, + "icon-size": 1, + "text-font": ["Frutiger Neue Italic"], + "text-size": [ + "interpolate", + ["linear"], + ["zoom"], + 14, + 10.5, + 18, + 13 + ], "icon-image": [ "case", - ["has", "lake_depth"], + ["has","lake_depth"], "arrow_line_blue", - ["==", ["length", ["to-string", ["get", "ele"]]], 3], + [ + "==", + [ + "length", + [ + "to-string", + ["get","ele"] + ] + ], + 3 + ], "line_blue_short", "line_blue_long" ], - "icon-offset": [0, 0], - "icon-optional": false, - "icon-size": 1, - "symbol-placement": "point", - "text-allow-overlap": false, - "text-anchor": "center", "text-field": [ "case", - ["has", "lake_depth"], - ["concat", ["get", "ele"], "\n\n", ["get", "lake_depth"]], - ["get", "ele"] + ["has","lake_depth"], + [ + "concat", + ["get","ele"], + "\n\n", + ["get","lake_depth"] + ], + ["get","ele"] ], - "text-font": ["Frutiger Neue Italic"], - "text-ignore-placement": false, - "text-justify": "center", - "text-keep-upright": false, - "text-line-height": 1, + "visibility": "visible", + "icon-offset": [0,0], + "text-anchor": "center", "text-offset": [ "case", - ["has", "lake_depth"], - ["literal", [0.35, -0.5]], - ["literal", [0, -0.5]] + ["has","lake_depth"], + [ + "literal", + [0.35,-0.5] + ], + [ + "literal", + [0,-0.5] + ] ], + "text-justify": "center", + "icon-optional": false, "text-optional": false, - "text-pitch-alignment": "auto", + "symbol-placement": "point", + "text-line-height": 1, + "text-keep-upright": false, + "icon-allow-overlap": true, + "text-allow-overlap": false, "text-radial-offset": 0, - "text-rotation-alignment": "auto", - "text-size": ["interpolate", ["linear"], ["zoom"], 14, 10.5, 18, 13], - "visibility": "visible" + "text-pitch-alignment": "auto", + "icon-ignore-placement": true, + "text-ignore-placement": false, + "text-rotation-alignment": "auto" }, "paint": { "icon-color": "#000000", - "icon-opacity": 1, "text-color": "rgba(20, 136, 205, 1)", + "icon-opacity": 1, + "text-opacity": 1, "text-halo-blur": 1, "text-halo-color": "rgba(242, 242, 242, 0.6)", - "text-halo-width": ["interpolate", ["linear"], ["zoom"], 12, 1, 18, 2], - "text-opacity": 1 - } + "text-halo-width": [ + "interpolate", + ["linear"], + ["zoom"], + 12, + 1, + 18, + 2 + ] + }, + "filter": [ + "all", + ["==","class","lake_elevation"] + ] }, { "id": "bridge-l1_road_casing", "type": "line", - "metadata": {"maputnik:comment": "casing color for motorway is brown"}, "source": "swissmaptiles", "source-layer": "transportation", - "minzoom": 10, - "filter": [ - "all", - ["==", "layer", 1], - [ - "!in", - "class", - "rail", - "ferry", - "path", - "transit", - "cable_car", - "gondola" - ], - ["==", "$type", "LineString"], - ["!=", "subclass", "covered_bridge"] - ], + "minzoom": 7.0, "layout": { "line-cap": "butt", "line-join": "round", "visibility": "visible" }, "paint": { - "line-blur": 0.4, + "line-blur": [ + "interpolate", + ["linear"], + ["zoom"], + 7, + 3, + 8, + 0.4, + 12, + [ + "match", + ["get","is_route"], + [11], + 2, + 0.4 + ], + 13, + [ + "match", + ["get","class"], + "track", + 2, + 0.4 + ], + 14, + 0.4 + ], "line-color": [ "interpolate", - ["exponential", 1.7], + ["exponential",1.7], ["zoom"], 9, [ "match", - ["get", "class"], - ["motorway", "trunk"], + ["get","class"], + ["motorway","trunk"], "rgb(170, 136, 30)", "rgb(80, 80, 80)" ], 15, [ "match", - ["get", "class"], - ["motorway", "trunk"], + ["get","class"], + ["motorway","trunk"], "rgb(139, 107, 63)", "rgb(90, 90, 90)" ] ], - "line-offset": 0, - "line-opacity": 1, "line-width": [ "interpolate", - ["exponential", 2], + ["exponential",2], ["zoom"], + 7, + ["literal",0], + 8, + [ + "match", + ["get","ramp"], + 1, + 1.5, + 3 + ], 10, [ "match", - ["get", "class"], + ["get","is_route"], + 11, + 0, + [ + "match", + ["get","class"], + ["motorway"], + [ + "match", + ["get","ramp"], + 1, + 2.5, + 4 + ], + ["trunk"], + 4, + 3 + ] + ], + 11, + [ + "match", + ["get","class"], ["motorway"], - ["match", ["get", "ramp"], 1, 2.5, 4], + [ + "match", + ["get","ramp"], + 1, + 2.5, + 4 + ], ["trunk"], 4, - 3 + [ + "match", + ["get","is_route"], + 11, + 0, + 3 + ] ], 12, [ "match", - ["get", "class"], + ["get","class"], ["motorway"], - ["match", ["get", "ramp"], 1, 2.5, 5], + [ + "match", + ["get","ramp"], + 1, + 3, + 5 + ], ["trunk"], - ["match", ["get", "oneway"], 1, 5, 5], + [ + "match", + ["get","oneway"], + 1, + 5, + 5 + ], ["primary"], - 5, + [ + "match", + ["get","is_route"], + [11], + 0.75, + [5,6,7,8,9,10,99], + 5, + 0 + ], ["secondary"], - 4.5, + [ + "match", + ["get","is_route"], + [11], + 0.75, + [5,6,7,8,9,10,99], + 4.5, + 0 + ], ["tertiary"], - 3.25, + [ + "match", + ["get","is_route"], + [11], + 0.75, + [5,6,7,8,9,10,99], + 3.25, + 0 + ], + ["track"], + [ + "match", + ["get","is_route"], + [11], + 0.75, + [5,6,7,8,9,10,99], + 0.75, + 0 + ], + ["minor"], + [ + "match", + ["get","is_route"], + [11], + 0.75, + [5,6,7,8,9,10,99], + 3, + 0 + ], 0 ], 13, [ "match", - ["get", "class"], + ["get","class"], ["motorway"], - ["match", ["get", "ramp"], 1, 3.5, 5.5], + [ + "match", + ["get","ramp"], + 1, + 3.5, + 5.5 + ], ["trunk"], - ["match", ["get", "oneway"], 1, 5.5, 5.5], + [ + "match", + ["get","oneway"], + 1, + 5.5, + 5.5 + ], ["primary"], 5.5, ["secondary"], @@ -2881,11 +4550,23 @@ 15, [ "match", - ["get", "class"], + ["get","class"], ["motorway"], - ["match", ["get", "ramp"], 1, 6.5, 8], + [ + "match", + ["get","ramp"], + 1, + 6.5, + 8 + ], ["trunk"], - ["match", ["get", "oneway"], 1, 8, 9], + [ + "match", + ["get","oneway"], + 1, + 8, + 9 + ], ["primary"], 9, ["secondary"], @@ -2901,11 +4582,23 @@ 16, [ "match", - ["get", "class"], + ["get","class"], ["motorway"], - ["match", ["get", "ramp"], 1, 10, 12], + [ + "match", + ["get","ramp"], + 1, + 10, + 12 + ], ["trunk"], - ["match", ["get", "oneway"], 1, 12, 15], + [ + "match", + ["get","oneway"], + 1, + 12, + 15 + ], ["primary"], 15, ["secondary"], @@ -2921,8 +4614,8 @@ 20, [ "match", - ["get", "class"], - ["motorway", "trunk", "primary", "rail"], + ["get","class"], + ["motorway","trunk","primary","rail"], 120, ["secondary"], 115, @@ -2934,43 +4627,53 @@ 3, 95 ] - ] - } + ], + "line-offset": 0, + "line-opacity": 1 + }, + "metadata": { + "maputnik:comment": "casing color for motorway is brown" + }, + "filter": [ + "all", + ["==","layer",1], + ["!in","class","rail","ferry","path","track","footway","transit","cable_car","gondola"], + ["==","$type","LineString"], + ["!=","subclass","covered_bridge"] + ] }, { "id": "bridge-l1_fill", "type": "line", "source": "swissmaptiles", "source-layer": "transportation", - "minzoom": 10, - "filter": [ - "all", - ["==", "layer", 1], - ["!in", "class", "ferry", "cable_car", "gondola"], - ["==", "$type", "LineString"], - ["!=", "subclass", "covered_bridge"] - ], + "minzoom": 7.0, "layout": { "line-cap": "butt", "line-join": "round", "visibility": "visible" }, "paint": { - "line-blur": {"stops": [[8, 0.4], [14, 0.1]]}, + "line-blur": { + "stops": [ + [8,0.4], + [14,0.1] + ] + }, "line-color": [ "interpolate", - ["exponential", 1], + ["exponential",1], ["zoom"], 9, [ "match", - ["get", "class"], - ["motorway", "trunk"], + ["get","class"], + ["motorway","trunk"], "rgb(255,230,160)", - ["rail", "path", "track"], + ["rail","path","track","footway"], [ "match", - ["get", "subclass"], + ["get","subclass"], "funicular", "rgba(243,243,246,0)", "rgb(243,243,246)" @@ -2982,13 +4685,13 @@ 15, [ "match", - ["get", "class"], - ["motorway", "trunk"], + ["get","class"], + ["motorway","trunk"], "rgb(255, 224, 138)", - ["rail", "path", "track"], + ["rail","path","track","footway"], [ "match", - ["get", "subclass"], + ["get","subclass"], "funicular", "rgba(243,243,246,0)", "rgb(243,243,246)" @@ -2996,45 +4699,138 @@ "rgb(255,255,255)" ] ], - "line-opacity": 1, "line-width": [ "interpolate", - ["exponential", 2], + ["exponential",2], ["zoom"], + 7, + ["literal",0], + 8, + [ + "match", + ["get","ramp"], + 1, + 0.5, + 2 + ], 10, [ "match", - ["get", "class"], + ["get","class"], ["motorway"], - ["match", ["get", "ramp"], 1, 1.5, 2.75], + [ + "match", + ["get","ramp"], + 1, + 1.5, + 2.75 + ], ["trunk"], 2.75, - 2 + [ + "match", + ["get","is_route"], + 11, + 0, + 2 + ] + ], + 11, + [ + "match", + ["get","class"], + ["motorway"], + [ + "match", + ["get","ramp"], + 1, + 1.5, + 2.75 + ], + ["trunk"], + 2.75, + [ + "match", + ["get","is_route"], + 11, + 0, + 2 + ] ], 12, [ "match", - ["get", "class"], + ["get","class"], ["motorway"], - ["match", ["get", "ramp"], 1, 1.5, 3.75], + [ + "match", + ["get","ramp"], + 1, + 1.5, + 3.75 + ], ["trunk"], - ["match", ["get", "oneway"], 1, 3.75, 3.75], + [ + "match", + ["get","oneway"], + 1, + 3.75, + 3.75 + ], ["primary"], - 3.75, + [ + "match", + ["get","is_route"], + [5,6,7,8,9,10,99], + 3.75, + 0 + ], ["secondary"], - 3.25, + [ + "match", + ["get","is_route"], + [5,6,7,8,9,10,99], + 3.25, + 0 + ], ["tertiary"], - 2.25, + [ + "match", + ["get","is_route"], + [5,6,7,8,9,10,99], + 2.25, + 0 + ], + ["minor","path","track","footway"], + [ + "match", + ["get","is_route"], + [5,6,7,8,9,10,99], + 2, + 0 + ], 0 ], 13, [ "match", - ["get", "class"], + ["get","class"], ["motorway"], - ["match", ["get", "ramp"], 1, 2.75, 4.25], + [ + "match", + ["get","ramp"], + 1, + 2.75, + 4.25 + ], ["trunk"], - ["match", ["get", "oneway"], 1, 4.25, 4.25], + [ + "match", + ["get","oneway"], + 1, + 4.25, + 4.25 + ], ["primary"], 4.25, ["secondary"], @@ -3048,48 +4844,72 @@ 15, [ "match", - ["get", "class"], + ["get","class"], ["motorway"], - ["match", ["get", "ramp"], 1, 5, 6.5], + [ + "match", + ["get","ramp"], + 1, + 5, + 6.5 + ], ["trunk"], - ["match", ["get", "oneway"], 1, 6.5, 7.5], + [ + "match", + ["get","oneway"], + 1, + 6.5, + 7.5 + ], ["primary"], 7.5, ["secondary"], 6.5, - ["tertiary", "rail"], + ["tertiary","rail"], 5.5, ["minor"], 3.5, - ["transit", "track", "path"], + ["transit","track","path","footway"], 2.5, 2.5 ], 16, [ "match", - ["get", "class"], + ["get","class"], ["motorway"], - ["match", ["get", "ramp"], 1, 8.5, 10.5], + [ + "match", + ["get","ramp"], + 1, + 8.5, + 10.5 + ], ["trunk"], - ["match", ["get", "oneway"], 1, 10.5, 13.5], + [ + "match", + ["get","oneway"], + 1, + 10.5, + 13.5 + ], ["primary"], 13.5, ["secondary"], 11.5, - ["tertiary", "rail"], + ["tertiary","rail"], 9.5, ["minor"], 7.5, - ["transit", "track", "path"], + ["transit","track","path","footway"], 6.5, 6.5 ], 20, [ "match", - ["get", "class"], - ["motorway", "trunk", "primary", "rail"], + ["get","class"], + ["motorway","trunk","primary","rail"], 117, ["secondary"], 112, @@ -3099,41 +4919,50 @@ 97, 92 ] - ] - } + ], + "line-opacity": 1 + }, + "filter": [ + "all", + ["==","layer",1], + ["!in","class","ferry","cable_car","gondola"], + ["==","$type","LineString"], + ["!=","subclass","covered_bridge"] + ] }, { "id": "bridge-l1_road_track", "type": "line", - "metadata": {"maputnik:comment": "casing color for motorway is brown"}, "source": "swissmaptiles", "source-layer": "transportation", - "minzoom": 14, - "filter": [ - "all", - ["==", "class", "track"], - ["==", "layer", 1], - ["==", "$type", "LineString"], - ["!=", "subclass", "covered_bridge"] - ], + "minzoom": 14.0, "layout": { "line-cap": "butt", "line-join": "round", "visibility": "visible" }, "paint": { - "line-blur": ["interpolate", ["linear"], ["zoom"], 14, 3, 15, 0.4], - "line-color": { - "stops": [[9, "rgba(80, 80, 80, 1)"], [15, "rgba(90, 90, 90, 1)"]] - }, - "line-offset": 0, - "line-opacity": 1, - "line-width": [ + "line-blur": [ "interpolate", - ["exponential", 2], + ["linear"], ["zoom"], 14, - 0, + 3, + 15, + 0.4 + ], + "line-color": { + "stops": [ + [9,"rgba(80, 80, 80, 1)"], + [15,"rgba(90, 90, 90, 1)"] + ] + }, + "line-width": [ + "interpolate", + ["exponential",2], + ["zoom"], + 13, + 0.5, 15, 1.1, 16, @@ -3142,68 +4971,116 @@ 2, 20, 3 + ], + "line-offset": 0, + "line-opacity": [ + "interpolate", + ["linear"], + ["zoom"], + 12, + 0.5, + 14, + 1 ] - } - }, - { - "id": "bridge-l1_road_path", - "type": "line", - "metadata": { - "maputnik:comment": "cannot be in the same layer as road_casings because dasharray doesn't support expressions" }, - "source": "swissmaptiles", - "source-layer": "transportation", - "minzoom": 14, + "metadata": { + "maputnik:comment": "casing color for motorway is brown" + }, "filter": [ "all", - ["in", "class", "path"], - ["==", "layer", 1], - ["==", "$type", "LineString"], - ["!=", "subclass", "covered_bridge"] - ], + ["==","class","track"], + ["==","layer",1], + ["==","$type","LineString"], + ["!=","subclass","covered_bridge"] + ] + }, + { + "id": "bridge-l1_road_path_footway", + "type": "line", + "source": "swissmaptiles", + "source-layer": "transportation", + "minzoom": 11.0, "layout": { "line-cap": "butt", "line-join": "bevel", "visibility": "visible" }, "paint": { - "line-blur": {"stops": [[15, 0.1], [20, 0.4]]}, + "line-blur": [ + "interpolate", + ["linear"], + ["zoom"], + 15, + 0.1, + 20, + 0.4 + ], "line-color": "rgba(115, 115, 115, 1)", - "line-dasharray": { - "stops": [ - [14, [3, 1]], - [15, [6, 2]], - [16, [9, 3]], - [17, [12, 4]], - [18, [15, 5]] - ] - }, - "line-opacity": {"stops": [[14, 0], [15, 1]]}, "line-width": [ "interpolate", - ["exponential", 1.5], + ["exponential",1.5], ["zoom"], + 13, + 0.5, 15, 1.1, 20, 3 + ], + "line-opacity": [ + "interpolate", + ["linear"], + ["zoom"], + 12, + 0.5, + 14, + 1 + ], + "line-dasharray": [ + "step", + ["zoom"], + [ + "literal", + [6,2] + ], + 16, + [ + "literal", + [9,3] + ], + 17, + [ + "literal", + [12,4] + ], + 18, + [ + "literal", + [15,5] + ] ] - } + }, + "metadata": { + "maputnik:comment": "cannot be in the same layer as road_casings because dasharray doesn't support expressions" + }, + "filter": [ + "all", + ["in","class","path","footway"], + ["==","layer",1], + ["==","$type","LineString"], + ["!=","subclass","covered_bridge"] + ] }, { "id": "bridge-l1_public_transport", "type": "line", "source": "swissmaptiles", "source-layer": "transportation", - "minzoom": 10, - "filter": [ - "all", - ["==", "layer", 1], - ["in", "class", "rail", "transit"], - ["==", "$type", "LineString"], - ["!=", "subclass", "covered_bridge"] - ], - "layout": {"line-cap": "round", "visibility": "visible"}, + "minzoom": 10.0, + "layout": { + "line-cap": "round", + "visibility": "visible" + }, "paint": { "line-blur": [ "interpolate", @@ -3212,13 +5089,19 @@ 8, [ "match", - ["get", "class"], + ["get","class"], ["rail"], [ "match", - ["get", "subclass"], + ["get","subclass"], ["rail"], - ["match", ["get", "service"], ["yard", "siding"], 2.5, 0.6], + [ + "match", + ["get","service"], + ["yard","siding"], + 2.5, + 0.6 + ], 0.6 ], 0.6 @@ -3226,13 +5109,19 @@ 14, [ "match", - ["get", "class"], + ["get","class"], ["rail"], [ "match", - ["get", "subclass"], + ["get","subclass"], ["rail"], - ["match", ["get", "service"], ["yard", "siding"], 2.5, 0.6], + [ + "match", + ["get","service"], + ["yard","siding"], + 2.5, + 0.6 + ], 0.6 ], 0.6 @@ -3241,37 +5130,11 @@ 0.4 ], "line-color": { - "stops": [[7, "rgba(255, 50, 50, 1)"], [15, "rgba(255, 80, 80, 1)"]] + "stops": [ + [7,"rgba(255, 50, 50, 1)"], + [15,"rgba(255, 80, 80, 1)"] + ] }, - "line-opacity": [ - "interpolate", - ["linear"], - ["zoom"], - 8, - 0, - 9, - ["match", ["get", "class"], ["rail"], 1, 0], - 12, - ["match", ["get", "class"], ["rail"], 1, 0], - 13, - ["match", ["get", "class"], ["rail"], 1, 0], - 14, - [ - "match", - ["get", "class"], - ["rail"], - [ - "match", - ["get", "subclass"], - ["rail", "narrow_gauge", "funicular"], - ["match", ["get", "service"], ["yard", "siding"], 0, 1], - 0 - ], - 0 - ], - 14.5, - 1 - ], "line-width": [ "interpolate", ["linear"], @@ -3279,13 +5142,19 @@ 8, [ "match", - ["get", "class"], + ["get","class"], ["rail"], [ "match", - ["get", "subclass"], - ["rail", "narrow_gauge"], - ["match", ["get", "service"], ["yard", "siding"], 0.2, 0.5], + ["get","subclass"], + ["rail","narrow_gauge","rack_rail"], + [ + "match", + ["get","service"], + ["yard","siding"], + 0.2, + 0.5 + ], 0.2 ], 0.2 @@ -3293,13 +5162,19 @@ 14, [ "match", - ["get", "class"], + ["get","class"], ["rail"], [ "match", - ["get", "subclass"], - ["rail", "narrow_gauge"], - ["match", ["get", "service"], ["yard", "siding"], 0.1, 1], + ["get","subclass"], + ["rail","narrow_gauge","rack_rail"], + [ + "match", + ["get","service"], + ["yard","siding"], + 0.1, + 1 + ], 1 ], ["cable_car"], @@ -3309,113 +5184,292 @@ 18, [ "match", - ["get", "class"], + ["get","class"], ["rail"], [ "match", - ["get", "subclass"], - ["rail", "narrow_gauge"], - ["match", ["get", "service"], ["yard", "siding"], 1.5, 2], + ["get","subclass"], + ["rail","narrow_gauge","rack_rail"], + [ + "match", + ["get","service"], + ["yard","siding"], + 1.5, + 2 + ], 2 ], ["cable_car"], 2, 1.5 ] + ], + "line-opacity": [ + "interpolate", + ["linear"], + ["zoom"], + 8, + 0, + 9, + [ + "match", + ["get","class"], + ["rail"], + 1, + 0 + ], + 12, + [ + "match", + ["get","class"], + ["rail"], + 1, + 0 + ], + 13, + [ + "match", + ["get","class"], + ["rail"], + 1, + 0 + ], + 14, + [ + "match", + ["get","class"], + ["rail"], + [ + "match", + ["get","subclass"], + ["rail","narrow_gauge","rack_rail","funicular"], + [ + "match", + ["get","service"], + ["yard","siding"], + 0, + 1 + ], + 0 + ], + 0 + ], + 14.5, + 1 ] - } + }, + "filter": [ + "all", + ["==","layer",1], + ["in","class","rail","transit"], + ["==","$type","LineString"], + ["!=","subclass","covered_bridge"] + ] }, { "id": "bridge-l2_road_casing", "type": "line", - "metadata": {"maputnik:comment": "casing color for motorway is brown"}, "source": "swissmaptiles", "source-layer": "transportation", - "minzoom": 10, - "filter": [ - "all", - [">", "layer", 1], - [ - "!in", - "class", - "rail", - "ferry", - "path", - "transit", - "cable_car", - "gondola" - ], - ["==", "$type", "LineString"], - ["!=", "subclass", "covered_bridge"] - ], + "minzoom": 7.0, "layout": { "line-cap": "butt", "line-join": "round", "visibility": "visible" }, "paint": { - "line-blur": 0.4, + "line-blur": [ + "interpolate", + ["linear"], + ["zoom"], + 7, + 3, + 8, + 0.4, + 12, + [ + "match", + ["get","is_route"], + [11], + 2, + 0.4 + ], + 13, + [ + "match", + ["get","class"], + "track", + 2, + 0.4 + ], + 14, + 0.4 + ], "line-color": [ "interpolate", - ["exponential", 1.7], + ["exponential",1.7], ["zoom"], 9, [ "match", - ["get", "class"], - ["motorway", "trunk"], + ["get","class"], + ["motorway","trunk"], "rgb(170, 136, 30)", "rgb(80, 80, 80)" ], 15, [ "match", - ["get", "class"], - ["motorway", "trunk"], + ["get","class"], + ["motorway","trunk"], "rgb(139, 107, 63)", "rgb(90, 90, 90)" ] ], - "line-offset": 0, - "line-opacity": 1, "line-width": [ "interpolate", - ["exponential", 2], + ["exponential",2], ["zoom"], + 7, + ["literal",0], + 8, + [ + "match", + ["get","ramp"], + 1, + 1.5, + 3 + ], 10, [ "match", - ["get", "class"], + ["get","class"], ["motorway"], - ["match", ["get", "ramp"], 1, 2.5, 4], + [ + "match", + ["get","ramp"], + 1, + 2.5, + 4 + ], ["trunk"], 4, 3 ], + 11, + [ + "match", + ["get","class"], + ["motorway"], + [ + "match", + ["get","ramp"], + 1, + 2.5, + 4 + ], + ["trunk"], + 4, + [ + "match", + ["get","is_route"], + 11, + 0, + 3 + ] + ], 12, [ "match", - ["get", "class"], + ["get","class"], ["motorway"], - ["match", ["get", "ramp"], 1, 2.5, 5], + [ + "match", + ["get","ramp"], + 1, + 3, + 5 + ], ["trunk"], - ["match", ["get", "oneway"], 1, 5, 5], + [ + "match", + ["get","oneway"], + 1, + 5, + 5 + ], ["primary"], - 5, + [ + "match", + ["get","is_route"], + [11], + 0.75, + [5,6,7,8,9,10,99], + 5, + 0 + ], ["secondary"], - 4.5, + [ + "match", + ["get","is_route"], + [11], + 0.75, + [5,6,7,8,9,10,99], + 4.5, + 0 + ], ["tertiary"], - 3.25, + [ + "match", + ["get","is_route"], + [11], + 0.75, + [5,6,7,8,9,10,99], + 3.25, + 0 + ], + ["track"], + [ + "match", + ["get","is_route"], + [11], + 0.75, + [5,6,7,8,9,10,99], + 0.75, + 0 + ], + ["minor"], + [ + "match", + ["get","is_route"], + [11], + 0.75, + [5,6,7,8,9,10,99], + 3, + 0 + ], 0 ], 13, [ "match", - ["get", "class"], + ["get","class"], ["motorway"], - ["match", ["get", "ramp"], 1, 3.5, 5.5], + [ + "match", + ["get","ramp"], + 1, + 3.5, + 5.5 + ], ["trunk"], - ["match", ["get", "oneway"], 1, 5.5, 5.5], + [ + "match", + ["get","oneway"], + 1, + 5.5, + 5.5 + ], ["primary"], 5.5, ["secondary"], @@ -3429,11 +5483,23 @@ 15, [ "match", - ["get", "class"], + ["get","class"], ["motorway"], - ["match", ["get", "ramp"], 1, 6.5, 8], + [ + "match", + ["get","ramp"], + 1, + 6.5, + 8 + ], ["trunk"], - ["match", ["get", "oneway"], 1, 8, 9], + [ + "match", + ["get","oneway"], + 1, + 8, + 9 + ], ["primary"], 9, ["secondary"], @@ -3449,11 +5515,23 @@ 16, [ "match", - ["get", "class"], + ["get","class"], ["motorway"], - ["match", ["get", "ramp"], 1, 10, 12], + [ + "match", + ["get","ramp"], + 1, + 10, + 12 + ], ["trunk"], - ["match", ["get", "oneway"], 1, 12, 15], + [ + "match", + ["get","oneway"], + 1, + 12, + 15 + ], ["primary"], 15, ["secondary"], @@ -3469,8 +5547,8 @@ 20, [ "match", - ["get", "class"], - ["motorway", "trunk", "primary", "rail"], + ["get","class"], + ["motorway","trunk","primary","rail"], 120, ["secondary"], 115, @@ -3482,43 +5560,53 @@ 3, 95 ] - ] - } + ], + "line-offset": 0, + "line-opacity": 1 + }, + "metadata": { + "maputnik:comment": "casing color for motorway is brown" + }, + "filter": [ + "all", + [">","layer",1], + ["!in","class","rail","ferry","path","track","footway","transit","cable_car","gondola"], + ["==","$type","LineString"], + ["!=","subclass","covered_bridge"] + ] }, { "id": "bridge-l2_fill", "type": "line", "source": "swissmaptiles", "source-layer": "transportation", - "minzoom": 10, - "filter": [ - "all", - [">", "layer", 1], - ["!in", "class", "ferry", "cable_car", "gondola"], - ["==", "$type", "LineString"], - ["!=", "subclass", "covered_bridge"] - ], + "minzoom": 7.0, "layout": { "line-cap": "butt", "line-join": "round", "visibility": "visible" }, "paint": { - "line-blur": {"stops": [[8, 0.4], [14, 0.1]]}, + "line-blur": { + "stops": [ + [8,0.4], + [14,0.1] + ] + }, "line-color": [ "interpolate", - ["exponential", 1], + ["exponential",1], ["zoom"], 9, [ "match", - ["get", "class"], - ["motorway", "trunk"], + ["get","class"], + ["motorway","trunk"], "rgb(255,230,160)", - ["rail", "path", "track"], + ["rail","path","track","footway"], [ "match", - ["get", "subclass"], + ["get","subclass"], "funicular", "rgba(243,243,246,0)", "rgb(243,243,246)" @@ -3530,13 +5618,13 @@ 15, [ "match", - ["get", "class"], - ["motorway", "trunk"], + ["get","class"], + ["motorway","trunk"], "rgb(255, 224, 138)", - ["rail", "path", "track"], + ["rail","path","track","footway"], [ "match", - ["get", "subclass"], + ["get","subclass"], "funicular", "rgba(243,243,246,0)", "rgb(243,243,246)" @@ -3544,45 +5632,138 @@ "rgb(255,255,255)" ] ], - "line-opacity": 1, "line-width": [ "interpolate", - ["exponential", 2], + ["exponential",2], ["zoom"], + 7, + ["literal",0], + 8, + [ + "match", + ["get","ramp"], + 1, + 0.5, + 2 + ], 10, [ "match", - ["get", "class"], + ["get","class"], ["motorway"], - ["match", ["get", "ramp"], 1, 1.5, 2.75], + [ + "match", + ["get","ramp"], + 1, + 1.5, + 2.75 + ], ["trunk"], 2.75, - 2 + [ + "match", + ["get","is_route"], + 11, + 0, + 2 + ] + ], + 11, + [ + "match", + ["get","class"], + ["motorway"], + [ + "match", + ["get","ramp"], + 1, + 1.5, + 2.75 + ], + ["trunk"], + 2.75, + [ + "match", + ["get","is_route"], + 11, + 0, + 2 + ] ], 12, [ "match", - ["get", "class"], + ["get","class"], ["motorway"], - ["match", ["get", "ramp"], 1, 1.5, 3.75], + [ + "match", + ["get","ramp"], + 1, + 1.5, + 3.75 + ], ["trunk"], - ["match", ["get", "oneway"], 1, 3.75, 3.75], + [ + "match", + ["get","oneway"], + 1, + 3.75, + 3.75 + ], ["primary"], - 3.75, + [ + "match", + ["get","is_route"], + [5,6,7,8,9,10,99], + 3.75, + 0 + ], ["secondary"], - 3.25, + [ + "match", + ["get","is_route"], + [5,6,7,8,9,10,99], + 3.25, + 0 + ], ["tertiary"], - 2.25, + [ + "match", + ["get","is_route"], + [5,6,7,8,9,10,99], + 2.25, + 0 + ], + ["minor","path","track","footway"], + [ + "match", + ["get","is_route"], + [5,6,7,8,9,10,99], + 2, + 0 + ], 0 ], 13, [ "match", - ["get", "class"], + ["get","class"], ["motorway"], - ["match", ["get", "ramp"], 1, 2.75, 4.25], + [ + "match", + ["get","ramp"], + 1, + 2.75, + 4.25 + ], ["trunk"], - ["match", ["get", "oneway"], 1, 4.25, 4.25], + [ + "match", + ["get","oneway"], + 1, + 4.25, + 4.25 + ], ["primary"], 4.25, ["secondary"], @@ -3596,48 +5777,72 @@ 15, [ "match", - ["get", "class"], + ["get","class"], ["motorway"], - ["match", ["get", "ramp"], 1, 5, 6.5], + [ + "match", + ["get","ramp"], + 1, + 5, + 6.5 + ], ["trunk"], - ["match", ["get", "oneway"], 1, 6.5, 7.5], + [ + "match", + ["get","oneway"], + 1, + 6.5, + 7.5 + ], ["primary"], 7.5, ["secondary"], 6.5, - ["tertiary", "rail"], + ["tertiary","rail"], 5.5, ["minor"], 3.5, - ["transit", "track", "path"], + ["transit","track","path"], 2.5, 2.5 ], 16, [ "match", - ["get", "class"], + ["get","class"], ["motorway"], - ["match", ["get", "ramp"], 1, 8.5, 10.5], + [ + "match", + ["get","ramp"], + 1, + 8.5, + 10.5 + ], ["trunk"], - ["match", ["get", "oneway"], 1, 10.5, 13.5], + [ + "match", + ["get","oneway"], + 1, + 10.5, + 13.5 + ], ["primary"], 13.5, ["secondary"], 11.5, - ["tertiary", "rail"], + ["tertiary","rail"], 9.5, ["minor"], 7.5, - ["transit", "track", "path"], + ["transit","track","path"], 6.5, 6.5 ], 20, [ "match", - ["get", "class"], - ["motorway", "trunk", "primary", "rail"], + ["get","class"], + ["motorway","trunk","primary","rail"], 117, ["secondary"], 112, @@ -3647,41 +5852,50 @@ 97, 92 ] - ] - } + ], + "line-opacity": 1 + }, + "filter": [ + "all", + [">","layer",1], + ["!in","class","ferry","cable_car","gondola"], + ["==","$type","LineString"], + ["!=","subclass","covered_bridge"] + ] }, { "id": "bridge-l2_road_track", "type": "line", - "metadata": {"maputnik:comment": "casing color for motorway is brown"}, "source": "swissmaptiles", "source-layer": "transportation", - "minzoom": 14, - "filter": [ - "all", - [">", "layer", 1], - ["==", "class", "track"], - ["==", "$type", "LineString"], - ["!=", "subclass", "covered_bridge"] - ], + "minzoom": 14.0, "layout": { "line-cap": "butt", "line-join": "round", "visibility": "visible" }, "paint": { - "line-blur": ["interpolate", ["linear"], ["zoom"], 14, 3, 15, 0.4], - "line-color": { - "stops": [[9, "rgba(80, 80, 80, 1)"], [15, "rgba(90, 90, 90, 1)"]] - }, - "line-offset": 0, - "line-opacity": 1, - "line-width": [ + "line-blur": [ "interpolate", - ["exponential", 2], + ["linear"], ["zoom"], 14, - 0, + 3, + 15, + 0.4 + ], + "line-color": { + "stops": [ + [9,"rgba(80, 80, 80, 1)"], + [15,"rgba(90, 90, 90, 1)"] + ] + }, + "line-width": [ + "interpolate", + ["exponential",2], + ["zoom"], + 13, + 0.5, 15, 1.1, 16, @@ -3690,68 +5904,116 @@ 2, 20, 3 + ], + "line-offset": 0, + "line-opacity": [ + "interpolate", + ["linear"], + ["zoom"], + 12, + 0.5, + 14, + 1 ] - } - }, - { - "id": "bridge-l2_road_path", - "type": "line", - "metadata": { - "maputnik:comment": "cannot be in the same layer as road_casings because dasharray doesn't support expressions" }, - "source": "swissmaptiles", - "source-layer": "transportation", - "minzoom": 14, + "metadata": { + "maputnik:comment": "casing color for motorway is brown" + }, "filter": [ "all", - [">", "layer", 1], - ["in", "class", "path"], - ["==", "$type", "LineString"], - ["!=", "subclass", "covered_bridge"] - ], + [">","layer",1], + ["==","class","track"], + ["==","$type","LineString"], + ["!=","subclass","covered_bridge"] + ] + }, + { + "id": "bridge-l2_road_path_footway", + "type": "line", + "source": "swissmaptiles", + "source-layer": "transportation", + "minzoom": 11.0, "layout": { "line-cap": "butt", "line-join": "bevel", "visibility": "visible" }, "paint": { - "line-blur": {"stops": [[15, 0.1], [20, 0.4]]}, + "line-blur": [ + "interpolate", + ["linear"], + ["zoom"], + 15, + 0.1, + 20, + 0.4 + ], "line-color": "rgba(115, 115, 115, 1)", - "line-dasharray": { - "stops": [ - [14, [3, 1]], - [15, [6, 2]], - [16, [9, 3]], - [17, [12, 4]], - [18, [15, 5]] - ] - }, - "line-opacity": {"stops": [[14, 0], [15, 1]]}, "line-width": [ "interpolate", - ["exponential", 1.5], + ["exponential",1.5], ["zoom"], + 13, + 0.5, 15, 1.1, 20, 3 + ], + "line-opacity": [ + "interpolate", + ["linear"], + ["zoom"], + 12, + 0.5, + 14, + 1 + ], + "line-dasharray": [ + "step", + ["zoom"], + [ + "literal", + [6,2] + ], + 16, + [ + "literal", + [9,3] + ], + 17, + [ + "literal", + [12,4] + ], + 18, + [ + "literal", + [15,5] + ] ] - } + }, + "metadata": { + "maputnik:comment": "cannot be in the same layer as road_casings because dasharray doesn't support expressions" + }, + "filter": [ + "all", + [">","layer",1], + ["in","class","path","footway"], + ["==","$type","LineString"], + ["!=","subclass","covered_bridge"] + ] }, { "id": "bridge-l2_public_transport", "type": "line", "source": "swissmaptiles", "source-layer": "transportation", - "minzoom": 10, - "filter": [ - "all", - [">", "layer", 1], - ["in", "class", "rail", "transit", "cable_car", "gondola"], - ["==", "$type", "LineString"], - ["!=", "subclass", "covered_bridge"] - ], - "layout": {"line-cap": "round", "visibility": "visible"}, + "minzoom": 10.0, + "layout": { + "line-cap": "round", + "visibility": "visible" + }, "paint": { "line-blur": [ "interpolate", @@ -3760,13 +6022,19 @@ 8, [ "match", - ["get", "class"], + ["get","class"], ["rail"], [ "match", - ["get", "subclass"], + ["get","subclass"], ["rail"], - ["match", ["get", "service"], ["yard", "siding"], 2.5, 0.6], + [ + "match", + ["get","service"], + ["yard","siding"], + 2.5, + 0.6 + ], 0.6 ], 0.6 @@ -3774,13 +6042,19 @@ 14, [ "match", - ["get", "class"], + ["get","class"], ["rail"], [ "match", - ["get", "subclass"], + ["get","subclass"], ["rail"], - ["match", ["get", "service"], ["yard", "siding"], 2.5, 0.6], + [ + "match", + ["get","service"], + ["yard","siding"], + 2.5, + 0.6 + ], 0.6 ], 0.6 @@ -3789,37 +6063,11 @@ 0.4 ], "line-color": { - "stops": [[7, "rgba(255, 50, 50, 1)"], [15, "rgba(255, 80, 80, 1)"]] + "stops": [ + [7,"rgba(255, 50, 50, 1)"], + [15,"rgba(255, 80, 80, 1)"] + ] }, - "line-opacity": [ - "interpolate", - ["linear"], - ["zoom"], - 8, - 0, - 9, - ["match", ["get", "class"], ["rail"], 1, 0], - 12, - ["match", ["get", "class"], ["rail"], 1, 0], - 13, - ["match", ["get", "class"], ["rail"], 1, 0], - 14, - [ - "match", - ["get", "class"], - ["rail"], - [ - "match", - ["get", "subclass"], - ["rail", "narrow_gauge", "funicular"], - ["match", ["get", "service"], ["yard", "siding"], 0, 1], - 0 - ], - 0 - ], - 14.5, - 1 - ], "line-width": [ "interpolate", ["linear"], @@ -3827,13 +6075,19 @@ 8, [ "match", - ["get", "class"], + ["get","class"], ["rail"], [ "match", - ["get", "subclass"], - ["rail", "narrow_gauge"], - ["match", ["get", "service"], ["yard", "siding"], 0.2, 0.5], + ["get","subclass"], + ["rail","narrow_gauge","rack_rail"], + [ + "match", + ["get","service"], + ["yard","siding"], + 0.2, + 0.5 + ], 0.2 ], 0.2 @@ -3841,13 +6095,19 @@ 14, [ "match", - ["get", "class"], + ["get","class"], ["rail"], [ "match", - ["get", "subclass"], - ["rail", "narrow_gauge"], - ["match", ["get", "service"], ["yard", "siding"], 0.1, 1], + ["get","subclass"], + ["rail","narrow_gauge","rack_rail"], + [ + "match", + ["get","service"], + ["yard","siding"], + 0.1, + 1 + ], 1 ], ["cable_car"], @@ -3857,75 +6117,137 @@ 18, [ "match", - ["get", "class"], + ["get","class"], ["rail"], [ "match", - ["get", "subclass"], - ["rail", "narrow_gauge"], - ["match", ["get", "service"], ["yard", "siding"], 1.5, 2], + ["get","subclass"], + ["rail","narrow_gauge","rack_rail"], + [ + "match", + ["get","service"], + ["yard","siding"], + 1.5, + 2 + ], 2 ], ["cable_car"], 2, 1.5 ] + ], + "line-opacity": [ + "interpolate", + ["linear"], + ["zoom"], + 8, + 0, + 9, + [ + "match", + ["get","class"], + ["rail"], + 1, + 0 + ], + 12, + [ + "match", + ["get","class"], + ["rail"], + 1, + 0 + ], + 13, + [ + "match", + ["get","class"], + ["rail"], + 1, + 0 + ], + 14, + [ + "match", + ["get","class"], + ["rail"], + [ + "match", + ["get","subclass"], + ["rail","narrow_gauge","rack_rail","funicular"], + [ + "match", + ["get","service"], + ["yard","siding"], + 0, + 1 + ], + 0 + ], + 0 + ], + 14.5, + 1 ] - } + }, + "filter": [ + "all", + [">","layer",1], + ["in","class","rail","transit","cable_car","gondola"], + ["==","$type","LineString"], + ["!=","subclass","covered_bridge"] + ] }, { "id": "spot_elevation", "type": "symbol", "source": "swissmaptiles", "source-layer": "spot_elevation", - "minzoom": 14, - "filter": [ - "all", - [ - "!in", - "class", - "lake_elevation", - "sinkhole", - "sinkhole_rock", - "sinkhole_scree", - "sinkhole_water", - "sinkhole_ice" - ] - ], + "minzoom": 14.0, "layout": { + "icon-size": 1, + "text-font": ["Frutiger Neue Regular"], + "text-size": [ + "interpolate", + ["linear"], + ["zoom"], + 14, + 10.5, + 18, + 13 + ], "icon-image": [ "match", - ["get", "class"], - "spot_elevation", + ["get","class"], + ["spot_elevation","terrain_spot_elevation"], "dot_dark_grey_3", "" ], - "icon-offset": [0, 0], - "icon-optional": false, - "icon-padding": 30, + "text-field": ["get","ele"], + "visibility": "visible", + "icon-offset": [0,0], "icon-rotate": 0, - "icon-size": 1, - "symbol-placement": "point", - "text-allow-overlap": false, "text-anchor": "center", - "text-field": ["get", "ele"], - "text-font": ["Frutiger Neue Regular"], - "text-ignore-placement": false, - "text-keep-upright": false, - "text-line-height": 0.9, + "icon-padding": 30, + "icon-optional": false, "text-optional": false, + "symbol-placement": "point", + "text-line-height": 0.9, + "text-keep-upright": false, + "text-allow-overlap": false, "text-radial-offset": 0.3, - "text-size": ["interpolate", ["linear"], ["zoom"], 14, 10.5, 18, 13], "text-variable-anchor": [ "literal", - ["bottom-left", "top-left", "bottom-right", "top-right"] + ["bottom-left","top-left","bottom-right","top-right"] ], - "visibility": "visible" + "text-ignore-placement": false }, "paint": { "icon-color": "#000000", - "icon-opacity": 0.8, "text-color": "rgba(80, 80, 80, 1)", + "icon-opacity": 0.8, + "text-opacity": ["literal",1], "text-halo-blur": 1, "text-halo-color": "rgba(242, 242, 242, 0.6)", "text-halo-width": [ @@ -3936,87 +6258,39 @@ 1.5, 18, 3 - ], - "text-opacity": ["literal", 1] - } - }, - { - "id": "water_name_point_label", - "type": "symbol", - "source": "swissmaptiles", - "source-layer": "water_name", - "filter": ["all", ["==", "$type", "Point"], ["==", "class", "lake"]], - "layout": { - "symbol-placement": "point", - "symbol-spacing": 350, - "symbol-z-order": "auto", - "text-allow-overlap": false, - "text-field": "{name:latin}", - "text-font": ["Frutiger Neue Italic"], - "text-ignore-placement": false, - "text-keep-upright": true, - "text-letter-spacing": 0.05, - "text-max-width": 1000, - "text-pitch-alignment": "map", - "text-rotation-alignment": "viewport", - "text-size": ["interpolate", ["linear"], ["zoom"], 10, 10.5, 16, 16], - "visibility": "visible" + ] }, - "paint": { - "text-color": "rgba(20, 136, 205, 1)", - "text-halo-blur": 1, - "text-halo-color": "rgba(242, 242, 242, 0.7)", - "text-halo-width": 1 - } + "filter": [ + "all", + ["!in","class","doline","lake_elevation","sinkhole","sinkhole_rock","sinkhole_scree","sinkhole_water","sinkhole_ice"] + ] }, { "id": "waterway_line_label", "type": "symbol", "source": "swissmaptiles", "source-layer": "waterway", - "minzoom": 9, - "filter": [ - "all", - ["==", "$type", "LineString"], - ["!=", "intermittent", 1] - ], + "minzoom": 9.0, "layout": { - "symbol-placement": "line", - "symbol-spacing": 650, - "symbol-z-order": "auto", - "text-allow-overlap": false, - "text-field": ["get", "name:latin"], "text-font": ["Frutiger Neue Italic"], - "text-ignore-placement": false, - "text-keep-upright": true, - "text-letter-spacing": [ - "interpolate", - ["linear"], - ["zoom"], - 8, - 0.1, - 12, - ["match", ["get", "class"], ["river"], 0.4, 0.2] - ], - "text-max-width": 9999, - "text-padding": 0, - "text-pitch-alignment": "map", - "text-rotation-alignment": "map", "text-size": [ "interpolate", - ["exponential", 1.5], + ["exponential",1.5], ["zoom"], 10, 10.5, 16, [ "match", - ["to-string", ["get", "width"]], - ["9", "10"], + [ + "to-string", + ["get","width"] + ], + ["9","10"], 18, - ["7", "8"], + ["7","8"], 17, - ["5", "6"], + ["5","6"], 16, "4", 15, @@ -4026,33 +6300,88 @@ 13, "1", 12, - ["match", ["get", "class"], ["river", "canal"], 18, 14] + [ + "match", + ["get","class"], + ["river","canal"], + 18, + 14 + ] ] - ] + ], + "text-field": ["get","name:latin"], + "text-padding": 0, + "symbol-spacing": 650, + "symbol-z-order": "auto", + "text-max-width": 9999, + "symbol-placement": "line", + "text-keep-upright": true, + "text-allow-overlap": false, + "text-letter-spacing": [ + "interpolate", + ["linear"], + ["zoom"], + 8, + 0.1, + 12, + [ + "match", + ["get","class"], + ["river"], + 0.4, + 0.2 + ] + ], + "text-pitch-alignment": "map", + "text-ignore-placement": false, + "text-rotation-alignment": "map" }, "paint": { - "text-color": [ - "match", - ["get", "intermittent"], - 1, - "rgb(64, 64, 64)", - "rgb(20, 136, 205)" - ], + "text-color": "rgb(20, 136, 205)", "text-halo-blur": 1, "text-halo-color": "rgba(242, 242, 242, 0.6)", "text-halo-width": 2 - } + }, + "filter": [ + "all", + ["==","$type","LineString"], + ["!=","intermittent",1] + ] }, { "id": "transportation_label", "type": "symbol", "source": "swissmaptiles", "source-layer": "transportation_name", - "minzoom": 13, - "filter": ["all", ["==", "$type", "LineString"]], + "minzoom": 13.0, "layout": { - "symbol-avoid-edges": true, - "symbol-placement": "line", + "text-font": ["Frutiger Neue Condensed Regular"], + "text-size": [ + "interpolate", + ["exponential",1.5], + ["zoom"], + 14, + [ + "match", + ["get","class"], + ["motorway","trunk"], + 11, + 10.5 + ], + 18, + [ + "match", + ["get","class"], + ["motorway","trunk"], + 18, + 16 + ] + ], + "text-field": "{name:latin}", + "visibility": "visible", + "text-anchor": "center", + "text-offset": [0,0], + "text-padding": 2, "symbol-spacing": [ "interpolate", ["linear"], @@ -4063,49 +6392,28 @@ 400 ], "symbol-z-order": "auto", - "text-anchor": "center", - "text-field": "{name:latin}", - "text-font": ["Frutiger Neue Condensed Regular"], - "text-keep-upright": true, - "text-letter-spacing": 0.1, "text-max-angle": 40, - "text-offset": [0, 0], - "text-padding": 2, - "text-pitch-alignment": "map", - "text-rotation-alignment": "map", - "text-size": [ - "interpolate", - ["exponential", 1.5], - ["zoom"], - 14, - ["match", ["get", "class"], ["motorway", "trunk"], 11, 10.5], - 18, - ["match", ["get", "class"], ["motorway", "trunk"], 18, 16] - ], "text-transform": "none", - "visibility": "visible" + "symbol-placement": "line", + "text-keep-upright": true, + "symbol-avoid-edges": true, + "text-letter-spacing": 0.1, + "text-pitch-alignment": "map", + "text-rotation-alignment": "map" }, "paint": { "text-color": [ "match", - ["get", "class"], - ["rail", "transit", "cable_car", "gondola", "chair_lift"], + ["get","class"], + ["rail","transit","cable_car","gondola","chair_lift"], "rgba(255, 50, 50, 1)", "rgba(60, 60, 70, 1)" ], "text-halo-blur": 0.2, "text-halo-color": [ "match", - ["get", "class"], - [ - "rail", - "transit", - "cable_car", - "gondola", - "chair_lift", - "motorway", - "trunk" - ], + ["get","class"], + ["rail","transit","cable_car","gondola","chair_lift","motorway","trunk"], "rgba(255, 255, 255, 0.6)", "rgba(255, 255, 255, 0.8)" ], @@ -4116,80 +6424,37 @@ 14, [ "match", - ["get", "class"], - ["rail", "transit", "cable_car", "gondola", "chair_lift"], + ["get","class"], + ["rail","transit","cable_car","gondola","chair_lift"], 1, 1.5 ], 20, 3 ] - } + }, + "filter": [ + "all", + ["==","$type","LineString"] + ] }, { "id": "aerialway", "type": "line", "source": "swissmaptiles", "source-layer": "transportation", - "minzoom": 12, - "filter": ["all", ["in", "class", "cable_car", "gondola", "chair_lift"]], - "layout": {"visibility": "visible"}, + "minzoom": 12.0, + "layout": { + "visibility": "visible" + }, "paint": { - "line-blur": [ - "interpolate", - ["linear"], - ["zoom"], - 8, - [ - "match", - ["get", "class"], - ["rail"], - [ - "match", - ["get", "subclass"], - ["rail", "narrow_gauge"], - ["match", ["get", "service"], ["yard", "siding"], 2.5, 0.6], - 0.6 - ], - 0.6 - ], - 14, - [ - "match", - ["get", "class"], - ["rail"], - [ - "match", - ["get", "subclass"], - ["rail", "narrow_gauge"], - ["match", ["get", "service"], ["yard", "siding"], 2.5, 0.6], - 0.6 - ], - 0.6 - ], - 18, - 0.4 - ], + "line-blur": 0.25, "line-color": { - "stops": [[7, "rgba(255, 50, 50, 1)"], [15, "rgba(255, 80, 80, 1)"]] - }, - "line-opacity": [ - "interpolate", - ["linear"], - ["zoom"], - 12, - 0, - 13, - ["match", ["get", "class"], ["cable_car", "gondola"], 1, 0], - 14, - [ - "match", - ["get", "class"], - ["cable_car", "gondola", "chair_lift"], - 1, - 0 + "stops": [ + [7,"rgba(255, 50, 50, 1)"], + [15,"rgba(255, 80, 80, 1)"] ] - ], + }, "line-width": [ "interpolate", ["linear"], @@ -4197,151 +6462,341 @@ 8, 0.2, 14, - ["match", ["get", "class"], ["cable_car"], 1, 0.75], + [ + "match", + ["get","class"], + ["cable_car"], + 1, + 0.75 + ], 18, - ["match", ["get", "class"], ["cable_car"], 2, 1.5] + [ + "match", + ["get","class"], + ["cable_car"], + 2, + 1.5 + ] + ], + "line-opacity": [ + "interpolate", + ["linear"], + ["zoom"], + 12, + 0, + 13, + [ + "match", + ["get","class"], + ["cable_car","gondola"], + 1, + 0 + ], + 14, + [ + "match", + ["get","class"], + ["cable_car","gondola","chair_lift"], + 1, + 0 + ] ] - } + }, + "filter": [ + "all", + ["in","class","cable_car","gondola","chair_lift"] + ] }, { "id": "road_number", "type": "symbol", "source": "swissmaptiles", "source-layer": "transportation_name", - "minzoom": 11, - "filter": [ - "all", - ["in", "class", "motorway", "trunk", "primary"], - ["has", "ref"], - ["<=", "ref_length", 12], - ["==", "$type", "LineString"] - ], + "minzoom": 11.0, "layout": { - "icon-allow-overlap": false, - "icon-ignore-placement": false, - "icon-image": "box_white_grey_casing_{ref_length}", - "icon-keep-upright": false, - "icon-offset": [0, -1.3], - "icon-optional": false, - "icon-padding": 2, - "icon-pitch-alignment": "viewport", - "icon-rotation-alignment": "viewport", "icon-size": 1, - "icon-text-fit": "none", - "symbol-avoid-edges": false, - "symbol-placement": "line", - "symbol-spacing": ["step", ["zoom"], 300, 10, 600, 14, 800], - "symbol-z-order": "auto", - "text-anchor": "center", - "text-field": ["get", "ref"], "text-font": ["Frutiger Neue Condensed Bold"], - "text-justify": "center", - "text-keep-upright": true, - "text-letter-spacing": 0, - "text-optional": false, - "text-pitch-alignment": "viewport", - "text-rotation-alignment": "viewport", "text-size": 10.5, - "visibility": "visible" + "icon-image": "box_white_grey_casing_{ref_length}", + "text-field": ["get","ref"], + "visibility": "visible", + "icon-offset": [0,-1.3], + "text-anchor": "center", + "icon-padding": 2, + "text-justify": "center", + "icon-optional": false, + "icon-text-fit": "none", + "text-optional": false, + "symbol-spacing": [ + "step", + ["zoom"], + 300, + 10, + 600, + 14, + 800 + ], + "symbol-z-order": "auto", + "symbol-placement": "line", + "icon-keep-upright": false, + "text-keep-upright": true, + "icon-allow-overlap": false, + "symbol-avoid-edges": false, + "text-letter-spacing": 0, + "icon-pitch-alignment": "viewport", + "text-pitch-alignment": "viewport", + "icon-ignore-placement": false, + "icon-rotation-alignment": "viewport", + "text-rotation-alignment": "viewport" }, "paint": { - "icon-opacity": 1, "text-color": "rgba(64, 64, 64, 1)", + "icon-opacity": 1, + "text-opacity": 1, "text-halo-blur": 0, "text-halo-color": "rgba(0, 0, 0, 0)", - "text-halo-width": 0, - "text-opacity": 1 - } + "text-halo-width": 0 + }, + "filter": [ + "all", + ["in","class","motorway","trunk","primary"], + ["has","ref"], + ["<=","ref_length",12], + ["==","$type","LineString"] + ] }, { "id": "area_name_glacier_point_label", "type": "symbol", "source": "swissmaptiles", "source-layer": "area_name", - "minzoom": 14, - "filter": [ - "all", - ["==", "$type", "Point"], - ["in", "subclass", "glacier"] - ], + "minzoom": 14.0, "layout": { - "symbol-avoid-edges": true, - "symbol-placement": "point", - "symbol-spacing": {"stops": [[12, 250], [14, 550]]}, - "symbol-z-order": "auto", - "text-allow-overlap": false, - "text-field": "{name:latin}", "text-font": ["Frutiger Neue Italic"], - "text-ignore-placement": false, - "text-keep-upright": true, - "text-letter-spacing": 0.15, + "text-size": [ + "interpolate", + ["linear"], + ["zoom"], + 10, + 11, + 16, + 20 + ], + "text-field": "{name:latin}", + "symbol-spacing": { + "stops": [ + [12,250], + [14,550] + ] + }, + "symbol-z-order": "auto", "text-max-width": 99999, + "symbol-placement": "point", + "text-keep-upright": true, + "symbol-avoid-edges": true, + "text-allow-overlap": false, + "text-letter-spacing": 0.15, "text-pitch-alignment": "map", - "text-rotation-alignment": "map", - "text-size": ["interpolate", ["linear"], ["zoom"], 10, 11, 16, 20] + "text-ignore-placement": false, + "text-rotation-alignment": "map" }, "paint": { "text-color": "rgba(55, 146, 201, 1)", "text-halo-blur": 1, "text-halo-color": "rgba(242, 242, 242, 0.6)", "text-halo-width": 1 - } + }, + "filter": [ + "all", + ["==","$type","Point"], + ["in","subclass","glacier"] + ] }, { "id": "area_name_glacier_line_label", "type": "symbol", "source": "swissmaptiles", "source-layer": "area_name", - "minzoom": 12, - "filter": [ - "all", - ["==", "$type", "LineString"], - ["in", "subclass", "glacier"] - ], + "minzoom": 12.0, "layout": { - "symbol-avoid-edges": true, - "symbol-placement": "line-center", - "symbol-spacing": {"stops": [[12, 250], [14, 550]]}, - "symbol-z-order": "auto", - "text-allow-overlap": false, - "text-field": "{name:latin}", "text-font": ["Frutiger Neue Italic"], - "text-ignore-placement": false, - "text-keep-upright": true, - "text-letter-spacing": {"stops": [[10, 0.15], [12, 0.3]]}, + "text-size": [ + "interpolate", + ["linear"], + ["zoom"], + 10, + 11, + 16, + 20 + ], + "text-field": "{name:latin}", + "symbol-spacing": { + "stops": [ + [12,250], + [14,550] + ] + }, + "symbol-z-order": "auto", "text-max-width": 99999, + "symbol-placement": "line-center", + "text-keep-upright": true, + "symbol-avoid-edges": true, + "text-allow-overlap": false, + "text-letter-spacing": { + "stops": [ + [10,0.15], + [12,0.3] + ] + }, "text-pitch-alignment": "map", - "text-rotation-alignment": "map", - "text-size": ["interpolate", ["linear"], ["zoom"], 10, 11, 16, 20] + "text-ignore-placement": false, + "text-rotation-alignment": "map" }, "paint": { "text-color": "rgba(55, 146, 201, 1)", "text-halo-blur": 1, "text-halo-color": "rgba(242, 242, 242, 0.6)", "text-halo-width": 1 - } + }, + "filter": [ + "all", + ["==","$type","LineString"], + ["in","subclass","glacier"] + ] }, { "id": "poi_rank3", "type": "symbol", "source": "swissmaptiles", "source-layer": "poi", - "minzoom": 15, + "minzoom": 15.0, + "layout": { + "icon-size": 1, + "text-font": ["Frutiger Neue Condensed Regular"], + "text-size": [ + "interpolate", + ["linear"], + ["zoom"], + 14, + 12, + 18, + 18 + ], + "icon-image": [ + "match", + ["get","subclass"], + ["tram_stop","bus_stop","halt","aerialway_station","elevator","subway_entrance"], + "dot_red", + "waterfall", + "waterfall_blue", + "observation_tower", + "observation_tower_grey", + ["survey_point","surveying_pyramid"], + "dot_dark_grey_4", + "" + ], + "text-field": ["get","name:latin"], + "visibility": "visible", + "icon-rotate": [ + "to-number", + ["get","direction"] + ], + "text-anchor": [ + "match", + ["get","subclass"], + ["halt","tram_stop","bus_stop","aerialway_station","elevator","subway_entrance","survey_point","surveying_pyramid"], + "bottom-left", + ["waterfall","observation_tower"], + "left", + "center" + ], + "text-offset": [ + "match", + ["get","subclass"], + "observation_tower", + [ + "literal", + [0.5,0.2] + ], + "waterfall", + [ + "literal", + [0.5,0.1] + ], + [ + "literal", + [0.4,0.1] + ] + ], + "text-justify": "left", + "text-padding": 2, + "icon-optional": false, + "text-optional": true, + "text-max-width": 10, + "icon-allow-overlap": false, + "icon-ignore-placement": false, + "icon-rotation-alignment": "map" + }, + "paint": { + "text-color": [ + "match", + ["get","subclass"], + ["halt","tram_stop","bus_stop","aerialway_station","elevator","subway_entrance"], + "rgba(255, 50, 50, 1)", + "waterfall", + "rgba(20, 136, 205, 1)", + "rgba(48, 48, 48, 1)" + ], + "icon-opacity": [ + "case", + ["has","name"], + 1, + 0 + ], + "text-opacity": [ + "step", + ["zoom"], + 0, + 15, + [ + "match", + ["get","class"], + "college", + 0, + 1 + ], + 16, + 1 + ], + "text-halo-blur": 1, + "text-halo-color": "rgba(242, 242, 242, 0.6)", + "text-halo-width": [ + "interpolate", + ["linear"], + ["zoom"], + 14, + 1, + 17, + 2 + ] + }, "filter": [ "all", [ "match", - ["get", "class"], + ["get","class"], [ "allottments", + "antenna_area", "attraction", "aerialway", "bus", "building", "cave", + "driving_centre", + "elevator", "entrance", "garden", - "museum", "place_of_worship", "railway", "survey_point", @@ -4354,20 +6809,24 @@ ], [ "match", - ["get", "subclass"], + ["get","subclass"], [ + "aerialway_station", "allottments", + "antenna_area", "attraction", "bus_stop", "cave", "building", + "elevator", "garden", "halt", - "museum", - "observation", - "station", + "observation_tower", + "observatory", "subway_entrance", "survey_point", + "surveying_pyramid", + "tower", "tram_stop", "wastewater_plant", "waterfall", @@ -4376,100 +6835,265 @@ true, false ] - ], - "layout": { - "icon-allow-overlap": false, - "icon-ignore-placement": false, - "icon-image": [ - "match", - ["get", "subclass"], - ["tram_stop", "bus_stop", "halt", "station", "subway_entrance"], - "dot_red", - "waterfall", - "waterfall_blue", - "observation", - "observation_tower_grey", - "survey_point", - "dot_dark_grey_4", - "" - ], - "icon-optional": false, - "icon-rotate": ["to-number", ["get", "direction"]], - "icon-rotation-alignment": "map", - "icon-size": 1, - "text-anchor": [ - "match", - ["get", "subclass"], - [ - "halt", - "tram_stop", - "bus_stop", - "station", - "subway_entrance", - "survey_point" - ], - "bottom-left", - ["waterfall", "observation"], - "left", - "center" - ], - "text-field": ["get", "name:latin"], - "text-font": ["Frutiger Neue Condensed Regular"], - "text-justify": "left", - "text-max-width": 10, - "text-offset": [ - "match", - ["get", "subclass"], - "observation", - ["literal", [0.5, 0.2]], - "waterfall", - ["literal", [0.5, 0.1]], - ["literal", [0.4, 0.1]] - ], - "text-optional": false, - "text-padding": 2, - "text-size": ["interpolate", ["linear"], ["zoom"], 14, 12, 18, 18], - "visibility": "visible" - }, - "paint": { - "icon-opacity": ["case", ["has", "name"], 1, 0], - "text-color": [ - "match", - ["get", "subclass"], - ["halt", "tram_stop", "bus_stop", "station", "subway_entrance"], - "rgba(255, 50, 50, 1)", - "waterfall", - "rgba(20, 136, 205, 1)", - "rgba(48, 48, 48, 1)" - ], - "text-halo-blur": 1, - "text-halo-color": "rgba(242, 242, 242, 0.6)", - "text-halo-width": ["interpolate", ["linear"], ["zoom"], 14, 1, 17, 2], - "text-opacity": [ - "step", - ["zoom"], - 0, - 15, - ["match", ["get", "class"], "college", 0, 1], - 16, - 1 - ] - } + ] }, { "id": "poi_rank2", "type": "symbol", "source": "swissmaptiles", "source-layer": "poi", - "minzoom": 13, + "minzoom": 13.0, + "layout": { + "icon-size": 1, + "text-font": ["Frutiger Neue Condensed Regular"], + "text-size": [ + "interpolate", + ["linear"], + ["zoom"], + 14, + 12, + 18, + 18 + ], + "icon-image": [ + "step", + ["zoom"], + [ + "match", + ["get","subclass"], + "church_tower", + "dot_circle_dark_grey_8", + ["golf_course","golf"], + "golf_grey", + ["ferry","ferry_terminal"], + "dot_blue", + "funicular_stop", + "dot_red", + "wind_turbine", + "windturbine_grey", + "communications_tower", + "communications_tower_grey", + "" + ], + 15, + [ + "match", + ["get","subclass"], + ["camp_site","caravan_site"], + "camping_grey", + "church_tower", + "dot_circle_dark_grey_10", + ["golf_course","golf"], + "golf_grey", + ["ferry","ferry_terminal"], + "dot_blue", + "funicular_stop", + "dot_red", + "wind_turbine", + "windturbine_grey", + "communications_tower", + "communications_tower_grey", + "" + ], + 16, + [ + "match", + ["get","subclass"], + ["camp_site","caravan_site"], + "camping_grey", + "church_tower", + "dot_circle_dark_grey_12", + ["golf_course","golf"], + "golf_grey", + ["ferry","ferry_terminal"], + "dot_blue", + "funicular_stop", + "dot_red", + "hospital", + "hospital_grey", + "wind_turbine", + "windturbine_grey", + "communications_tower", + "communications_tower_grey", + "" + ] + ], + "text-field": ["get","name:latin"], + "visibility": "visible", + "icon-offset": [0,0], + "text-anchor": [ + "match", + ["get","class"], + ["monastery"], + "left", + [ + "match", + ["get","subclass"], + ["caravan_site","camp_site","church_tower","golf_course","golf","hospital","communications_tower"], + "left", + ["ferry","ferry_terminal","funicular_stop"], + "bottom-left", + "center" + ] + ], + "text-offset": [ + "match", + ["get","subclass"], + ["ferry","ferry_terminal","funicular_stop"], + [ + "literal", + [0.4,0.1] + ], + [ + "literal", + [0.8,0.1] + ] + ], + "text-justify": "left", + "icon-optional": false, + "text-optional": true, + "text-max-width": 10, + "icon-allow-overlap": false, + "text-letter-spacing": [ + "match", + ["get","class"], + ["park"], + 0.05, + 0 + ], + "icon-ignore-placement": false + }, + "paint": { + "text-color": [ + "match", + ["get","subclass"], + ["ferry","ferry_terminal"], + "rgba(20, 136, 205, 1)", + "funicular_stop", + "rgba(255, 50, 50, 1)", + "weir", + "rgba(20, 136, 205, 1)", + "rgba(48, 48, 48, 1)" + ], + "icon-opacity": [ + "step", + ["zoom"], + 0, + 13, + [ + "match", + ["get","subclass"], + "wind_turbine", + 0, + 0 + ], + 14, + [ + "match", + ["get","class"], + ["place_of_worship"], + 1, + [ + "match", + ["get","subclass"], + [ + "wind_turbine", + "caravan_site", + "camp_site", + "ferry", + "ferry_terminal", + "funicular_stop", + "golf_course", + "golf", + "cemetery", + "stadium", + "park" + ], + 1, + 0 + ] + ], + 15, + 1 + ], + "text-opacity": [ + "step", + ["zoom"], + 0, + 14, + [ + "match", + ["get","class"], + ["ferry","ferry_terminal","funicular","golf","golf_course","cemetery","ruins","stadium","park","pitch"], + 1, + 0 + ], + 15, + [ + "match", + ["get","class"], + [ + "campsite", + "ferry", + "ferry_terminal", + "funicular", + "golf", + "golf_course", + "cemetery", + "stadium", + "park", + "pitch", + "place_of_worship", + "sports_centre", + "zoo" + ], + 1, + 0 + ], + 16, + [ + "match", + ["get","class"], + [ + "campsite", + "ferry", + "ferry_terminal", + "funicular", + "golf", + "golf_course", + "cemetery", + "stadium", + "park", + "pitch", + "place_of_worship", + "sports_centre", + "zoo" + ], + 1, + 0 + ], + 17, + 1 + ], + "text-halo-blur": 1, + "text-halo-color": "rgba(242, 242, 242, 0.6)", + "text-halo-width": [ + "interpolate", + ["linear"], + ["zoom"], + 14, + 1, + 17, + 2 + ] + }, "filter": [ "any", [ "match", - ["get", "class"], + ["get","class"], [ "cemetery", - "tower", "dam", "ferry_terminal", "funicular", @@ -4494,282 +7118,25 @@ true, false ], - ["match", ["get", "subclass"], "camp_site", true, false] - ], - "layout": { - "icon-allow-overlap": false, - "icon-ignore-placement": false, - "icon-image": [ - "step", - ["zoom"], - [ - "match", - ["get", "subclass"], - "church_tower", - "dot_circle_dark_grey_8", - ["golf_course", "golf"], - "golf_grey", - "ferry_terminal", - "dot_blue", - "funicular_stop", - "dot_red", - "wind_turbine", - "windturbine_grey", - "communications_tower", - "communications_tower_grey", - "" - ], - 15, - [ - "match", - ["get", "subclass"], - ["camp_site", "caravan_site"], - "camping_grey", - "church_tower", - "dot_circle_dark_grey_10", - ["golf_course", "golf"], - "golf_grey", - "ferry_terminal", - "dot_blue", - "funicular_stop", - "dot_red", - "wind_turbine", - "windturbine_grey", - "communications_tower", - "communications_tower_grey", - "" - ], - 16, - [ - "match", - ["get", "subclass"], - ["camp_site", "caravan_site"], - "camping_grey", - "church_tower", - "dot_circle_dark_grey_12", - ["golf_course", "golf"], - "golf_grey", - "ferry_terminal", - "dot_blue", - "funicular_stop", - "dot_red", - "hospital", - "hospital_grey", - "wind_turbine", - "windturbine_grey", - "communications_tower", - "communications_tower_grey", - "" - ] - ], - "icon-offset": [0, 0], - "icon-optional": false, - "icon-size": 1, - "text-anchor": [ + [ "match", - ["get", "class"], - ["monastery"], - "left", - [ - "match", - ["get", "subclass"], - [ - "caravan_site", - "camp_site", - "church_tower", - "golf_course", - "golf", - "hospital", - "communications_tower" - ], - "left", - ["ferry_terminal", "funicular_stop"], - "bottom-left", - "center" - ] - ], - "text-field": ["get", "name:latin"], - "text-font": ["Frutiger Neue Condensed Regular"], - "text-justify": "left", - "text-letter-spacing": ["match", ["get", "class"], ["park"], 0.05, 0], - "text-max-width": 10, - "text-offset": [ - "match", - ["get", "subclass"], - ["ferry_terminal", "funicular_stop"], - ["literal", [0.4, 0.1]], - ["literal", [0.8, 0.1]] - ], - "text-optional": true, - "text-size": ["interpolate", ["linear"], ["zoom"], 14, 12, 18, 18], - "visibility": "visible" - }, - "paint": { - "icon-opacity": [ - "step", - ["zoom"], - 0, - 13, - ["match", ["get", "subclass"], "wind_turbine", 0, 0], - 14, - [ - "match", - ["get", "class"], - ["place_of_worship"], - 1, - [ - "match", - ["get", "subclass"], - [ - "wind_turbine", - "caravan_site", - "camp_site", - "ferry_terminal", - "funicular_stop", - "golf_course", - "golf", - "cemetery", - "stadium", - "park" - ], - 1, - 0 - ] - ], - 15, - 1 - ], - "text-color": [ - "match", - ["get", "subclass"], - "ferry_terminal", - "rgba(20, 136, 205, 1)", - "funicular_stop", - "rgba(255, 50, 50, 1)", - "weir", - "rgba(20, 136, 205, 1)", - "rgba(48, 48, 48, 1)" - ], - "text-halo-blur": 1, - "text-halo-color": "rgba(242, 242, 242, 0.6)", - "text-halo-width": ["interpolate", ["linear"], ["zoom"], 14, 1, 17, 2], - "text-opacity": [ - "step", - ["zoom"], - 0, - 14, - [ - "match", - ["get", "class"], - [ - "ferry_terminal", - "funicular", - "golf", - "golf_course", - "cemetery", - "ruins", - "stadium", - "park", - "pitch" - ], - 1, - 0 - ], - 15, - [ - "match", - ["get", "class"], - [ - "campsite", - "ferry_terminal", - "funicular", - "golf", - "golf_course", - "cemetery", - "stadium", - "park", - "pitch", - "place_of_worship", - "sports_centre", - "zoo" - ], - 1, - 0 - ], - 16, - [ - "match", - ["get", "class"], - [ - "campsite", - "ferry_terminal", - "funicular", - "golf", - "golf_course", - "cemetery", - "stadium", - "park", - "pitch", - "place_of_worship", - "sports_centre", - "zoo" - ], - 1, - 0 - ], - 17, - 1 + ["get","subclass"], + ["church_tower","camp_site","communications_tower"], + true, + false ] - } + ] }, { "id": "peaks_other", "type": "symbol", "source": "swissmaptiles", "source-layer": "mountain_peak", - "minzoom": 15, - "maxzoom": 24, - "filter": [ - "match", - ["get", "class"], - ["rocky_knoll", "saddle"], - true, - false - ], + "minzoom": 15.0, + "maxzoom": 24.0, "layout": { - "icon-allow-overlap": false, - "icon-anchor": "center", - "icon-ignore-placement": false, - "icon-image": "dot_dark_grey_3", - "icon-offset": [0, 0], - "icon-optional": false, - "icon-padding": 0, - "icon-pitch-alignment": "auto", - "icon-rotation-alignment": "auto", "icon-size": 1, - "symbol-placement": "point", - "symbol-z-order": ["literal", "auto"], - "text-allow-overlap": false, - "text-anchor": "center", - "text-field": [ - "format", - ["get", "name:latin"], - {}, - "\n", - {}, - ["get", "ele"], - {"font-scale": 0.75} - ], - "text-font": ["Frutiger Neue Regular"], - "text-ignore-placement": false, - "text-justify": "auto", - "text-letter-spacing": 0.025, - "text-line-height": 1.15, - "text-max-width": 8, - "text-offset": [0, 0], - "text-optional": false, - "text-padding": 2, - "text-radial-offset": 0.3, + "text-font": ["Frutiger Neue Italic"], "text-size": [ "interpolate", ["linear"], @@ -4777,40 +7144,98 @@ 10, [ "case", - ["<=", 4000, ["get", "ele"]], + [ + "<=", + 4000, + ["get","ele"] + ], 14, - ["<=", 3000, ["get", "ele"]], + [ + "<=", + 3000, + ["get","ele"] + ], 13, - ["<=", 2000, ["get", "ele"]], + [ + "<=", + 2000, + ["get","ele"] + ], 12, 11 ], 18, [ "case", - ["<=", 4000, ["get", "ele"]], + [ + "<=", + 4000, + ["get","ele"] + ], 23, - ["<=", 3000, ["get", "ele"]], + [ + "<=", + 3000, + ["get","ele"] + ], 22, - ["<=", 2000, ["get", "ele"]], + [ + "<=", + 2000, + ["get","ele"] + ], 21, 20 ] ], + "icon-image": "dot_dark_grey_3", + "text-field": [ + "format", + ["get","name:latin"], + {}, + "\n", + {}, + ["get","ele"], + { + "font-scale": 0.75 + } + ], + "visibility": "visible", + "icon-anchor": "center", + "icon-offset": [0,0], + "text-anchor": "center", + "text-offset": [0,0], + "icon-padding": 0, + "text-justify": "auto", + "text-padding": 2, + "icon-optional": false, + "text-optional": false, + "symbol-z-order": ["literal","auto"], + "text-max-width": 8, + "symbol-placement": "point", + "text-line-height": 1.15, + "icon-allow-overlap": false, + "text-allow-overlap": false, + "text-radial-offset": 0.3, + "text-letter-spacing": 0.025, + "icon-pitch-alignment": "auto", "text-variable-anchor": [ "literal", - ["bottom-left", "top-left", "bottom-right", "top-right"] + ["bottom-left","top-left","bottom-right","top-right"] ], - "visibility": "visible" + "icon-ignore-placement": false, + "text-ignore-placement": false, + "icon-rotation-alignment": "auto" }, "paint": { "icon-color": "rgba(0, 0, 0, 1)", + "text-color": "rgba(48, 48, 48, 1)", + "icon-opacity": 1, + "text-opacity": 1, "icon-halo-blur": 0, + "text-halo-blur": 1, "icon-halo-color": "rgba(255, 255, 255, 1)", "icon-halo-width": 0, - "icon-opacity": 1, - "text-color": "rgba(48, 48, 48, 1)", - "text-halo-blur": 1, "text-halo-color": "rgba(242, 242, 242, 0.6)", "text-halo-width": [ "interpolate", @@ -4820,26 +7245,77 @@ 1.5, 18, 3 - ], - "text-opacity": 1 - } + ] + }, + "filter": [ + "match", + ["get","class"], + ["rocky_knoll","saddle"], + true, + false + ] }, { - "id": "peaks_rank3+", + "id": "peaks_rank5", "type": "symbol", "source": "swissmaptiles", "source-layer": "mountain_peak", - "minzoom": 14, - "maxzoom": 24, - "filter": [ - "all", - [">=", "rank", 3], - ["!in", "class", "rocky_knoll", "saddle", "mountain_pass"] - ], + "minzoom": 13.0, + "maxzoom": 24.0, "layout": { - "icon-allow-overlap": false, - "icon-anchor": "center", - "icon-ignore-placement": false, + "icon-size": 1, + "text-font": ["Frutiger Neue Italic"], + "text-size": [ + "interpolate", + ["linear"], + ["zoom"], + 10, + [ + "case", + [ + "<=", + 4000, + ["get","ele"] + ], + 14, + [ + "<=", + 3000, + ["get","ele"] + ], + 13, + [ + "<=", + 2000, + ["get","ele"] + ], + 12, + 11 + ], + 18, + [ + "case", + [ + "<=", + 4000, + ["get","ele"] + ], + 23, + [ + "<=", + 3000, + ["get","ele"] + ], + 22, + [ + "<=", + 2000, + ["get","ele"] + ], + 21, + 20 + ] + ], "icon-image": [ "step", ["zoom"], @@ -4851,72 +7327,49 @@ 18, "dot_dark_grey_8" ], - "icon-offset": [0, 0], - "icon-optional": false, - "icon-padding": 0, - "icon-pitch-alignment": "auto", - "icon-rotation-alignment": "auto", - "icon-size": 1, - "symbol-placement": "point", - "symbol-z-order": ["literal", "auto"], - "text-allow-overlap": false, - "text-anchor": "bottom-left", "text-field": [ "format", - ["get", "name:latin"], + ["get","name:latin"], {}, "\n", {}, - ["get", "ele"], - {"font-scale": 0.75} + ["get","ele"], + { + "font-scale": 0.75 + } ], - "text-font": ["Frutiger Neue Regular"], - "text-ignore-placement": false, + "visibility": "visible", + "icon-anchor": "center", + "icon-offset": [0,0], + "text-anchor": "bottom", + "text-offset": [0,0], + "icon-padding": 0, "text-justify": "auto", - "text-letter-spacing": 0.025, - "text-line-height": 1.15, - "text-max-width": 8, - "text-offset": [0, 0], - "text-optional": false, "text-padding": 2, + "icon-optional": false, + "text-optional": false, + "symbol-z-order": ["literal","auto"], + "text-max-width": 8, + "symbol-placement": "point", + "text-line-height": 1.15, + "icon-allow-overlap": false, + "text-allow-overlap": false, "text-radial-offset": 0.3, - "text-size": [ - "interpolate", - ["linear"], - ["zoom"], - 10, - [ - "case", - ["<=", 4000, ["get", "ele"]], - 14, - ["<=", 3000, ["get", "ele"]], - 13, - ["<=", 2000, ["get", "ele"]], - 12, - 11 - ], - 18, - [ - "case", - ["<=", 4000, ["get", "ele"]], - 23, - ["<=", 3000, ["get", "ele"]], - 22, - ["<=", 2000, ["get", "ele"]], - 21, - 20 - ] - ], - "visibility": "visible" + "text-letter-spacing": 0.025, + "icon-pitch-alignment": "auto", + "icon-ignore-placement": false, + "text-ignore-placement": false, + "icon-rotation-alignment": "auto" }, "paint": { "icon-color": "rgba(0, 0, 0, 1)", + "text-color": "rgba(48, 48, 48, 1)", + "icon-opacity": 1, + "text-opacity": 1, "icon-halo-blur": 0, + "text-halo-blur": 1, "icon-halo-color": "rgba(255, 255, 255, 1)", "icon-halo-width": 0, - "icon-opacity": 1, - "text-color": "rgba(48, 48, 48, 1)", - "text-halo-blur": 1, "text-halo-color": "rgba(242, 242, 242, 0.6)", "text-halo-width": [ "interpolate", @@ -4926,26 +7379,339 @@ 1.5, 18, 3 + ] + }, + "filter": [ + "all", + [">=","rank",5], + ["!in","class","rocky_knoll","saddle","mountain_pass"] + ] + }, + { + "id": "peaks_rank4", + "type": "symbol", + "source": "swissmaptiles", + "source-layer": "mountain_peak", + "minzoom": 12.0, + "maxzoom": 24.0, + "layout": { + "icon-size": 1, + "text-font": ["Frutiger Neue Italic"], + "text-size": [ + "interpolate", + ["linear"], + ["zoom"], + 10, + [ + "case", + [ + "<=", + 4000, + ["get","ele"] + ], + 14, + [ + "<=", + 3000, + ["get","ele"] + ], + 13, + [ + "<=", + 2000, + ["get","ele"] + ], + 12, + 11 + ], + 18, + [ + "case", + [ + "<=", + 4000, + ["get","ele"] + ], + 23, + [ + "<=", + 3000, + ["get","ele"] + ], + 22, + [ + "<=", + 2000, + ["get","ele"] + ], + 21, + 20 + ] ], - "text-opacity": 1 - } + "icon-image": [ + "step", + ["zoom"], + "", + 10, + "dot_dark_grey_4", + 14, + "dot_dark_grey_6", + 18, + "dot_dark_grey_8" + ], + "text-field": [ + "format", + ["get","name:latin"], + {}, + "\n", + {}, + ["get","ele"], + { + "font-scale": 0.75 + } + ], + "visibility": "visible", + "icon-anchor": "center", + "icon-offset": [0,0], + "text-anchor": "bottom", + "text-offset": [0,0], + "icon-padding": 0, + "text-justify": "auto", + "text-padding": 2, + "icon-optional": false, + "text-optional": false, + "symbol-z-order": ["literal","auto"], + "text-max-width": 8, + "symbol-placement": "point", + "text-line-height": 1.15, + "icon-allow-overlap": false, + "text-allow-overlap": false, + "text-radial-offset": 0.3, + "text-letter-spacing": 0.025, + "icon-pitch-alignment": "auto", + "icon-ignore-placement": false, + "text-ignore-placement": false, + "icon-rotation-alignment": "auto" + }, + "paint": { + "icon-color": "rgba(0, 0, 0, 1)", + "text-color": "rgba(48, 48, 48, 1)", + "icon-opacity": 1, + "text-opacity": 1, + "icon-halo-blur": 0, + "text-halo-blur": 1, + "icon-halo-color": "rgba(255, 255, 255, 1)", + "icon-halo-width": 0, + "text-halo-color": "rgba(242, 242, 242, 0.6)", + "text-halo-width": [ + "interpolate", + ["linear"], + ["zoom"], + 12, + 1.5, + 18, + 3 + ] + }, + "filter": [ + "all", + ["==","rank",4], + ["!in","class","rocky_knoll","saddle","mountain_pass"] + ] + }, + { + "id": "peaks_rank3", + "type": "symbol", + "source": "swissmaptiles", + "source-layer": "mountain_peak", + "minzoom": 11.0, + "maxzoom": 24.0, + "layout": { + "icon-size": 1, + "text-font": ["Frutiger Neue Italic"], + "text-size": [ + "interpolate", + ["linear"], + ["zoom"], + 10, + [ + "case", + [ + "<=", + 4000, + ["get","ele"] + ], + 14, + [ + "<=", + 3000, + ["get","ele"] + ], + 13, + [ + "<=", + 2000, + ["get","ele"] + ], + 12, + 11 + ], + 18, + [ + "case", + [ + "<=", + 4000, + ["get","ele"] + ], + 23, + [ + "<=", + 3000, + ["get","ele"] + ], + 22, + [ + "<=", + 2000, + ["get","ele"] + ], + 21, + 20 + ] + ], + "icon-image": [ + "step", + ["zoom"], + "", + 10, + "dot_dark_grey_4", + 14, + "dot_dark_grey_6", + 18, + "dot_dark_grey_8" + ], + "text-field": [ + "format", + ["get","name:latin"], + {}, + "\n", + {}, + ["get","ele"], + { + "font-scale": 0.75 + } + ], + "visibility": "visible", + "icon-anchor": "center", + "icon-offset": [0,0], + "text-anchor": "bottom", + "text-offset": [0,0], + "icon-padding": 0, + "text-justify": "auto", + "text-padding": 2, + "icon-optional": false, + "text-optional": false, + "symbol-z-order": ["literal","auto"], + "text-max-width": 8, + "symbol-placement": "point", + "text-line-height": 1.15, + "icon-allow-overlap": false, + "text-allow-overlap": false, + "text-radial-offset": 0.3, + "text-letter-spacing": 0.025, + "icon-pitch-alignment": "auto", + "icon-ignore-placement": false, + "text-ignore-placement": false, + "icon-rotation-alignment": "auto" + }, + "paint": { + "icon-color": "rgba(0, 0, 0, 1)", + "text-color": "rgba(48, 48, 48, 1)", + "icon-opacity": 1, + "text-opacity": 1, + "icon-halo-blur": 0, + "text-halo-blur": 1, + "icon-halo-color": "rgba(255, 255, 255, 1)", + "icon-halo-width": 0, + "text-halo-color": "rgba(242, 242, 242, 0.6)", + "text-halo-width": [ + "interpolate", + ["linear"], + ["zoom"], + 12, + 1.5, + 18, + 3 + ] + }, + "filter": [ + "all", + ["==","rank",3], + ["!in","class","rocky_knoll","saddle","mountain_pass"] + ] }, { "id": "peaks_rank2", "type": "symbol", "source": "swissmaptiles", "source-layer": "mountain_peak", - "minzoom": 11, - "maxzoom": 24, - "filter": [ - "all", - ["==", "rank", 2], - ["!in", "class", "rocky_knoll", "saddle", "mountain_pass"] - ], + "minzoom": 10.0, + "maxzoom": 24.0, "layout": { - "icon-allow-overlap": false, - "icon-anchor": "center", - "icon-ignore-placement": false, + "icon-size": 1, + "text-font": ["Frutiger Neue Italic"], + "text-size": [ + "interpolate", + ["linear"], + ["zoom"], + 10, + [ + "case", + [ + "<=", + 4000, + ["get","ele"] + ], + 14, + [ + "<=", + 3000, + ["get","ele"] + ], + 13, + [ + "<=", + 2000, + ["get","ele"] + ], + 12, + 11 + ], + 18, + [ + "case", + [ + "<=", + 4000, + ["get","ele"] + ], + 23, + [ + "<=", + 3000, + ["get","ele"] + ], + 22, + [ + "<=", + 2000, + ["get","ele"] + ], + 21, + 20 + ] + ], "icon-image": [ "step", ["zoom"], @@ -4957,72 +7723,49 @@ 18, "dot_dark_grey_8" ], - "icon-offset": [0, 0], - "icon-optional": false, - "icon-padding": 0, - "icon-pitch-alignment": "auto", - "icon-rotation-alignment": "auto", - "icon-size": 1, - "symbol-placement": "point", - "symbol-z-order": ["literal", "auto"], - "text-allow-overlap": false, - "text-anchor": "bottom-left", "text-field": [ "format", - ["get", "name:latin"], + ["get","name:latin"], {}, "\n", {}, - ["get", "ele"], - {"font-scale": 0.75} + ["get","ele"], + { + "font-scale": 0.75 + } ], - "text-font": ["Frutiger Neue Regular"], - "text-ignore-placement": false, + "visibility": "visible", + "icon-anchor": "center", + "icon-offset": [0,0], + "text-anchor": "bottom", + "text-offset": [0,0], + "icon-padding": 0, "text-justify": "auto", - "text-letter-spacing": 0.025, - "text-line-height": 1.15, - "text-max-width": 8, - "text-offset": [0, 0], - "text-optional": false, "text-padding": 2, + "icon-optional": false, + "text-optional": false, + "symbol-z-order": ["literal","auto"], + "text-max-width": 8, + "symbol-placement": "point", + "text-line-height": 1.15, + "icon-allow-overlap": false, + "text-allow-overlap": false, "text-radial-offset": 0.3, - "text-size": [ - "interpolate", - ["linear"], - ["zoom"], - 10, - [ - "case", - ["<=", 4000, ["get", "ele"]], - 14, - ["<=", 3000, ["get", "ele"]], - 13, - ["<=", 2000, ["get", "ele"]], - 12, - 11 - ], - 18, - [ - "case", - ["<=", 4000, ["get", "ele"]], - 23, - ["<=", 3000, ["get", "ele"]], - 22, - ["<=", 2000, ["get", "ele"]], - 21, - 20 - ] - ], - "visibility": "visible" + "text-letter-spacing": 0.025, + "icon-pitch-alignment": "auto", + "icon-ignore-placement": false, + "text-ignore-placement": false, + "icon-rotation-alignment": "auto" }, "paint": { "icon-color": "rgba(0, 0, 0, 1)", + "text-color": "rgba(48, 48, 48, 1)", + "icon-opacity": 1, + "text-opacity": 1, "icon-halo-blur": 0, + "text-halo-blur": 1, "icon-halo-color": "rgba(255, 255, 255, 1)", "icon-halo-width": 0, - "icon-opacity": 1, - "text-color": "rgba(48, 48, 48, 1)", - "text-halo-blur": 1, "text-halo-color": "rgba(242, 242, 242, 0.6)", "text-halo-width": [ "interpolate", @@ -5032,282 +7775,243 @@ 1.5, 18, 3 - ], - "text-opacity": 1 - } - }, - { - "id": "peaks_rank1", - "type": "symbol", - "source": "swissmaptiles", - "source-layer": "mountain_peak", - "minzoom": 9, - "maxzoom": 24, + ] + }, "filter": [ "all", - ["==", "rank", 1], - ["!in", "class", "rocky_knoll", "saddle", "mountain_pass"] - ], - "layout": { - "icon-allow-overlap": false, - "icon-anchor": "center", - "icon-ignore-placement": false, - "icon-image": [ - "step", - ["zoom"], - "dot_dark_grey_4", - 14, - "dot_dark_grey_6", - 18, - "dot_dark_grey_8" - ], - "icon-offset": [0, 0], - "icon-optional": false, - "icon-padding": 2, - "icon-pitch-alignment": "auto", - "icon-rotation-alignment": "auto", - "icon-size": 1, - "symbol-placement": "point", - "symbol-z-order": ["literal", "auto"], - "text-allow-overlap": false, - "text-anchor": "bottom-left", - "text-field": [ - "format", - ["get", "name:latin"], - {}, - "\n", - {}, - ["get", "ele"], - {"font-scale": 0.75} - ], - "text-font": ["Frutiger Neue Regular"], - "text-ignore-placement": false, - "text-justify": "auto", - "text-letter-spacing": 0.025, - "text-line-height": 1.15, - "text-max-width": 8, - "text-optional": false, - "text-padding": 10, - "text-radial-offset": 0.3, - "text-size": [ - "interpolate", - ["linear"], - ["zoom"], - 10, - [ - "case", - ["<=", 4000, ["get", "ele"]], - 14, - ["<=", 3000, ["get", "ele"]], - 13, - ["<=", 2000, ["get", "ele"]], - 12, - 11 - ], - 18, - [ - "case", - ["<=", 4000, ["get", "ele"]], - 23, - ["<=", 3000, ["get", "ele"]], - 22, - ["<=", 2000, ["get", "ele"]], - 21, - 20 - ] - ], - "visibility": "visible" - }, - "paint": { - "icon-color": "rgba(0, 0, 0, 1)", - "icon-halo-blur": 0, - "icon-halo-color": "rgba(255, 255, 255, 1)", - "icon-halo-width": 0, - "icon-opacity": [ - "step", - ["zoom"], - 0, - 9, - ["case", ["<=", 3200, ["get", "ele"]], 1, 0], - 10, - 1 - ], - "text-color": "rgba(48, 48, 48, 1)", - "text-halo-blur": 1, - "text-halo-color": "rgba(242, 242, 242, 0.6)", - "text-halo-width": [ - "interpolate", - ["linear"], - ["zoom"], - 10, - 1.5, - 18, - 3 - ], - "text-opacity": [ - "step", - ["zoom"], - 0, - 9, - ["case", ["<=", 3200, ["get", "ele"]], 1, 0], - 10, - 1 - ] - } + ["==","rank",2], + ["!in","class","rocky_knoll","saddle","mountain_pass"] + ] }, { "id": "place_other", "type": "symbol", "source": "swissmaptiles", "source-layer": "place", - "minzoom": 11, - "maxzoom": 24, - "filter": [ - "all", - [ - "!in", - "class", - "continent", - "country", - "state", - "city", - "town", - "village", - "hamlet", - "isolated_dwelling" - ] - ], + "minzoom": 14.0, + "maxzoom": 24.0, "layout": { - "icon-optional": false, "icon-size": 1, - "symbol-sort-key": ["to-number", ["get", "rank"]], - "symbol-z-order": ["literal", "auto"], - "text-anchor": "center", - "text-field": ["get", "name:latin"], "text-font": ["Frutiger Neue Condensed Medium"], - "text-justify": "auto", - "text-letter-spacing": 0.025, - "text-max-width": 10, - "text-offset": ["literal", [0.3, 0.2]], - "text-padding": 20, "text-size": [ "interpolate", - ["cubic-bezier", 0.5, 0.1, 0.7, 1], + ["cubic-bezier",0.5,0.1,0.7,1], ["zoom"], 4, - 6, + [ + "case", + [ + "<=", + 5000, + ["get","population"] + ], + 8, + [ + "<=", + 2000, + ["get","population"] + ], + 6, + 4 + ], 16, - 20 + [ + "case", + [ + "<=", + 5000, + ["get","population"] + ], + 22, + [ + "<=", + 2000, + ["get","population"] + ], + 20, + 18 + ] ], + "text-field": ["get","name:latin"], + "visibility": "visible", + "text-anchor": "center", + "text-offset": [ + "literal", + [0.3,0.2] + ], + "text-justify": "auto", + "text-padding": 20, + "icon-optional": false, + "symbol-z-order": ["literal","auto"], + "text-max-width": 10, "text-transform": "none", - "visibility": "visible" + "symbol-sort-key": [ + "to-number", + ["get","rank"] + ], + "text-letter-spacing": 0.025 }, "paint": { + "text-color": "rgba(64, 64, 64, 1)", "icon-opacity": [ "step", ["zoom"], 0, 11, - ["case", [">", 18, ["get", "rank"]], 1, 0], + [ + "case", + [ + ">", + 18, + ["get","rank"] + ], + 1, + 0 + ], 13, 1, 14, 0 ], - "text-color": "rgba(64, 64, 64, 1)", + "text-opacity": 1, "text-halo-blur": 1, "text-halo-color": "rgba(242, 242, 242, 0.6)", "text-halo-width": [ "interpolate", - ["cubic-bezier", 0, 0.75, 0.25, 1], + ["cubic-bezier",0,0.75,0.25,1], ["zoom"], 12, - 0, + 1, 16, 2 - ], - "text-opacity": [ - "step", - ["zoom"], - 0, - 11, - ["case", [">", 18, ["get", "rank"]], 1, 0], - 13, - 1 ] - } + }, + "filter": [ + "all", + ["!in","class","continent","country","state","city","town","village","hamlet","isolated_dwelling"] + ] }, { "id": "poi_rank1", "type": "symbol", "source": "swissmaptiles", "source-layer": "poi", - "minzoom": 14, - "filter": [ - "all", - ["in", "subclass", "castle", "station"], - ["in", "class", "castle", "railway"] - ], + "minzoom": 14.0, "layout": { + "icon-size": 1, + "text-font": ["Frutiger Neue Condensed Regular"], + "text-size": [ + "interpolate", + ["linear"], + ["zoom"], + 13, + 13, + 18, + 20 + ], "icon-image": [ "match", - ["get", "subclass"], - "station", + ["get","subclass"], + "railway_station", "square_red", "castle", "castle_grey", "" ], - "icon-size": 1, - "symbol-avoid-edges": true, + "text-field": ["get","name:latin"], + "visibility": "visible", "text-anchor": [ "match", - ["get", "subclass"], + ["get","subclass"], ["castle"], "left", - "station", + "railway_station", "bottom-left", "center" ], - "text-field": ["get", "name:latin"], - "text-font": ["Frutiger Neue Condensed Regular"], - "text-justify": "left", - "text-max-width": 10, "text-offset": [ "match", - ["get", "subclass"], - "station", - ["literal", [0.5, 0.15]], - ["literal", [0.8, 0.15]] + ["get","subclass"], + "railway_station", + [ + "literal", + [0.5,0.15] + ], + [ + "literal", + [0.8,0.15] + ] ], - "text-optional": false, + "text-justify": "left", "text-padding": 10, - "text-size": ["interpolate", ["linear"], ["zoom"], 13, 13, 18, 20], - "visibility": "visible" + "text-optional": false, + "text-max-width": 10, + "symbol-avoid-edges": true }, "paint": { "text-color": [ "match", - ["get", "subclass"], - "station", + ["get","subclass"], + "railway_station", "rgba(255, 50, 50, 1)", "rgba(48, 48, 48, 1)" ], + "text-opacity": 1, "text-halo-blur": 1, "text-halo-color": "rgba(242, 242, 242, 0.6)", - "text-halo-width": ["interpolate", ["linear"], ["zoom"], 14, 1, 17, 2], - "text-opacity": 1 - } + "text-halo-width": [ + "interpolate", + ["linear"], + ["zoom"], + 14, + 1, + 17, + 2 + ] + }, + "filter": [ + "all", + ["in","subclass","castle","railway_station"], + ["in","class","castle","railway"] + ] }, { "id": "place_hamlet_isolated_dwelling", "type": "symbol", "source": "swissmaptiles", "source-layer": "place", - "minzoom": 11, - "maxzoom": 24, - "filter": ["all", ["in", "class", "hamlet", "isolated_dwelling"]], + "minzoom": 11.0, + "maxzoom": 24.0, "layout": { + "icon-size": 1, + "text-font": ["Frutiger Neue Condensed Medium"], + "text-size": [ + "interpolate", + ["cubic-bezier",0.5,0.1,0.7,1], + ["zoom"], + 4, + [ + "case", + [ + "<=", + 50, + ["get","population"] + ], + 6, + 4 + ], + 16, + [ + "case", + [ + "<=", + 50, + ["get","population"] + ], + 20, + 18 + ] + ], "icon-image": [ "step", ["zoom"], @@ -5315,17 +8019,14 @@ 12, "circle_dark_grey_6" ], - "icon-optional": false, - "icon-size": 1, - "symbol-sort-key": ["to-number", ["get", "rank"]], - "symbol-z-order": ["literal", "auto"], - "text-anchor": ["literal", "bottom-left"], - "text-field": ["get", "name:latin"], - "text-font": ["Frutiger Neue Condensed Medium"], + "text-field": ["get","name:latin"], + "visibility": "visible", + "text-anchor": ["literal","bottom-left"], + "text-offset": [ + "literal", + [0.3,0.2] + ], "text-justify": "auto", - "text-letter-spacing": 0.025, - "text-max-width": 10, - "text-offset": ["literal", [0.3, 0.2]], "text-padding": [ "interpolate", ["linear"], @@ -5337,64 +8038,173 @@ 14, 0 ], - "text-size": [ - "interpolate", - ["cubic-bezier", 0.5, 0.1, 0.7, 1], - ["zoom"], - 4, - 6, - 16, - 18 - ], + "icon-optional": false, + "symbol-z-order": ["literal","auto"], + "text-max-width": 10, "text-transform": "none", - "visibility": "visible" + "symbol-sort-key": [ + "to-number", + ["get","rank"] + ], + "text-letter-spacing": 0.025 }, "paint": { + "text-color": "rgba(64, 64, 64, 1)", "icon-opacity": [ "step", ["zoom"], 0, 11, - ["case", [">", 30, ["get", "rank"]], 1, 0], + [ + "case", + [ + ">", + 30, + ["get","rank"] + ], + 1, + 0 + ], 13, - ["case", [">", 31, ["get", "rank"]], 1, 0], + [ + "case", + [ + ">", + 31, + ["get","rank"] + ], + 1, + 0 + ], 14, 0 ], - "text-color": "rgba(64, 64, 64, 1)", - "text-halo-blur": 1, - "text-halo-color": "rgba(242, 242, 242, 0.6)", - "text-halo-width": [ - "interpolate", - ["cubic-bezier", 0, 0.75, 0.25, 1], - ["zoom"], - 12, - 0, - 16, - 2 - ], "text-opacity": [ "step", ["zoom"], 0, 11, - ["case", [">", 30, ["get", "rank"]], 1, 0], + [ + "case", + [ + ">", + 30, + ["get","rank"] + ], + 1, + 0 + ], 13, - ["case", [">", 31, ["get", "rank"]], 1, 0], + [ + "case", + [ + ">", + 31, + ["get","rank"] + ], + 1, + 0 + ], 14, 1 + ], + "text-halo-blur": 1, + "text-halo-color": "rgba(242, 242, 242, 0.6)", + "text-halo-width": [ + "interpolate", + ["cubic-bezier",0,0.75,0.25,1], + ["zoom"], + 12, + 1, + 16, + 2 ] - } + }, + "filter": [ + "all", + ["in","class","hamlet","isolated_dwelling"] + ] + }, + { + "id": "place_country_exclave", + "type": "symbol", + "source": "swissmaptiles", + "source-layer": "place", + "minzoom": 11.0, + "maxzoom": 24.0, + "layout": { + "text-font": ["Frutiger Neue Condensed Regular"], + "text-size": [ + "interpolate", + ["linear"], + ["zoom"], + 1, + 11, + 7, + 14, + 11, + 16, + 18, + 24 + ], + "text-field": "{name:latin}", + "visibility": "visible", + "text-max-width": 10, + "text-transform": "uppercase", + "text-letter-spacing": 0.12 + }, + "paint": { + "text-color": "rgba(145, 70, 145, 0.9)", + "text-opacity": 1, + "text-halo-blur": 1, + "text-halo-color": "rgba(255, 255, 255, 0.8)", + "text-halo-width": 1 + }, + "filter": [ + "all", + ["in","class","country"], + ["in","iso_a2","DE","IT"] + ] }, { "id": "place_village", "type": "symbol", "source": "swissmaptiles", "source-layer": "place", - "minzoom": 7, - "maxzoom": 18, - "filter": ["all", ["==", "class", "village"]], + "minzoom": 7.0, + "maxzoom": 18.0, "layout": { + "icon-size": 1, + "text-font": ["Frutiger Neue Condensed Medium"], + "text-size": [ + "interpolate", + ["cubic-bezier",0.5,0.1,0.7,1], + ["zoom"], + 4, + 11, + 10, + [ + "case", + [ + "<=", + 3000, + ["get","population"] + ], + 16, + 14 + ], + 16, + [ + "case", + [ + "<=", + 3000, + ["get","population"] + ], + 28, + 24 + ] + ], "icon-image": [ "step", ["zoom"], @@ -5408,62 +8218,98 @@ 12, "circle_dark_grey_10" ], - "icon-optional": false, - "icon-size": 1, - "symbol-sort-key": ["to-number", ["get", "rank"]], - "symbol-z-order": ["literal", "auto"], - "text-anchor": ["literal", "bottom-left"], - "text-field": ["get", "name:latin"], - "text-font": ["Frutiger Neue Condensed Medium"], - "text-justify": "auto", - "text-letter-spacing": 0.025, - "text-max-width": 10, - "text-offset": ["literal", [0.4, 0.2]], - "text-optional": false, - "text-padding": 20, - "text-size": [ - "interpolate", - ["cubic-bezier", 0.5, 0.1, 0.7, 1], - ["zoom"], - 4, - 6, - 10, - 16, - 16, - 28 + "text-field": ["get","name:latin"], + "visibility": "visible", + "text-anchor": ["literal","bottom-left"], + "text-offset": [ + "literal", + [0.4,0.2] ], + "text-justify": "auto", + "text-padding": 10, + "icon-optional": false, + "text-optional": false, + "symbol-z-order": ["literal","auto"], + "text-max-width": 10, "text-transform": "none", - "visibility": "visible" + "symbol-sort-key": [ + "to-number", + ["get","rank"] + ], + "text-letter-spacing": 0.025 }, "paint": { - "icon-opacity": ["step", ["zoom"], 1, 13, 0], "text-color": "rgba(64, 64, 64, 1)", + "icon-opacity": [ + "step", + ["zoom"], + 1, + 13, + 0 + ], + "text-opacity": 1, "text-halo-blur": 1, "text-halo-color": "rgba(242, 242, 242, 0.6)", "text-halo-width": [ "interpolate", - ["cubic-bezier", 0, 0.75, 0.25, 1], + ["cubic-bezier",0,0.75,0.25,1], ["zoom"], 12, - 0, + 1, 16, 2 - ], - "text-opacity": 1 - } + ] + }, + "filter": [ + "all", + ["==","class","village"] + ] }, { "id": "aerodrome_label", "type": "symbol", "source": "swissmaptiles", "source-layer": "aerodrome_label", - "minzoom": 11, - "filter": ["all", ["!=", "class", "helipad"]], + "minzoom": 11.0, "layout": { - "icon-anchor": "center", + "icon-size": [ + "interpolate", + ["linear"], + ["zoom"], + 11, + 0.7, + 14, + 1 + ], + "text-font": ["Frutiger Neue Condensed Regular"], + "text-size": [ + "interpolate", + ["linear"], + ["zoom"], + 11, + [ + "match", + ["get","class"], + "international", + 16, + "regional", + 16, + 12 + ], + 14, + [ + "match", + ["get","class"], + "international", + 20, + "regional", + 18, + 16 + ] + ], "icon-image": [ "match", - ["get", "class"], + ["get","class"], "international", "airplane_large_grey", "regional", @@ -5474,82 +8320,238 @@ "helicopter_grey", "" ], - "icon-size": ["interpolate", ["linear"], ["zoom"], 11, 0.7, 14, 1], + "text-field": ["get","name:latin"], + "icon-anchor": "center", "text-anchor": "left", - "text-field": ["get", "name:latin"], - "text-font": ["Frutiger Neue Condensed Regular"], - "text-justify": "center", "text-offset": [ "match", - ["get", "class"], + ["get","class"], "helipad", - ["literal", [0.9, 0.2]], - ["literal", [0.9, 0]] + [ + "literal", + [0.9,0.2] + ], + [ + "literal", + [0.9,0] + ] ], + "text-justify": "center", "text-padding": 2, + "text-transform": "none" + }, + "paint": { + "text-color": "rgba(64, 64, 64, 1)", + "icon-opacity": ["literal",1], + "text-opacity": 1, + "text-halo-blur": 1, + "text-halo-color": "rgba(242, 242, 242, 0.8)", + "text-halo-width": [ + "interpolate", + ["linear"], + ["zoom"], + 14, + 1, + 17, + 2 + ] + }, + "filter": [ + "all", + ["!=","class","helipad"] + ] + }, + { + "id": "peaks_rank1", + "type": "symbol", + "source": "swissmaptiles", + "source-layer": "mountain_peak", + "minzoom": 9.0, + "maxzoom": 24.0, + "layout": { + "icon-size": 1, + "text-font": ["Frutiger Neue Italic"], "text-size": [ "interpolate", ["linear"], ["zoom"], - 11, - ["match", ["get", "class"], "international", 16, "regional", 16, 12], - 14, - ["match", ["get", "class"], "international", 20, "regional", 18, 16] + 10, + [ + "case", + [ + "<=", + 4000, + ["get","ele"] + ], + 14, + [ + "<=", + 3000, + ["get","ele"] + ], + 13, + [ + "<=", + 2000, + ["get","ele"] + ], + 12, + 11 + ], + 18, + [ + "case", + [ + "<=", + 4000, + ["get","ele"] + ], + 23, + [ + "<=", + 3000, + ["get","ele"] + ], + 22, + [ + "<=", + 2000, + ["get","ele"] + ], + 21, + 20 + ] ], - "text-transform": "none" + "icon-image": [ + "step", + ["zoom"], + "dot_dark_grey_4", + 14, + "dot_dark_grey_6", + 18, + "dot_dark_grey_8" + ], + "text-field": [ + "format", + ["get","name:latin"], + {}, + "\n", + {}, + ["get","ele"], + { + "font-scale": 0.75 + } + ], + "visibility": "visible", + "icon-anchor": "center", + "icon-offset": [0,0], + "text-anchor": "bottom", + "icon-padding": 2, + "text-justify": "auto", + "text-padding": 10, + "icon-optional": false, + "text-optional": false, + "symbol-z-order": ["literal","auto"], + "text-max-width": 8, + "symbol-placement": "point", + "text-line-height": 1.15, + "icon-allow-overlap": false, + "text-allow-overlap": false, + "text-radial-offset": 0.3, + "text-letter-spacing": 0.025, + "icon-pitch-alignment": "auto", + "icon-ignore-placement": false, + "text-ignore-placement": false, + "icon-rotation-alignment": "auto" }, "paint": { - "icon-opacity": ["literal", 1], - "text-color": "rgba(64, 64, 64, 1)", + "icon-color": "rgba(0, 0, 0, 1)", + "text-color": "rgba(48, 48, 48, 1)", + "icon-opacity": [ + "step", + ["zoom"], + 0, + 9, + [ + "case", + [ + "<=", + 3200, + ["get","ele"] + ], + 1, + 0 + ], + 10, + 1 + ], + "text-opacity": [ + "step", + ["zoom"], + 0, + 9, + [ + "case", + [ + "<=", + 3200, + ["get","ele"] + ], + 1, + 0 + ], + 10, + 1 + ], + "icon-halo-blur": 0, "text-halo-blur": 1, - "text-halo-color": "rgba(242, 242, 242, 0.8)", - "text-halo-width": ["interpolate", ["linear"], ["zoom"], 14, 1, 17, 2], - "text-opacity": 1 - } - }, - { - "id": "water_name_line_label", - "type": "symbol", - "source": "swissmaptiles", - "source-layer": "water_name", + "icon-halo-color": "rgba(255, 255, 255, 1)", + "icon-halo-width": 0, + "text-halo-color": "rgba(242, 242, 242, 0.6)", + "text-halo-width": [ + "interpolate", + ["linear"], + ["zoom"], + 10, + 1.5, + 18, + 3 + ] + }, "filter": [ "all", - ["==", "$type", "LineString"], - ["!=", "class", "lake_part"] - ], - "layout": { - "symbol-avoid-edges": false, - "symbol-placement": "line-center", - "symbol-spacing": {"stops": [[10, 250], [13, 950]]}, - "symbol-z-order": "auto", - "text-allow-overlap": false, - "text-field": "{name:latin}", - "text-font": ["Frutiger Neue Italic"], - "text-ignore-placement": false, - "text-keep-upright": true, - "text-letter-spacing": 0.15, - "text-max-width": 99999, - "text-padding": 2, - "text-pitch-alignment": "map", - "text-rotation-alignment": "map", - "text-size": ["interpolate", ["linear"], ["zoom"], 10, 14, 16, 24] - }, - "paint": { - "text-color": "rgba(20, 136, 205, 1)", - "text-halo-blur": 1, - "text-halo-color": "rgba(242, 242, 242, 0.6)", - "text-halo-width": 1 - } + ["==","rank",1], + ["!in","class","rocky_knoll","saddle","mountain_pass"] + ] }, { "id": "place_town", "type": "symbol", "source": "swissmaptiles", "source-layer": "place", - "minzoom": 6, - "maxzoom": 16, - "filter": ["all", ["==", "class", "town"]], + "minzoom": 6.0, + "maxzoom": 16.0, "layout": { + "icon-size": 1, + "text-font": ["Frutiger Neue Condensed Bold"], + "text-size": [ + "interpolate", + ["cubic-bezier",0.5,0.1,0.7,1], + ["zoom"], + 4, + 11, + 16, + [ + "case", + [ + "<=", + 30000, + ["get","population"] + ], + 32, + 28 + ] + ], "icon-image": [ "step", ["zoom"], @@ -5563,120 +8565,356 @@ 12, "circle_dark_grey_12" ], - "icon-optional": false, - "icon-size": 1, - "symbol-placement": "point", - "symbol-sort-key": ["to-number", ["get", "rank"]], - "symbol-z-order": ["literal", "auto"], - "text-anchor": ["literal", "bottom-left"], - "text-field": ["get", "name:latin"], - "text-font": ["Frutiger Neue Condensed Bold"], - "text-justify": "auto", - "text-letter-spacing": 0.025, - "text-max-width": 10, - "text-offset": ["literal", [0.35, 0.1]], - "text-padding": 10, - "text-size": [ - "interpolate", - ["cubic-bezier", 0.5, 0.1, 0.7, 1], - ["zoom"], - 4, - 8, - 16, - 32 + "text-field": ["get","name:latin"], + "visibility": "visible", + "text-anchor": ["literal","bottom-left"], + "text-offset": [ + "literal", + [0.35,0.1] ], + "text-justify": "auto", + "text-padding": 10, + "icon-optional": false, + "symbol-z-order": ["literal","auto"], + "text-max-width": 10, "text-transform": "uppercase", - "visibility": "visible" + "symbol-sort-key": [ + "to-number", + ["get","rank"] + ], + "symbol-placement": "point", + "text-letter-spacing": 0.025 }, "paint": { - "icon-opacity": ["step", ["zoom"], 1, 12, 0], "text-color": "rgba(64, 64, 64, 1)", + "icon-opacity": [ + "step", + ["zoom"], + 1, + 12, + 0 + ], + "text-opacity": 1, "text-halo-blur": 1, "text-halo-color": "rgba(242, 242, 242, 0.6)", "text-halo-width": [ "interpolate", - ["cubic-bezier", 0, 0.75, 0.25, 1], + ["cubic-bezier",0,0.75,0.25,1], ["zoom"], 12, - 0, + 1, 16, 3 + ] + }, + "filter": [ + "all", + ["==","class","town"] + ] + }, + { + "id": "water_name_point_label", + "type": "symbol", + "source": "swissmaptiles", + "source-layer": "water_name", + "minzoom": 7.0, + "maxzoom": 24.0, + "layout": { + "text-font": ["Frutiger Neue Italic"], + "text-size": [ + "interpolate", + ["linear"], + ["zoom"], + 8, + [ + "match", + ["get","size"], + [10,9], + 12, + [8,7], + 10, + 10 + ], + 10, + [ + "match", + ["get","size"], + [10,9], + 22, + [8,7,6], + 18, + [5,4], + 16, + [3], + 14, + [2], + 12, + [1], + 10, + 10 + ], + 12, + [ + "match", + ["get","size"], + [10,9], + 24, + [8,7], + 22, + [6,5,4,3], + 20, + [2], + 16, + [1], + 12, + 12 + ], + 14, + [ + "match", + ["get","size"], + [10,9], + 28, + [8,7], + 26, + [6,5,4,3], + 24, + [2], + 22, + [1], + 14, + 12 + ], + 15, + [ + "match", + ["get","size"], + [10,9], + 30, + [8,7], + 28, + [6,5,4,3], + 26, + [2], + 24, + [1], + 18, + 18 + ] ], - "text-opacity": 1 - } + "text-field": "{name:latin}", + "visibility": "visible", + "text-rotate": ["get","direction"], + "text-padding": 2, + "symbol-spacing": 250, + "symbol-z-order": "auto", + "text-max-width": 20, + "symbol-placement": "point", + "text-keep-upright": true, + "text-allow-overlap": false, + "text-letter-spacing": [ + "interpolate", + ["linear"], + ["zoom"], + 7, + [ + "match", + ["get","size"], + [10,9,8], + 0.1, + [7,6], + 0.04, + [5,4,3], + 0.02, + [2], + 0.01, + 0.05 + ], + 16, + [ + "match", + ["get","size"], + [10,9,8], + 0.7, + [7,6], + 0.5, + [5,4,3], + 0.3, + [2], + 0.2, + 0.1 + ] + ], + "text-pitch-alignment": "map", + "text-ignore-placement": false, + "text-rotation-alignment": "viewport" + }, + "paint": { + "text-color": "rgba(20, 136, 205, 1)", + "text-opacity": [ + "step", + ["zoom"], + 0, + 7, + [ + "match", + ["get","size"], + [10,9,8], + 1, + 0 + ], + 8, + [ + "match", + ["get","size"], + [10,9,8,7,6], + 1, + 0 + ], + 9, + [ + "match", + ["get","size"], + [10,9,8,7,6,4,3], + 1, + 0 + ], + 10, + [ + "match", + ["get","size"], + [10,9,8,7,6,5,4,3,2], + 1, + 0 + ], + 12, + [ + "match", + ["get","size"], + [10,9,8,7,6,5,4,3,2,1], + 1, + 1 + ] + ], + "text-halo-blur": 0.25, + "text-halo-color": "rgba(242, 242, 242, 0.6)", + "text-halo-width": 1 + }, + "filter": [ + "all", + ["==","$type","Point"], + ["==","class","lake"] + ] }, { "id": "park_label", "type": "symbol", "source": "swissmaptiles", "source-layer": "park", - "minzoom": 8, - "filter": [ - "all", - ["in", "class", "national_park"], - ["==", "$type", "Point"] - ], + "minzoom": 8.0, "layout": { - "symbol-z-order": ["literal", "auto"], - "text-field": "{name:latin}", "text-font": ["Frutiger Neue Regular"], - "text-padding": ["interpolate", ["linear"], ["zoom"], 10, 2, 14, 10], "text-size": [ "interpolate", - ["cubic-bezier", 0.5, 0.1, 0.7, 1], + ["cubic-bezier",0.5,0.1,0.7,1], ["zoom"], 8, 14, 16, 28 - ] + ], + "text-field": "{name:latin}", + "text-padding": [ + "interpolate", + ["linear"], + ["zoom"], + 10, + 2, + 14, + 10 + ], + "symbol-z-order": ["literal","auto"] }, "paint": { "text-color": "rgba(70, 130, 25, 0.9)", "text-halo-blur": 1, "text-halo-color": "rgba(255, 255, 255, 0.8)", "text-halo-width": 1 - } + }, + "filter": [ + "all", + ["in","class","national_park"], + ["==","$type","Point"] + ] }, { "id": "area_name_massif_label", "type": "symbol", "source": "swissmaptiles", "source-layer": "area_name", - "minzoom": 11, - "filter": ["all", ["==", "$type", "Point"], ["in", "subclass", "massif"]], + "minzoom": 11.0, "layout": { - "symbol-avoid-edges": true, - "symbol-placement": "point", - "symbol-spacing": {"stops": [[12, 250], [14, 550]]}, - "symbol-z-order": "auto", - "text-allow-overlap": false, - "text-field": "{name:latin}", "text-font": ["Frutiger Neue Regular"], - "text-ignore-placement": false, - "text-keep-upright": true, - "text-letter-spacing": 0.07, + "text-size": [ + "interpolate", + ["linear"], + ["zoom"], + 10, + 14, + 16, + 23 + ], + "text-field": "{name:latin}", + "symbol-spacing": { + "stops": [ + [12,250], + [14,550] + ] + }, + "symbol-z-order": "auto", "text-max-width": 99999, + "symbol-placement": "point", + "text-keep-upright": true, + "symbol-avoid-edges": true, + "text-allow-overlap": false, + "text-letter-spacing": 0.07, "text-pitch-alignment": "viewport", - "text-rotation-alignment": "viewport", - "text-size": ["interpolate", ["linear"], ["zoom"], 10, 14, 16, 23] + "text-ignore-placement": false, + "text-rotation-alignment": "viewport" }, "paint": { "text-color": "rgba(48, 48, 48, 1)", "text-halo-blur": 1, "text-halo-color": "rgba(242, 242, 242, 0.6)", "text-halo-width": 1 - } + }, + "filter": [ + "all", + ["==","$type","Point"], + ["in","subclass","massif"] + ] }, { "id": "place_city", "type": "symbol", "source": "swissmaptiles", "source-layer": "place", - "minzoom": 2, - "maxzoom": 14, - "filter": ["all", ["==", "class", "city"]], + "minzoom": 2.0, + "maxzoom": 14.0, "layout": { + "icon-size": 1, + "text-font": ["Frutiger Neue Condensed Bold"], + "text-size": [ + "interpolate", + ["cubic-bezier",0.5,0.1,0.7,1], + ["zoom"], + 1, + 11, + 4, + 12, + 16, + 48 + ], "icon-image": [ "step", ["zoom"], @@ -5690,73 +8928,141 @@ 12, "circle_circle_dark_grey_12" ], - "icon-optional": false, - "icon-size": 1, - "symbol-sort-key": ["to-number", ["get", "rank"]], - "symbol-z-order": ["literal", "auto"], + "text-field": ["get","name:latin"], + "visibility": "visible", "text-anchor": "bottom-left", - "text-field": ["get", "name:latin"], - "text-font": ["Frutiger Neue Condensed Bold"], + "text-offset": [ + "literal", + [0.35,0.1] + ], "text-justify": "auto", - "text-letter-spacing": 0.025, - "text-max-width": 10, - "text-offset": ["literal", [0.35, 0.1]], "text-padding": 10, - "text-size": [ - "interpolate", - ["cubic-bezier", 0.5, 0.1, 0.7, 1], + "icon-optional": false, + "symbol-z-order": ["literal","auto"], + "text-max-width": 10, + "text-transform": "uppercase", + "symbol-sort-key": [ + "to-number", + ["get","rank"] + ], + "text-letter-spacing": 0.025 + }, + "paint": { + "text-color": "rgba(64, 64, 64, 1)", + "icon-opacity": [ + "step", ["zoom"], 1, 11, - 4, - 12, - 16, - 48 + 0 ], - "text-transform": "uppercase", - "visibility": "visible" - }, - "paint": { - "icon-opacity": ["step", ["zoom"], 1, 11, 0], - "text-color": "rgba(64, 64, 64, 1)", + "text-opacity": 1, "text-halo-blur": 1, "text-halo-color": "rgba(242, 242, 242, 0.6)", "text-halo-width": [ "interpolate", - ["cubic-bezier", 0, 0.75, 0.25, 1], + ["cubic-bezier",0,0.75,0.25,1], ["zoom"], 12, - 0, + 1, 16, 3 - ], - "text-opacity": 1 - } + ] + }, + "filter": [ + "all", + ["==","class","city"] + ] }, { - "id": "place_country", + "id": "place_country_LI", "type": "symbol", "source": "swissmaptiles", "source-layer": "place", - "minzoom": 0, - "maxzoom": 7, - "filter": ["all", ["in", "class", "country"], ["in", "iso_a2", "CH"]], + "minzoom": 0.0, + "maxzoom": 7.0, "layout": { - "text-field": "{name:latin}", "text-font": ["Frutiger Neue Condensed Regular"], - "text-letter-spacing": 0.12, + "text-size": [ + "interpolate", + ["linear"], + ["zoom"], + 1, + 12, + 6, + 16 + ], + "text-field": "{name:latin}", + "visibility": "visible", "text-max-width": 10, - "text-size": ["interpolate", ["linear"], ["zoom"], 1, 12, 6, 16], "text-transform": "uppercase", - "visibility": "visible" + "text-letter-spacing": 0.12 }, "paint": { "text-color": "rgba(145, 70, 145, 0.9)", + "text-opacity": [ + "interpolate", + ["linear"], + ["zoom"], + 6, + 1, + 7, + 0 + ], "text-halo-blur": 1, "text-halo-color": "rgba(255, 255, 255, 0.8)", - "text-halo-width": 1, - "text-opacity": ["interpolate", ["linear"], ["zoom"], 6, 1, 7, 0] - } + "text-halo-width": 1 + }, + "filter": [ + "all", + ["in","class","country"], + ["in","iso_a2","LI"] + ] + }, + { + "id": "place_country_CH", + "type": "symbol", + "source": "swissmaptiles", + "source-layer": "place", + "minzoom": 0.0, + "maxzoom": 7.0, + "layout": { + "text-font": ["Frutiger Neue Condensed Regular"], + "text-size": [ + "interpolate", + ["linear"], + ["zoom"], + 1, + 12, + 6, + 16 + ], + "text-field": "{name:latin}", + "visibility": "visible", + "text-max-width": 10, + "text-transform": "uppercase", + "text-letter-spacing": 0.12 + }, + "paint": { + "text-color": "rgba(145, 70, 145, 0.9)", + "text-opacity": [ + "interpolate", + ["linear"], + ["zoom"], + 6, + 1, + 7, + 0 + ], + "text-halo-blur": 1, + "text-halo-color": "rgba(255, 255, 255, 0.8)", + "text-halo-width": 1 + }, + "filter": [ + "all", + ["in","class","country"], + ["in","iso_a2","CH"] + ] }, { diff --git a/src/assets/swisstopo_aerial.json b/src/assets/swisstopo_aerial.json index de571b0..abe6f49 100644 --- a/src/assets/swisstopo_aerial.json +++ b/src/assets/swisstopo_aerial.json @@ -88,7 +88,7 @@ "url": "https://1.{mapServer}.map.sotl.as/data/az.json" } }, - "sprite": "https://vectortiles.geo.admin.ch/styles/ch.swisstopo.leichte-basiskarte.vt/v1.0.0/sprite/sprite", + "sprite": "https://vectortiles.geo.admin.ch/styles/ch.swisstopo.leichte-basiskarte.vt/sprite/sprite", "glyphs": "https://vectortiles.geo.admin.ch/fonts/{fontstack}/{range}.pbf", "transition": {}, "layers": [ diff --git a/src/assets/swisstopo_raster.json b/src/assets/swisstopo_raster.json index 60c93ff..2fa3aaa 100644 --- a/src/assets/swisstopo_raster.json +++ b/src/assets/swisstopo_raster.json @@ -88,7 +88,7 @@ "url": "https://1.{mapServer}.map.sotl.as/data/az.json" } }, - "sprite": "https://vectortiles.geo.admin.ch/styles/ch.swisstopo.leichte-basiskarte.vt/v1.0.0/sprite/sprite", + "sprite": "https://vectortiles.geo.admin.ch/styles/ch.swisstopo.leichte-basiskarte.vt/sprite/sprite", "glyphs": "https://vectortiles.geo.admin.ch/fonts/{fontstack}/{range}.pbf", "transition": {}, "layers": [