From a95ee0cfcac1dce06063138d68252c8c766de99b Mon Sep 17 00:00:00 2001 From: pathmapper Date: Sat, 12 Oct 2019 08:39:22 +0200 Subject: [PATCH 1/2] Format style with gl-style-format --- style.json | 3256 ++++++++-------------------------------------------- 1 file changed, 478 insertions(+), 2778 deletions(-) diff --git a/style.json b/style.json index f1c8078..bd8afd8 100644 --- a/style.json +++ b/style.json @@ -1,10 +1,7 @@ { "version": 8, - "id": "osm-liberty", "name": "OSM Liberty", - "metadata": { - "mapbox:type": "template" - }, + "metadata": {"mapbox:type": "template"}, "sources": { "openmaptiles": { "type": "vector", @@ -25,33 +22,15 @@ { "id": "background", "type": "background", - "paint": { - "background-color": "rgb(239,239,239)" - } + "paint": {"background-color": "rgb(239,239,239)"} }, { "id": "natural_earth", "type": "raster", "source": "natural_earth_shaded_relief", "maxzoom": 6, - "layout": { - "visibility": "visible" - }, - "paint": { - "raster-opacity": { - "base": 1.5, - "stops": [ - [ - 0, - 0.6 - ], - [ - 6, - 0.1 - ] - ] - } - } + "layout": {"visibility": "visible"}, + "paint": {"raster-opacity": {"base": 1.5, "stops": [[0, 0.6], [6, 0.1]]}} }, { "id": "park", @@ -69,15 +48,12 @@ "type": "line", "source": "openmaptiles", "source-layer": "park", + "layout": {}, "paint": { - "line-dasharray": [ - 1, - 1.5 - ], + "line-dasharray": [1, 1.5], "line-color": "rgba(228, 241, 215, 1)", "line-opacity": 1 - }, - "layout": {} + } }, { "id": "landuse_residential", @@ -86,26 +62,14 @@ "source": "openmaptiles", "source-layer": "landuse", "maxzoom": 8, - "filter": [ - "==", - "class", - "residential" - ], - "layout": { - "visibility": "visible" - }, + "filter": ["==", "class", "residential"], + "layout": {"visibility": "visible"}, "paint": { "fill-color": { "base": 1, "stops": [ - [ - 9, - "hsla(0, 3%, 85%, 0.84)" - ], - [ - 12, - "hsla(35, 57%, 88%, 0.49)" - ] + [9, "hsla(0, 3%, 85%, 0.84)"], + [12, "hsla(35, 57%, 88%, 0.49)"] ] } } @@ -116,14 +80,7 @@ "metadata": {}, "source": "openmaptiles", "source-layer": "landcover", - "filter": [ - "all", - [ - "==", - "class", - "wood" - ] - ], + "filter": ["all", ["==", "class", "wood"]], "paint": { "fill-antialias": false, "fill-color": "hsla(98, 61%, 72%, 0.7)", @@ -136,14 +93,7 @@ "metadata": {}, "source": "openmaptiles", "source-layer": "landcover", - "filter": [ - "all", - [ - "==", - "class", - "grass" - ] - ], + "filter": ["all", ["==", "class", "grass"]], "paint": { "fill-antialias": false, "fill-color": "rgba(176, 213, 154, 1)", @@ -156,17 +106,9 @@ "metadata": {}, "source": "openmaptiles", "source-layer": "landuse", - "filter": [ - "==", - "class", - "cemetery" - ], - "layout": { - "visibility": "visible" - }, - "paint": { - "fill-color": "hsl(75, 37%, 81%)" - } + "filter": ["==", "class", "cemetery"], + "layout": {"visibility": "visible"}, + "paint": {"fill-color": "hsl(75, 37%, 81%)"} }, { "id": "landuse_hospital", @@ -174,14 +116,8 @@ "metadata": {}, "source": "openmaptiles", "source-layer": "landuse", - "filter": [ - "==", - "class", - "hospital" - ], - "paint": { - "fill-color": "#fde" - } + "filter": ["==", "class", "hospital"], + "paint": {"fill-color": "#fde"} }, { "id": "landuse_school", @@ -189,14 +125,8 @@ "metadata": {}, "source": "openmaptiles", "source-layer": "landuse", - "filter": [ - "==", - "class", - "school" - ], - "paint": { - "fill-color": "rgb(236,238,204)" - } + "filter": ["==", "class", "school"], + "paint": {"fill-color": "rgb(236,238,204)"} }, { "id": "waterway_river", @@ -204,29 +134,11 @@ "metadata": {}, "source": "openmaptiles", "source-layer": "waterway", - "filter": [ - "==", - "class", - "river" - ], - "layout": { - "line-cap": "round" - }, + "filter": ["==", "class", "river"], + "layout": {"line-cap": "round"}, "paint": { "line-color": "#a0c8f0", - "line-width": { - "base": 1.2, - "stops": [ - [ - 11, - 0.5 - ], - [ - 20, - 6 - ] - ] - } + "line-width": {"base": 1.2, "stops": [[11, 0.5], [20, 6]]} } }, { @@ -235,32 +147,11 @@ "metadata": {}, "source": "openmaptiles", "source-layer": "waterway", - "filter": [ - "all", - [ - "!=", - "class", - "river" - ] - ], - "layout": { - "line-cap": "round" - }, + "filter": ["all", ["!=", "class", "river"]], + "layout": {"line-cap": "round"}, "paint": { "line-color": "#a0c8f0", - "line-width": { - "base": 1.3, - "stops": [ - [ - 13, - 0.5 - ], - [ - 20, - 6 - ] - ] - } + "line-width": {"base": 1.3, "stops": [[13, 0.5], [20, 6]]} } }, { @@ -269,9 +160,7 @@ "metadata": {}, "source": "openmaptiles", "source-layer": "water", - "paint": { - "fill-color": "rgb(158,189,255)" - } + "paint": {"fill-color": "rgb(158,189,255)"} }, { "id": "landcover_sand", @@ -289,15 +178,8 @@ "source": "openmaptiles", "source-layer": "aeroway", "minzoom": 11, - "filter": [ - "==", - "$type", - "Polygon" - ], - "paint": { - "fill-color": "rgba(229, 228, 224, 1)", - "fill-opacity": 0.7 - } + "filter": ["==", "$type", "Polygon"], + "paint": {"fill-color": "rgba(229, 228, 224, 1)", "fill-opacity": 0.7} }, { "id": "aeroway_runway", @@ -308,32 +190,12 @@ "minzoom": 11, "filter": [ "all", - [ - "==", - "$type", - "LineString" - ], - [ - "==", - "class", - "runway" - ] + ["==", "$type", "LineString"], + ["==", "class", "runway"] ], "paint": { "line-color": "#f0ede9", - "line-width": { - "base": 1.2, - "stops": [ - [ - 11, - 3 - ], - [ - 20, - 16 - ] - ] - } + "line-width": {"base": 1.2, "stops": [[11, 3], [20, 16]]} } }, { @@ -345,32 +207,12 @@ "minzoom": 11, "filter": [ "all", - [ - "==", - "$type", - "LineString" - ], - [ - "==", - "class", - "taxiway" - ] + ["==", "$type", "LineString"], + ["==", "class", "taxiway"] ], "paint": { "line-color": "#f0ede9", - "line-width": { - "base": 1.2, - "stops": [ - [ - 11, - 0.5 - ], - [ - 20, - 6 - ] - ] - } + "line-width": {"base": 1.2, "stops": [[11, 0.5], [20, 6]]} } }, { @@ -381,53 +223,18 @@ "source-layer": "transportation", "filter": [ "all", - [ - "==", - "class", - "motorway" - ], - [ - "==", - "ramp", - 1 - ], - [ - "==", - "brunnel", - "tunnel" - ] + ["==", "class", "motorway"], + ["==", "ramp", 1], + ["==", "brunnel", "tunnel"] ], - "layout": { - "line-join": "round", - "visibility": "visible" - }, + "layout": {"line-join": "round", "visibility": "visible"}, "paint": { "line-color": "#e9ac77", - "line-dasharray": [ - 0.5, - 0.25 - ], + "line-dasharray": [0.5, 0.25], "line-opacity": 1, "line-width": { "base": 1.2, - "stops": [ - [ - 12, - 1 - ], - [ - 13, - 3 - ], - [ - 14, - 4 - ], - [ - 20, - 15 - ] - ] + "stops": [[12, 1], [13, 3], [14, 4], [20, 15]] } } }, @@ -439,44 +246,14 @@ "source-layer": "transportation", "filter": [ "all", - [ - "==", - "brunnel", - "tunnel" - ], - [ - "in", - "class", - "service", - "track" - ] + ["==", "brunnel", "tunnel"], + ["in", "class", "service", "track"] ], - "layout": { - "line-join": "round" - }, + "layout": {"line-join": "round"}, "paint": { "line-color": "#cfcdca", - "line-dasharray": [ - 0.5, - 0.25 - ], - "line-width": { - "base": 1.2, - "stops": [ - [ - 15, - 1 - ], - [ - 16, - 4 - ], - [ - 20, - 11 - ] - ] - } + "line-dasharray": [0.5, 0.25], + "line-width": {"base": 1.2, "stops": [[15, 1], [16, 4], [20, 11]]} } }, { @@ -485,45 +262,14 @@ "metadata": {}, "source": "openmaptiles", "source-layer": "transportation", - "filter": [ - "all", - [ - "==", - "ramp", - "1" - ], - [ - "==", - "brunnel", - "tunnel" - ] - ], - "layout": { - "line-join": "round" - }, + "filter": ["all", ["==", "ramp", "1"], ["==", "brunnel", "tunnel"]], + "layout": {"line-join": "round"}, "paint": { "line-color": "#e9ac77", "line-opacity": 1, "line-width": { "base": 1.2, - "stops": [ - [ - 12, - 1 - ], - [ - 13, - 3 - ], - [ - 14, - 4 - ], - [ - 20, - 15 - ] - ] + "stops": [[12, 1], [13, 3], [14, 4], [20, 15]] } } }, @@ -535,55 +281,16 @@ "source-layer": "transportation", "filter": [ "all", - [ - "==", - "brunnel", - "tunnel" - ], - [ - "in", - "class", - "street", - "street_limited" - ] + ["==", "brunnel", "tunnel"], + ["in", "class", "street", "street_limited"] ], - "layout": { - "line-join": "round" - }, + "layout": {"line-join": "round"}, "paint": { "line-color": "#cfcdca", - "line-opacity": { - "stops": [ - [ - 12, - 0 - ], - [ - 12.5, - 1 - ] - ] - }, + "line-opacity": {"stops": [[12, 0], [12.5, 1]]}, "line-width": { "base": 1.2, - "stops": [ - [ - 12, - 0.5 - ], - [ - 13, - 1 - ], - [ - 14, - 4 - ], - [ - 20, - 15 - ] - ] + "stops": [[12, 0.5], [13, 1], [14, 4], [20, 15]] } } }, @@ -595,37 +302,14 @@ "source-layer": "transportation", "filter": [ "all", - [ - "==", - "brunnel", - "tunnel" - ], - [ - "in", - "class", - "secondary", - "tertiary" - ] + ["==", "brunnel", "tunnel"], + ["in", "class", "secondary", "tertiary"] ], - "layout": { - "line-join": "round" - }, + "layout": {"line-join": "round"}, "paint": { "line-color": "#e9ac77", "line-opacity": 1, - "line-width": { - "base": 1.2, - "stops": [ - [ - 8, - 1.5 - ], - [ - 20, - 17 - ] - ] - } + "line-width": {"base": 1.2, "stops": [[8, 1.5], [20, 17]]} } }, { @@ -636,43 +320,15 @@ "source-layer": "transportation", "filter": [ "all", - [ - "==", - "brunnel", - "tunnel" - ], - [ - "in", - "class", - "primary", - "trunk" - ] + ["==", "brunnel", "tunnel"], + ["in", "class", "primary", "trunk"] ], - "layout": { - "line-join": "round" - }, + "layout": {"line-join": "round"}, "paint": { "line-color": "#e9ac77", "line-width": { "base": 1.2, - "stops": [ - [ - 5, - 0.4 - ], - [ - 6, - 0.7 - ], - [ - 7, - 1.75 - ], - [ - 20, - 22 - ] - ] + "stops": [[5, 0.4], [6, 0.7], [7, 1.75], [20, 22]] } } }, @@ -684,47 +340,16 @@ "source-layer": "transportation", "filter": [ "all", - [ - "==", - "class", - "motorway" - ], - [ - "==", - "brunnel", - "tunnel" - ] + ["==", "class", "motorway"], + ["==", "brunnel", "tunnel"] ], - "layout": { - "line-join": "round", - "visibility": "visible" - }, + "layout": {"line-join": "round", "visibility": "visible"}, "paint": { "line-color": "#e9ac77", - "line-dasharray": [ - 0.5, - 0.25 - ], + "line-dasharray": [0.5, 0.25], "line-width": { "base": 1.2, - "stops": [ - [ - 5, - 0.4 - ], - [ - 6, - 0.7 - ], - [ - 7, - 1.75 - ], - [ - 20, - 22 - ] - ] + "stops": [[5, 0.4], [6, 0.7], [7, 1.75], [20, 22]] } } }, @@ -736,362 +361,133 @@ "source-layer": "transportation", "filter": [ "all", - [ - "==", - "$type", - "LineString" - ], - [ - "==", - "brunnel", - "tunnel" - ], - [ - "in", - "class", - "path", - "pedestrian" - ] + ["==", "$type", "LineString"], + ["==", "brunnel", "tunnel"], + ["in", "class", "path", "pedestrian"] ], "paint": { "line-color": "hsl(0, 0%, 100%)", - "line-dasharray": [ - 1, - 0.75 - ], - "line-width": { - "base": 1.2, - "stops": [ - [ - 14, - 0.5 - ], - [ - 20, - 10 - ] - ] - } + "line-dasharray": [1, 0.75], + "line-width": {"base": 1.2, "stops": [[14, 0.5], [20, 10]]} } }, { "id": "tunnel_motorway_link", - "metadata": {}, - "paint": { - "line-color": "#fc8", - "line-width": { - "base": 1.2, - "stops": [ - [ - 12.5, - 0 - ], - [ - 13, - 1.5 - ], - [ - 14, - 2.5 - ], - [ - 20, - 11.5 - ] - ] - } - }, "type": "line", + "metadata": {}, "source": "openmaptiles", "source-layer": "transportation", "filter": [ "all", - [ - "==", - "class", - "motorway_link" - ], - [ - "==", - "ramp", - 1 - ], - [ - "==", - "brunnel", - "tunnel" - ] + ["==", "class", "motorway_link"], + ["==", "ramp", 1], + ["==", "brunnel", "tunnel"] ], - "layout": { - "line-join": "round", - "visibility": "visible" - } - }, - { - "id": "tunnel_service_track", - "metadata": {}, + "layout": {"line-join": "round", "visibility": "visible"}, "paint": { - "line-color": "#fff", + "line-color": "#fc8", "line-width": { "base": 1.2, - "stops": [ - [ - 15.5, - 0 - ], - [ - 16, - 2 - ], - [ - 20, - 7.5 - ] - ] + "stops": [[12.5, 0], [13, 1.5], [14, 2.5], [20, 11.5]] } - }, + } + }, + { + "id": "tunnel_service_track", "type": "line", + "metadata": {}, "source": "openmaptiles", "source-layer": "transportation", "filter": [ "all", - [ - "==", - "brunnel", - "tunnel" - ], - [ - "in", - "class", - "service", - "track" - ] + ["==", "brunnel", "tunnel"], + ["in", "class", "service", "track"] ], - "layout": { - "line-join": "round" + "layout": {"line-join": "round"}, + "paint": { + "line-color": "#fff", + "line-width": {"base": 1.2, "stops": [[15.5, 0], [16, 2], [20, 7.5]]} } }, { "id": "tunnel_link", + "type": "line", "metadata": {}, + "source": "openmaptiles", + "source-layer": "transportation", + "filter": ["all", ["==", "ramp", "1"], ["==", "brunnel", "tunnel"]], + "layout": {"line-join": "round"}, "paint": { "line-color": "#fff4c6", "line-width": { "base": 1.2, - "stops": [ - [ - 12.5, - 0 - ], - [ - 13, - 1.5 - ], - [ - 14, - 2.5 - ], - [ - 20, - 11.5 - ] - ] + "stops": [[12.5, 0], [13, 1.5], [14, 2.5], [20, 11.5]] } - }, - "type": "line", - "source": "openmaptiles", - "source-layer": "transportation", - "filter": [ - "all", - [ - "==", - "ramp", - "1" - ], - [ - "==", - "brunnel", - "tunnel" - ] - ], - "layout": { - "line-join": "round" } }, { "id": "tunnel_minor", + "type": "line", "metadata": {}, + "source": "openmaptiles", + "source-layer": "transportation", + "filter": ["all", ["==", "brunnel", "tunnel"], ["in", "class", "minor"]], + "layout": {"line-join": "round"}, "paint": { "line-color": "#fff", "line-opacity": 1, - "line-width": { - "base": 1.2, - "stops": [ - [ - 13.5, - 0 - ], - [ - 14, - 2.5 - ], - [ - 20, - 11.5 - ] - ] - } - }, - "type": "line", - "source": "openmaptiles", - "source-layer": "transportation", - "filter": [ - "all", - [ - "==", - "brunnel", - "tunnel" - ], - [ - "in", - "class", - "minor" - ] - ], - "layout": { - "line-join": "round" + "line-width": {"base": 1.2, "stops": [[13.5, 0], [14, 2.5], [20, 11.5]]} } }, { "id": "tunnel_secondary_tertiary", - "metadata": {}, - "paint": { - "line-color": "#fff4c6", - "line-width": { - "base": 1.2, - "stops": [ - [ - 6.5, - 0 - ], - [ - 7, - 0.5 - ], - [ - 20, - 10 - ] - ] - } - }, "type": "line", + "metadata": {}, "source": "openmaptiles", "source-layer": "transportation", "filter": [ "all", - [ - "==", - "brunnel", - "tunnel" - ], - [ - "in", - "class", - "secondary", - "tertiary" - ] + ["==", "brunnel", "tunnel"], + ["in", "class", "secondary", "tertiary"] ], - "layout": { - "line-join": "round" + "layout": {"line-join": "round"}, + "paint": { + "line-color": "#fff4c6", + "line-width": {"base": 1.2, "stops": [[6.5, 0], [7, 0.5], [20, 10]]} } }, { "id": "tunnel_trunk_primary", - "metadata": {}, - "paint": { - "line-color": "#fff4c6", - "line-width": { - "base": 1.2, - "stops": [ - [ - 5, - 0 - ], - [ - 7, - 1 - ], - [ - 20, - 18 - ] - ] - } - }, "type": "line", + "metadata": {}, "source": "openmaptiles", "source-layer": "transportation", "filter": [ "all", - [ - "==", - "brunnel", - "tunnel" - ], - [ - "in", - "class", - "primary", - "trunk" - ] + ["==", "brunnel", "tunnel"], + ["in", "class", "primary", "trunk"] ], - "layout": { - "line-join": "round" + "layout": {"line-join": "round"}, + "paint": { + "line-color": "#fff4c6", + "line-width": {"base": 1.2, "stops": [[5, 0], [7, 1], [20, 18]]} } }, { "id": "tunnel_motorway", - "metadata": {}, - "paint": { - "line-color": "#ffdaa6", - "line-width": { - "base": 1.2, - "stops": [ - [ - 5, - 0 - ], - [ - 7, - 1 - ], - [ - 20, - 18 - ] - ] - } - }, "type": "line", + "metadata": {}, "source": "openmaptiles", "source-layer": "transportation", "filter": [ "all", - [ - "==", - "class", - "motorway" - ], - [ - "==", - "brunnel", - "tunnel" - ] + ["==", "class", "motorway"], + ["==", "brunnel", "tunnel"] ], - "layout": { - "line-join": "round", - "visibility": "visible" + "layout": {"line-join": "round", "visibility": "visible"}, + "paint": { + "line-color": "#ffdaa6", + "line-width": {"base": 1.2, "stops": [[5, 0], [7, 1], [20, 18]]} } }, { @@ -1100,188 +496,67 @@ "metadata": {}, "source": "openmaptiles", "source-layer": "transportation", - "filter": [ - "all", - [ - "==", - "brunnel", - "tunnel" - ], - [ - "in", - "class", - "rail" - ] - ], + "filter": ["all", ["==", "brunnel", "tunnel"], ["in", "class", "rail"]], "paint": { "line-color": "#bbb", - "line-width": { - "base": 1.4, - "stops": [ - [ - 14, - 0.4 - ], - [ - 15, - 0.75 - ], - [ - 20, - 2 - ] - ] - } + "line-width": {"base": 1.4, "stops": [[14, 0.4], [15, 0.75], [20, 2]]} } }, { "id": "tunnel_major_rail_hatching", + "type": "line", "metadata": {}, + "source": "openmaptiles", + "source-layer": "transportation", + "filter": ["all", ["==", "brunnel", "tunnel"], ["==", "class", "rail"]], "paint": { "line-color": "#bbb", - "line-dasharray": [ - 0.2, - 8 - ], - "line-width": { - "base": 1.4, - "stops": [ - [ - 14.5, - 0 - ], - [ - 15, - 3 - ], - [ - 20, - 8 - ] - ] - } - }, + "line-dasharray": [0.2, 8], + "line-width": {"base": 1.4, "stops": [[14.5, 0], [15, 3], [20, 8]]} + } + }, + { + "id": "tunnel_transit_rail", "type": "line", + "metadata": {}, "source": "openmaptiles", "source-layer": "transportation", "filter": [ "all", - [ - "==", - "brunnel", - "tunnel" - ], - [ - "==", - "class", - "rail" - ] - ] + ["==", "brunnel", "tunnel"], + ["in", "class", "transit"] + ], + "paint": { + "line-color": "#bbb", + "line-width": {"base": 1.4, "stops": [[14, 0.4], [15, 0.75], [20, 2]]} + } }, { - "id": "tunnel_transit_rail", + "id": "tunnel_transit_rail_hatching", "type": "line", "metadata": {}, "source": "openmaptiles", "source-layer": "transportation", "filter": [ "all", - [ - "==", - "brunnel", - "tunnel" - ], - [ - "in", - "class", - "transit" - ] + ["==", "brunnel", "tunnel"], + ["==", "class", "transit"] ], "paint": { "line-color": "#bbb", - "line-width": { - "base": 1.4, - "stops": [ - [ - 14, - 0.4 - ], - [ - 15, - 0.75 - ], - [ - 20, - 2 - ] - ] - } + "line-dasharray": [0.2, 8], + "line-width": {"base": 1.4, "stops": [[14.5, 0], [15, 3], [20, 8]]} } }, { - "id": "tunnel_transit_rail_hatching", + "id": "road_area_pattern", + "type": "fill", "metadata": {}, - "paint": { - "line-color": "#bbb", - "line-dasharray": [ - 0.2, - 8 - ], - "line-width": { - "base": 1.4, - "stops": [ - [ - 14.5, - 0 - ], - [ - 15, - 3 - ], - [ - 20, - 8 - ] - ] - } - }, - "type": "line", - "source": "openmaptiles", - "source-layer": "transportation", - "filter": [ - "all", - [ - "==", - "brunnel", - "tunnel" - ], - [ - "==", - "class", - "transit" - ] - ] - }, - { - "id": "road_area_pattern", - "metadata": {}, - "paint": { - "fill-pattern": "pedestrian_polygon" - }, - "type": "fill", "source": "openmaptiles", "source-layer": "transportation", - "filter": [ - "all", - [ - "==", - "$type", - "Polygon" - ] - ], - "layout": { - "visibility": "visible" - } + "filter": ["all", ["==", "$type", "Polygon"]], + "layout": {"visibility": "visible"}, + "paint": {"fill-pattern": "pedestrian_polygon"} }, { "id": "road_motorway_link_casing", @@ -1292,50 +567,17 @@ "minzoom": 12, "filter": [ "all", - [ - "!in", - "brunnel", - "bridge", - "tunnel" - ], - [ - "==", - "class", - "motorway" - ], - [ - "==", - "ramp", - 1 - ] + ["!in", "brunnel", "bridge", "tunnel"], + ["==", "class", "motorway"], + ["==", "ramp", 1] ], - "layout": { - "line-cap": "round", - "line-join": "round" - }, + "layout": {"line-cap": "round", "line-join": "round"}, "paint": { "line-color": "#e9ac77", "line-opacity": 1, "line-width": { "base": 1.2, - "stops": [ - [ - 12, - 1 - ], - [ - 13, - 3 - ], - [ - 14, - 4 - ], - [ - 20, - 15 - ] - ] + "stops": [[12, 1], [13, 3], [14, 4], [20, 15]] } } }, @@ -1347,42 +589,13 @@ "source-layer": "transportation", "filter": [ "all", - [ - "!in", - "brunnel", - "bridge", - "tunnel" - ], - [ - "in", - "class", - "service", - "track" - ] + ["!in", "brunnel", "bridge", "tunnel"], + ["in", "class", "service", "track"] ], - "layout": { - "line-cap": "round", - "line-join": "round" - }, + "layout": {"line-cap": "round", "line-join": "round"}, "paint": { "line-color": "#cfcdca", - "line-width": { - "base": 1.2, - "stops": [ - [ - 15, - 1 - ], - [ - 16, - 4 - ], - [ - 20, - 11 - ] - ] - } + "line-width": {"base": 1.2, "stops": [[15, 1], [16, 4], [20, 11]]} } }, { @@ -1394,25 +607,9 @@ "minzoom": 13, "filter": [ "all", - [ - "!in", - "brunnel", - "bridge", - "tunnel" - ], - [ - "!in", - "class", - "pedestrian", - "path", - "track", - "service" - ], - [ - "==", - "ramp", - "1" - ] + ["!in", "brunnel", "bridge", "tunnel"], + ["!in", "class", "pedestrian", "path", "track", "service"], + ["==", "ramp", "1"] ], "layout": { "line-cap": "round", @@ -1424,24 +621,7 @@ "line-opacity": 1, "line-width": { "base": 1.2, - "stops": [ - [ - 12, - 1 - ], - [ - 13, - 3 - ], - [ - 14, - 4 - ], - [ - 20, - 15 - ] - ] + "stops": [[12, 1], [13, 3], [14, 4], [20, 15]] } } }, @@ -1453,66 +633,18 @@ "source-layer": "transportation", "filter": [ "all", - [ - "==", - "$type", - "LineString" - ], - [ - "!in", - "brunnel", - "bridge", - "tunnel" - ], - [ - "in", - "class", - "minor" - ], - [ - "!=", - "ramp", - "1" - ] + ["==", "$type", "LineString"], + ["!in", "brunnel", "bridge", "tunnel"], + ["in", "class", "minor"], + ["!=", "ramp", "1"] ], - "layout": { - "line-cap": "round", - "line-join": "round" - }, + "layout": {"line-cap": "round", "line-join": "round"}, "paint": { "line-color": "#cfcdca", - "line-opacity": { - "stops": [ - [ - 12, - 0 - ], - [ - 12.5, - 1 - ] - ] - }, + "line-opacity": {"stops": [[12, 0], [12.5, 1]]}, "line-width": { "base": 1.2, - "stops": [ - [ - 12, - 0.5 - ], - [ - 13, - 1 - ], - [ - 14, - 4 - ], - [ - 20, - 20 - ] - ] + "stops": [[12, 0.5], [13, 1], [14, 4], [20, 20]] } } }, @@ -1524,23 +656,9 @@ "source-layer": "transportation", "filter": [ "all", - [ - "!in", - "brunnel", - "bridge", - "tunnel" - ], - [ - "in", - "class", - "secondary", - "tertiary" - ], - [ - "!=", - "ramp", - 1 - ] + ["!in", "brunnel", "bridge", "tunnel"], + ["in", "class", "secondary", "tertiary"], + ["!=", "ramp", 1] ], "layout": { "line-cap": "round", @@ -1550,19 +668,7 @@ "paint": { "line-color": "#e9ac77", "line-opacity": 1, - "line-width": { - "base": 1.2, - "stops": [ - [ - 8, - 1.5 - ], - [ - 20, - 17 - ] - ] - } + "line-width": {"base": 1.2, "stops": [[8, 1.5], [20, 17]]} } }, { @@ -1573,18 +679,8 @@ "source-layer": "transportation", "filter": [ "all", - [ - "!in", - "brunnel", - "bridge", - "tunnel" - ], - [ - "in", - "class", - "primary", - "trunk" - ] + ["!in", "brunnel", "bridge", "tunnel"], + ["in", "class", "primary", "trunk"] ], "layout": { "line-cap": "butt", @@ -1596,24 +692,7 @@ "line-opacity": 1, "line-width": { "base": 1.2, - "stops": [ - [ - 5, - 0.4 - ], - [ - 6, - 0.7 - ], - [ - 7, - 1.75 - ], - [ - 20, - 22 - ] - ] + "stops": [[5, 0.4], [6, 0.7], [7, 1.75], [20, 22]] } } }, @@ -1626,22 +705,9 @@ "minzoom": 5, "filter": [ "all", - [ - "!in", - "brunnel", - "bridge", - "tunnel" - ], - [ - "==", - "class", - "motorway" - ], - [ - "!=", - "ramp", - "1" - ] + ["!in", "brunnel", "bridge", "tunnel"], + ["==", "class", "motorway"], + ["!=", "ramp", "1"] ], "layout": { "line-cap": "round", @@ -1652,24 +718,7 @@ "line-color": "#e9ac77", "line-width": { "base": 1.2, - "stops": [ - [ - 5, - 0.4 - ], - [ - 6, - 0.7 - ], - [ - 7, - 1.75 - ], - [ - 20, - 22 - ] - ] + "stops": [[5, 0.4], [6, 0.7], [7, 1.75], [20, 22]] } } }, @@ -1682,364 +731,148 @@ "minzoom": 14, "filter": [ "all", - [ - "==", - "$type", - "LineString" - ], - [ - "!in", - "brunnel", - "bridge", - "tunnel" - ], - [ - "in", - "class", - "path", - "pedestrian" - ] + ["==", "$type", "LineString"], + ["!in", "brunnel", "bridge", "tunnel"], + ["in", "class", "path", "pedestrian"] ], - "layout": { - "line-join": "round" - }, + "layout": {"line-join": "round"}, "paint": { "line-color": "hsl(0, 0%, 100%)", - "line-dasharray": [ - 1, - 0.7 - ], - "line-width": { - "base": 1.2, - "stops": [ - [ - 14, - 1 - ], - [ - 20, - 10 - ] - ] - } + "line-dasharray": [1, 0.7], + "line-width": {"base": 1.2, "stops": [[14, 1], [20, 10]]} } }, { "id": "road_motorway_link", - "metadata": {}, - "paint": { - "line-color": "#fc8", - "line-width": { - "base": 1.2, - "stops": [ - [ - 12.5, - 0 - ], - [ - 13, - 1.5 - ], - [ - 14, - 2.5 - ], - [ - 20, - 11.5 - ] - ] - } - }, "type": "line", + "metadata": {}, "source": "openmaptiles", "source-layer": "transportation", "minzoom": 12, "filter": [ "all", - [ - "!in", - "brunnel", - "bridge", - "tunnel" - ], - [ - "==", - "class", - "motorway" - ], - [ - "==", - "ramp", - 1 - ] + ["!in", "brunnel", "bridge", "tunnel"], + ["==", "class", "motorway"], + ["==", "ramp", 1] ], - "layout": { - "line-cap": "round", - "line-join": "round" - } - }, - { - "id": "road_service_track", - "metadata": {}, + "layout": {"line-cap": "round", "line-join": "round"}, "paint": { - "line-color": "#fff", + "line-color": "#fc8", "line-width": { "base": 1.2, - "stops": [ - [ - 15.5, - 0 - ], - [ - 16, - 2 - ], - [ - 20, - 7.5 - ] - ] + "stops": [[12.5, 0], [13, 1.5], [14, 2.5], [20, 11.5]] } - }, + } + }, + { + "id": "road_service_track", "type": "line", + "metadata": {}, "source": "openmaptiles", "source-layer": "transportation", "filter": [ "all", - [ - "!in", - "brunnel", - "bridge", - "tunnel" - ], - [ - "in", - "class", - "service", - "track" - ] + ["!in", "brunnel", "bridge", "tunnel"], + ["in", "class", "service", "track"] ], - "layout": { - "line-cap": "round", - "line-join": "round" + "layout": {"line-cap": "round", "line-join": "round"}, + "paint": { + "line-color": "#fff", + "line-width": {"base": 1.2, "stops": [[15.5, 0], [16, 2], [20, 7.5]]} } }, { "id": "road_link", - "metadata": {}, - "paint": { - "line-color": "#fea", - "line-width": { - "base": 1.2, - "stops": [ - [ - 12.5, - 0 - ], - [ - 13, - 1.5 - ], - [ - 14, - 2.5 - ], - [ - 20, - 11.5 - ] - ] - } - }, "type": "line", + "metadata": {}, "source": "openmaptiles", "source-layer": "transportation", "minzoom": 13, "filter": [ "all", - [ - "!in", - "brunnel", - "bridge", - "tunnel" - ], - [ - "==", - "ramp", - 1 - ], - [ - "!in", - "class", - "pedestrian", - "path", - "track", - "service" - ] + ["!in", "brunnel", "bridge", "tunnel"], + ["==", "ramp", 1], + ["!in", "class", "pedestrian", "path", "track", "service"] ], "layout": { "line-cap": "round", "line-join": "round", "visibility": "visible" - } - }, - { - "id": "road_secondary_tertiary", - "metadata": {}, + }, "paint": { "line-color": "#fea", "line-width": { "base": 1.2, - "stops": [ - [ - 6.5, - 0 - ], - [ - 8, - 0.5 - ], - [ - 20, - 13 - ] - ] + "stops": [[12.5, 0], [13, 1.5], [14, 2.5], [20, 11.5]] } - }, + } + }, + { + "id": "road_secondary_tertiary", "type": "line", + "metadata": {}, "source": "openmaptiles", "source-layer": "transportation", "filter": [ "all", - [ - "!in", - "brunnel", - "bridge", - "tunnel" - ], - [ - "in", - "class", - "secondary", - "tertiary" - ] + ["!in", "brunnel", "bridge", "tunnel"], + ["in", "class", "secondary", "tertiary"] ], "layout": { "line-cap": "round", "line-join": "round", "visibility": "visible" + }, + "paint": { + "line-color": "#fea", + "line-width": {"base": 1.2, "stops": [[6.5, 0], [8, 0.5], [20, 13]]} } }, { "id": "road_trunk_primary", - "metadata": {}, - "paint": { - "line-color": "#fea", - "line-width": { - "base": 1.2, - "stops": [ - [ - 5, - 0 - ], - [ - 7, - 1 - ], - [ - 20, - 18 - ] - ] - } - }, "type": "line", + "metadata": {}, "source": "openmaptiles", "source-layer": "transportation", "filter": [ "all", - [ - "!in", - "brunnel", - "bridge", - "tunnel" - ], - [ - "in", - "class", - "primary", - "trunk" - ] + ["!in", "brunnel", "bridge", "tunnel"], + ["in", "class", "primary", "trunk"] ], "layout": { "line-cap": "butt", "line-join": "round", "visibility": "visible" + }, + "paint": { + "line-color": "#fea", + "line-width": {"base": 1.2, "stops": [[5, 0], [7, 1], [20, 18]]} } }, { "id": "road_motorway", - "metadata": {}, - "paint": { - "line-color": { - "base": 1, - "stops": [ - [ - 5, - "hsl(26, 87%, 62%)" - ], - [ - 6, - "#fc8" - ] - ] - }, - "line-width": { - "base": 1.2, - "stops": [ - [ - 5, - 0 - ], - [ - 7, - 1 - ], - [ - 20, - 18 - ] - ] - } - }, "type": "line", + "metadata": {}, "source": "openmaptiles", "source-layer": "transportation", "minzoom": 5, "filter": [ "all", - [ - "!in", - "brunnel", - "bridge", - "tunnel" - ], - [ - "==", - "class", - "motorway" - ], - [ - "!=", - "ramp", - 1 - ] + ["!in", "brunnel", "bridge", "tunnel"], + ["==", "class", "motorway"], + ["!=", "ramp", 1] ], "layout": { "line-cap": "round", "line-join": "round", "visibility": "visible" + }, + "paint": { + "line-color": { + "base": 1, + "stops": [[5, "hsl(26, 87%, 62%)"], [6, "#fc8"]] + }, + "line-width": {"base": 1.2, "stops": [[5, 0], [7, 1], [20, 18]]} } }, { @@ -2050,85 +883,32 @@ "source-layer": "transportation", "filter": [ "all", - [ - "!in", - "brunnel", - "bridge", - "tunnel" - ], - [ - "==", - "class", - "rail" - ] + ["!in", "brunnel", "bridge", "tunnel"], + ["==", "class", "rail"] ], "paint": { "line-color": "#bbb", - "line-width": { - "base": 1.4, - "stops": [ - [ - 14, - 0.4 - ], - [ - 15, - 0.75 - ], - [ - 20, - 2 - ] - ] - } + "line-width": {"base": 1.4, "stops": [[14, 0.4], [15, 0.75], [20, 2]]} } }, { "id": "road_major_rail_hatching", - "metadata": {}, - "paint": { - "line-color": "#bbb", - "line-dasharray": [ - 0.2, - 8 - ], - "line-width": { - "base": 1.4, - "stops": [ - [ - 14.5, - 0 - ], - [ - 15, - 3 - ], - [ - 20, - 8 - ] - ] - } - }, "type": "line", + "metadata": {}, "source": "openmaptiles", "source-layer": "transportation", "filter": [ "all", - [ - "!in", - "brunnel", - "bridge", - "tunnel" - ], - [ - "==", - "class", - "rail" - ] - ] - }, - { + ["!in", "brunnel", "bridge", "tunnel"], + ["==", "class", "rail"] + ], + "paint": { + "line-color": "#bbb", + "line-dasharray": [0.2, 8], + "line-width": {"base": 1.4, "stops": [[14.5, 0], [15, 3], [20, 8]]} + } + }, + { "id": "road_transit_rail", "type": "line", "metadata": {}, @@ -2136,133 +916,48 @@ "source-layer": "transportation", "filter": [ "all", - [ - "!in", - "brunnel", - "bridge", - "tunnel" - ], - [ - "==", - "class", - "transit" - ] + ["!in", "brunnel", "bridge", "tunnel"], + ["==", "class", "transit"] ], "paint": { "line-color": "#bbb", - "line-width": { - "base": 1.4, - "stops": [ - [ - 14, - 0.4 - ], - [ - 15, - 0.75 - ], - [ - 20, - 2 - ] - ] - } + "line-width": {"base": 1.4, "stops": [[14, 0.4], [15, 0.75], [20, 2]]} } }, { "id": "road_transit_rail_hatching", - "metadata": {}, - "paint": { - "line-color": "#bbb", - "line-dasharray": [ - 0.2, - 8 - ], - "line-width": { - "base": 1.4, - "stops": [ - [ - 14.5, - 0 - ], - [ - 15, - 3 - ], - [ - 20, - 8 - ] - ] - } - }, "type": "line", + "metadata": {}, "source": "openmaptiles", "source-layer": "transportation", "filter": [ "all", - [ - "!in", - "brunnel", - "bridge", - "tunnel" - ], - [ - "==", - "class", - "transit" - ] - ] + ["!in", "brunnel", "bridge", "tunnel"], + ["==", "class", "transit"] + ], + "paint": { + "line-color": "#bbb", + "line-dasharray": [0.2, 8], + "line-width": {"base": 1.4, "stops": [[14.5, 0], [15, 3], [20, 8]]} + } }, { "id": "road_minor", - "metadata": {}, - "paint": { - "line-color": "#fff", - "line-opacity": 1, - "line-width": { - "base": 1.2, - "stops": [ - [ - 13.5, - 0 - ], - [ - 14, - 2.5 - ], - [ - 20, - 18 - ] - ] - } - }, "type": "line", + "metadata": {}, "source": "openmaptiles", "source-layer": "transportation", "filter": [ "all", - [ - "==", - "$type", - "LineString" - ], - [ - "!in", - "brunnel", - "bridge", - "tunnel" - ], - [ - "in", - "class", - "minor" - ] + ["==", "$type", "LineString"], + ["!in", "brunnel", "bridge", "tunnel"], + ["in", "class", "minor"] ], - "layout": { - "line-cap": "round", - "line-join": "round" + "layout": {"line-cap": "round", "line-join": "round"}, + "paint": { + "line-color": "#fff", + "line-opacity": 1, + "line-width": {"base": 1.2, "stops": [[13.5, 0], [14, 2.5], [20, 18]]} } }, { @@ -2273,48 +968,17 @@ "source-layer": "transportation", "filter": [ "all", - [ - "==", - "class", - "motorway_link" - ], - [ - "==", - "ramp", - 1 - ], - [ - "==", - "brunnel", - "bridge" - ] + ["==", "class", "motorway_link"], + ["==", "ramp", 1], + ["==", "brunnel", "bridge"] ], - "layout": { - "line-join": "round" - }, + "layout": {"line-join": "round"}, "paint": { "line-color": "#e9ac77", "line-opacity": 1, "line-width": { "base": 1.2, - "stops": [ - [ - 12, - 1 - ], - [ - 13, - 3 - ], - [ - 14, - 4 - ], - [ - 20, - 15 - ] - ] + "stops": [[12, 1], [13, 3], [14, 4], [20, 15]] } } }, @@ -2326,40 +990,13 @@ "source-layer": "transportation", "filter": [ "all", - [ - "==", - "brunnel", - "bridge" - ], - [ - "in", - "class", - "service", - "track" - ] + ["==", "brunnel", "bridge"], + ["in", "class", "service", "track"] ], - "layout": { - "line-join": "round" - }, + "layout": {"line-join": "round"}, "paint": { "line-color": "#cfcdca", - "line-width": { - "base": 1.2, - "stops": [ - [ - 15, - 1 - ], - [ - 16, - 4 - ], - [ - 20, - 11 - ] - ] - } + "line-width": {"base": 1.2, "stops": [[15, 1], [16, 4], [20, 11]]} } }, { @@ -2368,45 +1005,14 @@ "metadata": {}, "source": "openmaptiles", "source-layer": "transportation", - "filter": [ - "all", - [ - "==", - "class", - "link" - ], - [ - "==", - "brunnel", - "bridge" - ] - ], - "layout": { - "line-join": "round" - }, + "filter": ["all", ["==", "class", "link"], ["==", "brunnel", "bridge"]], + "layout": {"line-join": "round"}, "paint": { "line-color": "#e9ac77", "line-opacity": 1, "line-width": { "base": 1.2, - "stops": [ - [ - 12, - 1 - ], - [ - 13, - 3 - ], - [ - 14, - 4 - ], - [ - 20, - 15 - ] - ] + "stops": [[12, 1], [13, 3], [14, 4], [20, 15]] } } }, @@ -2418,55 +1024,16 @@ "source-layer": "transportation", "filter": [ "all", - [ - "==", - "brunnel", - "bridge" - ], - [ - "in", - "class", - "street", - "street_limited" - ] + ["==", "brunnel", "bridge"], + ["in", "class", "street", "street_limited"] ], - "layout": { - "line-join": "round" - }, + "layout": {"line-join": "round"}, "paint": { "line-color": "hsl(36, 6%, 74%)", - "line-opacity": { - "stops": [ - [ - 12, - 0 - ], - [ - 12.5, - 1 - ] - ] - }, + "line-opacity": {"stops": [[12, 0], [12.5, 1]]}, "line-width": { "base": 1.2, - "stops": [ - [ - 12, - 0.5 - ], - [ - 13, - 1 - ], - [ - 14, - 4 - ], - [ - 20, - 25 - ] - ] + "stops": [[12, 0.5], [13, 1], [14, 4], [20, 25]] } } }, @@ -2478,46 +1045,15 @@ "source-layer": "transportation", "filter": [ "all", - [ - "==", - "$type", - "LineString" - ], - [ - "==", - "brunnel", - "bridge" - ], - [ - "in", - "class", - "path", - "pedestrian" - ] + ["==", "$type", "LineString"], + ["==", "brunnel", "bridge"], + ["in", "class", "path", "pedestrian"] ], - "layout": { - "line-join": "miter", - "visibility": "visible" - }, + "layout": {"line-join": "miter", "visibility": "visible"}, "paint": { "line-color": "hsl(35, 6%, 80%)", - "line-dasharray": [ - 1, - 0 - ], - "line-width": { - "base": 1.2, - "stops": [ - [ - 14, - 1.5 - ], - [ - 20, - 18 - ] - ] - } + "line-dasharray": [1, 0], + "line-width": {"base": 1.2, "stops": [[14, 1.5], [20, 18]]} } }, { @@ -2528,37 +1064,14 @@ "source-layer": "transportation", "filter": [ "all", - [ - "==", - "brunnel", - "bridge" - ], - [ - "in", - "class", - "secondary", - "tertiary" - ] + ["==", "brunnel", "bridge"], + ["in", "class", "secondary", "tertiary"] ], - "layout": { - "line-join": "round" - }, + "layout": {"line-join": "round"}, "paint": { "line-color": "#e9ac77", "line-opacity": 1, - "line-width": { - "base": 1.2, - "stops": [ - [ - 8, - 1.5 - ], - [ - 20, - 17 - ] - ] - } + "line-width": {"base": 1.2, "stops": [[8, 1.5], [20, 17]]} } }, { @@ -2569,43 +1082,15 @@ "source-layer": "transportation", "filter": [ "all", - [ - "==", - "brunnel", - "bridge" - ], - [ - "in", - "class", - "primary", - "trunk" - ] + ["==", "brunnel", "bridge"], + ["in", "class", "primary", "trunk"] ], - "layout": { - "line-join": "round" - }, + "layout": {"line-join": "round"}, "paint": { "line-color": "#e9ac77", "line-width": { "base": 1.2, - "stops": [ - [ - 5, - 0.4 - ], - [ - 6, - 0.7 - ], - [ - 7, - 1.75 - ], - [ - 20, - 22 - ] - ] + "stops": [[5, 0.4], [6, 0.7], [7, 1.75], [20, 22]] } } }, @@ -2617,407 +1102,153 @@ "source-layer": "transportation", "filter": [ "all", - [ - "==", - "class", - "motorway" - ], - [ - "==", - "brunnel", - "bridge" - ] + ["==", "class", "motorway"], + ["==", "brunnel", "bridge"] ], - "layout": { - "line-join": "round" - }, + "layout": {"line-join": "round"}, "paint": { "line-color": "#e9ac77", "line-width": { "base": 1.2, - "stops": [ - [ - 5, - 0.4 - ], - [ - 6, - 0.7 - ], - [ - 7, - 1.75 - ], - [ - 20, - 22 - ] - ] + "stops": [[5, 0.4], [6, 0.7], [7, 1.75], [20, 22]] } } }, { - "id": "bridge_path_pedestrian", - "type": "line", - "metadata": {}, - "source": "openmaptiles", - "source-layer": "transportation", - "filter": [ - "all", - [ - "==", - "$type", - "LineString" - ], - [ - "==", - "brunnel", - "bridge" - ], - [ - "in", - "class", - "path", - "pedestrian" - ] - ], - "paint": { - "line-color": "hsl(0, 0%, 100%)", - "line-dasharray": [ - 1, - 0.3 - ], - "line-width": { - "base": 1.2, - "stops": [ - [ - 14, - 0.5 - ], - [ - 20, - 10 - ] - ] - } - } - }, - { - "id": "bridge_motorway_link", - "metadata": {}, - "paint": { - "line-color": "#fc8", - "line-width": { - "base": 1.2, - "stops": [ - [ - 12.5, - 0 - ], - [ - 13, - 1.5 - ], - [ - 14, - 2.5 - ], - [ - 20, - 11.5 - ] - ] - } - }, + "id": "bridge_path_pedestrian", "type": "line", + "metadata": {}, "source": "openmaptiles", "source-layer": "transportation", "filter": [ "all", - [ - "==", - "class", - "motorway_link" - ], - [ - "==", - "ramp", - 1 - ], - [ - "==", - "brunnel", - "bridge" - ] + ["==", "$type", "LineString"], + ["==", "brunnel", "bridge"], + ["in", "class", "path", "pedestrian"] ], - "layout": { - "line-join": "round" + "paint": { + "line-color": "hsl(0, 0%, 100%)", + "line-dasharray": [1, 0.3], + "line-width": {"base": 1.2, "stops": [[14, 0.5], [20, 10]]} } }, { - "id": "bridge_service_track", + "id": "bridge_motorway_link", + "type": "line", "metadata": {}, + "source": "openmaptiles", + "source-layer": "transportation", + "filter": [ + "all", + ["==", "class", "motorway_link"], + ["==", "ramp", 1], + ["==", "brunnel", "bridge"] + ], + "layout": {"line-join": "round"}, "paint": { - "line-color": "#fff", + "line-color": "#fc8", "line-width": { "base": 1.2, - "stops": [ - [ - 15.5, - 0 - ], - [ - 16, - 2 - ], - [ - 20, - 7.5 - ] - ] + "stops": [[12.5, 0], [13, 1.5], [14, 2.5], [20, 11.5]] } - }, + } + }, + { + "id": "bridge_service_track", "type": "line", + "metadata": {}, "source": "openmaptiles", "source-layer": "transportation", "filter": [ "all", - [ - "==", - "brunnel", - "bridge" - ], - [ - "in", - "class", - "service", - "track" - ] + ["==", "brunnel", "bridge"], + ["in", "class", "service", "track"] ], - "layout": { - "line-join": "round" + "layout": {"line-join": "round"}, + "paint": { + "line-color": "#fff", + "line-width": {"base": 1.2, "stops": [[15.5, 0], [16, 2], [20, 7.5]]} } }, { "id": "bridge_link", + "type": "line", "metadata": {}, + "source": "openmaptiles", + "source-layer": "transportation", + "filter": ["all", ["==", "class", "link"], ["==", "brunnel", "bridge"]], + "layout": {"line-join": "round"}, "paint": { "line-color": "#fea", "line-width": { "base": 1.2, - "stops": [ - [ - 12.5, - 0 - ], - [ - 13, - 1.5 - ], - [ - 14, - 2.5 - ], - [ - 20, - 11.5 - ] - ] + "stops": [[12.5, 0], [13, 1.5], [14, 2.5], [20, 11.5]] } - }, - "type": "line", - "source": "openmaptiles", - "source-layer": "transportation", - "filter": [ - "all", - [ - "==", - "class", - "link" - ], - [ - "==", - "brunnel", - "bridge" - ] - ], - "layout": { - "line-join": "round" } }, { "id": "bridge_street", + "type": "line", "metadata": {}, + "source": "openmaptiles", + "source-layer": "transportation", + "filter": ["all", ["==", "brunnel", "bridge"], ["in", "class", "minor"]], + "layout": {"line-join": "round"}, "paint": { "line-color": "#fff", "line-opacity": 1, - "line-width": { - "base": 1.2, - "stops": [ - [ - 13.5, - 0 - ], - [ - 14, - 2.5 - ], - [ - 20, - 18 - ] - ] - } - }, - "type": "line", - "source": "openmaptiles", - "source-layer": "transportation", - "filter": [ - "all", - [ - "==", - "brunnel", - "bridge" - ], - [ - "in", - "class", - "minor" - ] - ], - "layout": { - "line-join": "round" + "line-width": {"base": 1.2, "stops": [[13.5, 0], [14, 2.5], [20, 18]]} } }, { "id": "bridge_secondary_tertiary", - "metadata": {}, - "paint": { - "line-color": "#fea", - "line-width": { - "base": 1.2, - "stops": [ - [ - 6.5, - 0 - ], - [ - 7, - 0.5 - ], - [ - 20, - 10 - ] - ] - } - }, "type": "line", + "metadata": {}, "source": "openmaptiles", "source-layer": "transportation", "filter": [ "all", - [ - "==", - "brunnel", - "bridge" - ], - [ - "in", - "class", - "secondary", - "tertiary" - ] + ["==", "brunnel", "bridge"], + ["in", "class", "secondary", "tertiary"] ], - "layout": { - "line-join": "round" + "layout": {"line-join": "round"}, + "paint": { + "line-color": "#fea", + "line-width": {"base": 1.2, "stops": [[6.5, 0], [7, 0.5], [20, 10]]} } }, { "id": "bridge_trunk_primary", - "metadata": {}, - "paint": { - "line-color": "#fea", - "line-width": { - "base": 1.2, - "stops": [ - [ - 5, - 0 - ], - [ - 7, - 1 - ], - [ - 20, - 18 - ] - ] - } - }, "type": "line", + "metadata": {}, "source": "openmaptiles", "source-layer": "transportation", "filter": [ "all", - [ - "==", - "brunnel", - "bridge" - ], - [ - "in", - "class", - "primary", - "trunk" - ] + ["==", "brunnel", "bridge"], + ["in", "class", "primary", "trunk"] ], - "layout": { - "line-join": "round" + "layout": {"line-join": "round"}, + "paint": { + "line-color": "#fea", + "line-width": {"base": 1.2, "stops": [[5, 0], [7, 1], [20, 18]]} } }, { "id": "bridge_motorway", - "metadata": {}, - "paint": { - "line-color": "#fc8", - "line-width": { - "base": 1.2, - "stops": [ - [ - 5, - 0 - ], - [ - 7, - 1 - ], - [ - 20, - 18 - ] - ] - } - }, "type": "line", + "metadata": {}, "source": "openmaptiles", "source-layer": "transportation", "filter": [ "all", - [ - "==", - "class", - "motorway" - ], - [ - "==", - "brunnel", - "bridge" - ] + ["==", "class", "motorway"], + ["==", "brunnel", "bridge"] ], - "layout": { - "line-join": "round" + "layout": {"line-join": "round"}, + "paint": { + "line-color": "#fc8", + "line-width": {"base": 1.2, "stops": [[5, 0], [7, 1], [20, 18]]} } }, { @@ -3026,83 +1257,24 @@ "metadata": {}, "source": "openmaptiles", "source-layer": "transportation", - "filter": [ - "all", - [ - "==", - "class", - "rail" - ], - [ - "==", - "brunnel", - "bridge" - ] - ], + "filter": ["all", ["==", "class", "rail"], ["==", "brunnel", "bridge"]], "paint": { "line-color": "#bbb", - "line-width": { - "base": 1.4, - "stops": [ - [ - 14, - 0.4 - ], - [ - 15, - 0.75 - ], - [ - 20, - 2 - ] - ] - } + "line-width": {"base": 1.4, "stops": [[14, 0.4], [15, 0.75], [20, 2]]} } }, { "id": "bridge_major_rail_hatching", - "metadata": {}, - "paint": { - "line-color": "#bbb", - "line-dasharray": [ - 0.2, - 8 - ], - "line-width": { - "base": 1.4, - "stops": [ - [ - 14.5, - 0 - ], - [ - 15, - 3 - ], - [ - 20, - 8 - ] - ] - } - }, "type": "line", + "metadata": {}, "source": "openmaptiles", "source-layer": "transportation", - "filter": [ - "all", - [ - "==", - "class", - "rail" - ], - [ - "==", - "brunnel", - "bridge" - ] - ] + "filter": ["all", ["==", "class", "rail"], ["==", "brunnel", "bridge"]], + "paint": { + "line-color": "#bbb", + "line-dasharray": [0.2, 8], + "line-width": {"base": 1.4, "stops": [[14.5, 0], [15, 3], [20, 8]]} + } }, { "id": "bridge_transit_rail", @@ -3112,81 +1284,30 @@ "source-layer": "transportation", "filter": [ "all", - [ - "==", - "class", - "transit" - ], - [ - "==", - "brunnel", - "bridge" - ] + ["==", "class", "transit"], + ["==", "brunnel", "bridge"] ], "paint": { "line-color": "#bbb", - "line-width": { - "base": 1.4, - "stops": [ - [ - 14, - 0.4 - ], - [ - 15, - 0.75 - ], - [ - 20, - 2 - ] - ] - } + "line-width": {"base": 1.4, "stops": [[14, 0.4], [15, 0.75], [20, 2]]} } }, { "id": "bridge_transit_rail_hatching", - "metadata": {}, - "paint": { - "line-color": "#bbb", - "line-dasharray": [ - 0.2, - 8 - ], - "line-width": { - "base": 1.4, - "stops": [ - [ - 14.5, - 0 - ], - [ - 15, - 3 - ], - [ - 20, - 8 - ] - ] - } - }, "type": "line", + "metadata": {}, "source": "openmaptiles", "source-layer": "transportation", "filter": [ "all", - [ - "==", - "class", - "transit" - ], - [ - "==", - "brunnel", - "bridge" - ] - ] + ["==", "class", "transit"], + ["==", "brunnel", "bridge"] + ], + "paint": { + "line-color": "#bbb", + "line-dasharray": [0.2, 8], + "line-width": {"base": 1.4, "stops": [[14.5, 0], [15, 3], [20, 8]]} + } }, { "id": "building", @@ -3196,24 +1317,13 @@ "source-layer": "building", "minzoom": 13, "maxzoom": 14, + "layout": {"visibility": "visible"}, "paint": { "fill-color": "hsl(35, 8%, 85%)", "fill-outline-color": { "base": 1, - "stops": [ - [ - 13, - "hsla(35, 6%, 79%, 0.32)" - ], - [ - 14, - "hsl(35, 6%, 79%)" - ] - ] + "stops": [[13, "hsla(35, 6%, 79%, 0.32)"], [14, "hsl(35, 6%, 79%)"]] } - }, - "layout": { - "visibility": "visible" } }, { @@ -3223,6 +1333,7 @@ "source": "openmaptiles", "source-layer": "building", "minzoom": 14, + "layout": {"visibility": "visible"}, "paint": { "fill-extrusion-color": "hsl(35, 8%, 85%)", "fill-extrusion-height": { @@ -3234,9 +1345,6 @@ "type": "identity" }, "fill-extrusion-opacity": 0.8 - }, - "layout": { - "visibility": "visible" } }, { @@ -3246,41 +1354,12 @@ "source": "openmaptiles", "source-layer": "boundary", "minzoom": 8, - "filter": [ - "all", - [ - "in", - "admin_level", - 3, - 4 - ] - ], - "layout": { - "line-join": "round" - }, + "filter": ["all", ["in", "admin_level", 3, 4]], + "layout": {"line-join": "round"}, "paint": { "line-color": "#9e9cab", - "line-dasharray": [ - 5, - 1 - ], - "line-width": { - "base": 1, - "stops": [ - [ - 4, - 0.4 - ], - [ - 5, - 1 - ], - [ - 12, - 1.8 - ] - ] - } + "line-dasharray": [5, 1], + "line-width": {"base": 1, "stops": [[4, 0.4], [5, 1], [12, 1.8]]} } }, { @@ -3289,50 +1368,12 @@ "metadata": {}, "source": "openmaptiles", "source-layer": "boundary", - "filter": [ - "all", - [ - "==", - "admin_level", - 2 - ] - ], - "layout": { - "line-cap": "round", - "line-join": "round" - }, + "filter": ["all", ["==", "admin_level", 2]], + "layout": {"line-cap": "round", "line-join": "round"}, "paint": { "line-color": "hsl(248, 1%, 41%)", - "line-opacity": { - "base": 1, - "stops": [ - [ - 0, - 0.4 - ], - [ - 4, - 1 - ] - ] - }, - "line-width": { - "base": 1, - "stops": [ - [ - 3, - 1 - ], - [ - 5, - 1.2 - ], - [ - 12, - 3 - ] - ] - } + "line-opacity": {"base": 1, "stops": [[0, 0.4], [4, 1]]}, + "line-width": {"base": 1, "stops": [[3, 1], [5, 1.2], [12, 3]]} } }, { @@ -3341,19 +1382,11 @@ "metadata": {}, "source": "openmaptiles", "source-layer": "water_name", - "filter": [ - "all", - [ - "==", - "$type", - "LineString" - ] - ], + "minzoom": 0, + "filter": ["all", ["==", "$type", "LineString"]], "layout": { "text-field": "{name}", - "text-font": [ - "Roboto Regular" - ], + "text-font": ["Roboto Regular"], "text-max-width": 5, "text-size": 12, "symbol-placement": "line" @@ -3362,8 +1395,7 @@ "text-color": "#5d60be", "text-halo-color": "rgba(255,255,255,0.7)", "text-halo-width": 1 - }, - "minzoom": 0 + } }, { "id": "water_name_point", @@ -3371,16 +1403,11 @@ "metadata": {}, "source": "openmaptiles", "source-layer": "water_name", - "filter": [ - "==", - "$type", - "Point" - ], + "minzoom": 0, + "filter": ["==", "$type", "Point"], "layout": { "text-field": "{name}", - "text-font": [ - "Roboto Regular" - ], + "text-font": ["Roboto Regular"], "text-max-width": 5, "text-size": 12 }, @@ -3388,8 +1415,7 @@ "text-color": "#5d60be", "text-halo-color": "rgba(255,255,255,0.7)", "text-halo-width": 1 - }, - "minzoom": 0 + } }, { "id": "poi_z16", @@ -3398,31 +1424,14 @@ "source": "openmaptiles", "source-layer": "poi", "minzoom": 16, - "filter": [ - "all", - [ - "==", - "$type", - "Point" - ], - [ - ">=", - "rank", - 20 - ] - ], + "filter": ["all", ["==", "$type", "Point"], [">=", "rank", 20]], "layout": { "icon-image": "{class}_11", "text-anchor": "top", "text-field": "{name}", - "text-font": [ - "Roboto Condensed Italic" - ], + "text-font": ["Roboto Condensed Italic"], "text-max-width": 9, - "text-offset": [ - 0, - 0.6 - ], + "text-offset": [0, 0.6], "text-padding": 2, "text-size": 12 }, @@ -3442,34 +1451,17 @@ "minzoom": 15, "filter": [ "all", - [ - "==", - "$type", - "Point" - ], - [ - ">=", - "rank", - 7 - ], - [ - "<", - "rank", - 20 - ] + ["==", "$type", "Point"], + [">=", "rank", 7], + ["<", "rank", 20] ], "layout": { "icon-image": "{class}_11", "text-anchor": "top", "text-field": "{name}", - "text-font": [ - "Roboto Condensed Italic" - ], + "text-font": ["Roboto Condensed Italic"], "text-max-width": 9, - "text-offset": [ - 0, - 0.6 - ], + "text-offset": [0, 0.6], "text-padding": 2, "text-size": 12 }, @@ -3489,34 +1481,17 @@ "minzoom": 14, "filter": [ "all", - [ - "==", - "$type", - "Point" - ], - [ - ">=", - "rank", - 1 - ], - [ - "<", - "rank", - 7 - ] + ["==", "$type", "Point"], + [">=", "rank", 1], + ["<", "rank", 7] ], "layout": { "icon-image": "{class}_11", "text-anchor": "top", "text-field": "{name}", - "text-font": [ - "Roboto Condensed Italic" - ], + "text-font": ["Roboto Condensed Italic"], "text-max-width": 9, - "text-offset": [ - 0, - 0.6 - ], + "text-offset": [0, 0.6], "text-padding": 2, "text-size": 12 }, @@ -3533,18 +1508,14 @@ "metadata": {}, "source": "openmaptiles", "source-layer": "poi", + "filter": ["all", ["in", "class", "bus", "rail", "airport"]], "layout": { "icon-image": "{class}_11", "text-anchor": "left", "text-field": "{name_en}", - "text-font": [ - "Roboto Condensed Italic" - ], + "text-font": ["Roboto Condensed Italic"], "text-max-width": 9, - "text-offset": [ - 0.9, - 0 - ], + "text-offset": [0.9, 0], "text-padding": 2, "text-size": 12, "visibility": "visible" @@ -3554,17 +1525,7 @@ "text-halo-blur": 0.5, "text-halo-color": "#ffffff", "text-halo-width": 1 - }, - "filter": [ - "all", - [ - "in", - "class", - "bus", - "rail", - "airport" - ] - ] + } }, { "id": "road_label", @@ -3572,33 +1533,14 @@ "metadata": {}, "source": "openmaptiles", "source-layer": "transportation_name", - "filter": [ - "all" - ], + "filter": ["all"], "layout": { "symbol-placement": "line", "text-anchor": "center", "text-field": "{name}", - "text-font": [ - "Roboto Regular" - ], - "text-offset": [ - 0, - 0.15 - ], - "text-size": { - "base": 1, - "stops": [ - [ - 13, - 12 - ], - [ - 14, - 13 - ] - ] - } + "text-font": ["Roboto Regular"], + "text-offset": [0, 0.15], + "text-size": {"base": 1, "stops": [[13, 12], [14, 13]]} }, "paint": { "text-color": "#765", @@ -3613,39 +1555,15 @@ "source": "openmaptiles", "source-layer": "transportation_name", "minzoom": 7, - "filter": [ - "all", - [ - "<=", - "ref_length", - 6 - ] - ], + "filter": ["all", ["<=", "ref_length", 6]], "layout": { "icon-image": "default_{ref_length}", "icon-rotation-alignment": "viewport", - "symbol-placement": { - "base": 1, - "stops": [ - [ - 10, - "point" - ], - [ - 11, - "line" - ] - ] - }, + "symbol-placement": {"base": 1, "stops": [[10, "point"], [11, "line"]]}, "symbol-spacing": 500, "text-field": "{ref}", - "text-font": [ - "Roboto Regular" - ], - "text-offset": [ - 0, - 0.1 - ], + "text-font": ["Roboto Regular"], + "text-offset": [0, 0.1], "text-rotation-alignment": "viewport", "text-size": 10, "icon-size": 0.8 @@ -3660,36 +1578,14 @@ "source-layer": "place", "filter": [ "all", - [ - "in", - "class", - "hamlet", - "island", - "islet", - "neighbourhood", - "suburb" - ] + ["in", "class", "hamlet", "island", "islet", "neighbourhood", "suburb"] ], "layout": { "text-field": "{name_en}", - "text-font": [ - "Roboto Condensed Italic" - ], + "text-font": ["Roboto Condensed Italic"], "text-letter-spacing": 0.1, "text-max-width": 9, - "text-size": { - "base": 1.2, - "stops": [ - [ - 12, - 10 - ], - [ - 15, - 14 - ] - ] - }, + "text-size": {"base": 1.2, "stops": [[12, 10], [15, 14]]}, "text-transform": "uppercase" }, "paint": { @@ -3704,33 +1600,12 @@ "metadata": {}, "source": "openmaptiles", "source-layer": "place", - "filter": [ - "all", - [ - "==", - "class", - "village" - ] - ], + "filter": ["all", ["==", "class", "village"]], "layout": { "text-field": "{name_en}", - "text-font": [ - "Roboto Regular" - ], + "text-font": ["Roboto Regular"], "text-max-width": 8, - "text-size": { - "base": 1.2, - "stops": [ - [ - 10, - 12 - ], - [ - 15, - 22 - ] - ] - } + "text-size": {"base": 1.2, "stops": [[10, 12], [15, 22]]} }, "paint": { "text-color": "#333", @@ -3744,51 +1619,15 @@ "metadata": {}, "source": "openmaptiles", "source-layer": "place", - "filter": [ - "all", - [ - "==", - "class", - "town" - ] - ], + "filter": ["all", ["==", "class", "town"]], "layout": { - "icon-image": { - "base": 1, - "stops": [ - [ - 0, - "dot_9" - ], - [ - 8, - "" - ] - ] - }, + "icon-image": {"base": 1, "stops": [[0, "dot_9"], [8, ""]]}, "text-anchor": "bottom", "text-field": "{name_en}", - "text-font": [ - "Roboto Regular" - ], + "text-font": ["Roboto Regular"], "text-max-width": 8, - "text-offset": [ - 0, - 0 - ], - "text-size": { - "base": 1.2, - "stops": [ - [ - 7, - 12 - ], - [ - 11, - 16 - ] - ] - } + "text-offset": [0, 0], + "text-size": {"base": 1.2, "stops": [[7, 12], [11, 16]]} }, "paint": { "text-color": "#333", @@ -3803,51 +1642,15 @@ "source": "openmaptiles", "source-layer": "place", "minzoom": 5, - "filter": [ - "all", - [ - "==", - "class", - "city" - ] - ], + "filter": ["all", ["==", "class", "city"]], "layout": { - "icon-image": { - "base": 1, - "stops": [ - [ - 0, - "dot_9" - ], - [ - 8, - "" - ] - ] - }, + "icon-image": {"base": 1, "stops": [[0, "dot_9"], [8, ""]]}, "text-anchor": "bottom", "text-field": "{name_en}", - "text-font": [ - "Roboto Medium" - ], + "text-font": ["Roboto Medium"], "text-max-width": 8, - "text-offset": [ - 0, - 0 - ], - "text-size": { - "base": 1.2, - "stops": [ - [ - 7, - 14 - ], - [ - 11, - 24 - ] - ] - }, + "text-offset": [0, 0], + "text-size": {"base": 1.2, "stops": [[7, 14], [11, 24]]}, "icon-allow-overlap": true, "icon-optional": false }, @@ -3864,38 +1667,18 @@ "source": "openmaptiles", "source-layer": "place", "maxzoom": 6, + "filter": ["all", ["==", "class", "state"]], "layout": { "text-field": "{name_en}", - "text-font": [ - "Roboto Condensed Italic" - ], - "text-size": { - "stops": [ - [ - 4, - 11 - ], - [ - 6, - 15 - ] - ] - }, + "text-font": ["Roboto Condensed Italic"], + "text-size": {"stops": [[4, 11], [6, 15]]}, "text-transform": "uppercase" }, "paint": { "text-color": "#633", "text-halo-color": "rgba(255,255,255,0.7)", "text-halo-width": 1 - }, - "filter": [ - "all", - [ - "==", - "class", - "state" - ] - ] + } }, { "id": "country_3", @@ -3903,37 +1686,12 @@ "metadata": {}, "source": "openmaptiles", "source-layer": "place", - "filter": [ - "all", - [ - ">=", - "rank", - 3 - ], - [ - "==", - "class", - "country" - ] - ], + "filter": ["all", [">=", "rank", 3], ["==", "class", "country"]], "layout": { "text-field": "{name_en}", - "text-font": [ - "Roboto Condensed Italic" - ], + "text-font": ["Roboto Condensed Italic"], "text-max-width": 6.25, - "text-size": { - "stops": [ - [ - 3, - 11 - ], - [ - 7, - 17 - ] - ] - }, + "text-size": {"stops": [[3, 11], [7, 17]]}, "text-transform": "none" }, "paint": { @@ -3949,37 +1707,12 @@ "metadata": {}, "source": "openmaptiles", "source-layer": "place", - "filter": [ - "all", - [ - "==", - "rank", - 2 - ], - [ - "==", - "class", - "country" - ] - ], + "filter": ["all", ["==", "rank", 2], ["==", "class", "country"]], "layout": { "text-field": "{name_en}", - "text-font": [ - "Roboto Condensed Italic" - ], + "text-font": ["Roboto Condensed Italic"], "text-max-width": 6.25, - "text-size": { - "stops": [ - [ - 2, - 11 - ], - [ - 5, - 17 - ] - ] - }, + "text-size": {"stops": [[2, 11], [5, 17]]}, "text-transform": "none" }, "paint": { @@ -3995,37 +1728,12 @@ "metadata": {}, "source": "openmaptiles", "source-layer": "place", - "filter": [ - "all", - [ - "==", - "rank", - 1 - ], - [ - "==", - "class", - "country" - ] - ], + "filter": ["all", ["==", "rank", 1], ["==", "class", "country"]], "layout": { "text-field": "{name_en}", - "text-font": [ - "Roboto Condensed Italic" - ], + "text-font": ["Roboto Condensed Italic"], "text-max-width": 6.25, - "text-size": { - "stops": [ - [ - 1, - 11 - ], - [ - 4, - 17 - ] - ] - }, + "text-size": {"stops": [[1, 11], [4, 17]]}, "text-transform": "none" }, "paint": { @@ -4042,11 +1750,10 @@ "source": "openmaptiles", "source-layer": "place", "maxzoom": 1, + "filter": ["all", ["==", "class", "continent"]], "layout": { "text-field": "{name_en}", - "text-font": [ - "Roboto Condensed Italic" - ], + "text-font": ["Roboto Condensed Italic"], "text-size": 13, "text-transform": "uppercase", "text-justify": "center" @@ -4055,15 +1762,8 @@ "text-color": "#633", "text-halo-color": "rgba(255,255,255,0.7)", "text-halo-width": 1 - }, - "filter": [ - "all", - [ - "==", - "class", - "continent" - ] - ] + } } - ] + ], + "id": "osm-liberty" } From 791dab5a2bdd28b50c0e6a13804d81e93b969d15 Mon Sep 17 00:00:00 2001 From: pathmapper Date: Sat, 12 Oct 2019 12:14:40 +0200 Subject: [PATCH 2/2] Test if style is properly formatted --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index 6044dc8..c948528 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,3 +8,4 @@ branches: script: - npm install -g @mapbox/mapbox-gl-style-spec - gl-style-validate style.json + - diff <(gl-style-format style.json) style.json