diff --git a/map/martin/config.yaml b/map/martin/config.yaml index 066da9474..25616ed3d 100644 --- a/map/martin/config.yaml +++ b/map/martin/config.yaml @@ -247,6 +247,7 @@ postgres: tags: jsonb recreational_nodes: schema: public + minzoom: 17 table: recreational_nodes srid: 3857 geometry_column: geom diff --git a/map/styles/navigatum-basemap.json b/map/styles/navigatum-basemap.json index 0fd62e37d..b4372b663 100644 --- a/map/styles/navigatum-basemap.json +++ b/map/styles/navigatum-basemap.json @@ -6,16 +6,10 @@ "maputnik:renderer": "mbgljs", "openmaptiles:version": "3.x" }, - "sources": { - "recreational": { - "minzoom": 18, + "openmaptiles": { "type": "vector", - "url": "https://nav.tum.de/tiles/recreational_nodes" + "url": "https://nav.tum.de/tiles/openmaptiles,recreational_nodes" }, - "openmaptiles": { - "type": "vector", - "url": "https://nav.tum.de/tiles/openmaptiles" - }, "natural_earth_shaded_relief": { "maxzoom": 6, "tileSize": 256, @@ -32,9 +26,7 @@ "id": "background", "type": "background", "source": "openmaptiles", - "paint": { - "background-color": "rgb(239,239,239)" - } + "paint": {"background-color": "rgb(239,239,239)"} }, { "id": "natural_earth", @@ -44,13 +36,8 @@ "paint": { "raster-opacity": [ "interpolate", - [ - "exponential", - 1.5 - ], - [ - "zoom" - ], + ["exponential", 1.5], + ["zoom"], 4, 0.7, 6, @@ -75,10 +62,7 @@ "source": "openmaptiles", "source-layer": "park", "paint": { - "line-dasharray": [ - 1, - 1.5 - ], + "line-dasharray": [1, 1.5], "line-color": "rgba(228, 241, 215, 1)" } }, @@ -88,23 +72,12 @@ "source": "openmaptiles", "source-layer": "landuse", "maxzoom": 8, - "filter": [ - "==", - [ - "get", - "class" - ], - "residential" - ], + "filter": ["==", ["get", "class"], "residential"], "paint": { "fill-color": [ "interpolate", - [ - "linear" - ], - [ - "zoom" - ], + ["linear"], + ["zoom"], 9, "hsla(0,3%,85%,0.84)", 12, @@ -117,14 +90,7 @@ "type": "fill", "source": "openmaptiles", "source-layer": "landcover", - "filter": [ - "==", - [ - "get", - "class" - ], - "wood" - ], + "filter": ["==", ["get", "class"], "wood"], "paint": { "fill-antialias": false, "fill-color": "hsla(98,61%,72%,0.7)", @@ -136,14 +102,7 @@ "type": "fill", "source": "openmaptiles", "source-layer": "landcover", - "filter": [ - "==", - [ - "get", - "class" - ], - "grass" - ], + "filter": ["==", ["get", "class"], "grass"], "paint": { "fill-antialias": false, "fill-color": "rgba(176, 213, 154, 1)", @@ -155,14 +114,7 @@ "type": "fill", "source": "openmaptiles", "source-layer": "landcover", - "filter": [ - "==", - [ - "get", - "class" - ], - "ice" - ], + "filter": ["==", ["get", "class"], "ice"], "paint": { "fill-antialias": false, "fill-color": "rgba(224, 236, 236, 1)", @@ -174,122 +126,56 @@ "type": "fill", "source": "openmaptiles", "source-layer": "landuse", - "filter": [ - "==", - "class", - "pitch" - ], - "paint": { - "fill-color": "#DEE3CD" - } + "filter": ["==", "class", "pitch"], + "paint": {"fill-color": "#DEE3CD"} }, { "id": "landuse_track", "type": "fill", "source": "openmaptiles", "source-layer": "landuse", - "filter": [ - "==", - "class", - "track" - ], - "paint": { - "fill-color": "#DEE3CD" - } + "filter": ["==", "class", "track"], + "paint": {"fill-color": "#DEE3CD"} }, { "id": "landuse_cemetery", "type": "fill", "source": "openmaptiles", "source-layer": "landuse", - "filter": [ - "==", - [ - "get", - "class" - ], - "cemetery" - ], - "paint": { - "fill-color": "hsl(75,37%,81%)" - } + "filter": ["==", ["get", "class"], "cemetery"], + "paint": {"fill-color": "hsl(75,37%,81%)"} }, { "id": "landuse_hospital", "type": "fill", "source": "openmaptiles", "source-layer": "landuse", - "filter": [ - "==", - [ - "get", - "class" - ], - "hospital" - ], - "paint": { - "fill-color": "#fde" - } + "filter": ["==", ["get", "class"], "hospital"], + "paint": {"fill-color": "#fde"} }, { "id": "landuse_school", "type": "fill", "source": "openmaptiles", "source-layer": "landuse", - "filter": [ - "==", - [ - "get", - "class" - ], - "school" - ], - "paint": { - "fill-color": "rgb(236,238,204)" - } + "filter": ["==", ["get", "class"], "school"], + "paint": {"fill-color": "rgb(236,238,204)"} }, { "id": "waterway_tunnel", "type": "line", "source": "openmaptiles", "source-layer": "waterway", - "filter": [ - "==", - [ - "get", - "brunnel" - ], - "tunnel" - ], + "filter": ["==", ["get", "brunnel"], "tunnel"], "paint": { "line-color": "#a0c8f0", - "line-dasharray": [ - 3, - 3 - ], - "line-gap-width": [ - "interpolate", - [ - "linear" - ], - [ - "zoom" - ], - 12, - 0, - 20, - 6 - ], + "line-dasharray": [3, 3], + "line-gap-width": ["interpolate", ["linear"], ["zoom"], 12, 0, 20, 6], "line-opacity": 1, "line-width": [ "interpolate", - [ - "exponential", - 1.4 - ], - [ - "zoom" - ], + ["exponential", 1.4], + ["zoom"], 8, 1, 20, @@ -304,37 +190,16 @@ "source-layer": "waterway", "filter": [ "all", - [ - "==", - [ - "get", - "class" - ], - "river" - ], - [ - "!=", - [ - "get", - "brunnel" - ], - "tunnel" - ] + ["==", ["get", "class"], "river"], + ["!=", ["get", "brunnel"], "tunnel"] ], - "layout": { - "line-cap": "round" - }, + "layout": {"line-cap": "round"}, "paint": { "line-color": "#a0c8f0", "line-width": [ "interpolate", - [ - "exponential", - 1.2 - ], - [ - "zoom" - ], + ["exponential", 1.2], + ["zoom"], 11, 0.5, 20, @@ -349,37 +214,16 @@ "source-layer": "waterway", "filter": [ "all", - [ - "!=", - [ - "get", - "class" - ], - "river" - ], - [ - "!=", - [ - "get", - "brunnel" - ], - "tunnel" - ] + ["!=", ["get", "class"], "river"], + ["!=", ["get", "brunnel"], "tunnel"] ], - "layout": { - "line-cap": "round" - }, + "layout": {"line-cap": "round"}, "paint": { "line-color": "#a0c8f0", "line-width": [ "interpolate", - [ - "exponential", - 1.3 - ], - [ - "zoom" - ], + ["exponential", 1.3], + ["zoom"], 13, 0.5, 20, @@ -392,34 +236,16 @@ "type": "fill", "source": "openmaptiles", "source-layer": "water", - "filter": [ - "!=", - [ - "get", - "brunnel" - ], - "tunnel" - ], - "paint": { - "fill-color": "rgb(158,189,255)" - } + "filter": ["!=", ["get", "brunnel"], "tunnel"], + "paint": {"fill-color": "rgb(158,189,255)"} }, { "id": "landcover_sand", "type": "fill", "source": "openmaptiles", "source-layer": "landcover", - "filter": [ - "==", - [ - "get", - "class" - ], - "sand" - ], - "paint": { - "fill-color": "rgba(247, 239, 195, 1)" - } + "filter": ["==", ["get", "class"], "sand"], + "paint": {"fill-color": "rgba(247, 239, 195, 1)"} }, { "id": "aeroway_fill", @@ -427,17 +253,8 @@ "source": "openmaptiles", "source-layer": "aeroway", "minzoom": 11, - "filter": [ - "==", - [ - "geometry-type" - ], - "Polygon" - ], - "paint": { - "fill-color": "rgba(229, 228, 224, 1)", - "fill-opacity": 0.7 - } + "filter": ["==", ["geometry-type"], "Polygon"], + "paint": {"fill-color": "rgba(229, 228, 224, 1)", "fill-opacity": 0.7} }, { "id": "aeroway_runway", @@ -447,33 +264,15 @@ "minzoom": 11, "filter": [ "all", - [ - "==", - [ - "geometry-type" - ], - "LineString" - ], - [ - "==", - [ - "get", - "class" - ], - "runway" - ] + ["==", ["geometry-type"], "LineString"], + ["==", ["get", "class"], "runway"] ], "paint": { "line-color": "#f0ede9", "line-width": [ "interpolate", - [ - "exponential", - 1.2 - ], - [ - "zoom" - ], + ["exponential", 1.2], + ["zoom"], 11, 3, 20, @@ -489,33 +288,15 @@ "minzoom": 11, "filter": [ "all", - [ - "==", - [ - "geometry-type" - ], - "LineString" - ], - [ - "==", - [ - "get", - "class" - ], - "taxiway" - ] + ["==", ["geometry-type"], "LineString"], + ["==", ["get", "class"], "taxiway"] ], "paint": { "line-color": "#f0ede9", "line-width": [ "interpolate", - [ - "exponential", - 1.2 - ], - [ - "zoom" - ], + ["exponential", 1.2], + ["zoom"], 11, 0.5, 20, @@ -530,49 +311,18 @@ "source-layer": "transportation", "filter": [ "all", - [ - "==", - [ - "get", - "class" - ], - "motorway" - ], - [ - "==", - [ - "get", - "ramp" - ], - 1 - ], - [ - "==", - [ - "get", - "brunnel" - ], - "tunnel" - ] + ["==", ["get", "class"], "motorway"], + ["==", ["get", "ramp"], 1], + ["==", ["get", "brunnel"], "tunnel"] ], - "layout": { - "line-join": "round" - }, + "layout": {"line-join": "round"}, "paint": { "line-color": "#e9ac77", - "line-dasharray": [ - 0.5, - 0.25 - ], + "line-dasharray": [0.5, 0.25], "line-width": [ "interpolate", - [ - "exponential", - 1.2 - ], - [ - "zoom" - ], + ["exponential", 1.2], + ["zoom"], 12, 1, 13, @@ -591,46 +341,17 @@ "source-layer": "transportation", "filter": [ "all", - [ - "==", - [ - "get", - "brunnel" - ], - "tunnel" - ], - [ - "match", - [ - "get", - "class" - ], - [ - "service", - "track" - ], - true, - false - ] + ["==", ["get", "brunnel"], "tunnel"], + ["match", ["get", "class"], ["service", "track"], true, false] ], - "layout": { - "line-join": "round" - }, + "layout": {"line-join": "round"}, "paint": { "line-color": "#cfcdca", - "line-dasharray": [ - 0.5, - 0.25 - ], + "line-dasharray": [0.5, 0.25], "line-width": [ "interpolate", - [ - "exponential", - 1.2 - ], - [ - "zoom" - ], + ["exponential", 1.2], + ["zoom"], 15, 1, 16, @@ -647,37 +368,16 @@ "source-layer": "transportation", "filter": [ "all", - [ - "==", - [ - "get", - "ramp" - ], - 1 - ], - [ - "==", - [ - "get", - "brunnel" - ], - "tunnel" - ] + ["==", ["get", "ramp"], 1], + ["==", ["get", "brunnel"], "tunnel"] ], - "layout": { - "line-join": "round" - }, + "layout": {"line-join": "round"}, "paint": { "line-color": "#e9ac77", "line-width": [ "interpolate", - [ - "exponential", - 1.2 - ], - [ - "zoom" - ], + ["exponential", 1.2], + ["zoom"], 12, 1, 13, @@ -696,55 +396,17 @@ "source-layer": "transportation", "filter": [ "all", - [ - "==", - [ - "get", - "brunnel" - ], - "tunnel" - ], - [ - "match", - [ - "get", - "class" - ], - [ - "street", - "street_limited" - ], - true, - false - ] + ["==", ["get", "brunnel"], "tunnel"], + ["match", ["get", "class"], ["street", "street_limited"], true, false] ], - "layout": { - "line-join": "round" - }, + "layout": {"line-join": "round"}, "paint": { "line-color": "#cfcdca", - "line-opacity": [ - "interpolate", - [ - "linear" - ], - [ - "zoom" - ], - 12, - 0, - 12.5, - 1 - ], + "line-opacity": ["interpolate", ["linear"], ["zoom"], 12, 0, 12.5, 1], "line-width": [ "interpolate", - [ - "exponential", - 1.2 - ], - [ - "zoom" - ], + ["exponential", 1.2], + ["zoom"], 12, 0.5, 13, @@ -763,42 +425,16 @@ "source-layer": "transportation", "filter": [ "all", - [ - "==", - [ - "get", - "brunnel" - ], - "tunnel" - ], - [ - "match", - [ - "get", - "class" - ], - [ - "secondary", - "tertiary" - ], - true, - false - ] + ["==", ["get", "brunnel"], "tunnel"], + ["match", ["get", "class"], ["secondary", "tertiary"], true, false] ], - "layout": { - "line-join": "round" - }, + "layout": {"line-join": "round"}, "paint": { "line-color": "#e9ac77", "line-width": [ "interpolate", - [ - "exponential", - 1.2 - ], - [ - "zoom" - ], + ["exponential", 1.2], + ["zoom"], 8, 1.5, 20, @@ -813,42 +449,16 @@ "source-layer": "transportation", "filter": [ "all", - [ - "==", - [ - "get", - "brunnel" - ], - "tunnel" - ], - [ - "match", - [ - "get", - "class" - ], - [ - "primary", - "trunk" - ], - true, - false - ] + ["==", ["get", "brunnel"], "tunnel"], + ["match", ["get", "class"], ["primary", "trunk"], true, false] ], - "layout": { - "line-join": "round" - }, + "layout": {"line-join": "round"}, "paint": { "line-color": "#e9ac77", "line-width": [ "interpolate", - [ - "exponential", - 1.2 - ], - [ - "zoom" - ], + ["exponential", 1.2], + ["zoom"], 5, 0.4, 6, @@ -867,49 +477,18 @@ "source-layer": "transportation", "filter": [ "all", - [ - "==", - [ - "get", - "class" - ], - "motorway" - ], - [ - "!=", - [ - "get", - "ramp" - ], - 1 - ], - [ - "==", - [ - "get", - "brunnel" - ], - "tunnel" - ] + ["==", ["get", "class"], "motorway"], + ["!=", ["get", "ramp"], 1], + ["==", ["get", "brunnel"], "tunnel"] ], - "layout": { - "line-join": "round" - }, + "layout": {"line-join": "round"}, "paint": { "line-color": "#e9ac77", - "line-dasharray": [ - 0.5, - 0.25 - ], + "line-dasharray": [0.5, 0.25], "line-width": [ "interpolate", - [ - "exponential", - 1.2 - ], - [ - "zoom" - ], + ["exponential", 1.2], + ["zoom"], 5, 0.4, 6, @@ -928,50 +507,17 @@ "source-layer": "transportation", "filter": [ "all", - [ - "==", - [ - "geometry-type" - ], - "LineString" - ], - [ - "==", - [ - "get", - "brunnel" - ], - "tunnel" - ], - [ - "match", - [ - "get", - "class" - ], - [ - "path", - "pedestrian" - ], - true, - false - ] + ["==", ["geometry-type"], "LineString"], + ["==", ["get", "brunnel"], "tunnel"], + ["match", ["get", "class"], ["path", "pedestrian"], true, false] ], "paint": { "line-color": "hsl(0,0%,100%)", - "line-dasharray": [ - 1, - 0.75 - ], + "line-dasharray": [1, 0.75], "line-width": [ "interpolate", - [ - "exponential", - 1.2 - ], - [ - "zoom" - ], + ["exponential", 1.2], + ["zoom"], 14, 0.5, 20, @@ -986,45 +532,17 @@ "source-layer": "transportation", "filter": [ "all", - [ - "==", - [ - "get", - "class" - ], - "motorway" - ], - [ - "==", - [ - "get", - "ramp" - ], - 1 - ], - [ - "==", - [ - "get", - "brunnel" - ], - "tunnel" - ] + ["==", ["get", "class"], "motorway"], + ["==", ["get", "ramp"], 1], + ["==", ["get", "brunnel"], "tunnel"] ], - "layout": { - "line-join": "round" - }, + "layout": {"line-join": "round"}, "paint": { "line-color": "#fc8", "line-width": [ "interpolate", - [ - "exponential", - 1.2 - ], - [ - "zoom" - ], + ["exponential", 1.2], + ["zoom"], 12.5, 0, 13, @@ -1043,42 +561,16 @@ "source-layer": "transportation", "filter": [ "all", - [ - "==", - [ - "get", - "brunnel" - ], - "tunnel" - ], - [ - "match", - [ - "get", - "class" - ], - [ - "service", - "track" - ], - true, - false - ] + ["==", ["get", "brunnel"], "tunnel"], + ["match", ["get", "class"], ["service", "track"], true, false] ], - "layout": { - "line-join": "round" - }, + "layout": {"line-join": "round"}, "paint": { "line-color": "#fff", "line-width": [ "interpolate", - [ - "exponential", - 1.2 - ], - [ - "zoom" - ], + ["exponential", 1.2], + ["zoom"], 15.5, 0, 16, @@ -1095,37 +587,16 @@ "source-layer": "transportation", "filter": [ "all", - [ - "==", - [ - "get", - "ramp" - ], - 1 - ], - [ - "==", - [ - "get", - "brunnel" - ], - "tunnel" - ] + ["==", ["get", "ramp"], 1], + ["==", ["get", "brunnel"], "tunnel"] ], - "layout": { - "line-join": "round" - }, + "layout": {"line-join": "round"}, "paint": { "line-color": "#fff4c6", "line-width": [ "interpolate", - [ - "exponential", - 1.2 - ], - [ - "zoom" - ], + ["exponential", 1.2], + ["zoom"], 12.5, 0, 13, @@ -1144,41 +615,16 @@ "source-layer": "transportation", "filter": [ "all", - [ - "==", - [ - "get", - "brunnel" - ], - "tunnel" - ], - [ - "match", - [ - "get", - "class" - ], - [ - "minor" - ], - true, - false - ] + ["==", ["get", "brunnel"], "tunnel"], + ["match", ["get", "class"], ["minor"], true, false] ], - "layout": { - "line-join": "round" - }, + "layout": {"line-join": "round"}, "paint": { "line-color": "#fff", "line-width": [ "interpolate", - [ - "exponential", - 1.2 - ], - [ - "zoom" - ], + ["exponential", 1.2], + ["zoom"], 13.5, 0, 14, @@ -1195,42 +641,16 @@ "source-layer": "transportation", "filter": [ "all", - [ - "==", - [ - "get", - "brunnel" - ], - "tunnel" - ], - [ - "match", - [ - "get", - "class" - ], - [ - "secondary", - "tertiary" - ], - true, - false - ] + ["==", ["get", "brunnel"], "tunnel"], + ["match", ["get", "class"], ["secondary", "tertiary"], true, false] ], - "layout": { - "line-join": "round" - }, + "layout": {"line-join": "round"}, "paint": { "line-color": "#fff4c6", "line-width": [ "interpolate", - [ - "exponential", - 1.2 - ], - [ - "zoom" - ], + ["exponential", 1.2], + ["zoom"], 6.5, 0, 7, @@ -1247,42 +667,16 @@ "source-layer": "transportation", "filter": [ "all", - [ - "==", - [ - "get", - "brunnel" - ], - "tunnel" - ], - [ - "match", - [ - "get", - "class" - ], - [ - "primary", - "trunk" - ], - true, - false - ] + ["==", ["get", "brunnel"], "tunnel"], + ["match", ["get", "class"], ["primary", "trunk"], true, false] ], - "layout": { - "line-join": "round" - }, + "layout": {"line-join": "round"}, "paint": { "line-color": "#fff4c6", "line-width": [ "interpolate", - [ - "exponential", - 1.2 - ], - [ - "zoom" - ], + ["exponential", 1.2], + ["zoom"], 5, 0, 7, @@ -1299,45 +693,17 @@ "source-layer": "transportation", "filter": [ "all", - [ - "==", - [ - "get", - "class" - ], - "motorway" - ], - [ - "!=", - [ - "get", - "ramp" - ], - 1 - ], - [ - "==", - [ - "get", - "brunnel" - ], - "tunnel" - ] + ["==", ["get", "class"], "motorway"], + ["!=", ["get", "ramp"], 1], + ["==", ["get", "brunnel"], "tunnel"] ], - "layout": { - "line-join": "round" - }, + "layout": {"line-join": "round"}, "paint": { "line-color": "#ffdaa6", "line-width": [ "interpolate", - [ - "exponential", - 1.2 - ], - [ - "zoom" - ], + ["exponential", 1.2], + ["zoom"], 5, 0, 7, @@ -1354,38 +720,15 @@ "source-layer": "transportation", "filter": [ "all", - [ - "==", - [ - "get", - "brunnel" - ], - "tunnel" - ], - [ - "match", - [ - "get", - "class" - ], - [ - "rail" - ], - true, - false - ] + ["==", ["get", "brunnel"], "tunnel"], + ["match", ["get", "class"], ["rail"], true, false] ], "paint": { "line-color": "#bbb", "line-width": [ "interpolate", - [ - "exponential", - 1.4 - ], - [ - "zoom" - ], + ["exponential", 1.4], + ["zoom"], 14, 0.4, 15, @@ -1402,38 +745,16 @@ "source-layer": "transportation", "filter": [ "all", - [ - "==", - [ - "get", - "brunnel" - ], - "tunnel" - ], - [ - "==", - [ - "get", - "class" - ], - "rail" - ] + ["==", ["get", "brunnel"], "tunnel"], + ["==", ["get", "class"], "rail"] ], "paint": { "line-color": "#bbb", - "line-dasharray": [ - 0.2, - 8 - ], + "line-dasharray": [0.2, 8], "line-width": [ "interpolate", - [ - "exponential", - 1.4 - ], - [ - "zoom" - ], + ["exponential", 1.4], + ["zoom"], 14.5, 0, 15, @@ -1450,38 +771,15 @@ "source-layer": "transportation", "filter": [ "all", - [ - "==", - [ - "get", - "brunnel" - ], - "tunnel" - ], - [ - "match", - [ - "get", - "class" - ], - [ - "transit" - ], - true, - false - ] + ["==", ["get", "brunnel"], "tunnel"], + ["match", ["get", "class"], ["transit"], true, false] ], "paint": { "line-color": "#bbb", "line-width": [ "interpolate", - [ - "exponential", - 1.4 - ], - [ - "zoom" - ], + ["exponential", 1.4], + ["zoom"], 14, 0.4, 15, @@ -1498,38 +796,16 @@ "source-layer": "transportation", "filter": [ "all", - [ - "==", - [ - "get", - "brunnel" - ], - "tunnel" - ], - [ - "==", - [ - "get", - "class" - ], - "transit" - ] + ["==", ["get", "brunnel"], "tunnel"], + ["==", ["get", "class"], "transit"] ], "paint": { "line-color": "#bbb", - "line-dasharray": [ - 0.2, - 8 - ], + "line-dasharray": [0.2, 8], "line-width": [ "interpolate", - [ - "exponential", - 1.4 - ], - [ - "zoom" - ], + ["exponential", 1.4], + ["zoom"], 14.5, 0, 15, @@ -1544,16 +820,8 @@ "type": "fill", "source": "openmaptiles", "source-layer": "transportation", - "filter": [ - "==", - [ - "geometry-type" - ], - "Polygon" - ], - "paint": { - "fill-pattern": "pedestrian_polygon" - } + "filter": ["==", ["geometry-type"], "Polygon"], + "paint": {"fill-pattern": "pedestrian_polygon"} }, { "id": "road_motorway_link_casing", @@ -1563,51 +831,17 @@ "minzoom": 12, "filter": [ "all", - [ - "match", - [ - "get", - "brunnel" - ], - [ - "bridge", - "tunnel" - ], - false, - true - ], - [ - "==", - [ - "get", - "class" - ], - "motorway" - ], - [ - "==", - [ - "get", - "ramp" - ], - 1 - ] + ["match", ["get", "brunnel"], ["bridge", "tunnel"], false, true], + ["==", ["get", "class"], "motorway"], + ["==", ["get", "ramp"], 1] ], - "layout": { - "line-cap": "round", - "line-join": "round" - }, + "layout": {"line-cap": "round", "line-join": "round"}, "paint": { "line-color": "#e9ac77", "line-width": [ "interpolate", - [ - "exponential", - 1.2 - ], - [ - "zoom" - ], + ["exponential", 1.2], + ["zoom"], 12, 1, 13, @@ -1626,48 +860,16 @@ "source-layer": "transportation", "filter": [ "all", - [ - "match", - [ - "get", - "brunnel" - ], - [ - "bridge", - "tunnel" - ], - false, - true - ], - [ - "match", - [ - "get", - "class" - ], - [ - "service", - "track" - ], - true, - false - ] + ["match", ["get", "brunnel"], ["bridge", "tunnel"], false, true], + ["match", ["get", "class"], ["service", "track"], true, false] ], - "layout": { - "line-cap": "round", - "line-join": "round" - }, + "layout": {"line-cap": "round", "line-join": "round"}, "paint": { "line-color": "#cfcdca", "line-width": [ "interpolate", - [ - "exponential", - 1.2 - ], - [ - "zoom" - ], + ["exponential", 1.2], + ["zoom"], 15, 1, 16, @@ -1685,59 +887,23 @@ "minzoom": 13, "filter": [ "all", + ["match", ["get", "brunnel"], ["bridge", "tunnel"], false, true], [ "match", - [ - "get", - "brunnel" - ], - [ - "bridge", - "tunnel" - ], - false, - true - ], - [ - "match", - [ - "get", - "class" - ], - [ - "motorway", - "path", - "pedestrian", - "service", - "track" - ], + ["get", "class"], + ["motorway", "path", "pedestrian", "service", "track"], false, true ], - [ - "==", - [ - "get", - "ramp" - ], - 1 - ] + ["==", ["get", "ramp"], 1] ], - "layout": { - "line-cap": "round", - "line-join": "round" - }, + "layout": {"line-cap": "round", "line-join": "round"}, "paint": { "line-color": "#e9ac77", "line-width": [ "interpolate", - [ - "exponential", - 1.2 - ], - [ - "zoom" - ], + ["exponential", 1.2], + ["zoom"], 12, 1, 13, @@ -1756,75 +922,19 @@ "source-layer": "transportation", "filter": [ "all", - [ - "==", - [ - "geometry-type" - ], - "LineString" - ], - [ - "match", - [ - "get", - "brunnel" - ], - [ - "bridge", - "tunnel" - ], - false, - true - ], - [ - "match", - [ - "get", - "class" - ], - [ - "minor" - ], - true, - false - ], - [ - "!=", - [ - "get", - "ramp" - ], - 1 - ] + ["==", ["geometry-type"], "LineString"], + ["match", ["get", "brunnel"], ["bridge", "tunnel"], false, true], + ["match", ["get", "class"], ["minor"], true, false], + ["!=", ["get", "ramp"], 1] ], - "layout": { - "line-cap": "round", - "line-join": "round" - }, + "layout": {"line-cap": "round", "line-join": "round"}, "paint": { "line-color": "#cfcdca", - "line-opacity": [ - "interpolate", - [ - "linear" - ], - [ - "zoom" - ], - 12, - 0, - 12.5, - 1 - ], + "line-opacity": ["interpolate", ["linear"], ["zoom"], 12, 0, 12.5, 1], "line-width": [ "interpolate", - [ - "exponential", - 1.2 - ], - [ - "zoom" - ], + ["exponential", 1.2], + ["zoom"], 12, 0.5, 13, @@ -1843,56 +953,17 @@ "source-layer": "transportation", "filter": [ "all", - [ - "match", - [ - "get", - "brunnel" - ], - [ - "bridge", - "tunnel" - ], - false, - true - ], - [ - "match", - [ - "get", - "class" - ], - [ - "secondary", - "tertiary" - ], - true, - false - ], - [ - "!=", - [ - "get", - "ramp" - ], - 1 - ] + ["match", ["get", "brunnel"], ["bridge", "tunnel"], false, true], + ["match", ["get", "class"], ["secondary", "tertiary"], true, false], + ["!=", ["get", "ramp"], 1] ], - "layout": { - "line-cap": "round", - "line-join": "round" - }, + "layout": {"line-cap": "round", "line-join": "round"}, "paint": { "line-color": "#e9ac77", "line-width": [ "interpolate", - [ - "exponential", - 1.2 - ], - [ - "zoom" - ], + ["exponential", 1.2], + ["zoom"], 8, 1.5, 20, @@ -1907,47 +978,16 @@ "source-layer": "transportation", "filter": [ "all", - [ - "match", - [ - "get", - "brunnel" - ], - [ - "bridge", - "tunnel" - ], - false, - true - ], - [ - "match", - [ - "get", - "class" - ], - [ - "primary", - "trunk" - ], - true, - false - ] + ["match", ["get", "brunnel"], ["bridge", "tunnel"], false, true], + ["match", ["get", "class"], ["primary", "trunk"], true, false] ], - "layout": { - "line-join": "round" - }, + "layout": {"line-join": "round"}, "paint": { "line-color": "#e9ac77", "line-width": [ "interpolate", - [ - "exponential", - 1.2 - ], - [ - "zoom" - ], + ["exponential", 1.2], + ["zoom"], 5, 0.4, 6, @@ -1967,51 +1007,17 @@ "minzoom": 5, "filter": [ "all", - [ - "match", - [ - "get", - "brunnel" - ], - [ - "bridge", - "tunnel" - ], - false, - true - ], - [ - "==", - [ - "get", - "class" - ], - "motorway" - ], - [ - "!=", - [ - "get", - "ramp" - ], - 1 - ] + ["match", ["get", "brunnel"], ["bridge", "tunnel"], false, true], + ["==", ["get", "class"], "motorway"], + ["!=", ["get", "ramp"], 1] ], - "layout": { - "line-cap": "round", - "line-join": "round" - }, + "layout": {"line-cap": "round", "line-join": "round"}, "paint": { "line-color": "#e9ac77", "line-width": [ "interpolate", - [ - "exponential", - 1.2 - ], - [ - "zoom" - ], + ["exponential", 1.2], + ["zoom"], 5, 0.4, 6, @@ -2031,51 +1037,17 @@ "minzoom": 12, "filter": [ "all", - [ - "match", - [ - "get", - "brunnel" - ], - [ - "bridge", - "tunnel" - ], - false, - true - ], - [ - "==", - [ - "get", - "class" - ], - "motorway" - ], - [ - "==", - [ - "get", - "ramp" - ], - 1 - ] + ["match", ["get", "brunnel"], ["bridge", "tunnel"], false, true], + ["==", ["get", "class"], "motorway"], + ["==", ["get", "ramp"], 1] ], - "layout": { - "line-cap": "round", - "line-join": "round" - }, + "layout": {"line-cap": "round", "line-join": "round"}, "paint": { "line-color": "#fc8", "line-width": [ "interpolate", - [ - "exponential", - 1.2 - ], - [ - "zoom" - ], + ["exponential", 1.2], + ["zoom"], 12.5, 0, 13, @@ -2094,48 +1066,16 @@ "source-layer": "transportation", "filter": [ "all", - [ - "match", - [ - "get", - "brunnel" - ], - [ - "bridge", - "tunnel" - ], - false, - true - ], - [ - "match", - [ - "get", - "class" - ], - [ - "service", - "track" - ], - true, - false - ] + ["match", ["get", "brunnel"], ["bridge", "tunnel"], false, true], + ["match", ["get", "class"], ["service", "track"], true, false] ], - "layout": { - "line-cap": "round", - "line-join": "round" - }, + "layout": {"line-cap": "round", "line-join": "round"}, "paint": { "line-color": "#fff", "line-width": [ "interpolate", - [ - "exponential", - 1.2 - ], - [ - "zoom" - ], + ["exponential", 1.2], + ["zoom"], 15.5, 0, 16, @@ -2153,59 +1093,23 @@ "minzoom": 13, "filter": [ "all", + ["match", ["get", "brunnel"], ["bridge", "tunnel"], false, true], + ["==", ["get", "ramp"], 1], [ "match", - [ - "get", - "brunnel" - ], - [ - "bridge", - "tunnel" - ], - false, - true - ], - [ - "==", - [ - "get", - "ramp" - ], - 1 - ], - [ - "match", - [ - "get", - "class" - ], - [ - "motorway", - "path", - "pedestrian", - "service", - "track" - ], + ["get", "class"], + ["motorway", "path", "pedestrian", "service", "track"], false, true ] ], - "layout": { - "line-cap": "round", - "line-join": "round" - }, + "layout": {"line-cap": "round", "line-join": "round"}, "paint": { "line-color": "#fea", "line-width": [ "interpolate", - [ - "exponential", - 1.2 - ], - [ - "zoom" - ], + ["exponential", 1.2], + ["zoom"], 12.5, 0, 13, @@ -2224,54 +1128,17 @@ "source-layer": "transportation", "filter": [ "all", - [ - "==", - [ - "geometry-type" - ], - "LineString" - ], - [ - "match", - [ - "get", - "brunnel" - ], - [ - "bridge", - "tunnel" - ], - false, - true - ], - [ - "match", - [ - "get", - "class" - ], - [ - "minor" - ], - true, - false - ] + ["==", ["geometry-type"], "LineString"], + ["match", ["get", "brunnel"], ["bridge", "tunnel"], false, true], + ["match", ["get", "class"], ["minor"], true, false] ], - "layout": { - "line-cap": "round", - "line-join": "round" - }, + "layout": {"line-cap": "round", "line-join": "round"}, "paint": { "line-color": "#fff", "line-width": [ "interpolate", - [ - "exponential", - 1.2 - ], - [ - "zoom" - ], + ["exponential", 1.2], + ["zoom"], 13.5, 0, 14, @@ -2288,48 +1155,16 @@ "source-layer": "transportation", "filter": [ "all", - [ - "match", - [ - "get", - "brunnel" - ], - [ - "bridge", - "tunnel" - ], - false, - true - ], - [ - "match", - [ - "get", - "class" - ], - [ - "secondary", - "tertiary" - ], - true, - false - ] + ["match", ["get", "brunnel"], ["bridge", "tunnel"], false, true], + ["match", ["get", "class"], ["secondary", "tertiary"], true, false] ], - "layout": { - "line-cap": "round", - "line-join": "round" - }, + "layout": {"line-cap": "round", "line-join": "round"}, "paint": { "line-color": "#fea", "line-width": [ "interpolate", - [ - "exponential", - 1.2 - ], - [ - "zoom" - ], + ["exponential", 1.2], + ["zoom"], 6.5, 0, 8, @@ -2346,47 +1181,16 @@ "source-layer": "transportation", "filter": [ "all", - [ - "match", - [ - "get", - "brunnel" - ], - [ - "bridge", - "tunnel" - ], - false, - true - ], - [ - "match", - [ - "get", - "class" - ], - [ - "primary", - "trunk" - ], - true, - false - ] + ["match", ["get", "brunnel"], ["bridge", "tunnel"], false, true], + ["match", ["get", "class"], ["primary", "trunk"], true, false] ], - "layout": { - "line-join": "round" - }, + "layout": {"line-join": "round"}, "paint": { "line-color": "#fea", "line-width": [ "interpolate", - [ - "exponential", - 1.2 - ], - [ - "zoom" - ], + ["exponential", 1.2], + ["zoom"], 5, 0, 7, @@ -2404,49 +1208,16 @@ "minzoom": 5, "filter": [ "all", - [ - "match", - [ - "get", - "brunnel" - ], - [ - "bridge", - "tunnel" - ], - false, - true - ], - [ - "==", - [ - "get", - "class" - ], - "motorway" - ], - [ - "!=", - [ - "get", - "ramp" - ], - 1 - ] + ["match", ["get", "brunnel"], ["bridge", "tunnel"], false, true], + ["==", ["get", "class"], "motorway"], + ["!=", ["get", "ramp"], 1] ], - "layout": { - "line-cap": "round", - "line-join": "round" - }, + "layout": {"line-cap": "round", "line-join": "round"}, "paint": { "line-color": [ "interpolate", - [ - "linear" - ], - [ - "zoom" - ], + ["linear"], + ["zoom"], 5, "hsl(26,87%,62%)", 6, @@ -2454,13 +1225,8 @@ ], "line-width": [ "interpolate", - [ - "exponential", - 1.2 - ], - [ - "zoom" - ], + ["exponential", 1.2], + ["zoom"], 5, 0, 7, @@ -2477,39 +1243,15 @@ "source-layer": "transportation", "filter": [ "all", - [ - "match", - [ - "get", - "brunnel" - ], - [ - "bridge", - "tunnel" - ], - false, - true - ], - [ - "==", - [ - "get", - "class" - ], - "rail" - ] + ["match", ["get", "brunnel"], ["bridge", "tunnel"], false, true], + ["==", ["get", "class"], "rail"] ], "paint": { "line-color": "#bbb", "line-width": [ "interpolate", - [ - "exponential", - 1.4 - ], - [ - "zoom" - ], + ["exponential", 1.4], + ["zoom"], 14, 0.4, 15, @@ -2526,43 +1268,16 @@ "source-layer": "transportation", "filter": [ "all", - [ - "match", - [ - "get", - "brunnel" - ], - [ - "bridge", - "tunnel" - ], - false, - true - ], - [ - "==", - [ - "get", - "class" - ], - "rail" - ] + ["match", ["get", "brunnel"], ["bridge", "tunnel"], false, true], + ["==", ["get", "class"], "rail"] ], "paint": { "line-color": "#bbb", - "line-dasharray": [ - 0.2, - 8 - ], + "line-dasharray": [0.2, 8], "line-width": [ "interpolate", - [ - "exponential", - 1.4 - ], - [ - "zoom" - ], + ["exponential", 1.4], + ["zoom"], 14.5, 0, 15, @@ -2579,39 +1294,15 @@ "source-layer": "transportation", "filter": [ "all", - [ - "match", - [ - "get", - "brunnel" - ], - [ - "bridge", - "tunnel" - ], - false, - true - ], - [ - "==", - [ - "get", - "class" - ], - "transit" - ] + ["match", ["get", "brunnel"], ["bridge", "tunnel"], false, true], + ["==", ["get", "class"], "transit"] ], "paint": { "line-color": "#bbb", "line-width": [ "interpolate", - [ - "exponential", - 1.4 - ], - [ - "zoom" - ], + ["exponential", 1.4], + ["zoom"], 14, 0.4, 15, @@ -2628,43 +1319,16 @@ "source-layer": "transportation", "filter": [ "all", - [ - "match", - [ - "get", - "brunnel" - ], - [ - "bridge", - "tunnel" - ], - false, - true - ], - [ - "==", - [ - "get", - "class" - ], - "transit" - ] + ["match", ["get", "brunnel"], ["bridge", "tunnel"], false, true], + ["==", ["get", "class"], "transit"] ], "paint": { "line-color": "#bbb", - "line-dasharray": [ - 0.2, - 8 - ], + "line-dasharray": [0.2, 8], "line-width": [ "interpolate", - [ - "exponential", - 1.4 - ], - [ - "zoom" - ], + ["exponential", 1.4], + ["zoom"], 14.5, 0, 15, @@ -2680,35 +1344,14 @@ "source": "openmaptiles", "source-layer": "transportation", "minzoom": 16, - "filter": [ - "==", - [ - "get", - "oneway" - ], - 1 - ], + "filter": ["==", ["get", "oneway"], 1], "layout": { "icon-image": "arrow", "symbol-placement": "line", "icon-optional": true, - "icon-size": { - "base": 1, - "stops": [ - [ - 15.5, - 0 - ], - [ - 20, - 1 - ] - ] - } + "icon-size": {"base": 1, "stops": [[15.5, 0], [20, 1]]} }, - "paint": { - "icon-opacity": 0.5 - } + "paint": {"icon-opacity": 0.5} }, { "id": "road_one_way_arrow_opposite", @@ -2716,32 +1359,13 @@ "source": "openmaptiles", "source-layer": "transportation", "minzoom": 16, - "filter": [ - "==", - [ - "get", - "oneway" - ], - -1 - ], + "filter": ["==", ["get", "oneway"], -1], "layout": { "icon-image": "arrow", "symbol-placement": "line", "icon-rotate": 180, "icon-optional": true, - "icon-size": { - "base": 1, - "stops": [ - [ - 15.5, - 0 - ], - [ - 20, - 1 - ] - ] - } + "icon-size": {"base": 1, "stops": [[15.5, 0], [20, 1]]} } }, { @@ -2751,45 +1375,17 @@ "source-layer": "transportation", "filter": [ "all", - [ - "==", - [ - "get", - "class" - ], - "motorway" - ], - [ - "==", - [ - "get", - "ramp" - ], - 1 - ], - [ - "==", - [ - "get", - "brunnel" - ], - "bridge" - ] + ["==", ["get", "class"], "motorway"], + ["==", ["get", "ramp"], 1], + ["==", ["get", "brunnel"], "bridge"] ], - "layout": { - "line-join": "round" - }, + "layout": {"line-join": "round"}, "paint": { "line-color": "#e9ac77", "line-width": [ "interpolate", - [ - "exponential", - 1.2 - ], - [ - "zoom" - ], + ["exponential", 1.2], + ["zoom"], 12, 1, 13, @@ -2808,42 +1404,16 @@ "source-layer": "transportation", "filter": [ "all", - [ - "==", - [ - "get", - "brunnel" - ], - "bridge" - ], - [ - "match", - [ - "get", - "class" - ], - [ - "service", - "track" - ], - true, - false - ] + ["==", ["get", "brunnel"], "bridge"], + ["match", ["get", "class"], ["service", "track"], true, false] ], - "layout": { - "line-join": "round" - }, + "layout": {"line-join": "round"}, "paint": { "line-color": "#cfcdca", "line-width": [ "interpolate", - [ - "exponential", - 1.2 - ], - [ - "zoom" - ], + ["exponential", 1.2], + ["zoom"], 15, 1, 16, @@ -2860,37 +1430,16 @@ "source-layer": "transportation", "filter": [ "all", - [ - "==", - [ - "get", - "class" - ], - "link" - ], - [ - "==", - [ - "get", - "brunnel" - ], - "bridge" - ] + ["==", ["get", "class"], "link"], + ["==", ["get", "brunnel"], "bridge"] ], - "layout": { - "line-join": "round" - }, + "layout": {"line-join": "round"}, "paint": { "line-color": "#e9ac77", "line-width": [ "interpolate", - [ - "exponential", - 1.2 - ], - [ - "zoom" - ], + ["exponential", 1.2], + ["zoom"], 12, 1, 13, @@ -2909,55 +1458,17 @@ "source-layer": "transportation", "filter": [ "all", - [ - "==", - [ - "get", - "brunnel" - ], - "bridge" - ], - [ - "match", - [ - "get", - "class" - ], - [ - "street", - "street_limited" - ], - true, - false - ] + ["==", ["get", "brunnel"], "bridge"], + ["match", ["get", "class"], ["street", "street_limited"], true, false] ], - "layout": { - "line-join": "round" - }, + "layout": {"line-join": "round"}, "paint": { "line-color": "hsl(36,6%,74%)", - "line-opacity": [ - "interpolate", - [ - "linear" - ], - [ - "zoom" - ], - 12, - 0, - 12.5, - 1 - ], + "line-opacity": ["interpolate", ["linear"], ["zoom"], 12, 0, 12.5, 1], "line-width": [ "interpolate", - [ - "exponential", - 1.2 - ], - [ - "zoom" - ], + ["exponential", 1.2], + ["zoom"], 12, 0.5, 13, @@ -2976,42 +1487,16 @@ "source-layer": "transportation", "filter": [ "all", - [ - "==", - [ - "get", - "brunnel" - ], - "bridge" - ], - [ - "match", - [ - "get", - "class" - ], - [ - "secondary", - "tertiary" - ], - true, - false - ] + ["==", ["get", "brunnel"], "bridge"], + ["match", ["get", "class"], ["secondary", "tertiary"], true, false] ], - "layout": { - "line-join": "round" - }, + "layout": {"line-join": "round"}, "paint": { "line-color": "#e9ac77", "line-width": [ "interpolate", - [ - "exponential", - 1.2 - ], - [ - "zoom" - ], + ["exponential", 1.2], + ["zoom"], 8, 1.5, 20, @@ -3026,42 +1511,16 @@ "source-layer": "transportation", "filter": [ "all", - [ - "==", - [ - "get", - "brunnel" - ], - "bridge" - ], - [ - "match", - [ - "get", - "class" - ], - [ - "primary", - "trunk" - ], - true, - false - ] + ["==", ["get", "brunnel"], "bridge"], + ["match", ["get", "class"], ["primary", "trunk"], true, false] ], - "layout": { - "line-join": "round" - }, + "layout": {"line-join": "round"}, "paint": { "line-color": "#e9ac77", "line-width": [ "interpolate", - [ - "exponential", - 1.2 - ], - [ - "zoom" - ], + ["exponential", 1.2], + ["zoom"], 5, 0.4, 6, @@ -3080,45 +1539,17 @@ "source-layer": "transportation", "filter": [ "all", - [ - "==", - [ - "get", - "class" - ], - "motorway" - ], - [ - "!=", - [ - "get", - "ramp" - ], - 1 - ], - [ - "==", - [ - "get", - "brunnel" - ], - "bridge" - ] + ["==", ["get", "class"], "motorway"], + ["!=", ["get", "ramp"], 1], + ["==", ["get", "brunnel"], "bridge"] ], - "layout": { - "line-join": "round" - }, + "layout": {"line-join": "round"}, "paint": { "line-color": "#e9ac77", "line-width": [ "interpolate", - [ - "exponential", - 1.2 - ], - [ - "zoom" - ], + ["exponential", 1.2], + ["zoom"], 5, 0.4, 6, @@ -3137,45 +1568,17 @@ "source-layer": "transportation", "filter": [ "all", - [ - "==", - [ - "get", - "class" - ], - "motorway" - ], - [ - "==", - [ - "get", - "ramp" - ], - 1 - ], - [ - "==", - [ - "get", - "brunnel" - ], - "bridge" - ] + ["==", ["get", "class"], "motorway"], + ["==", ["get", "ramp"], 1], + ["==", ["get", "brunnel"], "bridge"] ], - "layout": { - "line-join": "round" - }, + "layout": {"line-join": "round"}, "paint": { "line-color": "#fc8", "line-width": [ "interpolate", - [ - "exponential", - 1.2 - ], - [ - "zoom" - ], + ["exponential", 1.2], + ["zoom"], 12.5, 0, 13, @@ -3194,42 +1597,16 @@ "source-layer": "transportation", "filter": [ "all", - [ - "==", - [ - "get", - "brunnel" - ], - "bridge" - ], - [ - "match", - [ - "get", - "class" - ], - [ - "service", - "track" - ], - true, - false - ] + ["==", ["get", "brunnel"], "bridge"], + ["match", ["get", "class"], ["service", "track"], true, false] ], - "layout": { - "line-join": "round" - }, + "layout": {"line-join": "round"}, "paint": { "line-color": "#fff", "line-width": [ "interpolate", - [ - "exponential", - 1.2 - ], - [ - "zoom" - ], + ["exponential", 1.2], + ["zoom"], 15.5, 0, 16, @@ -3246,37 +1623,16 @@ "source-layer": "transportation", "filter": [ "all", - [ - "==", - [ - "get", - "class" - ], - "link" - ], - [ - "==", - [ - "get", - "brunnel" - ], - "bridge" - ] + ["==", ["get", "class"], "link"], + ["==", ["get", "brunnel"], "bridge"] ], - "layout": { - "line-join": "round" - }, + "layout": {"line-join": "round"}, "paint": { "line-color": "#fea", "line-width": [ "interpolate", - [ - "exponential", - 1.2 - ], - [ - "zoom" - ], + ["exponential", 1.2], + ["zoom"], 12.5, 0, 13, @@ -3295,41 +1651,16 @@ "source-layer": "transportation", "filter": [ "all", - [ - "==", - [ - "get", - "brunnel" - ], - "bridge" - ], - [ - "match", - [ - "get", - "class" - ], - [ - "minor" - ], - true, - false - ] + ["==", ["get", "brunnel"], "bridge"], + ["match", ["get", "class"], ["minor"], true, false] ], - "layout": { - "line-join": "round" - }, + "layout": {"line-join": "round"}, "paint": { "line-color": "#fff", "line-width": [ "interpolate", - [ - "exponential", - 1.2 - ], - [ - "zoom" - ], + ["exponential", 1.2], + ["zoom"], 13.5, 0, 14, @@ -3346,42 +1677,16 @@ "source-layer": "transportation", "filter": [ "all", - [ - "==", - [ - "get", - "brunnel" - ], - "bridge" - ], - [ - "match", - [ - "get", - "class" - ], - [ - "secondary", - "tertiary" - ], - true, - false - ] + ["==", ["get", "brunnel"], "bridge"], + ["match", ["get", "class"], ["secondary", "tertiary"], true, false] ], - "layout": { - "line-join": "round" - }, + "layout": {"line-join": "round"}, "paint": { "line-color": "#fea", "line-width": [ "interpolate", - [ - "exponential", - 1.2 - ], - [ - "zoom" - ], + ["exponential", 1.2], + ["zoom"], 6.5, 0, 7, @@ -3398,42 +1703,16 @@ "source-layer": "transportation", "filter": [ "all", - [ - "==", - [ - "get", - "brunnel" - ], - "bridge" - ], - [ - "match", - [ - "get", - "class" - ], - [ - "primary", - "trunk" - ], - true, - false - ] + ["==", ["get", "brunnel"], "bridge"], + ["match", ["get", "class"], ["primary", "trunk"], true, false] ], - "layout": { - "line-join": "round" - }, + "layout": {"line-join": "round"}, "paint": { "line-color": "#fea", "line-width": [ "interpolate", - [ - "exponential", - 1.2 - ], - [ - "zoom" - ], + ["exponential", 1.2], + ["zoom"], 5, 0, 7, @@ -3450,45 +1729,17 @@ "source-layer": "transportation", "filter": [ "all", - [ - "==", - [ - "get", - "class" - ], - "motorway" - ], - [ - "!=", - [ - "get", - "ramp" - ], - 1 - ], - [ - "==", - [ - "get", - "brunnel" - ], - "bridge" - ] + ["==", ["get", "class"], "motorway"], + ["!=", ["get", "ramp"], 1], + ["==", ["get", "brunnel"], "bridge"] ], - "layout": { - "line-join": "round" - }, + "layout": {"line-join": "round"}, "paint": { "line-color": "#fc8", "line-width": [ "interpolate", - [ - "exponential", - 1.2 - ], - [ - "zoom" - ], + ["exponential", 1.2], + ["zoom"], 5, 0, 7, @@ -3505,34 +1756,15 @@ "source-layer": "transportation", "filter": [ "all", - [ - "==", - [ - "get", - "class" - ], - "rail" - ], - [ - "==", - [ - "get", - "brunnel" - ], - "bridge" - ] + ["==", ["get", "class"], "rail"], + ["==", ["get", "brunnel"], "bridge"] ], "paint": { "line-color": "#bbb", "line-width": [ "interpolate", - [ - "exponential", - 1.4 - ], - [ - "zoom" - ], + ["exponential", 1.4], + ["zoom"], 14, 0.4, 15, @@ -3549,38 +1781,16 @@ "source-layer": "transportation", "filter": [ "all", - [ - "==", - [ - "get", - "class" - ], - "rail" - ], - [ - "==", - [ - "get", - "brunnel" - ], - "bridge" - ] + ["==", ["get", "class"], "rail"], + ["==", ["get", "brunnel"], "bridge"] ], "paint": { "line-color": "#bbb", - "line-dasharray": [ - 0.2, - 8 - ], + "line-dasharray": [0.2, 8], "line-width": [ "interpolate", - [ - "exponential", - 1.4 - ], - [ - "zoom" - ], + ["exponential", 1.4], + ["zoom"], 14.5, 0, 15, @@ -3597,34 +1807,15 @@ "source-layer": "transportation", "filter": [ "all", - [ - "==", - [ - "get", - "class" - ], - "transit" - ], - [ - "==", - [ - "get", - "brunnel" - ], - "bridge" - ] + ["==", ["get", "class"], "transit"], + ["==", ["get", "brunnel"], "bridge"] ], "paint": { "line-color": "#bbb", "line-width": [ "interpolate", - [ - "exponential", - 1.4 - ], - [ - "zoom" - ], + ["exponential", 1.4], + ["zoom"], 14, 0.4, 15, @@ -3641,38 +1832,16 @@ "source-layer": "transportation", "filter": [ "all", - [ - "==", - [ - "get", - "class" - ], - "transit" - ], - [ - "==", - [ - "get", - "brunnel" - ], - "bridge" - ] + ["==", ["get", "class"], "transit"], + ["==", ["get", "brunnel"], "bridge"] ], "paint": { "line-color": "#bbb", - "line-dasharray": [ - 0.2, - 8 - ], + "line-dasharray": [0.2, 8], "line-width": [ "interpolate", - [ - "exponential", - 1.4 - ], - [ - "zoom" - ], + ["exponential", 1.4], + ["zoom"], 14.5, 0, 15, @@ -3693,12 +1862,8 @@ "fill-color": "rgba(152, 198, 234, 1)", "fill-outline-color": [ "interpolate", - [ - "linear" - ], - [ - "zoom" - ], + ["linear"], + ["zoom"], 13, "hsla(35,6%,79%,0.32)", 14, @@ -3706,12 +1871,8 @@ ], "fill-opacity": [ "interpolate", - [ - "linear" - ], - [ - "zoom" - ], + ["linear"], + ["zoom"], 13, 0, 14, @@ -3734,22 +1895,12 @@ "minzoom": 13.5, "maxzoom": 16.5, "paint": { - "fill-extrusion-height": [ - "get", - "render_height" - ], - "fill-extrusion-base": [ - "get", - "render_min_height" - ], + "fill-extrusion-height": ["get", "render_height"], + "fill-extrusion-base": ["get", "render_min_height"], "fill-extrusion-opacity": [ "interpolate", - [ - "linear" - ], - [ - "zoom" - ], + ["linear"], + ["zoom"], 13.5, 0, 14, @@ -3763,12 +1914,8 @@ ], "fill-extrusion-color": [ "interpolate", - [ - "linear" - ], - [ - "zoom" - ], + ["linear"], + ["zoom"], 13, "#98c6ea", 15, @@ -3784,36 +1931,15 @@ "source": "openmaptiles", "source-layer": "boundary", "minzoom": 8, - "filter": [ - "match", - [ - "get", - "admin_level" - ], - [ - 3, - 4 - ], - true, - false - ], - "layout": { - "line-join": "round" - }, + "filter": ["match", ["get", "admin_level"], [3, 4], true, false], + "layout": {"line-join": "round"}, "paint": { "line-color": "#9e9cab", - "line-dasharray": [ - 5, - 1 - ], + "line-dasharray": [5, 1], "line-width": [ "interpolate", - [ - "linear" - ], - [ - "zoom" - ], + ["linear"], + ["zoom"], 4, 0.4, 5, @@ -3831,56 +1957,14 @@ "maxzoom": 5, "filter": [ "all", - [ - "==", - [ - "get", - "admin_level" - ], - 2 - ], - [ - "!", - [ - "has", - "claimed_by" - ] - ] + ["==", ["get", "admin_level"], 2], + ["!", ["has", "claimed_by"]] ], - "layout": { - "line-cap": "round", - "line-join": "round" - }, + "layout": {"line-cap": "round", "line-join": "round"}, "paint": { "line-color": "hsl(248,1%,41%)", - "line-opacity": [ - "interpolate", - [ - "linear" - ], - [ - "zoom" - ], - 0, - 0.4, - 4, - 1 - ], - "line-width": [ - "interpolate", - [ - "linear" - ], - [ - "zoom" - ], - 3, - 1, - 5, - 1.2, - 12, - 3 - ] + "line-opacity": ["interpolate", ["linear"], ["zoom"], 0, 0.4, 4, 1], + "line-width": ["interpolate", ["linear"], ["zoom"], 3, 1, 5, 1.2, 12, 3] } }, { @@ -3889,48 +1973,12 @@ "source": "openmaptiles", "source-layer": "boundary", "minzoom": 5, - "filter": [ - "==", - [ - "get", - "admin_level" - ], - 2 - ], - "layout": { - "line-cap": "round", - "line-join": "round" - }, + "filter": ["==", ["get", "admin_level"], 2], + "layout": {"line-cap": "round", "line-join": "round"}, "paint": { "line-color": "hsl(248,1%,41%)", - "line-opacity": [ - "interpolate", - [ - "linear" - ], - [ - "zoom" - ], - 0, - 0.4, - 4, - 1 - ], - "line-width": [ - "interpolate", - [ - "linear" - ], - [ - "zoom" - ], - 3, - 1, - 5, - 1.2, - 12, - 3 - ] + "line-opacity": ["interpolate", ["linear"], ["zoom"], 0, 0.4, 4, 1], + "line-width": ["interpolate", ["linear"], ["zoom"], 3, 1, 5, 1.2, 12, 3] } }, { @@ -3938,24 +1986,10 @@ "type": "symbol", "source": "openmaptiles", "source-layer": "waterway", - "filter": [ - "==", - [ - "geometry-type" - ], - "LineString" - ], + "filter": ["==", ["geometry-type"], "LineString"], "layout": { - "text-field": [ - "to-string", - [ - "get", - "name" - ] - ], - "text-font": [ - "Roboto Regular" - ], + "text-field": ["to-string", ["get", "name"]], + "text-font": ["Roboto Regular"], "text-max-width": 5, "text-size": 12, "symbol-placement": "line" @@ -3971,24 +2005,10 @@ "type": "symbol", "source": "openmaptiles", "source-layer": "water_name", - "filter": [ - "==", - [ - "geometry-type" - ], - "Point" - ], + "filter": ["==", ["geometry-type"], "Point"], "layout": { - "text-field": [ - "to-string", - [ - "get", - "name" - ] - ], - "text-font": [ - "Roboto Regular" - ], + "text-field": ["to-string", ["get", "name"]], + "text-font": ["Roboto Regular"], "text-max-width": 5, "text-size": 12 }, @@ -4006,62 +2026,31 @@ "minzoom": 16, "filter": [ "all", + ["==", ["geometry-type"], "Point"], + [">=", ["get", "rank"], 20], [ - "==", - [ - "geometry-type" - ], - "Point" - ], - [ - ">=", - [ - "get", - "rank" - ], - 20 + "match", + ["get", "class"], + ["airport", "bus", "rail", "parking"], + false, + true ] ], "layout": { "icon-image": [ "match", - [ - "get", - "subclass" - ], - [ - "florist", - "furniture", - "soccer", - "tennis" - ], - [ - "get", - "subclass" - ], - [ - "get", - "class" - ] + ["get", "subclass"], + ["florist", "furniture", "soccer", "tennis"], + ["get", "subclass"], + ["get", "class"] ], "text-anchor": "top", - "text-field": [ - "to-string", - [ - "get", - "name" - ] - ], - "text-font": [ - "Roboto Condensed Italic" - ], + "text-field": ["to-string", ["get", "name"]], + "text-font": ["Roboto Condensed Italic"], "text-max-width": 9, - "text-offset": [ - 0, - 0.6 - ], + "text-offset": [0, 0.6], "text-size": 12, - "visibility": "none" + "visibility": "visible" }, "paint": { "text-color": "#191919", @@ -4078,69 +2067,32 @@ "minzoom": 15, "filter": [ "all", + ["==", ["geometry-type"], "Point"], + [">=", ["get", "rank"], 7], + ["<", ["get", "rank"], 20], [ - "==", - [ - "geometry-type" - ], - "Point" - ], - [ - ">=", - [ - "get", - "rank" - ], - 7 - ], - [ - "<", - [ - "get", - "rank" - ], - 20 + "match", + ["get", "class"], + ["airport", "bus", "rail", "parking"], + false, + true ] ], "layout": { "icon-image": [ "match", - [ - "get", - "subclass" - ], - [ - "florist", - "furniture", - "soccer", - "tennis" - ], - [ - "get", - "subclass" - ], - [ - "get", - "class" - ] + ["get", "subclass"], + ["florist", "furniture", "soccer", "tennis"], + ["get", "subclass"], + ["get", "class"] ], "text-anchor": "top", - "text-field": [ - "to-string", - [ - "get", - "name" - ] - ], - "text-font": [ - "Roboto Condensed Italic" - ], + "text-field": ["to-string", ["get", "name"]], + "text-font": ["Roboto Condensed Italic"], "text-max-width": 9, - "text-offset": [ - 0, - 0.6 - ], - "text-size": 12 + "text-offset": [0, 0.6], + "text-size": 12, + "visibility": "visible" }, "paint": { "text-color": "#191919", @@ -4157,68 +2109,30 @@ "minzoom": 14, "filter": [ "all", + ["==", ["geometry-type"], "Point"], + [">=", ["get", "rank"], 1], + ["<", ["get", "rank"], 7], [ - "==", - [ - "geometry-type" - ], - "Point" - ], - [ - ">=", - [ - "get", - "rank" - ], - 1 - ], - [ - "<", - [ - "get", - "rank" - ], - 7 + "match", + ["get", "class"], + ["airport", "bus", "rail", "parking"], + false, + true ] ], "layout": { "icon-image": [ "match", - [ - "get", - "subclass" - ], - [ - "florist", - "furniture", - "soccer", - "tennis" - ], - [ - "get", - "subclass" - ], - [ - "get", - "class" - ] + ["get", "subclass"], + ["florist", "furniture", "soccer", "tennis"], + ["get", "subclass"], + ["get", "class"] ], "text-anchor": "top", - "text-field": [ - "to-string", - [ - "get", - "name" - ] - ], - "text-font": [ - "Roboto Condensed Italic" - ], + "text-field": ["to-string", ["get", "name"]], + "text-font": ["Roboto Condensed Italic"], "text-max-width": 9, - "text-offset": [ - 0, - 0.6 - ], + "text-offset": [0, 0.6], "text-size": 12, "visibility": "visible" }, @@ -4229,53 +2143,64 @@ "text-halo-width": 1 } }, + { + "id": "poi_parking", + "type": "symbol", + "source": "openmaptiles", + "source-layer": "poi", + "minzoom": 16, + "filter": ["==", ["get", "class"], "parking"], + "layout": { + "icon-image": ["get", "class"], + "text-anchor": "left", + "text-field": ["to-string", ["get", "name_en"]], + "text-font": ["Roboto Condensed Italic"], + "text-max-width": 9, + "text-offset": [0.9, 0], + "text-size": 14 + }, + "paint": { + "text-color": "rgba(0, 109, 255, 1)", + "text-halo-color": "#ffffff", + "icon-color": "rgba(0, 109, 255, 1)", + "icon-halo-color": "rgba(255, 255, 255, 1)", + "icon-halo-width": 1, + "icon-halo-blur": 0, + "text-halo-blur": 2, + "text-halo-width": 2 + } + }, { "id": "poi_transit", "type": "symbol", "source": "openmaptiles", "source-layer": "poi", + "minzoom": 13, "filter": [ "match", - [ - "get", - "class" - ], - [ - "airport", - "bus", - "rail" - ], + ["get", "class"], + ["airport", "bus", "rail"], true, false ], "layout": { - "icon-image": [ - "get", - "class" - ], + "icon-image": ["get", "class"], "text-anchor": "left", - "text-field": [ - "to-string", - [ - "get", - "name_en" - ] - ], - "text-font": [ - "Roboto Condensed Italic" - ], + "text-field": ["to-string", ["get", "name_en"]], + "text-font": ["Roboto Condensed Italic"], "text-max-width": 9, - "text-offset": [ - 0.9, - 0 - ], + "text-offset": [0.9, 0], "text-size": 14 }, "paint": { "text-color": "rgba(0, 109, 255, 1)", "text-halo-color": "#ffffff", "text-halo-width": 1, - "text-halo-blur": 0.5 + "text-halo-blur": 0.5, + "icon-color": "rgba(0, 109, 255, 1)", + "icon-halo-color": "rgba(255, 255, 255, 1)", + "icon-halo-blur": 1, + "icon-halo-width": 4 } }, { @@ -4284,39 +2209,14 @@ "source": "openmaptiles", "source-layer": "transportation_name", "maxzoom": 24, - "filter": [ - "all" - ], + "filter": ["all"], "layout": { "symbol-placement": "line", "text-anchor": "center", - "text-field": [ - "to-string", - [ - "get", - "name" - ] - ], - "text-font": [ - "Roboto Regular" - ], - "text-offset": [ - 0, - 0.15 - ], - "text-size": [ - "interpolate", - [ - "linear" - ], - [ - "zoom" - ], - 13, - 12, - 14, - 13 - ], + "text-field": ["to-string", ["get", "name"]], + "text-font": ["Roboto Regular"], + "text-offset": [0, 0.15], + "text-size": ["interpolate", ["linear"], ["zoom"], 13, 12, 14, 13], "visibility": "visible" }, "paint": { @@ -4334,60 +2234,17 @@ "minzoom": 7, "filter": [ "all", - [ - "<=", - [ - "get", - "ref_length" - ], - 6 - ], - [ - "!=", - [ - "get", - "subclass" - ], - [ - "literal", - "junction" - ] - ] + ["<=", ["get", "ref_length"], 6], + ["!=", ["get", "subclass"], ["literal", "junction"]] ], "layout": { - "icon-image": [ - "concat", - "default_", - [ - "get", - "ref_length" - ] - ], + "icon-image": ["concat", "default_", ["get", "ref_length"]], "icon-rotation-alignment": "viewport", - "symbol-placement": [ - "step", - [ - "zoom" - ], - "point", - 11, - "line" - ], + "symbol-placement": ["step", ["zoom"], "point", 11, "line"], "symbol-spacing": 500, - "text-field": [ - "to-string", - [ - "get", - "ref" - ] - ], - "text-font": [ - "Roboto Regular" - ], - "text-offset": [ - 0, - 0.1 - ], + "text-field": ["to-string", ["get", "ref"]], + "text-font": ["Roboto Regular"], + "text-offset": [0, 0.1], "text-rotation-alignment": "viewport", "text-size": 10, "icon-size": 0.8, @@ -4401,43 +2258,20 @@ "source-layer": "place", "filter": [ "match", - [ - "get", - "class" - ], - [ - "hamlet", - "island", - "islet", - "neighbourhood", - "quarter", - "suburb" - ], + ["get", "class"], + ["hamlet", "island", "islet", "neighbourhood", "quarter", "suburb"], true, false ], "layout": { - "text-field": [ - "to-string", - [ - "get", - "name_en" - ] - ], - "text-font": [ - "Roboto Condensed Italic" - ], + "text-field": ["to-string", ["get", "name_en"]], + "text-font": ["Roboto Condensed Italic"], "text-letter-spacing": 0.1, "text-max-width": 9, "text-size": [ "interpolate", - [ - "exponential", - 1.2 - ], - [ - "zoom" - ], + ["exponential", 1.2], + ["zoom"], 12, 10, 15, @@ -4456,35 +2290,15 @@ "type": "symbol", "source": "openmaptiles", "source-layer": "place", - "filter": [ - "==", - [ - "get", - "class" - ], - "village" - ], + "filter": ["==", ["get", "class"], "village"], "layout": { - "text-field": [ - "to-string", - [ - "get", - "name_en" - ] - ], - "text-font": [ - "Roboto Regular" - ], + "text-field": ["to-string", ["get", "name_en"]], + "text-font": ["Roboto Regular"], "text-max-width": 8, "text-size": [ "interpolate", - [ - "exponential", - 1.2 - ], - [ - "zoom" - ], + ["exponential", 1.2], + ["zoom"], 10, 12, 15, @@ -4502,49 +2316,18 @@ "type": "symbol", "source": "openmaptiles", "source-layer": "place", - "filter": [ - "==", - [ - "get", - "class" - ], - "town" - ], + "filter": ["==", ["get", "class"], "town"], "layout": { - "icon-image": [ - "step", - [ - "zoom" - ], - "dot_9", - 8, - "" - ], + "icon-image": ["step", ["zoom"], "dot_9", 8, ""], "text-anchor": "bottom", - "text-field": [ - "to-string", - [ - "get", - "name_en" - ] - ], - "text-font": [ - "Roboto Regular" - ], + "text-field": ["to-string", ["get", "name_en"]], + "text-font": ["Roboto Regular"], "text-max-width": 8, - "text-offset": [ - 0, - 0 - ], + "text-offset": [0, 0], "text-size": [ "interpolate", - [ - "exponential", - 1.2 - ], - [ - "zoom" - ], + ["exponential", 1.2], + ["zoom"], 7, 12, 11, @@ -4563,49 +2346,18 @@ "source": "openmaptiles", "source-layer": "place", "minzoom": 5, - "filter": [ - "==", - [ - "get", - "class" - ], - "city" - ], + "filter": ["==", ["get", "class"], "city"], "layout": { - "icon-image": [ - "step", - [ - "zoom" - ], - "dot_9", - 8, - "" - ], + "icon-image": ["step", ["zoom"], "dot_9", 8, ""], "text-anchor": "bottom", - "text-field": [ - "to-string", - [ - "get", - "name_en" - ] - ], - "text-font": [ - "Roboto Medium" - ], + "text-field": ["to-string", ["get", "name_en"]], + "text-font": ["Roboto Medium"], "text-max-width": 8, - "text-offset": [ - 0, - 0 - ], + "text-offset": [0, 0], "text-size": [ "interpolate", - [ - "exponential", - 1.2 - ], - [ - "zoom" - ], + ["exponential", 1.2], + ["zoom"], 7, 14, 11, @@ -4627,38 +2379,11 @@ "source-layer": "place", "minzoom": 0, "maxzoom": 6, - "filter": [ - "==", - [ - "get", - "class" - ], - "state" - ], + "filter": ["==", ["get", "class"], "state"], "layout": { - "text-field": [ - "to-string", - [ - "get", - "name_en" - ] - ], - "text-font": [ - "Roboto Condensed Italic" - ], - "text-size": [ - "interpolate", - [ - "linear" - ], - [ - "zoom" - ], - 4, - 11, - 6, - 15 - ], + "text-field": ["to-string", ["get", "name_en"]], + "text-font": ["Roboto Condensed Italic"], + "text-size": ["interpolate", ["linear"], ["zoom"], 4, 11, 6, 15], "text-transform": "uppercase" }, "paint": { @@ -4675,48 +2400,14 @@ "minzoom": 2.5, "filter": [ "all", - [ - ">=", - [ - "get", - "rank" - ], - 3 - ], - [ - "==", - [ - "get", - "class" - ], - "country" - ] + [">=", ["get", "rank"], 3], + ["==", ["get", "class"], "country"] ], "layout": { - "text-field": [ - "to-string", - [ - "get", - "name_en" - ] - ], - "text-font": [ - "Roboto Condensed Italic" - ], + "text-field": ["to-string", ["get", "name_en"]], + "text-font": ["Roboto Condensed Italic"], "text-max-width": 6.25, - "text-size": [ - "interpolate", - [ - "linear" - ], - [ - "zoom" - ], - 3, - 11, - 7, - 17 - ], + "text-size": ["interpolate", ["linear"], ["zoom"], 3, 11, 7, 17], "text-transform": "none" }, "paint": { @@ -4734,48 +2425,14 @@ "minzoom": 2, "filter": [ "all", - [ - "==", - [ - "get", - "rank" - ], - 2 - ], - [ - "==", - [ - "get", - "class" - ], - "country" - ] + ["==", ["get", "rank"], 2], + ["==", ["get", "class"], "country"] ], "layout": { - "text-field": [ - "to-string", - [ - "get", - "name_en" - ] - ], - "text-font": [ - "Roboto Condensed Italic" - ], + "text-field": ["to-string", ["get", "name_en"]], + "text-font": ["Roboto Condensed Italic"], "text-max-width": 6.25, - "text-size": [ - "interpolate", - [ - "linear" - ], - [ - "zoom" - ], - 2, - 11, - 5, - 17 - ], + "text-size": ["interpolate", ["linear"], ["zoom"], 2, 11, 5, 17], "text-transform": "none" }, "paint": { @@ -4793,48 +2450,14 @@ "minzoom": 1, "filter": [ "all", - [ - "==", - [ - "get", - "rank" - ], - 1 - ], - [ - "==", - [ - "get", - "class" - ], - "country" - ] + ["==", ["get", "rank"], 1], + ["==", ["get", "class"], "country"] ], "layout": { - "text-field": [ - "to-string", - [ - "get", - "name_en" - ] - ], - "text-font": [ - "Roboto Condensed Italic" - ], + "text-field": ["to-string", ["get", "name_en"]], + "text-font": ["Roboto Condensed Italic"], "text-max-width": 6.25, - "text-size": [ - "interpolate", - [ - "linear" - ], - [ - "zoom" - ], - 1, - 11, - 4, - 17 - ], + "text-size": ["interpolate", ["linear"], ["zoom"], 1, 11, 4, 17], "text-transform": "none" }, "paint": { @@ -4850,25 +2473,10 @@ "source": "openmaptiles", "source-layer": "place", "maxzoom": 1, - "filter": [ - "==", - [ - "get", - "class" - ], - "continent" - ], + "filter": ["==", ["get", "class"], "continent"], "layout": { - "text-field": [ - "to-string", - [ - "get", - "name_en" - ] - ], - "text-font": [ - "Roboto Condensed Italic" - ], + "text-field": ["to-string", ["get", "name_en"]], + "text-font": ["Roboto Condensed Italic"], "text-size": 13, "text-transform": "uppercase", "text-justify": "center"