From f446b50d0c70fca87b0b709600fb3ae23f61c161 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adam=20La=C5=BEa?= Date: Tue, 29 Jul 2025 12:10:20 +0200 Subject: [PATCH] Update style (#1728) Update style snippets with the latest changes. --- layers/aerodrome_label/style.json | 66 +- layers/aeroway/style.json | 76 +- layers/boundary/style.json | 178 +- layers/building/style.json | 15 +- layers/housenumber/style.json | 22 +- layers/landcover/style.json | 888 ++++-- layers/landuse/style.json | 602 ++-- layers/mountain_peak/style.json | 183 +- layers/park/style.json | 62 +- layers/place/style.json | 559 ++-- layers/poi/style.json | 2767 ++++++++++--------- layers/transportation/style.json | 3638 ++++++++++++++----------- layers/transportation_name/style.json | 358 +-- layers/water/style.json | 12 +- layers/water_name/style.json | 64 +- layers/waterway/style.json | 134 +- style/style-header.json | 4 +- 17 files changed, 5558 insertions(+), 4070 deletions(-) diff --git a/layers/aerodrome_label/style.json b/layers/aerodrome_label/style.json index f75f84a2..b046bac5 100644 --- a/layers/aerodrome_label/style.json +++ b/layers/aerodrome_label/style.json @@ -1,17 +1,49 @@ { "layers": [ { - "id": "airport-label-major", + "id": "Major airport labels", "type": "symbol", "source": "openmaptiles", "source-layer": "aerodrome_label", "minzoom": 8, "maxzoom": 17, "layout": { + "icon-allow-overlap": false, + "icon-image": "aerodrome.12", "icon-size": 1, + "symbol-sort-key": [ + "to-number", + [ + "get", + "rank" + ] + ], + "symbol-z-order": "auto", + "text-allow-overlap": false, + "text-anchor": "top", + "text-field": { + "stops": [ + [ + 8, + " " + ], + [ + 11, + "{name}" + ] + ] + }, "text-font": [ + "Open Sans Italic", "Noto Sans Italic" ], + "text-max-width": 9, + "text-offset": [ + 0, + 0.6 + ], + "text-optional": true, + "text-padding": 2, "text-size": { "stops": [ [ @@ -24,36 +56,12 @@ ] ] }, - "icon-image": "aerodrome.12", - "text-field": { - "stops": [ - [ - 8, - " " - ], - [ - 11, - "{name:latin}\n{name:nonlatin}" - ] - ] - }, - "visibility": "visible", - "text-anchor": "top", - "text-offset": [ - 0, - 0.6 - ], - "text-padding": 2, - "text-optional": true, - "symbol-z-order": "auto", - "text-max-width": 9, - "icon-allow-overlap": false, - "text-allow-overlap": false + "visibility": "visible" }, "paint": { - "text-color": "#5e3b9e", + "text-color": "hsl(261, 46%, 43%)", "text-halo-blur": 0.5, - "text-halo-color": "rgba(255, 255, 255, 0.8)", + "text-halo-color": "hsla(0, 0%, 100%, 0.8)", "text-halo-width": 1 }, "filter": [ @@ -63,7 +71,7 @@ "iata" ] ], - "order": 190 + "order": 232 } ] } \ No newline at end of file diff --git a/layers/aeroway/style.json b/layers/aeroway/style.json index c42ca49c..d96155a0 100644 --- a/layers/aeroway/style.json +++ b/layers/aeroway/style.json @@ -1,7 +1,7 @@ { "layers": [ { - "id": "aeroway_fill", + "id": "Aeroway", "type": "fill", "source": "openmaptiles", "source-layer": "aeroway", @@ -14,11 +14,11 @@ "stops": [ [ 6, - "rgba(223, 223, 228, 1)" + "hsl(240, 8%, 88%)" ], [ 12, - "rgba(232, 231, 223, 1)" + "hsl(53, 16%, 89%)" ] ] }, @@ -30,10 +30,10 @@ "$type", "Polygon" ], - "order": 3 + "order": 12 }, { - "id": "aeroway_runway", + "id": "Runway", "type": "line", "source": "openmaptiles", "source-layer": "aeroway", @@ -42,7 +42,8 @@ "visibility": "visible" }, "paint": { - "line-color": "rgba(178, 181, 209, 1)", + "line-color": "hsl(234, 25%, 76%)", + "line-opacity": 1, "line-width": { "base": 1.2, "stops": [ @@ -55,8 +56,7 @@ 48 ] ] - }, - "line-opacity": 1 + } }, "metadata": {}, "filter": [ @@ -72,10 +72,10 @@ "runway" ] ], - "order": 22 + "order": 57 }, { - "id": "aeroway_taxiway", + "id": "Taxiway", "type": "line", "source": "openmaptiles", "source-layer": "aeroway", @@ -84,7 +84,8 @@ "visibility": "visible" }, "paint": { - "line-color": "rgba(178, 181, 209, 1)", + "line-color": "hsl(234, 25%, 76%)", + "line-opacity": 1, "line-width": { "base": 1.2, "stops": [ @@ -97,8 +98,7 @@ 24 ] ] - }, - "line-opacity": 1 + } }, "metadata": {}, "filter": [ @@ -114,18 +114,37 @@ "taxiway" ] ], - "order": 23 + "order": 58 }, { - "id": "airport_label", + "id": "Airport labels", "type": "symbol", "source": "openmaptiles", "source-layer": "aeroway", "minzoom": 14, "layout": { + "symbol-placement": "line", + "symbol-sort-key": [ + "to-number", + [ + "get", + "rank" + ] + ], + "text-field": [ + "coalesce", + [ + "get", + "name:en" + ], + [ + "get", + "name" + ] + ], "text-font": [ - "Noto Sans Italic", - "Noto Sans Regular" + "Open Sans Italic", + "Noto Sans Italic" ], "text-size": { "stops": [ @@ -139,13 +158,11 @@ ] ] }, - "text-field": "{ref}", - "visibility": "visible", - "symbol-placement": "line" + "visibility": "visible" }, "paint": { - "text-color": "#333333", - "text-halo-color": "rgba(255, 255, 255, 0.8)", + "text-color": "hsl(0, 0%, 20%)", + "text-halo-color": "hsla(0, 0%, 100%, 0.8)", "text-halo-width": 1 }, "filter": [ @@ -157,16 +174,18 @@ "taxiway" ] ], - "order": 191 + "order": 233 }, { - "id": "airport_gate", + "id": "Airport gate labels", "type": "symbol", "source": "openmaptiles", "source-layer": "aeroway", "minzoom": 16.5, "layout": { + "text-field": "{ref}", "text-font": [ + "Open Sans Semibold", "Noto Sans Regular" ], "text-size": { @@ -181,12 +200,11 @@ ] ] }, - "text-field": "{ref}", "visibility": "visible" }, "paint": { - "text-color": "rgba(135, 135, 135, 1)", - "text-halo-color": "rgba(255, 255, 255, 1)", + "text-color": "hsl(0, 0%, 53%)", + "text-halo-color": "hsl(0, 0%, 100%)", "text-halo-width": 1 }, "filter": [ @@ -197,7 +215,7 @@ "gate" ] ], - "order": 192 + "order": 234 } ] -} \ No newline at end of file +} diff --git a/layers/boundary/style.json b/layers/boundary/style.json index 068be95e..8f25eb71 100644 --- a/layers/boundary/style.json +++ b/layers/boundary/style.json @@ -1,7 +1,7 @@ { "layers": [ { - "id": "boundary_3", + "id": "Other border", "type": "line", "source": "openmaptiles", "source-layer": "boundary", @@ -11,7 +11,23 @@ "visibility": "visible" }, "paint": { - "line-color": "#845283", + "line-color": "hsl(301, 23%, 42%)", + "line-dasharray": [ + 5, + 3 + ], + "line-opacity": { + "stops": [ + [ + 3, + 0.5 + ], + [ + 10, + 1 + ] + ] + }, "line-width": { "base": 1, "stops": [ @@ -28,23 +44,7 @@ 1.6 ] ] - }, - "line-opacity": { - "stops": [ - [ - 3, - 0.5 - ], - [ - 10, - 1 - ] - ] - }, - "line-dasharray": [ - 5, - 3 - ] + } }, "metadata": {}, "filter": [ @@ -61,10 +61,10 @@ 0 ] ], - "order": 146 + "order": 194 }, { - "id": "boundary_2", + "id": "Country border", "type": "line", "source": "openmaptiles", "source-layer": "boundary", @@ -75,7 +75,8 @@ "visibility": "visible" }, "paint": { - "line-color": "#a37da1", + "line-color": "hsl(303, 17%, 56%)", + "line-opacity": 1, "line-width": { "base": 1, "stops": [ @@ -92,8 +93,7 @@ 3 ] ] - }, - "line-opacity": 1 + } }, "metadata": {}, "filter": [ @@ -103,21 +103,16 @@ "admin_level", 2 ], - [ - "==", - "maritime", - 0 - ], [ "==", "disputed", 0 ] ], - "order": 147 + "order": 195 }, { - "id": "boundary_2_disputed", + "id": "Disputed border", "type": "line", "source": "openmaptiles", "source-layer": "boundary", @@ -128,121 +123,12 @@ "visibility": "visible" }, "paint": { - "line-color": "#a37da1", - "line-width": { - "base": 1, - "stops": [ - [ - 3, - 0.3 - ], - [ - 5, - 1.2 - ], - [ - 12, - 3 - ] - ] - }, - "line-opacity": 1, + "line-color": "hsl(246, 17%, 56%)", "line-dasharray": [ 4, 3 - ] - }, - "metadata": {}, - "filter": [ - "all", - [ - "==", - "admin_level", - 2 ], - [ - "==", - "disputed", - 1 - ], - [ - "==", - "maritime", - 0 - ] - ], - "order": 148 - }, - { - "id": "boundary_2_disputed_maritime", - "type": "line", - "source": "openmaptiles", - "source-layer": "boundary", - "minzoom": 0, - "layout": { - "line-cap": "round", - "line-join": "round", - "visibility": "visible" - }, - "paint": { - "line-color": "rgba(129, 125, 163, 1)", - "line-width": { - "base": 1, - "stops": [ - [ - 3, - 0.5 - ], - [ - 5, - 1.2 - ], - [ - 12, - 3 - ] - ] - }, "line-opacity": 1, - "line-dasharray": [ - 4, - 3 - ] - }, - "metadata": {}, - "filter": [ - "all", - [ - "==", - "admin_level", - 2 - ], - [ - "==", - "disputed", - 1 - ], - [ - "==", - "maritime", - 1 - ] - ], - "order": 149 - }, - { - "id": "boundary_2_maritime", - "type": "line", - "source": "openmaptiles", - "source-layer": "boundary", - "minzoom": 4, - "layout": { - "line-cap": "round", - "line-join": "round", - "visibility": "visible" - }, - "paint": { - "line-color": "#a37da1", "line-width": { "base": 1, "stops": [ @@ -259,8 +145,7 @@ 3 ] ] - }, - "line-opacity": 1 + } }, "metadata": {}, "filter": [ @@ -273,15 +158,10 @@ [ "==", "disputed", - 0 - ], - [ - "==", - "maritime", 1 ] ], - "order": 150 + "order": 196 } ] } \ No newline at end of file diff --git a/layers/building/style.json b/layers/building/style.json index 4834f68a..422b7470 100644 --- a/layers/building/style.json +++ b/layers/building/style.json @@ -1,12 +1,11 @@ { "layers": [ { - "id": "building", + "id": "Building", "type": "fill", "source": "openmaptiles", "source-layer": "building", - "minzoom": 12, - "maxzoom": 24, + "minzoom": 13, "layout": { "visibility": "visible" }, @@ -15,11 +14,11 @@ "stops": [ [ 13, - "rgba(222, 213, 207, 1)" + "hsl(24, 19%, 84%)" ], [ 16, - "#d9d0c9" + "hsl(26, 17%, 82%)" ] ] }, @@ -28,17 +27,17 @@ "stops": [ [ 13, - "#9A918A" + "hsl(26, 7%, 57%)" ], [ 16, - "rgba(166, 157, 150, 1)" + "hsl(26, 8%, 62%)" ] ] } }, "metadata": {}, - "order": 19 + "order": 62 } ] } \ No newline at end of file diff --git a/layers/housenumber/style.json b/layers/housenumber/style.json index 108fd041..e0614308 100644 --- a/layers/housenumber/style.json +++ b/layers/housenumber/style.json @@ -1,15 +1,21 @@ { "layers": [ { - "id": "housenumber", + "id": "House number labels", "type": "symbol", "source": "openmaptiles", "source-layer": "housenumber", "minzoom": 17, "layout": { + "symbol-avoid-edges": false, + "text-allow-overlap": false, + "text-field": "{housenumber}", "text-font": [ "Noto Sans Regular" ], + "text-ignore-placement": false, + "text-line-height": -0.15, + "text-padding": 3, "text-size": { "stops": [ [ @@ -21,20 +27,14 @@ 11 ] ] - }, - "text-field": "{housenumber}", - "text-padding": 3, - "text-line-height": -0.15, - "symbol-avoid-edges": false, - "text-allow-overlap": false, - "text-ignore-placement": false + } }, "paint": { - "text-color": "rgba(102, 102, 102, 1)", - "text-halo-color": "rgba(255,255,255,0.8)", + "text-color": "hsl(0, 0%, 40%)", + "text-halo-color": "hsla(0, 0%, 100%, 0.8)", "text-halo-width": 1 }, - "order": 154 + "order": 200 } ] } \ No newline at end of file diff --git a/layers/landcover/style.json b/layers/landcover/style.json index 27831292..9a3d578c 100644 --- a/layers/landcover/style.json +++ b/layers/landcover/style.json @@ -1,7 +1,7 @@ { "layers": [ { - "id": "landcover_classes", + "id": "Wetland (medium scale)", "type": "fill", "source": "openmaptiles", "source-layer": "landcover", @@ -10,26 +10,8 @@ "visibility": "visible" }, "paint": { - "fill-color": [ - "match", - [ - "get", - "class" - ], - "farmland", - "#eef0d5", - "wood", - "#add19e", - "rock", - "#eee5dc", - "grass", - "#cdebb0", - "sand", - "#f5e9c6", - "wetland", - "#add19e", - "#000" - ], + "fill-antialias": false, + "fill-color": "hsl(102, 36%, 72%)", "fill-opacity": { "stops": [ [ @@ -41,49 +23,224 @@ 1 ] ] - }, - "fill-antialias": false + } }, "metadata": {}, "filter": [ "all", [ - "in", + "==", "class", - "farmland", - "wood", - "rock", - "grass", - "wetland", - "sand" + "wetland" ] ], - "order": 4 + "order": 13 }, { - "id": "landcover_class_outline", - "type": "line", + "id": "Sand (medium scale)", + "type": "fill", "source": "openmaptiles", "source-layer": "landcover", + "maxzoom": 13, "layout": { "visibility": "visible" }, "paint": { - "line-color": "#c7c9ae", - "line-width": 0.5 + "fill-antialias": false, + "fill-color": "hsl(45, 70%, 87%)", + "fill-opacity": { + "stops": [ + [ + 7, + 0.5 + ], + [ + 10, + 1 + ] + ] + } + }, + "metadata": {}, + "filter": [ + "all", + [ + "==", + "class", + "sand" + ] + ], + "order": 14 + }, + { + "id": "Grass (medium scale)", + "type": "fill", + "source": "openmaptiles", + "source-layer": "landcover", + "maxzoom": 13, + "layout": { + "visibility": "visible" + }, + "paint": { + "fill-antialias": false, + "fill-color": "hsl(91, 60%, 81%)", + "fill-opacity": { + "stops": [ + [ + 7, + 0.5 + ], + [ + 10, + 1 + ] + ] + } + }, + "metadata": {}, + "filter": [ + "all", + [ + "==", + "class", + "grass" + ] + ], + "order": 15 + }, + { + "id": "Rock (medium scale)", + "type": "fill", + "source": "openmaptiles", + "source-layer": "landcover", + "maxzoom": 13, + "layout": { + "visibility": "visible" + }, + "paint": { + "fill-antialias": false, + "fill-color": "hsl(30, 35%, 90%)", + "fill-opacity": { + "stops": [ + [ + 7, + 0.5 + ], + [ + 10, + 1 + ] + ] + } + }, + "metadata": {}, + "filter": [ + "all", + [ + "==", + "class", + "rock" + ] + ], + "order": 16 + }, + { + "id": "Wood (medium scale)", + "type": "fill", + "source": "openmaptiles", + "source-layer": "landcover", + "maxzoom": 13, + "layout": { + "visibility": "visible" + }, + "paint": { + "fill-antialias": false, + "fill-color": "hsl(102, 36%, 72%)", + "fill-opacity": { + "stops": [ + [ + 7, + 0.5 + ], + [ + 10, + 1 + ] + ] + } + }, + "metadata": {}, + "filter": [ + "all", + [ + "==", + "class", + "wood" + ] + ], + "order": 17 + }, + { + "id": "Farmland (medium scale)", + "type": "fill", + "source": "openmaptiles", + "source-layer": "landcover", + "maxzoom": 13, + "layout": { + "visibility": "visible" + }, + "paint": { + "fill-antialias": false, + "fill-color": "hsl(64, 47%, 89%)", + "fill-opacity": { + "stops": [ + [ + 7, + 0.5 + ], + [ + 10, + 1 + ] + ] + } + }, + "metadata": {}, + "filter": [ + "all", + [ + "==", + "class", + "farmland" + ] + ], + "order": 18 + }, + { + "id": "Marsh", + "type": "fill", + "source": "openmaptiles", + "source-layer": "landcover", + "minzoom": 9, + "layout": { + "visibility": "visible" + }, + "paint": { + "fill-antialias": true, + "fill-color": "hsl(60, 100%, 50%)" }, "filter": [ "all", [ "in", - "class", - "farmland" + "subclass", + "marsh" ] ], - "order": 5 + "order": 19 }, { - "id": "landcover_park", + "id": "Park", "type": "fill", "source": "openmaptiles", "source-layer": "landcover", @@ -92,8 +249,8 @@ "visibility": "visible" }, "paint": { - "fill-color": "#c8facc", - "fill-antialias": true + "fill-antialias": true, + "fill-color": "hsl(125, 83%, 88%)" }, "filter": [ "all", @@ -103,10 +260,33 @@ "park" ] ], - "order": 6 + "order": 20 }, { - "id": "landcover_subclasses", + "id": "Garden", + "type": "fill", + "source": "openmaptiles", + "source-layer": "landcover", + "minzoom": 9, + "layout": { + "visibility": "visible" + }, + "paint": { + "fill-antialias": true, + "fill-color": "hsl(91, 60%, 81%)" + }, + "filter": [ + "all", + [ + "==", + "subclass", + "garden" + ] + ], + "order": 23 + }, + { + "id": "Garden pattern", "type": "fill", "source": "openmaptiles", "source-layer": "landcover", @@ -115,123 +295,442 @@ "visibility": "visible" }, "paint": { - "fill-color": [ - "match", - [ - "get", - "subclass" - ], - "allotments", - "#c9e1bf", - "bare_rock", - "#eee5dc", - "beach", - "#fff1ba", - "bog", - "#d6d99f", - "dune", - "#f5e9c6", - "scrub", - "#c8d7ab", - "farm", - "#f5dcba", - "farmland", - "#eef0d5", - "flowerbed", - "#cdebb0", - "forest", - "#add19e", - "grass", - "#cdebb0", - "grassland", - "#cdebb0", - "golf_course", - "#def6c0", - "heath", - "#d6d99f", - "mangrove", - "#c8d7ab", - "meadow", - "#cdebb0", - "orchard", - "#aedfa3", - "park", - "#c8facc", - "garden", - "#cdebb0", - "plant_nursery", - "#aedfa3", - "recreation_ground", - "#d5ffd9", - "reedbed", - "#cdebb0", - "saltmarsh", - "#cdebb0", - "sand", - "#f5e9c6", - "scree", - "#eee5dc", - "swamp", - "#add19e", - "tidalflat", - "#DED6CF", - "village_green", - "#cdebb0", - "vineyard", - "#aedfa3", - "wet_meadow", - "#cdebb0", - "wetland", - "#add19e", - "wood", - "#add19e", - "marsh", - "#ff0", - "#FFFFFF" - ], - "fill-antialias": true + "fill-opacity": 0.6, + "fill-pattern": "plant_nursery" + }, + "metadata": {}, + "filter": [ + "all", + [ + "in", + "subclass", + "garden" + ] + ], + "order": 24 + }, + { + "id": "Wood", + "type": "fill", + "source": "openmaptiles", + "source-layer": "landcover", + "minzoom": 9, + "layout": { + "visibility": "visible" + }, + "paint": { + "fill-antialias": true, + "fill-color": "hsl(102, 36%, 72%)" + }, + "filter": [ + "all", + [ + "==", + "subclass", + "wood" + ] + ], + "order": 25 + }, + { + "id": "Tidalflat", + "type": "fill", + "source": "openmaptiles", + "source-layer": "landcover", + "minzoom": 9, + "layout": { + "visibility": "visible" + }, + "paint": { + "fill-antialias": true, + "fill-color": "hsl(28, 19%, 84%)" + }, + "filter": [ + "all", + [ + "==", + "subclass", + "tidalflat" + ] + ], + "order": 26 + }, + { + "id": "Wetland and swamp", + "type": "fill", + "source": "openmaptiles", + "source-layer": "landcover", + "minzoom": 9, + "layout": { + "visibility": "visible" + }, + "paint": { + "fill-antialias": true, + "fill-color": "hsl(102, 36%, 72%)" }, "filter": [ "all", [ "in", "subclass", - "allotments", - "bare_rock", - "beach", - "dune", - "scrub", - "farm", - "farmland", - "flowerbed", - "forest", - "garden", - "grass", - "grassland", - "golf_course", - "heath", - "meadow", - "orchard", - "plant_nursery", - "recreation_ground", - "reedbed", - "saltmarsh", - "sand", - "scree", "swamp", - "tidalflat", - "tundra", - "village_green", - "vineyard", - "wet_meadow", - "wetland", - "wood" + "wetland" ] ], - "order": 7 + "order": 27 }, { - "id": "landcover_subclass_patterns", + "id": "Scree", + "type": "fill", + "source": "openmaptiles", + "source-layer": "landcover", + "minzoom": 9, + "layout": { + "visibility": "visible" + }, + "paint": { + "fill-antialias": true, + "fill-color": "hsl(30, 35%, 90%)" + }, + "filter": [ + "all", + [ + "==", + "subclass", + "scree" + ] + ], + "order": 28 + }, + { + "id": "Sand", + "type": "fill", + "source": "openmaptiles", + "source-layer": "landcover", + "minzoom": 9, + "layout": { + "visibility": "visible" + }, + "paint": { + "fill-antialias": true, + "fill-color": "hsl(45, 70%, 87%)" + }, + "filter": [ + "all", + [ + "==", + "subclass", + "sand" + ] + ], + "order": 29 + }, + { + "id": "Recreation ground", + "type": "fill", + "source": "openmaptiles", + "source-layer": "landcover", + "minzoom": 9, + "layout": { + "visibility": "visible" + }, + "paint": { + "fill-antialias": true, + "fill-color": "hsl(126, 100%, 92%)" + }, + "filter": [ + "all", + [ + "==", + "subclass", + "recreation_ground" + ] + ], + "order": 30 + }, + { + "id": "Orchard and vineyard", + "type": "fill", + "source": "openmaptiles", + "source-layer": "landcover", + "minzoom": 9, + "layout": { + "visibility": "visible" + }, + "paint": { + "fill-antialias": true, + "fill-color": "hsl(109, 48%, 76%)" + }, + "filter": [ + "all", + [ + "in", + "subclass", + "orchard", + "plant_nursery", + "vineyard" + ] + ], + "order": 31 + }, + { + "id": "Meadow", + "type": "fill", + "source": "openmaptiles", + "source-layer": "landcover", + "minzoom": 9, + "layout": { + "visibility": "visible" + }, + "paint": { + "fill-antialias": true, + "fill-color": "hsl(91, 60%, 81%)" + }, + "filter": [ + "all", + [ + "in", + "subclass", + "meadow", + "reedbed", + "saltmarsh", + "village_green" + ] + ], + "order": 32 + }, + { + "id": "Mangrove", + "type": "fill", + "source": "openmaptiles", + "source-layer": "landcover", + "minzoom": 9, + "layout": { + "visibility": "visible" + }, + "paint": { + "fill-antialias": true, + "fill-color": "hsl(80, 35%, 76%)" + }, + "filter": [ + "all", + [ + "==", + "subclass", + "mangrove" + ] + ], + "order": 33 + }, + { + "id": "Heath", + "type": "fill", + "source": "openmaptiles", + "source-layer": "landcover", + "minzoom": 9, + "layout": { + "visibility": "visible" + }, + "paint": { + "fill-antialias": true, + "fill-color": "hsl(63, 43%, 74%)" + }, + "filter": [ + "all", + [ + "in", + "subclass", + "heath" + ] + ], + "order": 34 + }, + { + "id": "Forest", + "type": "fill", + "source": "openmaptiles", + "source-layer": "landcover", + "minzoom": 9, + "layout": { + "visibility": "visible" + }, + "paint": { + "fill-antialias": true, + "fill-color": "hsl(102, 36%, 72%)" + }, + "filter": [ + "all", + [ + "==", + "subclass", + "forest" + ] + ], + "order": 35 + }, + { + "id": "Farmland", + "type": "fill", + "source": "openmaptiles", + "source-layer": "landcover", + "minzoom": 9, + "layout": { + "visibility": "visible" + }, + "paint": { + "fill-antialias": true, + "fill-color": "hsl(64, 47%, 89%)" + }, + "filter": [ + "all", + [ + "==", + "subclass", + "farmland" + ] + ], + "order": 36 + }, + { + "id": "Farm", + "type": "fill", + "source": "openmaptiles", + "source-layer": "landcover", + "minzoom": 9, + "layout": { + "visibility": "visible" + }, + "paint": { + "fill-antialias": true, + "fill-color": "hsl(35, 75%, 85%)" + }, + "filter": [ + "all", + [ + "==", + "subclass", + "farm" + ] + ], + "order": 37 + }, + { + "id": "Scrub", + "type": "fill", + "source": "openmaptiles", + "source-layer": "landcover", + "minzoom": 9, + "layout": { + "visibility": "visible" + }, + "paint": { + "fill-antialias": true, + "fill-color": "hsl(80, 35%, 76%)" + }, + "filter": [ + "all", + [ + "==", + "subclass", + "scrub" + ] + ], + "order": 38 + }, + { + "id": "Dune", + "type": "fill", + "source": "openmaptiles", + "source-layer": "landcover", + "minzoom": 9, + "layout": { + "visibility": "visible" + }, + "paint": { + "fill-antialias": true, + "fill-color": "hsl(45, 70%, 87%)" + }, + "filter": [ + "all", + [ + "==", + "subclass", + "dune" + ] + ], + "order": 39 + }, + { + "id": "Beach", + "type": "fill", + "source": "openmaptiles", + "source-layer": "landcover", + "minzoom": 9, + "layout": { + "visibility": "visible" + }, + "paint": { + "fill-antialias": true, + "fill-color": "hsl(48, 100%, 86%)" + }, + "filter": [ + "all", + [ + "==", + "subclass", + "beach" + ] + ], + "order": 40 + }, + { + "id": "Bare rock", + "type": "fill", + "source": "openmaptiles", + "source-layer": "landcover", + "minzoom": 9, + "layout": { + "visibility": "visible" + }, + "paint": { + "fill-antialias": true, + "fill-color": "hsl(30, 35%, 90%)" + }, + "filter": [ + "all", + [ + "==", + "subclass", + "bare_rock" + ] + ], + "order": 41 + }, + { + "id": "Allotments", + "type": "fill", + "source": "openmaptiles", + "source-layer": "landcover", + "minzoom": 9, + "layout": { + "visibility": "visible" + }, + "paint": { + "fill-antialias": true, + "fill-color": "hsl(102, 36%, 82%)" + }, + "filter": [ + "all", + [ + "==", + "subclass", + "allotments" + ] + ], + "order": 42 + }, + { + "id": "Landcover patterns", "type": "fill", "source": "openmaptiles", "source-layer": "landcover", @@ -254,8 +753,6 @@ 0.3, "scrub", 0.6, - "garden", - 0.6, "scree", 0.3, "wood", @@ -278,12 +775,8 @@ "wetland_bog", "scrub", "scrub", - "flowerbed", - "flowerbed_high_zoom", "forest", "leaftype_unknown", - "garden", - "plant_nursery", "mangrove", "wetland_mangrove", "marsh", @@ -325,9 +818,7 @@ "scrub", "farm", "farmland", - "flowerbed", "forest", - "garden", "grass", "grassland", "golf_course", @@ -352,10 +843,35 @@ "wood" ] ], - "order": 8 + "order": 43 }, { - "id": "landcover_subclass_outline", + "id": "Grass", + "type": "fill", + "source": "openmaptiles", + "source-layer": "landcover", + "minzoom": 9, + "layout": { + "visibility": "visible" + }, + "paint": { + "fill-antialias": true, + "fill-color": "hsl(91, 60%, 81%)" + }, + "filter": [ + "all", + [ + "in", + "subclass", + "grass", + "grassland", + "golf_course" + ] + ], + "order": 44 + }, + { + "id": "Landcover outline", "type": "line", "source": "openmaptiles", "source-layer": "landcover", @@ -371,15 +887,16 @@ "subclass" ], "allotments", - "#B1C6A8", + "hsl(102, 21%, 72%)", "farm", - "#d1b48c", + "hsl(35, 43%, 68%)", "farmland", - "#c7c9ae", + "hsl(64, 20%, 74%)", "recreation_ground", - "#3c6640", - "#000" + "hsl(126, 26%, 32%)", + "hsl(0, 0%, 0%)" ], + "line-opacity": 1, "line-width": [ "match", [ @@ -389,8 +906,7 @@ "recreation_ground", 0.3, 0.5 - ], - "line-opacity": 1 + ] }, "filter": [ "all", @@ -403,17 +919,17 @@ "recreation_ground" ] ], - "order": 9 + "order": 45 }, { - "id": "landcover_ice", + "id": "Glacier", "type": "fill", "source": "openmaptiles", "source-layer": "landcover", "minzoom": 5, "paint": { - "fill-color": "#ddecec", - "fill-antialias": false + "fill-antialias": false, + "fill-color": "hsl(180, 28%, 90%)" }, "metadata": {}, "filter": [ @@ -424,10 +940,10 @@ "ice" ] ], - "order": 10 + "order": 46 }, { - "id": "landcover_ice_outline", + "id": "Glacier outline", "type": "line", "source": "openmaptiles", "source-layer": "landcover", @@ -436,19 +952,7 @@ "visibility": "visible" }, "paint": { - "line-color": "#9cf", - "line-width": { - "stops": [ - [ - 5, - 1 - ], - [ - 10, - 1.5 - ] - ] - }, + "line-color": "hsl(210, 100%, 80%)", "line-dasharray": { "stops": [ [ @@ -466,6 +970,18 @@ ] ] ] + }, + "line-width": { + "stops": [ + [ + 5, + 1 + ], + [ + 10, + 1.5 + ] + ] } }, "filter": [ @@ -476,7 +992,7 @@ "ice" ] ], - "order": 11 + "order": 47 } ] } \ No newline at end of file diff --git a/layers/landuse/style.json b/layers/landuse/style.json index a32e70b8..53d4f665 100644 --- a/layers/landuse/style.json +++ b/layers/landuse/style.json @@ -1,104 +1,11 @@ { "layers": [ { - "id": "landuse_classes", - "type": "fill", - "source": "openmaptiles", - "source-layer": "landuse", - "minzoom": 7, - "layout": { - "visibility": "visible" - }, - "paint": { - "fill-color": [ - "match", - [ - "get", - "class" - ], - "railway", - "#ebdbe8", - "residential", - "#e0dfdf", - "cemetery", - "#aacbaf", - "military", - "#fceaea", - "commercial", - "#f2dad9", - "industrial", - "#ebdbe8", - "garages", - "#dfddce", - "retail", - "#ffd6d1", - "bus_station", - "#e9e7e2", - "school", - "#ffffe5", - "university", - "#ffffe5", - "kindergarten", - "#ffffe5", - "college", - "#ffffe5", - "hospital", - "#ffffe5", - "stadium", - "#d5ffd9", - "pitch", - "#aae0cb", - "playground", - "#d5ffd9", - "track", - "#aae0cb", - "dam", - "#adadad", - "#000" - ], - "fill-opacity": 1 - }, - "metadata": {}, - "filter": [ - "all", - [ - "in", - "class", - "railway", - "cemetery", - "military", - "residential", - "commercial", - "industrial", - "garages", - "retail", - "bus_station", - "school", - "university", - "kindergarten", - "college", - "hospital", - "stadium", - "pitch", - "playground", - "track", - "dam" - ], - [ - "==", - "$type", - "Polygon" - ] - ], - "order": 1 - }, - { - "id": "landuse_residential", + "id": "Residential", "type": "fill", "source": "openmaptiles", "source-layer": "landuse", "minzoom": 6, - "maxzoom": 24, "layout": { "visibility": "visible" }, @@ -107,15 +14,15 @@ "stops": [ [ 7, - "#d0d0d0" + "hsl(0, 0%, 82%)" ], [ 11, - "#dddddd" + "hsl(0, 0%, 87%)" ], [ 12, - "#e0dfdf" + "hsl(0, 2%, 88%)" ] ] } @@ -131,10 +38,366 @@ "neighbourhood" ] ], + "order": 1 + }, + { + "id": "Cemetery", + "type": "fill", + "source": "openmaptiles", + "source-layer": "landuse", + "minzoom": 7, + "layout": { + "visibility": "visible" + }, + "paint": { + "fill-color": "hsl(129, 24%, 73%)", + "fill-opacity": 1 + }, + "metadata": {}, + "filter": [ + "all", + [ + "==", + "class", + "cemetery" + ], + [ + "==", + "$type", + "Polygon" + ] + ], "order": 2 }, { - "id": "landuse_class_pattern", + "id": "Military", + "type": "fill", + "source": "openmaptiles", + "source-layer": "landuse", + "minzoom": 7, + "layout": { + "visibility": "visible" + }, + "paint": { + "fill-color": "hsl(0, 75%, 95%)", + "fill-opacity": 1 + }, + "metadata": {}, + "filter": [ + "all", + [ + "==", + "class", + "military" + ], + [ + "==", + "$type", + "Polygon" + ] + ], + "order": 3 + }, + { + "id": "Railway", + "type": "fill", + "source": "openmaptiles", + "source-layer": "landuse", + "minzoom": 7, + "layout": { + "visibility": "visible" + }, + "paint": { + "fill-color": "hsl(311, 29%, 89%)", + "fill-opacity": 1 + }, + "metadata": {}, + "filter": [ + "all", + [ + "==", + "class", + "railway" + ], + [ + "==", + "$type", + "Polygon" + ] + ], + "order": 4 + }, + { + "id": "Garage", + "type": "fill", + "source": "openmaptiles", + "source-layer": "landuse", + "minzoom": 7, + "layout": { + "visibility": "visible" + }, + "paint": { + "fill-color": "hsl(53, 21%, 84%)", + "fill-opacity": 1 + }, + "metadata": {}, + "filter": [ + "all", + [ + "==", + "class", + "garages" + ], + [ + "==", + "$type", + "Polygon" + ] + ], + "order": 5 + }, + { + "id": "Dam", + "type": "fill", + "source": "openmaptiles", + "source-layer": "landuse", + "minzoom": 7, + "layout": { + "visibility": "visible" + }, + "paint": { + "fill-color": "hsl(0, 0%, 68%)", + "fill-opacity": 1 + }, + "metadata": {}, + "filter": [ + "all", + [ + "==", + "class", + "dam" + ], + [ + "==", + "$type", + "Polygon" + ] + ], + "order": 6 + }, + { + "id": "Quarry", + "type": "fill", + "source": "openmaptiles", + "source-layer": "landuse", + "minzoom": 7, + "layout": { + "visibility": "visible" + }, + "paint": { + "fill-color": "hsl(0, 0%, 83%)", + "fill-opacity": 1 + }, + "metadata": {}, + "filter": [ + "all", + [ + "==", + "class", + "quarry" + ], + [ + "==", + "$type", + "Polygon" + ] + ], + "order": 7 + }, + { + "id": "Industrial", + "type": "fill", + "source": "openmaptiles", + "source-layer": "landuse", + "minzoom": 7, + "layout": { + "visibility": "visible" + }, + "paint": { + "fill-color": "hsl(311, 29%, 89%)", + "fill-opacity": 1, + "fill-outline-color": "hsl(309, 14%, 74%)" + }, + "metadata": {}, + "filter": [ + "all", + [ + "==", + "class", + "industrial" + ], + [ + "==", + "$type", + "Polygon" + ] + ], + "order": 8 + }, + { + "id": "Retail", + "type": "fill", + "source": "openmaptiles", + "source-layer": "landuse", + "minzoom": 7, + "layout": { + "visibility": "visible" + }, + "paint": { + "fill-color": "hsl(7, 100%, 91%)", + "fill-opacity": 1 + }, + "metadata": {}, + "filter": [ + "all", + [ + "==", + "class", + "retail" + ], + [ + "==", + "$type", + "Polygon" + ] + ], + "order": 9 + }, + { + "id": "Commercial", + "type": "fill", + "source": "openmaptiles", + "source-layer": "landuse", + "minzoom": 7, + "layout": { + "visibility": "visible" + }, + "paint": { + "fill-color": "hsl(2, 49%, 90%)", + "fill-opacity": 1, + "fill-outline-color": "hsl(2, 49%, 90%)" + }, + "metadata": {}, + "filter": [ + "all", + [ + "==", + "class", + "commercial" + ], + [ + "==", + "$type", + "Polygon" + ] + ], + "order": 10 + }, + { + "id": "Education and Health", + "type": "fill", + "source": "openmaptiles", + "source-layer": "landuse", + "minzoom": 7, + "layout": { + "visibility": "visible" + }, + "paint": { + "fill-color": "hsl(60, 100%, 95%)", + "fill-opacity": 1 + }, + "metadata": {}, + "filter": [ + "all", + [ + "in", + "class", + "school", + "university", + "kindergarten", + "college", + "hospital" + ], + [ + "==", + "$type", + "Polygon" + ] + ], + "order": 11 + }, + { + "id": "Stadium", + "type": "fill", + "source": "openmaptiles", + "source-layer": "landuse", + "minzoom": 7, + "layout": { + "visibility": "visible" + }, + "paint": { + "fill-color": "hsl(126, 100%, 92%)", + "fill-opacity": 1 + }, + "metadata": {}, + "filter": [ + "all", + [ + "in", + "class", + "stadium", + "playground" + ], + [ + "==", + "$type", + "Polygon" + ] + ], + "order": 21 + }, + { + "id": "Pitch", + "type": "fill", + "source": "openmaptiles", + "source-layer": "landuse", + "minzoom": 7, + "layout": { + "visibility": "visible" + }, + "paint": { + "fill-color": "hsl(157, 47%, 77%)", + "fill-opacity": 1 + }, + "metadata": {}, + "filter": [ + "all", + [ + "in", + "class", + "pitch", + "track" + ], + [ + "==", + "$type", + "Polygon" + ] + ], + "order": 22 + }, + { + "id": "Landuse pattern", "type": "fill", "source": "openmaptiles", "source-layer": "landuse", @@ -142,8 +405,28 @@ "visibility": "visible" }, "paint": { - "fill-color": "#000000", - "fill-opacity": 1, + "fill-antialias": true, + "fill-color": "hsl(0, 0%, 0%)", + "fill-opacity": [ + "match", + [ + "get", + "class" + ], + "quarry", + 0.6, + 1 + ], + "fill-outline-color": [ + "match", + [ + "get", + "class" + ], + "quarry", + "hsl(0, 0%, 44%)", + "hsla(0, 0%, 0%, 0)" + ], "fill-pattern": [ "match", [ @@ -154,6 +437,8 @@ "military_red_hatch", "cemetery", "grave_yard_generic", + "quarry", + "quarry", "" ] }, @@ -164,13 +449,14 @@ "in", "class", "military", - "cemetery" + "cemetery", + "quarry" ] ], - "order": 25 + "order": 59 }, { - "id": "landuse_class_outline", + "id": "Landuse outline", "type": "line", "source": "openmaptiles", "source-layer": "landuse", @@ -186,42 +472,62 @@ "class" ], "railway", - "#c6b3c3", + "hsl(309, 14%, 74%)", "military", - "#ff5555", + "hsl(0, 100%, 67%)", "residential", - "#b9b9b9", + "hsl(0, 0%, 73%)", "commercial", - "#f2dad9", + "hsl(2, 49%, 90%)", "industrial", - "#c6b3c3", + "hsl(309, 14%, 74%)", "retail", - "#d99c95", + "hsl(6, 47%, 72%)", "school", - "#A6A68C", + "hsl(60, 13%, 60%)", "university", - "#A6A68C", + "hsl(60, 13%, 60%)", "kindergarten", - "#A6A68C", + "hsl(60, 13%, 60%)", "college", - "#A6A68C", + "hsl(60, 13%, 60%)", "hospital", - "#A6A68C", + "hsl(60, 13%, 60%)", "stadium", - "#7ca680", + "hsl(126, 19%, 57%)", "pitch", - "#7aaa97", + "hsl(156, 22%, 57%)", "playground", - "#3c6640", + "hsl(126, 26%, 32%)", "track", - "#7aaa96", + "hsl(155, 22%, 57%)", "theme_park", - "#660033", + "hsl(330, 100%, 20%)", "zoo", - "#660033", + "hsl(330, 100%, 20%)", "dam", - "#444444", - "#000" + "hsl(0, 0%, 27%)", + "hsl(0, 0%, 0%)" + ], + "line-offset": [ + "match", + [ + "get", + "class" + ], + "military", + 1, + 0 + ], + "line-opacity": [ + "match", + [ + "get", + "class" + ], + "military", + 0.24, + 1 ], "line-width": [ "match", @@ -266,26 +572,6 @@ "dam", 2, 1 - ], - "line-offset": [ - "match", - [ - "get", - "class" - ], - "military", - 1, - 0 - ], - "line-opacity": [ - "match", - [ - "get", - "class" - ], - "military", - 0.24, - 1 ] }, "filter": [ @@ -313,10 +599,10 @@ "dam" ] ], - "order": 26 + "order": 60 }, { - "id": "landuse_class_themepark", + "id": "Theme park", "type": "line", "source": "openmaptiles", "source-layer": "landuse", @@ -327,19 +613,7 @@ "visibility": "visible" }, "paint": { - "line-color": "#660033", - "line-width": { - "stops": [ - [ - 9, - 3.5 - ], - [ - 14, - 5.5 - ] - ] - }, + "line-color": "hsl(330, 100%, 20%)", "line-offset": 2, "line-opacity": { "stops": [ @@ -352,6 +626,18 @@ 0.3 ] ] + }, + "line-width": { + "stops": [ + [ + 9, + 3.5 + ], + [ + 14, + 5.5 + ] + ] } }, "filter": [ @@ -363,7 +649,7 @@ "zoo" ] ], - "order": 27 + "order": 61 } ] } \ No newline at end of file diff --git a/layers/mountain_peak/style.json b/layers/mountain_peak/style.json index befc0f0c..fe4dda91 100644 --- a/layers/mountain_peak/style.json +++ b/layers/mountain_peak/style.json @@ -1,11 +1,110 @@ { "layers": [ { - "id": "mountain_peak", + "id": "Volcano peak labels", "type": "symbol", "source": "openmaptiles", "source-layer": "mountain_peak", "maxzoom": 16, + "layout": { + "icon-image": "volcano", + "symbol-sort-key": [ + "to-number", + [ + "get", + "rank" + ] + ], + "text-anchor": "top", + "text-field": { + "stops": [ + [ + 6, + " " + ], + [ + 12, + "{name} {ele}m" + ] + ] + }, + "text-font": [ + "Open Sans Regular", + "Noto Sans Regular" + ], + "text-line-height": 1.1, + "text-max-width": 6, + "text-offset": [ + 0, + 0.5 + ], + "text-size": 10 + }, + "paint": { + "text-color": "hsl(0, 100%, 42%)", + "text-halo-color": "hsla(0, 0%, 100%, 0.8)", + "text-halo-width": 1 + }, + "filter": [ + "all", + [ + "==", + "class", + "volcano" + ], + [ + "has", + "ele" + ] + ], + "order": 239 + }, + { + "id": "Mountain peak labels", + "type": "symbol", + "source": "openmaptiles", + "source-layer": "mountain_peak", + "maxzoom": 16, + "layout": { + "icon-image": "peak", + "symbol-sort-key": [ + "to-number", + [ + "get", + "rank" + ] + ], + "text-anchor": "top", + "text-field": { + "stops": [ + [ + 6, + " " + ], + [ + 12, + "{name} {ele}m" + ] + ] + }, + "text-font": [ + "Open Sans Regular", + "Noto Sans Regular" + ], + "text-line-height": 1.1, + "text-max-width": 6, + "text-offset": [ + 0, + 0.5 + ], + "text-size": 10, + "visibility": "visible" + }, + "paint": { + "text-color": "hsl(29, 57%, 27%)", + "text-halo-color": "hsla(0, 0%, 100%, 0.8)", + "text-halo-width": 1 + }, "filter": [ "all", [ @@ -13,89 +112,13 @@ "class", "cliff", "volcano" - ] - ], - "layout": { - "text-size": 10, - "icon-image": "peak", - "text-field": { - "stops": [ - [ - 6, - " " - ], - [ - 12, - "{name} {ele}m" - ] - ] - }, - "text-anchor": "top", - "text-offset": [ - 0, - 0.5 ], - "text-max-width": 6, - "text-line-height": 1.1, - "text-font": [ - "Noto Sans Regular", - "Noto Sans Italic" - ] - }, - "paint": { - "text-color": "#6e441e", - "text-halo-color": "rgba(255, 255, 255, .8)", - "text-halo-width": 1 - }, - "order": 197 - }, - { - "id": "mountain_peak_volcano", - "type": "symbol", - "source": "openmaptiles", - "source-layer": "mountain_peak", - "maxzoom": 16, - "filter": [ - "all", [ - "==", - "class", - "volcano" + "has", + "ele" ] ], - "layout": { - "text-size": 10, - "icon-image": "volcano", - "text-field": { - "stops": [ - [ - 6, - " " - ], - [ - 12, - "{name} {ele}m" - ] - ] - }, - "text-anchor": "top", - "text-offset": [ - 0, - 0.5 - ], - "text-max-width": 6, - "text-line-height": 1.1, - "text-font": [ - "Noto Sans Regular", - "Noto Sans Italic" - ] - }, - "paint": { - "text-color": "#d40000", - "text-halo-color": "rgba(255, 255, 255, .8)", - "text-halo-width": 1 - }, - "order": 198 + "order": 240 } ] } \ No newline at end of file diff --git a/layers/park/style.json b/layers/park/style.json index c15f90bf..c5b629dc 100644 --- a/layers/park/style.json +++ b/layers/park/style.json @@ -1,7 +1,7 @@ { "layers": [ { - "id": "national_parks", + "id": "National parks", "type": "line", "source": "openmaptiles", "source-layer": "park", @@ -10,7 +10,9 @@ "visibility": "visible" }, "paint": { - "line-color": "rgba(154, 199, 136, 1)", + "line-color": "hsl(103, 36%, 66%)", + "line-offset": 1, + "line-opacity": 0.8, "line-width": { "base": 1, "stops": [ @@ -31,54 +33,70 @@ 3.6 ] ] - }, - "line-offset": 1, - "line-opacity": 0.8 + } }, - "order": 20 + "order": 55 }, { - "id": "national_parks_thin", + "id": "National park outline", "type": "line", "source": "openmaptiles", "source-layer": "park", - "minzoom": 10, + "minzoom": 14, "layout": { - "visibility": "none" + "visibility": "visible" }, "paint": { - "line-color": "rgba(93, 156, 76, 1)", + "line-color": "hsl(107, 34%, 45%)", "line-width": 1.5 }, - "order": 21 + "order": 56 }, { - "id": "park-national", + "id": "National park labels", "type": "symbol", "source": "openmaptiles", "source-layer": "park", "minzoom": 7, "maxzoom": 12, "layout": { + "symbol-sort-key": [ + "to-number", + [ + "get", + "rank" + ] + ], + "symbol-spacing": 150, + "text-allow-overlap": false, + "text-field": [ + "coalesce", + [ + "get", + "name:en" + ], + [ + "get", + "name" + ] + ], "text-font": [ + "Open Sans Semibold Italic", "Noto Sans Italic" ], "text-size": 12, - "text-field": "{name:latin}{name:nonlatin}", - "visibility": "visible", - "symbol-spacing": 150, - "text-allow-overlap": false + "visibility": "visible" }, "paint": { "text-color": { "stops": [ [ 7, - "rgba(70, 164, 70, 1)" + "hsl(120, 40%, 46%)" ], [ 10, - "#008000" + "hsl(120, 100%, 25%)" ] ] }, @@ -87,11 +105,11 @@ "stops": [ [ 7, - "rgba(241, 255, 234, 1)" + "hsl(100, 100%, 96%)" ], [ 10, - "rgba(208, 250, 200, 1)" + "hsl(110, 83%, 88%)" ] ] }, @@ -105,7 +123,7 @@ 2 ] ], - "order": 195 + "order": 237 } ] -} \ No newline at end of file +} diff --git a/layers/place/style.json b/layers/place/style.json index 3ee5457d..9d832b9a 100644 --- a/layers/place/style.json +++ b/layers/place/style.json @@ -1,15 +1,36 @@ { "layers": [ { - "id": "place_other", + "id": "Other labels", "type": "symbol", "source": "openmaptiles", "source-layer": "place", "minzoom": 8, "layout": { + "symbol-sort-key": [ + "to-number", + [ + "get", + "rank" + ] + ], + "symbol-spacing": 150, + "text-field": [ + "coalesce", + [ + "get", + "name:en" + ], + [ + "get", + "name" + ] + ], "text-font": [ + "Open Sans Semibold", "Noto Sans Regular" ], + "text-max-width": 10, "text-size": { "base": 1.2, "stops": [ @@ -27,22 +48,19 @@ ] ] }, - "text-field": "{name:latin}\n{name:nonlatin}", - "visibility": "visible", - "symbol-spacing": 150, - "text-max-width": 10, - "text-transform": "none" + "text-transform": "none", + "visibility": "visible" }, "paint": { "text-color": { "stops": [ [ 12.5, - "#222222" + "hsl(0, 0%, 13%)" ], [ 12.6, - "#777777" + "hsl(0, 0%, 47%)" ] ] }, @@ -51,11 +69,11 @@ "stops": [ [ 11, - "rgba(255,255,255,0.6)" + "hsla(0, 0%, 100%, 0.6)" ], [ 13, - "#ffffff" + "hsl(0, 0%, 100%)" ] ] }, @@ -82,22 +100,31 @@ "island", "islet", "neighbourhood", - "suburb", - "borough" + "suburb" ] ], - "order": 193 + "order": 235 }, { - "id": "place_village", + "id": "Village labels", "type": "symbol", "source": "openmaptiles", "source-layer": "place", "minzoom": 8, "layout": { + "symbol-sort-key": [ + "to-number", + [ + "get", + "rank" + ] + ], + "text-field": "{name}", "text-font": [ + "Open Sans Semibold", "Noto Sans Regular" ], + "text-max-width": 8, "text-size": { "base": 1.2, "stops": [ @@ -111,13 +138,11 @@ ] ] }, - "text-field": "{name:latin}\n{name:nonlatin}", - "visibility": "visible", - "text-max-width": 8 + "visibility": "visible" }, "paint": { - "text-color": "#333", - "text-halo-color": "rgba(255,255,255,0.8)", + "text-color": "hsl(0, 0%, 20%)", + "text-halo-color": "hsla(0, 0%, 100%, 0.8)", "text-halo-width": 1.2 }, "metadata": {}, @@ -129,18 +154,43 @@ "village" ] ], - "order": 199 + "order": 241 }, { - "id": "place_town", + "id": "Town labels", "type": "symbol", "source": "openmaptiles", "source-layer": "place", "minzoom": 6, "layout": { + "symbol-sort-key": [ + "to-number", + [ + "get", + "rank" + ] + ], + "text-anchor": "bottom", + "text-field": [ + "coalesce", + [ + "get", + "name:en" + ], + [ + "get", + "name" + ] + ], "text-font": [ + "Open Sans Semibold", "Noto Sans Regular" ], + "text-max-width": 8, + "text-offset": [ + 0, + 0 + ], "text-size": { "base": 1.2, "stops": [ @@ -154,18 +204,11 @@ ] ] }, - "text-field": "{name:latin}\n{name:nonlatin}", - "visibility": "visible", - "text-anchor": "bottom", - "text-offset": [ - 0, - 0 - ], - "text-max-width": 8 + "visibility": "visible" }, "paint": { - "text-color": "#333", - "text-halo-color": "rgba(255,255,255,0.8)", + "text-color": "hsl(0, 0%, 20%)", + "text-halo-color": "hsla(0, 0%, 100%, 0.8)", "text-halo-width": 1.2 }, "metadata": {}, @@ -177,20 +220,40 @@ "town" ] ], - "order": 200 + "order": 242 }, { - "id": "place_state", + "id": "State labels", "type": "symbol", "source": "openmaptiles", "source-layer": "place", "minzoom": 4, "maxzoom": 12, "layout": { + "symbol-sort-key": [ + "to-number", + [ + "get", + "rank" + ] + ], + "text-field": [ + "coalesce", + [ + "get", + "name:en" + ], + [ + "get", + "name" + ] + ], "text-font": [ - "Noto Sans Regular", + "Open Sans Regular", "Noto Sans Bold" ], + "text-letter-spacing": 0, + "text-padding": 2, "text-size": { "stops": [ [ @@ -203,15 +266,12 @@ ] ] }, - "text-field": "{name:latin}", - "visibility": "visible", - "text-padding": 2, "text-transform": "none", - "text-letter-spacing": 0 + "visibility": "visible" }, "paint": { - "text-color": "#7e587d", - "text-halo-color": "rgba(255,255,255,0.7)", + "text-color": "hsl(302, 18%, 42%)", + "text-halo-color": "hsla(0, 0%, 100%, 0.7)", "text-halo-width": 0.8 }, "metadata": {}, @@ -228,32 +288,17 @@ 3 ] ], - "order": 201 + "order": 243 }, { - "id": "place_city", + "id": "City labels", "type": "symbol", "source": "openmaptiles", "source-layer": "place", "minzoom": 4, "maxzoom": 14, "layout": { - "text-font": [ - "Noto Sans Regular" - ], - "text-size": { - "base": 1.2, - "stops": [ - [ - 4, - 12 - ], - [ - 15, - 18 - ] - ] - }, + "icon-allow-overlap": true, "icon-image": { "stops": [ [ @@ -266,35 +311,68 @@ ] ] }, - "text-field": "{name:latin}\n{name:nonlatin}", - "visibility": "visible", "icon-offset": [ 0, 3 ], + "icon-optional": false, + "symbol-sort-key": [ + "to-number", + [ + "get", + "rank" + ] + ], "text-anchor": "bottom", + "text-field": [ + "coalesce", + [ + "get", + "name:en" + ], + [ + "get", + "name" + ] + ], + "text-font": [ + "Open Sans Semibold", + "Noto Sans Regular" + ], + "text-max-width": 8, "text-offset": [ 0, 0 ], - "icon-optional": false, - "text-max-width": 8, - "icon-allow-overlap": true + "text-size": { + "base": 1.2, + "stops": [ + [ + 4, + 11 + ], + [ + 15, + 16 + ] + ] + }, + "visibility": "visible" }, "paint": { "text-color": { "stops": [ [ 6, - "rgba(88, 88, 88, 1)" + "hsl(0, 0%, 35%)" ], [ 14, - "rgba(32, 32, 32, 1)" + "hsl(0, 0%, 13%)" ] ] }, - "text-halo-color": "rgba(255,255,255,0.8)", + "text-halo-color": "hsla(0, 0%, 100%, 0.8)", "text-halo-width": 1 }, "metadata": {}, @@ -311,33 +389,17 @@ 1 ] ], - "order": 202 + "order": 244 }, { - "id": "place_capital", + "id": "Capital city labels", "type": "symbol", "source": "openmaptiles", "source-layer": "place", "minzoom": 3, "maxzoom": 15, "layout": { - "icon-size": 1, - "text-font": [ - "Noto Sans Regular" - ], - "text-size": { - "base": 1.2, - "stops": [ - [ - 4, - 11 - ], - [ - 12, - 16 - ] - ] - }, + "icon-allow-overlap": true, "icon-image": { "stops": [ [ @@ -350,35 +412,59 @@ ] ] }, - "text-field": "{name:latin}\n{name:nonlatin}", - "visibility": "visible", "icon-offset": [ 0, 3 ], + "icon-optional": false, + "icon-size": 1, + "symbol-sort-key": [ + "to-number", + [ + "get", + "rank" + ] + ], "text-anchor": "bottom", + "text-field": "{name:en}", + "text-font": [ + "Open Sans Semibold", + "Noto Sans Regular" + ], + "text-max-width": 8, "text-offset": [ 0, 0 ], - "icon-optional": false, - "text-max-width": 8, - "icon-allow-overlap": true + "text-size": { + "base": 1.2, + "stops": [ + [ + 4, + 12 + ], + [ + 12, + 18 + ] + ] + }, + "visibility": "visible" }, "paint": { "text-color": { "stops": [ [ 6, - "rgba(73, 73, 73, 1)" + "hsl(0, 0%, 29%)" ], [ 14, - "rgba(32, 32, 32, 1)" + "hsla(0, 0%, 13%, 1)" ] ] }, - "text-halo-color": "rgba(255,255,255,0.8)", + "text-halo-color": "hsla(0, 0%, 100%, 0.8)", "text-halo-width": 1.2 }, "metadata": {}, @@ -396,267 +482,116 @@ 2 ] ], - "order": 203 + "order": 245 }, { - "id": "country_other", - "type": "symbol", - "source": "openmaptiles", - "source-layer": "place", - "minzoom": 4, - "maxzoom": 15, - "layout": { - "text-font": [ - "Noto Sans Regular" - ], - "text-size": { - "stops": [ - [ - 3, - 11 - ], - [ - 5, - 13 - ], - [ - 7, - 20 - ] - ] - }, - "text-field": "{name:latin}", - "visibility": "visible", - "text-max-width": 6.25, - "text-transform": "none" - }, - "paint": { - "text-color": "rgba(131, 81, 130, 1)", - "text-halo-blur": 1, - "text-halo-color": "rgba(255,255,255,0.8)", - "text-halo-width": 0.8 - }, - "metadata": {}, - "filter": [ - "all", - [ - "==", - "class", - "country" - ], - [ - "!has", - "iso_a2" - ] - ], - "order": 204 - }, - { - "id": "country_3", - "type": "symbol", - "source": "openmaptiles", - "source-layer": "place", - "minzoom": 5, - "maxzoom": 12, - "layout": { - "text-font": [ - "Noto Sans Bold" - ], - "text-size": { - "stops": [ - [ - 3, - 11 - ], - [ - 5, - 13 - ], - [ - 7, - 17 - ] - ] - }, - "text-field": "{name:latin}", - "visibility": "visible", - "text-max-width": 6.25, - "text-transform": "none" - }, - "paint": { - "text-color": { - "stops": [ - [ - 3, - "rgba(108, 78, 107, 1)" - ], - [ - 10, - "rgba(57, 37, 73, 1)" - ] - ] - }, - "text-halo-blur": 1, - "text-halo-color": "rgba(255,255,255,0.8)", - "text-halo-width": 0.8 - }, - "metadata": {}, - "filter": [ - "all", - [ - ">=", - "rank", - 3 - ], - [ - "==", - "class", - "country" - ], - [ - "has", - "iso_a2" - ] - ], - "order": 205 - }, - { - "id": "country_2", + "id": "Country labels", "type": "symbol", "source": "openmaptiles", "source-layer": "place", "minzoom": 2, "maxzoom": 12, "layout": { + "symbol-sort-key": [ + "to-number", + [ + "get", + "rank" + ] + ], + "text-field": "{name:en}", "text-font": [ + "Open Sans Semibold", "Noto Sans Bold" ], - "text-size": { - "stops": [ - [ - 3, - 11 - ], - [ - 5, - 14 - ], - [ - 7, - 19 - ] - ] - }, - "text-field": "{name:latin}", - "visibility": "visible", "text-max-width": 6.25, - "text-transform": "none" - }, - "paint": { - "text-color": { - "stops": [ + "text-size": [ + "interpolate", + [ + "linear", + 1 + ], + [ + "zoom" + ], + 4.99, + [ + "case", [ - 3, - "rgba(108, 78, 107, 1)" + ">", + [ + "get", + "rank" + ], + 2 ], + 0, + 11 + ], + 5, + [ + "case", [ - 10, - "rgba(57, 37, 73, 1)" - ] + ">", + [ + "get", + "rank" + ], + 2 + ], + 13, + 14 + ], + 7, + [ + "case", + [ + ">", + [ + "get", + "rank" + ], + 2 + ], + 17, + 19 ] - }, - "text-halo-blur": 1, - "text-halo-color": "rgba(255,255,255,0.8)", - "text-halo-width": 0.8 - }, - "metadata": {}, - "filter": [ - "all", - [ - "==", - "rank", - 2 ], - [ - "==", - "class", - "country" - ], - [ - "has", - "iso_a2" - ] - ], - "order": 206 - }, - { - "id": "country_1", - "type": "symbol", - "source": "openmaptiles", - "source-layer": "place", - "minzoom": 2, - "maxzoom": 12, - "layout": { - "text-font": [ - "Noto Sans Bold" - ], - "text-size": { - "stops": [ - [ - 3, - 11 - ], - [ - 5, - 14 - ], - [ - 7, - 19 - ] - ] - }, - "text-field": "{name:latin}", - "visibility": "visible", - "text-max-width": 6.25, - "text-transform": "none" + "text-transform": "none", + "visibility": "visible" }, "paint": { "text-color": { "stops": [ [ 2, - "rgba(108, 78, 107, 1)" + "hsl(302, 16%, 36%)" ], [ 10, - "rgba(57, 37, 73, 1)" + "hsl(273, 33%, 22%)" ] ] }, "text-halo-blur": 1, - "text-halo-color": "rgba(255,255,255,0.8)", + "text-halo-color": "hsla(0, 0%, 100%, 0.8)", "text-halo-width": 0.8 }, "metadata": {}, "filter": [ "all", - [ - "==", - "rank", - 1 - ], [ "==", "class", "country" ], [ - "has", - "iso_a2" + "!=", + "iso_a2", + "VA" ] ], - "order": 207 + "order": 246 } ] -} \ No newline at end of file +} diff --git a/layers/poi/style.json b/layers/poi/style.json index fc76a5ac..2f081489 100644 --- a/layers/poi/style.json +++ b/layers/poi/style.json @@ -1,774 +1,13 @@ { "layers": [ { - "id": "poi_shop-z17", - "type": "symbol", - "source": "openmaptiles", - "source-layer": "poi", - "minzoom": 17, - "layout": { - "text-font": [ - "Noto Sans Bold" - ], - "text-size": { - "stops": [ - [ - 15, - 10 - ], - [ - 20, - 11 - ] - ] - }, - "icon-image": [ - "coalesce", - [ - "image", - [ - "match", - [ - "get", - "subclass" - ], - "chocolate", - "confectionery", - "wine", - "alcohol", - "kiosk", - "newsagent", - "perfume", - "perfumery", - "wholesale", - "trade", - [ - "get", - "subclass" - ] - ] - ], - [ - "image", - "shop" - ] - ], - "text-field": "{name:latin}\n{name:nonlatin}", - "visibility": "visible", - "text-anchor": "top", - "text-offset": [ - 0, - 1.1 - ], - "text-padding": 2, - "text-max-width": 9, - "icon-allow-overlap": true - }, - "paint": { - "text-color": "#939", - "icon-opacity": 1, - "icon-halo-blur": 1, - "text-halo-blur": 0.5, - "icon-halo-color": "rgba(255, 255, 255, 1)", - "icon-halo-width": 0.5, - "text-halo-color": "#ffffff", - "text-halo-width": 1 - }, - "metadata": {}, - "filter": [ - "all", - [ - "in", - "class", - "shop", - "clothing_store", - "library", - "art_gallery", - "music", - "alcohol_shop", - "bakery" - ], - [ - "!in", - "subclass", - "mall", - "library", - "artwork", - "arts_centre", - "gallery" - ] - ], - "order": 155 - }, - { - "id": "poi_shop-z15", + "id": "Shop", "type": "symbol", "source": "openmaptiles", "source-layer": "poi", "minzoom": 15, "layout": { - "text-font": [ - "Noto Sans Bold" - ], - "text-size": { - "stops": [ - [ - 15, - 10 - ], - [ - 20, - 11 - ] - ] - }, - "icon-image": [ - "match", - [ - "get", - "subclass" - ], - "chocolate", - "confectionery", - [ - "get", - "subclass" - ] - ], - "text-field": "{name:latin}\n{name:nonlatin}", - "visibility": "visible", - "text-anchor": "top", - "text-offset": [ - 0, - 1.1 - ], - "text-padding": 2, - "text-max-width": 9, - "icon-allow-overlap": true - }, - "paint": { - "text-color": "#939", - "icon-opacity": 1, - "icon-halo-blur": 1, - "text-halo-blur": 0.5, - "icon-halo-color": "rgba(255, 255, 255, 1)", - "icon-halo-width": 0.5, - "text-halo-color": "#ffffff", - "text-halo-width": 1 - }, - "metadata": {}, - "filter": [ - "all", - [ - "==", - "subclass", - "supermarket" - ] - ], - "order": 156 - }, - { - "id": "poi_waste", - "type": "symbol", - "source": "openmaptiles", - "source-layer": "poi", - "minzoom": 18, - "layout": { - "text-font": [ - "Noto Sans Bold" - ], - "text-size": { - "stops": [ - [ - 15, - 10 - ], - [ - 20, - 11 - ] - ] - }, - "icon-image": "{subclass}", - "text-field": "{name:latin}\n{name:nonlatin}", - "visibility": "visible", - "text-anchor": "top", - "text-offset": [ - 0, - 0.8 - ], - "text-padding": 2, - "text-max-width": 9, - "icon-allow-overlap": false - }, - "paint": { - "text-color": "#734a08", - "icon-opacity": 1, - "icon-halo-blur": 1, - "text-halo-blur": 0.5, - "icon-halo-color": "rgba(255, 255, 255, 1)", - "icon-halo-width": 0.5, - "text-halo-color": "#ffffff", - "text-halo-width": 1 - }, - "metadata": {}, - "filter": [ - "all", - [ - "in", - "class", - "recycling", - "waste_basket", - "drinking_water", - "toilets" - ] - ], - "order": 157 - }, - { - "id": "poi_cemetery", - "type": "symbol", - "source": "openmaptiles", - "source-layer": "poi", - "minzoom": 14, - "layout": { - "icon-size": 1, - "text-font": [ - "Noto Sans Regular" - ], - "text-size": 11, - "text-field": "{name:latin}\n{name:nonlatin}", - "visibility": "visible", - "icon-anchor": "bottom", - "icon-offset": [ - 0, - 0 - ], - "text-anchor": "center", - "text-offset": [ - 0, - 0 - ], - "text-padding": 2, - "icon-text-fit": "none", - "text-max-width": 14, "icon-allow-overlap": false, - "icon-pitch-alignment": "viewport" - }, - "paint": { - "text-color": "#2d4931", - "icon-translate": [ - 0, - 0 - ], - "text-translate": [ - 0, - 5 - ], - "text-halo-color": "rgba(255, 255, 255, 1)", - "text-halo-width": 0.8, - "icon-translate-anchor": "map", - "text-translate-anchor": "viewport" - }, - "metadata": {}, - "filter": [ - "all", - [ - "in", - "class", - "cemetery" - ] - ], - "order": 158 - }, - { - "id": "poi_school", - "type": "symbol", - "source": "openmaptiles", - "source-layer": "poi", - "minzoom": 16, - "layout": { - "icon-size": 1, - "text-font": [ - "Noto Sans Italic", - "Noto Sans Regular" - ], - "text-size": 11, - "icon-image": "{subclass}", - "text-field": "{name:latin}\n{name:nonlatin}", - "visibility": "visible", - "icon-anchor": "bottom", - "icon-offset": [ - 0, - 0 - ], - "text-anchor": "center", - "text-offset": [ - 0, - 0 - ], - "text-padding": 2, - "icon-text-fit": "none", - "text-max-width": 9, - "icon-allow-overlap": false, - "icon-pitch-alignment": "viewport" - }, - "paint": { - "text-color": "#4d4d00", - "icon-translate": [ - 0, - 0 - ], - "text-translate": [ - 0, - 5 - ], - "text-halo-color": "rgba(255, 255, 255, 1)", - "text-halo-width": 0.8, - "icon-translate-anchor": "map", - "text-translate-anchor": "viewport" - }, - "metadata": {}, - "filter": [ - "all", - [ - "in", - "class", - "college", - "school" - ] - ], - "order": 159 - }, - { - "id": "poi_outdoor", - "type": "symbol", - "source": "openmaptiles", - "source-layer": "poi", - "minzoom": 16, - "layout": { - "text-font": [ - "Noto Sans Bold" - ], - "text-size": { - "stops": [ - [ - 15, - 10 - ], - [ - 20, - 11 - ] - ] - }, - "icon-image": "{subclass}", - "text-field": "{name:latin}\n{name:nonlatin}", - "visibility": "visible", - "text-anchor": "top", - "text-offset": [ - 0, - 1.2 - ], - "text-padding": 2, - "text-max-width": 9, - "icon-allow-overlap": false - }, - "paint": { - "text-color": "#008c0d", - "icon-opacity": 1, - "text-halo-blur": 0, - "text-halo-color": "#ffffff", - "text-halo-width": 1 - }, - "metadata": {}, - "filter": [ - "all", - [ - "in", - "class", - "playground", - "stile", - "garden", - "gate" - ] - ], - "order": 160 - }, - { - "id": "poi_parking", - "type": "symbol", - "source": "openmaptiles", - "source-layer": "poi", - "minzoom": 15, - "layout": { - "text-font": [ - "Noto Sans Bold" - ], - "text-size": { - "stops": [ - [ - 15, - 10 - ], - [ - 20, - 11 - ] - ] - }, - "icon-image": "{subclass}", - "text-field": { - "stops": [ - [ - 15, - "" - ], - [ - 16, - "{name:latin}\n{name:nonlatin}" - ] - ] - }, - "visibility": "visible", - "text-anchor": "top", - "text-offset": [ - 0, - 0.9 - ], - "text-padding": 2, - "text-max-width": 6, - "icon-allow-overlap": false - }, - "paint": { - "text-color": "#0066ff", - "icon-opacity": 1, - "icon-halo-blur": 1, - "text-halo-blur": 0.5, - "icon-halo-color": "rgba(255, 255, 255, 1)", - "icon-halo-width": 0.5, - "text-halo-color": "#ffffff", - "text-halo-width": 1 - }, - "metadata": {}, - "filter": [ - "all", - [ - "in", - "class", - "parking" - ] - ], - "order": 161 - }, - { - "id": "poi_golf", - "type": "symbol", - "source": "openmaptiles", - "source-layer": "poi", - "minzoom": 16, - "layout": { - "text-font": [ - "Noto Sans Bold" - ], - "text-size": { - "stops": [ - [ - 15, - 10 - ], - [ - 20, - 11 - ] - ] - }, - "icon-image": "golf", - "text-field": "{name:latin}\n{name:nonlatin}", - "visibility": "visible", - "text-anchor": "top", - "text-offset": [ - 0, - 1.2 - ], - "text-padding": 2, - "text-max-width": 9, - "icon-allow-overlap": false - }, - "paint": { - "text-color": "#008c0d", - "icon-opacity": 1, - "icon-halo-blur": 1, - "text-halo-blur": 0.5, - "icon-halo-color": "rgba(255, 255, 255, 1)", - "icon-halo-width": 0.5, - "text-halo-color": "#ffffff", - "text-halo-width": 1 - }, - "metadata": {}, - "filter": [ - "all", - [ - "in", - "class", - "golf" - ] - ], - "order": 162 - }, - { - "id": "poi_sport", - "type": "symbol", - "source": "openmaptiles", - "source-layer": "poi", - "minzoom": 16, - "layout": { - "text-font": [ - "Noto Sans Italic" - ], - "text-size": { - "stops": [ - [ - 15, - 10 - ], - [ - 20, - 11 - ] - ] - }, - "icon-image": "{subclass}", - "text-field": "{name:latin}\n{name:nonlatin}", - "visibility": "visible", - "text-anchor": "top", - "text-offset": [ - 0, - 1.2 - ], - "text-padding": 2, - "text-max-width": 9, - "icon-allow-overlap": false - }, - "paint": { - "text-color": "#008c0d", - "icon-opacity": 1, - "icon-halo-blur": 0, - "text-halo-blur": 1, - "text-halo-color": "#ffffff", - "text-halo-width": 0.2 - }, - "metadata": {}, - "filter": [ - "all", - [ - "in", - "class", - "stadium", - "swimming_pool", - "sports_centre", - "water_park" - ] - ], - "order": 163 - }, - { - "id": "poi_ferry", - "type": "symbol", - "source": "openmaptiles", - "source-layer": "poi", - "minzoom": 15, - "layout": { - "text-font": [ - "Noto Sans Regular" - ], - "text-size": { - "stops": [ - [ - 15, - 10 - ], - [ - 20, - 11 - ] - ] - }, - "icon-image": "ferry", - "text-field": "{name:latin}\n{name:nonlatin}", - "visibility": "visible", - "text-anchor": "top", - "text-offset": [ - 0, - 0.7 - ], - "text-padding": 2, - "text-max-width": 9, - "icon-allow-overlap": false - }, - "paint": { - "text-color": "#5e3b9e", - "icon-opacity": 1, - "icon-halo-blur": 1, - "text-halo-blur": 0.5, - "icon-halo-color": "rgba(255, 255, 255, 1)", - "icon-halo-width": 0.5, - "text-halo-color": "#ffffff", - "text-halo-width": 1 - }, - "metadata": {}, - "filter": [ - "all", - [ - "==", - "subclass", - "ferry_terminal" - ], - [ - "==", - "class", - "ferry_terminal" - ] - ], - "order": 164 - }, - { - "id": "poi_food", - "type": "symbol", - "source": "openmaptiles", - "source-layer": "poi", - "minzoom": 16, - "layout": { - "text-font": [ - "Noto Sans Bold" - ], - "text-size": { - "stops": [ - [ - 15, - 10 - ], - [ - 20, - 11 - ] - ] - }, - "icon-image": "{subclass}", - "text-field": "{name:latin}\n{name:nonlatin}", - "visibility": "visible", - "text-anchor": "top", - "text-offset": [ - 0, - 1 - ], - "text-padding": 2, - "text-max-width": 9, - "icon-allow-overlap": false - }, - "paint": { - "text-color": "#C77400", - "icon-opacity": 1, - "icon-halo-blur": 1, - "text-halo-blur": 0.5, - "icon-halo-color": "rgba(255, 255, 255, 1)", - "icon-halo-width": 0.5, - "text-halo-color": "#ffffff", - "text-halo-width": 1 - }, - "metadata": {}, - "filter": [ - "all", - [ - "in", - "class", - "ice_cream", - "cafe", - "beer", - "bar", - "fast_food", - "restaurant" - ] - ], - "order": 165 - }, - { - "id": "poi_water", - "type": "symbol", - "source": "openmaptiles", - "source-layer": "poi", - "minzoom": 16, - "layout": { - "text-font": [ - "Noto Sans Bold" - ], - "text-size": { - "stops": [ - [ - 15, - 10 - ], - [ - 20, - 11 - ] - ] - }, - "icon-image": "{subclass}", - "text-field": "{name:latin}\n{name:nonlatin}", - "visibility": "visible", - "text-anchor": "top", - "text-offset": [ - 0, - 1.2 - ], - "text-padding": 2, - "text-max-width": 9, - "icon-allow-overlap": false - }, - "paint": { - "text-color": "#4d80b3", - "icon-opacity": 1, - "icon-halo-blur": 1, - "text-halo-blur": 0.5, - "icon-halo-color": "rgba(255, 255, 255, 1)", - "icon-halo-width": 0.5, - "text-halo-color": "#ffffff", - "text-halo-width": 1 - }, - "metadata": {}, - "filter": [ - "all", - [ - "in", - "class", - "ice_rink" - ] - ], - "order": 166 - }, - { - "id": "poi_public", - "type": "symbol", - "source": "openmaptiles", - "source-layer": "poi", - "minzoom": 16, - "layout": { - "text-font": [ - "Noto Sans Bold" - ], - "text-size": { - "stops": [ - [ - 15, - 10 - ], - [ - 20, - 11 - ] - ] - }, "icon-image": [ "coalesce", [ @@ -787,64 +26,38 @@ ], [ "image", - "" + "dot" + ] + ], + "symbol-sort-key": [ + "to-number", + [ + "get", + "rank" ] ], - "text-field": "{name:latin}\n{name:nonlatin}", - "visibility": "visible", "text-anchor": "top", - "text-offset": [ - 0, - 0.8 + "text-field": [ + "coalesce", + [ + "get", + "name:en" + ], + [ + "get", + "name" + ] ], - "text-padding": 2, - "text-max-width": 9, - "icon-allow-overlap": false - }, - "paint": { - "text-color": "#734a08", - "icon-opacity": 1, - "icon-halo-blur": 1, - "text-halo-blur": 0.5, - "icon-halo-color": "rgba(255, 255, 255, 1)", - "icon-halo-width": 0.5, - "text-halo-color": "#ffffff", - "text-halo-width": 1 - }, - "metadata": {}, - "filter": [ - "all", - [ - "in", - "class", - "town_hall", - "post", - "library", - "police", - "information", - "cinema", - "theatre", - "fire_station", - "office" - ], - [ - "!=", - "subclass", - "books" - ] - ], - "order": 167 - }, - { - "id": "poi_cultural", - "type": "symbol", - "source": "openmaptiles", - "source-layer": "poi", - "minzoom": 15, - "layout": { "text-font": [ + "Open Sans Semibold", "Noto Sans Bold" ], + "text-max-width": 9, + "text-offset": [ + 0, + 1 + ], + "text-padding": 2, "text-size": { "stops": [ [ @@ -857,26 +70,784 @@ ] ] }, + "visibility": "visible" + }, + "paint": { + "icon-color": "hsl(0, 0%, 0%)", + "icon-halo-blur": 1, + "icon-halo-color": "hsl(0, 0%, 100%)", + "icon-halo-width": 0.5, + "icon-opacity": [ + "step", + [ + "zoom" + ], + 0, + 15, + [ + "match", + [ + "get", + "subclass" + ], + [ + "supermarket" + ], + 1, + 0 + ], + 16, + [ + "match", + [ + "get", + "subclass" + ], + [ + "supermarket" + ], + 1, + 0 + ], + 17, + 1 + ], + "text-color": "hsl(300, 50%, 40%)", + "text-halo-blur": 0.5, + "text-halo-color": "hsl(0, 0%, 100%)", + "text-halo-width": 1, + "text-opacity": [ + "step", + [ + "zoom" + ], + 0, + 15, + [ + "match", + [ + "get", + "subclass" + ], + [ + "supermarket" + ], + 1, + 0 + ], + 16, + [ + "match", + [ + "get", + "subclass" + ], + [ + "supermarket" + ], + 1, + 0 + ], + 17, + 1 + ] + }, + "metadata": {}, + "filter": [ + "any", + [ + "in", + "class", + "alcohol_shop", + "bakery", + "bicycle", + "butcher", + "clothing_store", + "grocery", + "hairdresser", + "music", + "seafood", + "shop" + ], + [ + "in", + "subclass", + "books", + "supermarket" + ] + ], + "order": 201 + }, + { + "id": "Waste", + "type": "symbol", + "source": "openmaptiles", + "source-layer": "poi", + "minzoom": 18, + "layout": { + "icon-allow-overlap": false, "icon-image": "{subclass}", - "text-field": "{name:latin}\n{name:nonlatin}", - "visibility": "visible", + "symbol-sort-key": [ + "to-number", + [ + "get", + "rank" + ] + ], "text-anchor": "top", + "text-field": [ + "coalesce", + [ + "get", + "name:en" + ], + [ + "get", + "name" + ] + ], + "text-font": [ + "Open Sans Semibold", + "Noto Sans Bold" + ], + "text-max-width": 9, "text-offset": [ 0, 0.8 ], "text-padding": 2, - "text-max-width": 9, - "icon-allow-overlap": false + "text-size": { + "stops": [ + [ + 15, + 10 + ], + [ + 20, + 11 + ] + ] + }, + "visibility": "visible" }, "paint": { - "text-color": "#734a08", - "icon-opacity": 1, "icon-halo-blur": 1, - "text-halo-blur": 0.5, - "icon-halo-color": "rgba(255, 255, 255, 1)", + "icon-halo-color": "hsl(0, 0%, 100%)", "icon-halo-width": 0.5, - "text-halo-color": "#ffffff", + "icon-opacity": 1, + "text-color": "hsl(37, 87%, 24%)", + "text-halo-blur": 0.5, + "text-halo-color": "hsl(0, 0%, 100%)", + "text-halo-width": 1 + }, + "metadata": {}, + "filter": [ + "all", + [ + "in", + "class", + "recycling", + "waste_basket", + "drinking_water", + "toilets" + ] + ], + "order": 202 + }, + { + "id": "Mortuary", + "type": "symbol", + "source": "openmaptiles", + "source-layer": "poi", + "minzoom": 14, + "layout": { + "icon-allow-overlap": false, + "icon-offset": [ + 0, + 0 + ], + "icon-pitch-alignment": "viewport", + "icon-text-fit": "none", + "symbol-sort-key": [ + "to-number", + [ + "get", + "rank" + ] + ], + "text-anchor": "center", + "text-field": [ + "coalesce", + [ + "get", + "name:en" + ], + [ + "get", + "name" + ] + ], + "text-font": [ + "Open Sans Bold Italic", + "Noto Sans Regular" + ], + "text-max-width": 14, + "text-offset": [ + 0, + 0 + ], + "text-padding": 2, + "text-size": 11, + "visibility": "visible" + }, + "paint": { + "icon-translate": [ + 0, + 0 + ], + "icon-translate-anchor": "map", + "text-color": "hsl(129, 24%, 23%)", + "text-halo-color": "hsl(0, 0%, 100%)", + "text-halo-width": 0.8, + "text-translate": [ + 0, + 5 + ], + "text-translate-anchor": "viewport" + }, + "metadata": {}, + "filter": [ + "all", + [ + "in", + "class", + "cemetery" + ] + ], + "order": 203 + }, + { + "id": "Education", + "type": "symbol", + "source": "openmaptiles", + "source-layer": "poi", + "minzoom": 16, + "layout": { + "icon-allow-overlap": false, + "icon-offset": [ + 0, + 0 + ], + "icon-pitch-alignment": "viewport", + "icon-text-fit": "none", + "symbol-sort-key": [ + "to-number", + [ + "get", + "rank" + ] + ], + "text-anchor": "center", + "text-field": [ + "coalesce", + [ + "get", + "name:en" + ], + [ + "get", + "name" + ] + ], + "text-font": [ + "Open Sans Semibold Italic", + "Noto Sans Regular" + ], + "text-max-width": 9, + "text-offset": [ + 0, + 0 + ], + "text-padding": 2, + "text-size": 11, + "visibility": "visible" + }, + "paint": { + "icon-translate-anchor": "map", + "text-color": "hsl(60, 100%, 15%)", + "text-halo-color": "hsl(0, 0%, 100%)", + "text-halo-width": 0.8, + "text-translate": [ + 0, + 5 + ], + "text-translate-anchor": "viewport" + }, + "metadata": {}, + "filter": [ + "all", + [ + "in", + "class", + "college", + "kindergarten", + "school", + "university" + ] + ], + "order": 204 + }, + { + "id": "Outdoor", + "type": "symbol", + "source": "openmaptiles", + "source-layer": "poi", + "minzoom": 16, + "layout": { + "icon-allow-overlap": false, + "icon-image": "{subclass}", + "symbol-sort-key": [ + "to-number", + [ + "get", + "rank" + ] + ], + "text-anchor": "top", + "text-field": [ + "coalesce", + [ + "get", + "name:en" + ], + [ + "get", + "name" + ] + ], + "text-font": [ + "Open Sans Semibold", + "Noto Sans Bold" + ], + "text-max-width": 9, + "text-offset": [ + 0, + 1.2 + ], + "text-padding": 2, + "text-size": { + "stops": [ + [ + 15, + 10 + ], + [ + 20, + 11 + ] + ] + }, + "visibility": "visible" + }, + "paint": { + "icon-opacity": 1, + "text-color": "hsl(126, 100%, 27%)", + "text-halo-blur": 0, + "text-halo-color": "hsl(0, 0%, 100%)", + "text-halo-width": 1 + }, + "metadata": {}, + "filter": [ + "all", + [ + "in", + "class", + "pitch", + "playground", + "stile", + "garden", + "gate" + ] + ], + "order": 205 + }, + { + "id": "Sport", + "type": "symbol", + "source": "openmaptiles", + "source-layer": "poi", + "minzoom": 16, + "layout": { + "icon-allow-overlap": false, + "icon-image": "{subclass}", + "symbol-sort-key": [ + "to-number", + [ + "get", + "rank" + ] + ], + "text-anchor": "top", + "text-field": [ + "coalesce", + [ + "get", + "name:en" + ], + [ + "get", + "name" + ] + ], + "text-font": [ + "Open Sans Semibold Italic", + "Noto Sans Bold" + ], + "text-max-width": 9, + "text-offset": [ + 0, + 1.2 + ], + "text-padding": 2, + "text-size": { + "stops": [ + [ + 15, + 10 + ], + [ + 20, + 11 + ] + ] + }, + "visibility": "visible" + }, + "paint": { + "icon-halo-blur": 0, + "icon-opacity": 1, + "text-color": "hsl(126, 100%, 27%)", + "text-halo-blur": 1, + "text-halo-color": "hsl(0, 0%, 100%)", + "text-halo-width": 0.2 + }, + "metadata": {}, + "filter": [ + "all", + [ + "in", + "class", + "golf", + "stadium", + "swimming_pool", + "sports_centre", + "water_park" + ] + ], + "order": 206 + }, + { + "id": "Ferry", + "type": "symbol", + "source": "openmaptiles", + "source-layer": "poi", + "minzoom": 15, + "layout": { + "icon-allow-overlap": false, + "icon-image": "ferry", + "symbol-sort-key": [ + "to-number", + [ + "get", + "rank" + ] + ], + "text-anchor": "top", + "text-field": [ + "coalesce", + [ + "get", + "name:en" + ], + [ + "get", + "name" + ] + ], + "text-font": [ + "Open Sans Regular", + "Noto Sans Regular" + ], + "text-max-width": 9, + "text-offset": [ + 0, + 0.7 + ], + "text-padding": 2, + "text-size": { + "stops": [ + [ + 15, + 10 + ], + [ + 20, + 11 + ] + ] + }, + "visibility": "visible" + }, + "paint": { + "icon-halo-blur": 1, + "icon-halo-color": "hsl(0, 0%, 100%)", + "icon-halo-width": 0.5, + "icon-opacity": 1, + "text-color": "hsl(261, 46%, 43%)", + "text-halo-blur": 0.5, + "text-halo-color": "hsl(0, 0%, 100%)", + "text-halo-width": 1 + }, + "metadata": {}, + "filter": [ + "all", + [ + "==", + "subclass", + "ferry_terminal" + ], + [ + "==", + "class", + "ferry_terminal" + ] + ], + "order": 207 + }, + { + "id": "Food", + "type": "symbol", + "source": "openmaptiles", + "source-layer": "poi", + "minzoom": 16, + "layout": { + "icon-allow-overlap": false, + "icon-image": "{subclass}", + "symbol-sort-key": [ + "to-number", + [ + "get", + "rank" + ] + ], + "text-anchor": "top", + "text-field": [ + "coalesce", + [ + "get", + "name:en" + ], + [ + "get", + "name" + ] + ], + "text-font": [ + "Open Sans Semibold", + "Noto Sans Bold" + ], + "text-max-width": 9, + "text-offset": [ + 0, + 1 + ], + "text-padding": 2, + "text-size": { + "stops": [ + [ + 15, + 10 + ], + [ + 20, + 11 + ] + ] + }, + "visibility": "visible" + }, + "paint": { + "icon-halo-blur": 1, + "icon-halo-color": "hsl(0, 0%, 100%)", + "icon-halo-width": 0.5, + "icon-opacity": 1, + "text-color": "hsl(35, 100%, 39%)", + "text-halo-blur": 0.5, + "text-halo-color": "hsl(0, 0%, 100%)", + "text-halo-width": 1 + }, + "metadata": {}, + "filter": [ + "all", + [ + "in", + "class", + "ice_cream", + "cafe", + "beer", + "bar", + "fast_food", + "restaurant" + ] + ], + "order": 208 + }, + { + "id": "Public", + "type": "symbol", + "source": "openmaptiles", + "source-layer": "poi", + "minzoom": 16, + "layout": { + "icon-allow-overlap": false, + "icon-image": "{subclass}", + "symbol-sort-key": [ + "to-number", + [ + "get", + "rank" + ] + ], + "text-anchor": "top", + "text-field": [ + "coalesce", + [ + "get", + "name:en" + ], + [ + "get", + "name" + ] + ], + "text-font": [ + "Open Sans Semibold", + "Noto Sans Bold" + ], + "text-max-width": 9, + "text-offset": [ + 0, + 0.8 + ], + "text-padding": 2, + "text-size": { + "stops": [ + [ + 15, + 10 + ], + [ + 20, + 11 + ] + ] + }, + "visibility": "visible" + }, + "paint": { + "icon-halo-blur": 1, + "icon-halo-color": "hsl(0, 0%, 100%)", + "icon-halo-width": 0.5, + "icon-opacity": 1, + "text-color": "hsl(37, 87%, 24%)", + "text-halo-blur": 0.5, + "text-halo-color": "hsl(0, 0%, 100%)", + "text-halo-width": 1 + }, + "metadata": {}, + "filter": [ + "all", + [ + "in", + "class", + "atm", + "town_hall", + "post", + "library", + "police", + "information", + "cinema", + "theatre", + "fire_station" + ], + [ + "!=", + "subclass", + "books" + ] + ], + "order": 209 + }, + { + "id": "Cultural", + "type": "symbol", + "source": "openmaptiles", + "source-layer": "poi", + "minzoom": 15, + "layout": { + "icon-allow-overlap": false, + "icon-image": "{subclass}", + "symbol-sort-key": [ + "to-number", + [ + "get", + "rank" + ] + ], + "text-anchor": "top", + "text-field": [ + "coalesce", + [ + "get", + "name:en" + ], + [ + "get", + "name" + ] + ], + "text-font": [ + "Open Sans Semibold", + "Noto Sans Bold" + ], + "text-max-width": 9, + "text-offset": [ + 0, + 0.8 + ], + "text-padding": 2, + "text-size": { + "stops": [ + [ + 15, + 10 + ], + [ + 20, + 11 + ] + ] + }, + "visibility": "visible" + }, + "paint": { + "icon-halo-blur": 1, + "icon-halo-color": "hsl(0, 0%, 100%)", + "icon-halo-width": 0.5, + "icon-opacity": 1, + "text-color": "hsl(37, 87%, 24%)", + "text-halo-blur": 0.5, + "text-halo-color": "hsl(0, 0%, 100%)", "text-halo-width": 1 }, "metadata": {}, @@ -890,27 +861,57 @@ "museum", "castle", "monument", - "art_gallery" + "art_gallery", + "arts_centre", + "gallery" ], [ "!in", "subclass", "books", + "musical_instrument", "art" ] ], - "order": 168 + "order": 210 }, { - "id": "poi_attraction", + "id": "Attraction", "type": "symbol", "source": "openmaptiles", "source-layer": "poi", "minzoom": 15, "layout": { + "icon-allow-overlap": false, + "symbol-sort-key": [ + "to-number", + [ + "get", + "rank" + ] + ], + "text-anchor": "center", + "text-field": [ + "coalesce", + [ + "get", + "name:en" + ], + [ + "get", + "name" + ] + ], "text-font": [ + "Open Sans Semibold", "Noto Sans Bold" ], + "text-max-width": 9, + "text-offset": [ + 0, + 1.2 + ], + "text-padding": 2, "text-size": { "stops": [ [ @@ -923,26 +924,350 @@ ] ] }, + "visibility": "visible" + }, + "paint": { + "icon-opacity": 1, + "text-color": "hsl(330, 100%, 20%)", + "text-halo-blur": 0.5, + "text-halo-color": "hsl(0, 0%, 100%)", + "text-halo-width": 1 + }, + "metadata": {}, + "filter": [ + "==", + "class", + "attraction" + ], + "order": 211 + }, + { + "id": "Transport", + "type": "symbol", + "source": "openmaptiles", + "source-layer": "poi", + "minzoom": 17, + "layout": { + "icon-allow-overlap": false, + "icon-ignore-placement": false, "icon-image": "{subclass}", - "text-field": "{name:latin}\n{name:nonlatin}", - "visibility": "visible", + "symbol-sort-key": [ + "to-number", + [ + "get", + "rank" + ] + ], "text-anchor": "top", + "text-field": { + "stops": [ + [ + 15, + "" + ], + [ + 16, + "{name}" + ] + ] + }, + "text-font": [ + "Open Sans Semibold", + "Noto Sans Bold" + ], + "text-max-width": 9, "text-offset": [ 0, 1.2 ], "text-padding": 2, - "text-max-width": 9, - "icon-allow-overlap": false + "text-size": { + "stops": [ + [ + 15, + 10 + ], + [ + 20, + 11 + ] + ] + }, + "visibility": "visible" }, "paint": { - "text-color": "#660033", - "icon-opacity": 1, "icon-halo-blur": 1, - "text-halo-blur": 0.5, - "icon-halo-color": "rgba(255, 255, 255, 1)", + "icon-halo-color": "hsl(0, 0%, 100%)", "icon-halo-width": 0.5, - "text-halo-color": "#ffffff", + "icon-opacity": [ + "step", + [ + "zoom" + ], + 0, + 15, + [ + "match", + [ + "get", + "class" + ], + [ + "parking" + ], + 1, + 0 + ], + 16, + [ + "match", + [ + "get", + "class" + ], + [ + "parking" + ], + 1, + 0 + ], + 17, + 1 + ], + "text-color": "hsl(216, 100%, 50%)", + "text-halo-blur": 0.5, + "text-halo-color": "hsl(0, 0%, 100%)", + "text-halo-width": 1 + }, + "metadata": {}, + "filter": [ + "all", + [ + "==", + "$type", + "Point" + ], + [ + "in", + "class", + "bicycle_parking", + "car", + "fuel", + "parking" + ] + ], + "order": 212 + }, + { + "id": "Health", + "type": "symbol", + "source": "openmaptiles", + "source-layer": "poi", + "minzoom": 16, + "layout": { + "icon-allow-overlap": false, + "icon-image": "{class}", + "symbol-sort-key": [ + "to-number", + [ + "get", + "rank" + ] + ], + "text-anchor": "top", + "text-field": [ + "coalesce", + [ + "get", + "name:en" + ], + [ + "get", + "name" + ] + ], + "text-font": [ + "Open Sans Regular", + "Noto Sans Regular" + ], + "text-max-width": 9, + "text-offset": [ + 0, + 1.2 + ], + "text-padding": 2, + "text-size": { + "stops": [ + [ + 14, + 10 + ], + [ + 20, + 11 + ] + ] + }, + "visibility": "visible" + }, + "paint": { + "icon-color": "hsla(0, 0%, 0%, 0.98)", + "icon-halo-blur": 1, + "icon-halo-color": "hsl(0, 0%, 100%)", + "icon-halo-width": 0.5, + "icon-opacity": [ + "step", + [ + "zoom" + ], + 0, + 14, + [ + "match", + [ + "get", + "class" + ], + [ + "hospital" + ], + 1, + 0 + ], + 16, + [ + "match", + [ + "get", + "class" + ], + [ + "hospital", + "pharmacy" + ], + 1, + 0 + ], + 17, + 1 + ], + "text-color": "hsl(0, 100%, 37%)", + "text-halo-blur": 0.5, + "text-halo-color": "hsl(0, 0%, 100%)", + "text-halo-width": 1, + "text-opacity": [ + "step", + [ + "zoom" + ], + 0, + 14, + [ + "match", + [ + "get", + "class" + ], + [ + "hospital" + ], + 1, + 0 + ], + 16, + [ + "match", + [ + "get", + "class" + ], + [ + "hospital", + "pharmacy" + ], + 1, + 0 + ], + 17, + 1, + 22, + 1 + ] + }, + "metadata": {}, + "filter": [ + "all", + [ + "in", + "class", + "hospital", + "pharmacy", + "dentist", + "veterinary" + ] + ], + "order": 213 + }, + { + "id": "Campsite", + "type": "symbol", + "source": "openmaptiles", + "source-layer": "poi", + "minzoom": 16, + "layout": { + "icon-allow-overlap": false, + "icon-image": "camping", + "symbol-sort-key": [ + "to-number", + [ + "get", + "rank" + ] + ], + "text-anchor": "top", + "text-field": [ + "coalesce", + [ + "get", + "name:en" + ], + [ + "get", + "name" + ] + ], + "text-font": [ + "Open Sans Semibold", + "Noto Sans Bold" + ], + "text-max-width": 9, + "text-offset": [ + 0, + 1.2 + ], + "text-padding": 2, + "text-size": { + "stops": [ + [ + 15, + 10 + ], + [ + 20, + 11 + ] + ] + }, + "visibility": "visible" + }, + "paint": { + "icon-halo-blur": 1, + "icon-halo-color": "hsl(0, 0%, 100%)", + "icon-halo-width": 0.5, + "icon-opacity": 1, + "text-color": "hsl(216, 100%, 50%)", + "text-halo-blur": 0.5, + "text-halo-color": "hsl(0, 0%, 100%)", "text-halo-width": 1 }, "metadata": {}, @@ -951,283 +1276,28 @@ [ "==", "class", - "attraction" - ] - ], - "order": 169 - }, - { - "id": "poi_car", - "type": "symbol", - "source": "openmaptiles", - "source-layer": "poi", - "minzoom": 17, - "layout": { - "text-font": [ - "Noto Sans Bold" - ], - "text-size": { - "stops": [ - [ - 15, - 10 - ], - [ - 20, - 11 - ] - ] - }, - "icon-image": "{subclass}", - "text-field": { - "stops": [ - [ - 15, - "" - ], - [ - 16, - "{name:latin}\n{name:nonlatin}" - ] - ] - }, - "visibility": "visible", - "text-anchor": "top", - "text-offset": [ - 0, - 1.2 - ], - "text-padding": 2, - "text-max-width": 9, - "icon-allow-overlap": false, - "icon-ignore-placement": false - }, - "paint": { - "text-color": "#0066ff", - "icon-opacity": 1, - "icon-halo-blur": 1, - "text-halo-blur": 0.5, - "icon-halo-color": "rgba(255, 255, 255, 1)", - "icon-halo-width": 0.5, - "text-halo-color": "#ffffff", - "text-halo-width": 1 - }, - "metadata": {}, - "filter": [ - "all", - [ - "in", - "class", - "car", - "bicycle_parking", - "fuel", - "charging_station" - ] - ], - "order": 170 - }, - { - "id": "poi_health", - "type": "symbol", - "source": "openmaptiles", - "source-layer": "poi", - "minzoom": 16, - "layout": { - "text-font": [ - "Noto Sans Regular", - "Noto Sans Bold" - ], - "text-size": { - "stops": [ - [ - 14, - 10 - ], - [ - 20, - 11 - ] - ] - }, - "icon-image": "{subclass}", - "text-field": "{name:latin}\n{name:nonlatin}", - "visibility": "visible", - "text-anchor": "top", - "text-offset": [ - 0, - 1.2 - ], - "text-padding": 2, - "text-max-width": 9, - "icon-allow-overlap": false - }, - "paint": { - "text-color": "#BF0000", - "icon-opacity": 1, - "icon-halo-blur": 1, - "text-halo-blur": 0.5, - "icon-halo-color": "rgba(255, 255, 255, 1)", - "icon-halo-width": 0.5, - "text-halo-color": "#ffffff", - "text-halo-width": 1 - }, - "metadata": {}, - "filter": [ - "all", - [ - "in", - "class", - "pharmacy", - "dentist", - "veterinary" - ] - ], - "order": 171 - }, - { - "id": "poi_hospital", - "type": "symbol", - "source": "openmaptiles", - "source-layer": "poi", - "minzoom": 14, - "layout": { - "text-font": [ - "Noto Sans Bold" - ], - "text-size": { - "stops": [ - [ - 14, - 10 - ], - [ - 20, - 11 - ] - ] - }, - "icon-image": "{subclass}", - "text-field": { - "stops": [ - [ - 14, - "" - ], - [ - 16, - "{name:latin}\n{name:nonlatin}" - ] - ] - }, - "visibility": "visible", - "text-anchor": "top", - "text-offset": [ - 0, - 1.2 - ], - "text-padding": 2, - "text-max-width": 9, - "icon-allow-overlap": false - }, - "paint": { - "text-color": "#BF0000", - "icon-opacity": 1, - "icon-halo-blur": 1, - "text-halo-blur": 0.5, - "icon-halo-color": "rgba(255, 255, 255, 1)", - "icon-halo-width": 0.5, - "text-halo-color": "#ffffff", - "text-halo-width": 1 - }, - "metadata": {}, - "filter": [ - "all", - [ - "in", - "class", - "hospital" - ] - ], - "order": 172 - }, - { - "id": "poi_campsite", - "type": "symbol", - "source": "openmaptiles", - "source-layer": "poi", - "minzoom": 16, - "layout": { - "text-font": [ - "Noto Sans Bold" - ], - "text-size": { - "stops": [ - [ - 15, - 10 - ], - [ - 20, - 11 - ] - ] - }, - "icon-image": "camping", - "text-field": "{name:latin}\n{name:nonlatin}", - "visibility": "visible", - "text-anchor": "top", - "text-offset": [ - 0, - 1.2 - ], - "text-padding": 2, - "text-max-width": 9, - "icon-allow-overlap": false - }, - "paint": { - "text-color": "#0066ff", - "icon-opacity": 1, - "icon-halo-blur": 1, - "text-halo-blur": 0.5, - "icon-halo-color": "rgba(255, 255, 255, 1)", - "icon-halo-width": 0.5, - "text-halo-color": "#ffffff", - "text-halo-width": 1 - }, - "metadata": {}, - "filter": [ - "all", - [ - "in", - "class", "campsite" ] ], - "order": 173 + "order": 214 }, { - "id": "poi_accommodation", + "id": "Accommodation", "type": "symbol", "source": "openmaptiles", "source-layer": "poi", "minzoom": 17, "layout": { - "text-font": [ - "Noto Sans Bold" - ], - "text-size": { - "stops": [ - [ - 15, - 10 - ], - [ - 20, - 11 - ] - ] - }, + "icon-allow-overlap": false, "icon-image": "{subclass}", + "symbol-sort-key": [ + "to-number", + [ + "get", + "rank" + ] + ], + "text-anchor": "top", "text-field": { "stops": [ [ @@ -1236,53 +1306,96 @@ ], [ 18, - "{name:latin}\n{name:nonlatin}" + "{name}" ] ] }, - "visibility": "visible", - "text-anchor": "top", + "text-font": [ + "Open Sans Semibold", + "Noto Sans Bold" + ], + "text-max-width": 9, "text-offset": [ 0, 0.6 ], "text-padding": 2, - "text-max-width": 9, - "icon-allow-overlap": false + "text-size": { + "stops": [ + [ + 15, + 10 + ], + [ + 20, + 11 + ] + ] + }, + "visibility": "visible" }, "paint": { - "text-color": "#0066ff", - "icon-opacity": 1, "icon-halo-blur": 1, - "text-halo-blur": 0.5, - "icon-halo-color": "rgba(255, 255, 255, 1)", + "icon-halo-color": "hsl(0, 0%, 100%)", "icon-halo-width": 0.5, - "text-halo-color": "#ffffff", + "icon-opacity": 1, + "text-color": "hsl(216, 100%, 50%)", + "text-halo-blur": 0.5, + "text-halo-color": "hsl(0, 0%, 100%)", "text-halo-width": 1 }, "metadata": {}, "filter": [ "all", [ - "in", + "==", "class", - "lodging", - "campsite" + "lodging" ] ], - "order": 174 + "order": 215 }, { - "id": "poi_place_of_worship", + "id": "Place of worship", "type": "symbol", "source": "openmaptiles", "source-layer": "poi", "minzoom": 16, "layout": { + "icon-allow-overlap": false, + "icon-image": "{subclass}", "icon-size": 1, + "symbol-sort-key": [ + "to-number", + [ + "get", + "rank" + ] + ], + "text-allow-overlap": false, + "text-anchor": "top", + "text-field": { + "stops": [ + [ + 15, + "" + ], + [ + 16, + "{name}" + ] + ] + }, "text-font": [ + "Open Sans Semibold", "Noto Sans Bold" ], + "text-max-width": 9, + "text-offset": [ + 0, + 0.8 + ], + "text-padding": 2, "text-size": { "stops": [ [ @@ -1295,34 +1408,12 @@ ] ] }, - "icon-image": "{subclass}", - "text-field": { - "stops": [ - [ - 15, - "" - ], - [ - 16, - "{name:latin}\n{name:nonlatin}" - ] - ] - }, - "visibility": "visible", - "text-anchor": "top", - "text-offset": [ - 0, - 1.2 - ], - "text-padding": 2, - "text-max-width": 9, - "icon-allow-overlap": false, - "text-allow-overlap": false + "visibility": "visible" }, "paint": { - "text-color": "rgba(56, 56, 71, 1)", + "text-color": "hsl(240, 12%, 25%)", "text-halo-blur": 0.5, - "text-halo-color": "#ffffff", + "text-halo-color": "hsl(0, 0%, 100%)", "text-halo-width": 1 }, "metadata": {}, @@ -1334,19 +1425,47 @@ "place_of_worship" ] ], - "order": 175 + "order": 216 }, { - "id": "poi_busstop", + "id": "Bus stop", "type": "symbol", "source": "openmaptiles", "source-layer": "poi", "minzoom": 17, "layout": { + "icon-allow-overlap": false, + "icon-anchor": "bottom", + "icon-image": "bus_stop.12", + "icon-keep-upright": true, + "icon-pitch-alignment": "viewport", "icon-size": 1, + "icon-text-fit": "none", + "symbol-sort-key": [ + "to-number", + [ + "get", + "rank" + ] + ], + "text-anchor": "top", + "text-field": [ + "coalesce", + [ + "get", + "name:en" + ], + [ + "get", + "name" + ] + ], "text-font": [ + "Open Sans Regular", "Noto Sans Regular" ], + "text-max-width": 14, + "text-padding": 2, "text-size": { "stops": [ [ @@ -1359,31 +1478,17 @@ ] ] }, - "icon-image": "bus_stop.12", - "text-field": "{name:latin}\n{name:nonlatin}", - "visibility": "visible", - "icon-anchor": "bottom", - "text-anchor": "top", - "text-padding": 2, - "icon-text-fit": "none", - "text-max-width": 14, - "icon-keep-upright": true, - "icon-allow-overlap": false, - "icon-pitch-alignment": "viewport" + "visibility": "visible" }, "paint": { - "text-color": "#0066ff", - "icon-translate": [ - 0, - 0 - ], + "icon-translate-anchor": "map", + "text-color": "hsl(216, 100%, 50%)", + "text-halo-color": "hsl(0, 0%, 100%)", + "text-halo-width": 0.8, "text-translate": [ 0, 4 ], - "text-halo-color": "rgba(255, 255, 255, 1)", - "text-halo-width": 0.8, - "icon-translate-anchor": "map", "text-translate-anchor": "viewport" }, "metadata": {}, @@ -1395,50 +1500,67 @@ "bus" ] ], - "order": 176 + "order": 217 }, { - "id": "poi_bus", + "id": "Bus station", "type": "symbol", "source": "openmaptiles", "source-layer": "poi", "minzoom": 17, "layout": { - "icon-size": 1, - "text-font": [ - "Noto Sans Bold", - "Noto Sans Regular" - ], - "text-size": 11, - "icon-image": "{subclass}", - "text-field": "{name:latin}\n{name:nonlatin}", - "visibility": "visible", + "icon-allow-overlap": false, "icon-anchor": "bottom", + "icon-image": "{subclass}", + "icon-keep-upright": true, "icon-offset": [ 0, 0 ], - "text-anchor": "center", - "text-padding": 2, + "icon-pitch-alignment": "viewport", + "icon-size": 1, "icon-text-fit": "none", + "symbol-sort-key": [ + "to-number", + [ + "get", + "rank" + ] + ], + "text-anchor": "center", + "text-field": [ + "coalesce", + [ + "get", + "name:en" + ], + [ + "get", + "name" + ] + ], + "text-font": [ + "Open Sans Bold", + "Noto Sans Bold" + ], "text-max-width": 14, - "icon-keep-upright": true, - "icon-allow-overlap": false, - "icon-pitch-alignment": "viewport" + "text-padding": 2, + "text-size": 11, + "visibility": "visible" }, "paint": { - "text-color": "#0066ff", "icon-translate": [ 0, - 0 + -8 ], + "icon-translate-anchor": "map", + "text-color": "hsl(216, 100%, 50%)", + "text-halo-color": "hsl(0, 0%, 100%)", + "text-halo-width": 0.8, "text-translate": [ 0, 5 ], - "text-halo-color": "rgba(255, 255, 255, 1)", - "text-halo-width": 0.8, - "icon-translate-anchor": "map", "text-translate-anchor": "viewport" }, "metadata": {}, @@ -1455,18 +1577,41 @@ "bus_stop" ] ], - "order": 177 + "order": 218 }, { - "id": "poi_harbor", + "id": "Harbor", "type": "symbol", "source": "openmaptiles", "source-layer": "poi", "minzoom": 16, "layout": { - "text-font": [ - "Noto Sans Bold" + "icon-allow-overlap": false, + "symbol-sort-key": [ + "to-number", + [ + "get", + "rank" + ] ], + "text-anchor": "top", + "text-field": [ + "coalesce", + [ + "get", + "name:en" + ], + [ + "get", + "name" + ] + ], + "text-font": [ + "Open Sans Semibold Italic", + "Noto Sans Italic" + ], + "text-max-width": 6, + "text-padding": 2, "text-size": { "stops": [ [ @@ -1479,21 +1624,16 @@ ] ] }, - "text-field": "{name:latin}\n{name:nonlatin}", - "visibility": "visible", - "text-anchor": "top", - "text-padding": 2, - "text-max-width": 6, - "icon-allow-overlap": false + "visibility": "visible" }, "paint": { - "text-color": "#576ddf", - "icon-opacity": 1, "icon-halo-blur": 1, - "text-halo-blur": 0.1, - "icon-halo-color": "rgba(255, 255, 255, 1)", + "icon-halo-color": "hsl(0, 0%, 100%)", "icon-halo-width": 0.2, - "text-halo-color": "#ffffff", + "icon-opacity": 1, + "text-color": "hsl(230, 68%, 61%)", + "text-halo-blur": 0.1, + "text-halo-color": "hsl(0, 0%, 100%)", "text-halo-width": 0.3 }, "metadata": {}, @@ -1505,18 +1645,45 @@ "harbor" ] ], - "order": 178 + "order": 219 }, { - "id": "poi_mall", + "id": "Mall", "type": "symbol", "source": "openmaptiles", "source-layer": "poi", "minzoom": 15, "layout": { + "icon-allow-overlap": false, + "symbol-sort-key": [ + "to-number", + [ + "get", + "rank" + ] + ], + "text-anchor": "top", + "text-field": [ + "coalesce", + [ + "get", + "name:en" + ], + [ + "get", + "name" + ] + ], "text-font": [ + "Open Sans Semibold Italic", "Noto Sans Italic" ], + "text-max-width": 9, + "text-offset": [ + 0, + 1.1 + ], + "text-padding": 2, "text-size": { "stops": [ [ @@ -1529,25 +1696,16 @@ ] ] }, - "text-field": "{name:latin}\n{name:nonlatin}", - "visibility": "visible", - "text-anchor": "top", - "text-offset": [ - 0, - 1.1 - ], - "text-padding": 2, - "text-max-width": 9, - "icon-allow-overlap": false + "visibility": "visible" }, "paint": { - "text-color": "#d11700", - "icon-opacity": 1, "icon-halo-blur": 1, - "text-halo-blur": 0.5, - "icon-halo-color": "rgba(255, 255, 255, 1)", + "icon-halo-color": "hsl(0, 0%, 100%)", "icon-halo-width": 0.5, - "text-halo-color": "#ffffff", + "icon-opacity": 1, + "text-color": "hsl(7, 100%, 41%)", + "text-halo-blur": 0.5, + "text-halo-color": "hsl(0, 0%, 100%)", "text-halo-width": 1 }, "metadata": {}, @@ -1564,54 +1722,67 @@ "mall" ] ], - "order": 179 + "order": 220 }, { - "id": "poi_train", + "id": "Train", "type": "symbol", "source": "openmaptiles", "source-layer": "poi", - "minzoom": 10, + "minzoom": 12, "layout": { - "icon-size": 1, - "text-font": [ - "Noto Sans Bold", - "Noto Sans Regular" - ], - "text-size": 11, - "icon-image": "square_train", - "text-field": "{name:latin}\n{name:nonlatin}", - "visibility": "visible", + "icon-allow-overlap": false, "icon-anchor": "bottom", + "icon-image": "square_train", "icon-offset": [ 0, 0 ], + "icon-pitch-alignment": "viewport", + "icon-size": 1, + "icon-text-fit": "none", + "symbol-sort-key": [ + "to-number", + [ + "get", + "rank" + ] + ], + "text-allow-overlap": false, "text-anchor": "center", + "text-field": [ + "coalesce", + [ + "get", + "name:en" + ], + [ + "get", + "name" + ] + ], + "text-font": [ + "Open Sans Bold", + "Noto Sans Bold" + ], + "text-max-width": 14, "text-offset": [ 0, 0.5 ], "text-padding": 2, - "icon-text-fit": "none", - "text-max-width": 12, - "icon-allow-overlap": false, - "text-allow-overlap": false, - "icon-pitch-alignment": "viewport" + "text-size": 11, + "visibility": "visible" }, "paint": { - "text-color": "#4957ad", - "icon-translate": [ - 0, - 0 - ], + "icon-translate-anchor": "map", + "text-color": "hsl(232, 41%, 48%)", + "text-halo-color": "hsl(0, 0%, 100%)", + "text-halo-width": 0.8, "text-translate": [ 0, 1 ], - "text-halo-color": "rgba(255, 255, 255, 1)", - "text-halo-width": 0.8, - "icon-translate-anchor": "map", "text-translate-anchor": "viewport" }, "metadata": {}, @@ -1623,33 +1794,39 @@ "railway" ] ], - "order": 180 + "order": 221 }, { - "id": "park-local", + "id": "Local park", "type": "symbol", "source": "openmaptiles", "source-layer": "poi", "minzoom": 15, "layout": { + "symbol-sort-key": [ + "to-number", + [ + "get", + "rank" + ] + ], + "symbol-spacing": 150, + "text-allow-overlap": false, + "text-field": [ + "coalesce", + [ + "get", + "name:en" + ], + [ + "get", + "name" + ] + ], "text-font": [ + "Open Sans Semibold Italic", "Noto Sans Italic" ], - "text-size": { - "stops": [ - [ - 15, - 10 - ], - [ - 20, - 13 - ] - ] - }, - "text-field": "{name:latin}{name:nonlatin}", - "visibility": "visible", - "symbol-spacing": 150, "text-max-width": { "stops": [ [ @@ -1662,12 +1839,24 @@ ] ] }, - "text-allow-overlap": false + "text-size": { + "stops": [ + [ + 15, + 10 + ], + [ + 20, + 13 + ] + ] + }, + "visibility": "visible" }, "paint": { - "text-color": "#0c8416", + "text-color": "hsl(125, 83%, 28%)", "text-halo-blur": 0.5, - "text-halo-color": "rgba(255, 255, 255, 1)", + "text-halo-color": "hsl(0, 0%, 100%)", "text-halo-width": 1 }, "filter": [ @@ -1683,18 +1872,46 @@ "park" ] ], - "order": 194 + "order": 236 }, { - "id": "poi_zoo", + "id": "Zoo", "type": "symbol", "source": "openmaptiles", "source-layer": "poi", - "minzoom": 11, + "minzoom": 12, "layout": { + "icon-allow-overlap": false, + "icon-image": "{subclass}", + "symbol-sort-key": [ + "to-number", + [ + "get", + "rank" + ] + ], + "text-anchor": "top", + "text-field": [ + "coalesce", + [ + "get", + "name:en" + ], + [ + "get", + "name" + ] + ], "text-font": [ + "Open Sans Bold", "Noto Sans Bold" ], + "text-max-width": 6, + "text-offset": [ + 0, + 1.2 + ], + "text-padding": 2, "text-size": { "stops": [ [ @@ -1707,26 +1924,16 @@ ] ] }, - "icon-image": "{subclass}", - "text-field": "{name}", - "visibility": "visible", - "text-anchor": "top", - "text-offset": [ - 0, - 1.2 - ], - "text-padding": 2, - "text-max-width": 6, - "icon-allow-overlap": true + "visibility": "visible" }, "paint": { - "text-color": "#660033", - "icon-opacity": 1, "icon-halo-blur": 1, - "text-halo-blur": 0.5, - "icon-halo-color": "rgba(255, 255, 255, 1)", + "icon-halo-color": "hsl(0, 0%, 100%)", "icon-halo-width": 0.5, - "text-halo-color": "#ffffff", + "icon-opacity": 1, + "text-color": "hsl(330, 100%, 20%)", + "text-halo-blur": 0.5, + "text-halo-color": "hsl(0, 0%, 100%)", "text-halo-width": 1 }, "metadata": {}, @@ -1743,7 +1950,7 @@ "zoo" ] ], - "order": 196 + "order": 238 } ] -} \ No newline at end of file +} diff --git a/layers/transportation/style.json b/layers/transportation/style.json index 93656861..50cf2ec4 100644 --- a/layers/transportation/style.json +++ b/layers/transportation/style.json @@ -1,46 +1,7 @@ { "layers": [ { - "id": "ferry", - "type": "line", - "source": "openmaptiles", - "source-layer": "transportation", - "minzoom": 4, - "layout": { - "line-join": "round", - "visibility": "visible" - }, - "paint": { - "line-color": "#66f", - "line-width": { - "stops": [ - [ - 10, - 0.5 - ], - [ - 14, - 1.1 - ] - ] - }, - "line-dasharray": [ - 6, - 6 - ] - }, - "filter": [ - "all", - [ - "in", - "class", - "ferry" - ] - ], - "order": 24 - }, - { - "id": "tunnel_motorway_link_casing", + "id": "Highway link tunnel outline", "type": "line", "source": "openmaptiles", "source-layer": "transportation", @@ -54,11 +15,11 @@ "stops": [ [ 11, - "#c24e6b" + "hsl(345, 49%, 53%)" ], [ 12, - "#dc2a67" + "hsl(339, 72%, 51%)" ] ] }, @@ -115,10 +76,10 @@ "tunnel" ] ], - "order": 28 + "order": 63 }, { - "id": "tunnel_service_track_casing", + "id": "Service tunnel outline", "type": "line", "source": "openmaptiles", "source-layer": "transportation", @@ -127,7 +88,11 @@ "visibility": "visible" }, "paint": { - "line-color": "#cfcdca", + "line-color": "hsl(36, 5%, 80%)", + "line-dasharray": [ + 0.5, + 0.25 + ], "line-width": { "base": 1.2, "stops": [ @@ -144,11 +109,7 @@ 11 ] ] - }, - "line-dasharray": [ - 0.5, - 0.25 - ] + } }, "metadata": {}, "filter": [ @@ -165,10 +126,10 @@ "track" ] ], - "order": 29 + "order": 64 }, { - "id": "tunnel_link_casing", + "id": "Link tunnel outline", "type": "line", "source": "openmaptiles", "source-layer": "transportation", @@ -177,7 +138,8 @@ "visibility": "visible" }, "paint": { - "line-color": "#e9ac77", + "line-color": "hsl(28, 72%, 69%)", + "line-opacity": 1, "line-width": { "base": 1.2, "stops": [ @@ -198,8 +160,7 @@ 15 ] ] - }, - "line-opacity": 1 + } }, "metadata": {}, "filter": [ @@ -220,10 +181,10 @@ 0 ] ], - "order": 30 + "order": 65 }, { - "id": "tunnel_street_casing", + "id": "Street tunnel outline", "type": "line", "source": "openmaptiles", "source-layer": "transportation", @@ -232,7 +193,19 @@ "visibility": "visible" }, "paint": { - "line-color": "#cfcdca", + "line-color": "hsl(36, 5%, 80%)", + "line-opacity": { + "stops": [ + [ + 12, + 0 + ], + [ + 12.5, + 1 + ] + ] + }, "line-width": { "base": 1.2, "stops": [ @@ -253,18 +226,6 @@ 15 ] ] - }, - "line-opacity": { - "stops": [ - [ - 12, - 0 - ], - [ - 12.5, - 1 - ] - ] } }, "metadata": {}, @@ -282,10 +243,10 @@ "street_limited" ] ], - "order": 31 + "order": 66 }, { - "id": "tunnel_tertiary_casing", + "id": "Tertiary tunnel outline", "type": "line", "source": "openmaptiles", "source-layer": "transportation", @@ -295,7 +256,12 @@ "visibility": "visible" }, "paint": { - "line-color": "#8f8f8f", + "line-color": "hsl(0, 0%, 56%)", + "line-dasharray": [ + 0.5, + 0.25 + ], + "line-opacity": 1, "line-width": { "base": 1.2, "stops": [ @@ -332,12 +298,7 @@ 27 ] ] - }, - "line-opacity": 1, - "line-dasharray": [ - 0.5, - 0.25 - ] + } }, "metadata": {}, "filter": [ @@ -353,10 +314,10 @@ "tertiary" ] ], - "order": 32 + "order": 67 }, { - "id": "tunnel_secondary_casing", + "id": "Secondary tunnel outline", "type": "line", "source": "openmaptiles", "source-layer": "transportation", @@ -366,7 +327,12 @@ "visibility": "visible" }, "paint": { - "line-color": "#707d05", + "line-color": "hsl(67, 92%, 25%)", + "line-dasharray": [ + 0.5, + 0.25 + ], + "line-opacity": 1, "line-width": { "base": 1.2, "stops": [ @@ -403,12 +369,7 @@ 27 ] ] - }, - "line-opacity": 1, - "line-dasharray": [ - 0.5, - 0.25 - ] + } }, "metadata": {}, "filter": [ @@ -424,10 +385,10 @@ "secondary" ] ], - "order": 33 + "order": 68 }, { - "id": "tunnel_trunk_casing", + "id": "Trunk tunnel outline", "type": "line", "source": "openmaptiles", "source-layer": "transportation", @@ -441,14 +402,18 @@ "stops": [ [ 11, - "#cf6649" + "hsl(13, 58%, 55%)" ], [ 12, - "#c84e2f" + "hsl(12, 62%, 48%)" ] ] }, + "line-dasharray": [ + 0.5, + 0.25 + ], "line-width": { "base": 1.2, "stops": [ @@ -477,11 +442,7 @@ 27 ] ] - }, - "line-dasharray": [ - 0.5, - 0.25 - ] + } }, "metadata": {}, "filter": [ @@ -497,10 +458,10 @@ "trunk" ] ], - "order": 34 + "order": 69 }, { - "id": "tunnel_trunk_construction_casing", + "id": "Trunk tunnel under construction outline", "type": "line", "source": "openmaptiles", "source-layer": "transportation", @@ -510,7 +471,11 @@ "visibility": "visible" }, "paint": { - "line-color": "rgba(255, 255, 255, 1)", + "line-color": "hsl(0, 0%, 100%)", + "line-dasharray": [ + 1, + 0 + ], "line-width": { "base": 1.2, "stops": [ @@ -539,11 +504,7 @@ 25 ] ] - }, - "line-dasharray": [ - 1, - 0 - ] + } }, "metadata": {}, "filter": [ @@ -559,10 +520,10 @@ "trunk_construction" ] ], - "order": 35 + "order": 70 }, { - "id": "tunnel_primary_casing", + "id": "Primary tunnel outline", "type": "line", "source": "openmaptiles", "source-layer": "transportation", @@ -576,14 +537,18 @@ "stops": [ [ 6, - "#a06b00" + "hsl(40, 100%, 31%)" ], [ 10, - "rgba(160, 116, 0, 1)" + "hsl(44, 100%, 31%)" ] ] }, + "line-dasharray": [ + 0.5, + 0.25 + ], "line-width": { "base": 1.2, "stops": [ @@ -612,11 +577,7 @@ 27 ] ] - }, - "line-dasharray": [ - 0.5, - 0.25 - ] + } }, "metadata": {}, "filter": [ @@ -632,10 +593,10 @@ "primary" ] ], - "order": 36 + "order": 71 }, { - "id": "tunnel_motorway_construction_casing", + "id": "Highway tunnel under construction outline", "type": "line", "source": "openmaptiles", "source-layer": "transportation", @@ -648,14 +609,18 @@ "stops": [ [ 6, - "#dc2a67" + "hsl(339, 72%, 51%)" ], [ 10, - "#c24e6b" + "hsl(345, 49%, 53%)" ] ] }, + "line-dasharray": [ + 0.5, + 0.25 + ], "line-width": { "base": 1.2, "stops": [ @@ -672,11 +637,7 @@ 27 ] ] - }, - "line-dasharray": [ - 0.5, - 0.25 - ] + } }, "metadata": {}, "filter": [ @@ -692,10 +653,10 @@ "tunnel" ] ], - "order": 37 + "order": 72 }, { - "id": "tunnel_motorway_casing", + "id": "Highway tunnel outline", "type": "line", "source": "openmaptiles", "source-layer": "transportation", @@ -708,14 +669,18 @@ "stops": [ [ 6, - "#dc2a67" + "hsl(339, 72%, 51%)" ], [ 10, - "#c24e6b" + "hsl(345, 49%, 53%)" ] ] }, + "line-dasharray": [ + 0.5, + 0.25 + ], "line-width": { "base": 1.2, "stops": [ @@ -732,11 +697,7 @@ 27 ] ] - }, - "line-dasharray": [ - 0.5, - 0.25 - ] + } }, "metadata": {}, "filter": [ @@ -752,10 +713,10 @@ "tunnel" ] ], - "order": 38 + "order": 73 }, { - "id": "tunnel_path_casing_casing", + "id": "Path tunnel second outline", "type": "line", "source": "openmaptiles", "source-layer": "transportation", @@ -763,7 +724,11 @@ "visibility": "visible" }, "paint": { - "line-color": "rgba(50, 50, 50, 1)", + "line-color": "hsl(0, 0%, 20%)", + "line-dasharray": [ + 1, + 0.5 + ], "line-width": { "base": 1.2, "stops": [ @@ -788,11 +753,7 @@ 4.6 ] ] - }, - "line-dasharray": [ - 1, - 0.5 - ] + } }, "metadata": {}, "filter": [ @@ -813,10 +774,10 @@ "path" ] ], - "order": 39 + "order": 74 }, { - "id": "tunnel_path_casing", + "id": "Path tunnel outline", "type": "line", "source": "openmaptiles", "source-layer": "transportation", @@ -824,7 +785,11 @@ "visibility": "visible" }, "paint": { - "line-color": "rgba(255, 255, 255, 1)", + "line-color": "hsl(0, 0%, 100%)", + "line-dasharray": [ + 1, + 0 + ], "line-width": { "base": 1.2, "stops": [ @@ -849,11 +814,7 @@ 3.6 ] ] - }, - "line-dasharray": [ - 1, - 0 - ] + } }, "metadata": {}, "filter": [ @@ -874,16 +835,20 @@ "path" ] ], - "order": 40 + "order": 75 }, { - "id": "tunnel_path_cycleway", + "id": "Cycleway path tunnel", "type": "line", "source": "openmaptiles", "source-layer": "transportation", "minzoom": 13, "paint": { - "line-color": "#0000ff", + "line-color": "hsl(240, 100%, 50%)", + "line-dasharray": [ + 2, + 2 + ], "line-width": { "base": 1.2, "stops": [ @@ -908,11 +873,7 @@ 1.6 ] ] - }, - "line-dasharray": [ - 2, - 2 - ] + } }, "metadata": {}, "filter": [ @@ -946,16 +907,20 @@ ] ] ], - "order": 41 + "order": 76 }, { - "id": "tunnel_path_bridleway", + "id": "Bridleway path tunnel", "type": "line", "source": "openmaptiles", "source-layer": "transportation", "minzoom": 13, "paint": { - "line-color": "#008000", + "line-color": "hsl(120, 100%, 25%)", + "line-dasharray": [ + 2, + 2 + ], "line-width": { "base": 1.2, "stops": [ @@ -980,11 +945,7 @@ 1.6 ] ] - }, - "line-dasharray": [ - 2, - 2 - ] + } }, "metadata": {}, "filter": [ @@ -1023,16 +984,20 @@ "designated" ] ], - "order": 42 + "order": 77 }, { - "id": "tunnel_path_footway", + "id": "Footway path tunnel", "type": "line", "source": "openmaptiles", "source-layer": "transportation", "minzoom": 13, "paint": { - "line-color": "#fa8072", + "line-color": "hsl(6, 93%, 71%)", + "line-dasharray": [ + 2, + 2 + ], "line-width": { "base": 1.2, "stops": [ @@ -1057,11 +1022,7 @@ 1.6 ] ] - }, - "line-dasharray": [ - 2, - 2 - ] + } }, "metadata": {}, "filter": [ @@ -1098,10 +1059,10 @@ "designated" ] ], - "order": 43 + "order": 78 }, { - "id": "tunnel_motorway_link", + "id": "Highway link tunnel", "type": "line", "source": "openmaptiles", "source-layer": "transportation", @@ -1111,7 +1072,12 @@ "visibility": "visible" }, "paint": { - "line-color": "#f1bcc6", + "line-color": "hsl(349, 65%, 84%)", + "line-dasharray": [ + 0.5, + 0.25 + ], + "line-opacity": 1, "line-width": { "base": 1.2, "stops": [ @@ -1148,12 +1114,7 @@ 15.4 ] ] - }, - "line-opacity": 1, - "line-dasharray": [ - 0.5, - 0.25 - ] + } }, "metadata": {}, "filter": [ @@ -1174,10 +1135,10 @@ "tunnel" ] ], - "order": 44 + "order": 79 }, { - "id": "tunnel_service_track", + "id": "Service tunnel", "type": "line", "source": "openmaptiles", "source-layer": "transportation", @@ -1187,7 +1148,7 @@ "visibility": "visible" }, "paint": { - "line-color": "#f2f2f2", + "line-color": "hsl(0, 0%, 95%)", "line-width": { "base": 1.2, "stops": [ @@ -1229,10 +1190,10 @@ "track" ] ], - "order": 45 + "order": 80 }, { - "id": "tunnel_service_track_construction", + "id": "Service tunnel under construction", "type": "line", "source": "openmaptiles", "source-layer": "transportation", @@ -1242,7 +1203,11 @@ "visibility": "visible" }, "paint": { - "line-color": "#fff", + "line-color": "hsl(0, 0%, 100%)", + "line-dasharray": [ + 2, + 2 + ], "line-width": { "base": 1.2, "stops": [ @@ -1267,11 +1232,7 @@ 6.9 ] ] - }, - "line-dasharray": [ - 2, - 2 - ] + } }, "metadata": {}, "filter": [ @@ -1288,10 +1249,10 @@ "track_construction" ] ], - "order": 46 + "order": 81 }, { - "id": "tunnel_link", + "id": "Link tunnel", "type": "line", "source": "openmaptiles", "source-layer": "transportation", @@ -1300,7 +1261,7 @@ "visibility": "visible" }, "paint": { - "line-color": "#fff4c6", + "line-color": "hsl(48, 100%, 89%)", "line-width": { "base": 1.2, "stops": [ @@ -1342,10 +1303,10 @@ 0 ] ], - "order": 47 + "order": 82 }, { - "id": "tunnel_minor", + "id": "Minor tunnel", "type": "line", "source": "openmaptiles", "source-layer": "transportation", @@ -1354,7 +1315,8 @@ "visibility": "visible" }, "paint": { - "line-color": "#fff", + "line-color": "hsl(0, 0%, 100%)", + "line-opacity": 1, "line-width": { "base": 1.2, "stops": [ @@ -1371,8 +1333,7 @@ 11.5 ] ] - }, - "line-opacity": 1 + } }, "metadata": {}, "filter": [ @@ -1388,10 +1349,10 @@ "minor" ] ], - "order": 48 + "order": 83 }, { - "id": "tunnel_minor_construction", + "id": "Minor tunnel under construction", "type": "line", "source": "openmaptiles", "source-layer": "transportation", @@ -1400,7 +1361,12 @@ "visibility": "visible" }, "paint": { - "line-color": "#fff", + "line-color": "hsl(0, 0%, 100%)", + "line-dasharray": [ + 2, + 2 + ], + "line-opacity": 1, "line-width": { "base": 1.2, "stops": [ @@ -1417,12 +1383,7 @@ 11.5 ] ] - }, - "line-opacity": 1, - "line-dasharray": [ - 2, - 2 - ] + } }, "metadata": {}, "filter": [ @@ -1438,10 +1399,10 @@ "minor_construction" ] ], - "order": 49 + "order": 84 }, { - "id": "tunnel_tertiary", + "id": "Tertiary tunnel", "type": "line", "source": "openmaptiles", "source-layer": "transportation", @@ -1450,7 +1411,7 @@ "visibility": "visible" }, "paint": { - "line-color": "#ffffff", + "line-color": "hsl(0, 0%, 100%)", "line-width": { "base": 1.2, "stops": [ @@ -1503,10 +1464,10 @@ "tertiary" ] ], - "order": 50 + "order": 85 }, { - "id": "tunnel_tertiary_construction", + "id": "Tertiary tunnel under construction", "type": "line", "source": "openmaptiles", "source-layer": "transportation", @@ -1515,7 +1476,11 @@ "visibility": "visible" }, "paint": { - "line-color": "#ffffff", + "line-color": "hsl(0, 0%, 100%)", + "line-dasharray": [ + 2, + 2 + ], "line-width": { "base": 1.2, "stops": [ @@ -1552,11 +1517,7 @@ 25.4 ] ] - }, - "line-dasharray": [ - 2, - 2 - ] + } }, "metadata": {}, "filter": [ @@ -1572,10 +1533,10 @@ "tertiary_construction" ] ], - "order": 51 + "order": 86 }, { - "id": "tunnel_secondary", + "id": "Secondary tunnel", "type": "line", "source": "openmaptiles", "source-layer": "transportation", @@ -1585,7 +1546,7 @@ "visibility": "visible" }, "paint": { - "line-color": "#fafcd7", + "line-color": "hsl(63, 86%, 92%)", "line-width": { "base": 1.2, "stops": [ @@ -1650,10 +1611,10 @@ "secondary" ] ], - "order": 52 + "order": 87 }, { - "id": "tunnel_secondary_construction", + "id": "Secondary tunnel under construction", "type": "line", "source": "openmaptiles", "source-layer": "transportation", @@ -1663,7 +1624,11 @@ "visibility": "visible" }, "paint": { - "line-color": "#fafcd7", + "line-color": "hsl(63, 86%, 92%)", + "line-dasharray": [ + 2, + 2 + ], "line-width": { "base": 1.2, "stops": [ @@ -1712,11 +1677,7 @@ 25 ] ] - }, - "line-dasharray": [ - 2, - 2 - ] + } }, "metadata": {}, "filter": [ @@ -1732,10 +1693,10 @@ "secondary_construction" ] ], - "order": 53 + "order": 88 }, { - "id": "tunnel_primary", + "id": "Primary tunnel", "type": "line", "source": "openmaptiles", "source-layer": "transportation", @@ -1745,7 +1706,8 @@ "visibility": "visible" }, "paint": { - "line-color": "#feecd5", + "line-color": "hsl(34, 95%, 92%)", + "line-opacity": 1, "line-width": { "base": 1.2, "stops": [ @@ -1798,8 +1760,7 @@ 25 ] ] - }, - "line-opacity": 1 + } }, "metadata": {}, "filter": [ @@ -1815,10 +1776,10 @@ "primary" ] ], - "order": 54 + "order": 89 }, { - "id": "tunnel_primary_construction", + "id": "Primary tunnel under construction", "type": "line", "source": "openmaptiles", "source-layer": "transportation", @@ -1828,7 +1789,12 @@ "visibility": "visible" }, "paint": { - "line-color": "#feecd5", + "line-color": "hsl(34, 95%, 92%)", + "line-dasharray": [ + 2, + 2 + ], + "line-opacity": 1, "line-width": { "base": 1.2, "stops": [ @@ -1881,12 +1847,7 @@ 25 ] ] - }, - "line-opacity": 1, - "line-dasharray": [ - 2, - 2 - ] + } }, "metadata": {}, "filter": [ @@ -1902,10 +1863,10 @@ "primary_construction" ] ], - "order": 55 + "order": 90 }, { - "id": "tunnel_trunk", + "id": "Trunk tunnel", "type": "line", "source": "openmaptiles", "source-layer": "transportation", @@ -1918,14 +1879,15 @@ "stops": [ [ 5, - "#f5977a" + "hsl(14, 86%, 72%)" ], [ 11, - "#fcd7cc" + "hsl(14, 89%, 89%)" ] ] }, + "line-opacity": 1, "line-width": { "base": 1.2, "stops": [ @@ -1978,8 +1940,7 @@ 25 ] ] - }, - "line-opacity": 1 + } }, "metadata": {}, "filter": [ @@ -1995,10 +1956,10 @@ "trunk" ] ], - "order": 56 + "order": 91 }, { - "id": "tunnel_trunk_construction", + "id": "Trunk tunnel under construction", "type": "line", "source": "openmaptiles", "source-layer": "transportation", @@ -2007,7 +1968,12 @@ "visibility": "visible" }, "paint": { - "line-color": "#f9b29c", + "line-color": "hsl(14, 89%, 79%)", + "line-dasharray": [ + 2, + 2 + ], + "line-opacity": 1, "line-width": { "base": 1.2, "stops": [ @@ -2060,12 +2026,7 @@ 25 ] ] - }, - "line-opacity": 1, - "line-dasharray": [ - 2, - 2 - ] + } }, "metadata": {}, "filter": [ @@ -2081,10 +2042,10 @@ "trunk_construction" ] ], - "order": 57 + "order": 92 }, { - "id": "tunnel_motorway", + "id": "Highway tunnel", "type": "line", "source": "openmaptiles", "source-layer": "transportation", @@ -2097,11 +2058,11 @@ "stops": [ [ 5, - "#e66e89" + "hsl(347, 71%, 67%)" ], [ 11, - "#f1bcc6" + "hsl(349, 65%, 84%)" ] ] }, @@ -2137,10 +2098,10 @@ "tunnel" ] ], - "order": 58 + "order": 93 }, { - "id": "tunnel_motorway_construction", + "id": "Highway tunnel under construction", "type": "line", "source": "openmaptiles", "source-layer": "transportation", @@ -2153,14 +2114,18 @@ "stops": [ [ 5, - "#e66e89" + "hsl(347, 71%, 67%)" ], [ 11, - "#f1bcc6" + "hsl(349, 65%, 84%)" ] ] }, + "line-dasharray": [ + 2, + 2 + ], "line-width": { "base": 1.2, "stops": [ @@ -2177,11 +2142,7 @@ 25 ] ] - }, - "line-dasharray": [ - 2, - 2 - ] + } }, "metadata": {}, "filter": [ @@ -2197,10 +2158,10 @@ "tunnel" ] ], - "order": 59 + "order": 94 }, { - "id": "tunnel_major_rail", + "id": "Major rail tunnel", "type": "line", "source": "openmaptiles", "source-layer": "transportation", @@ -2208,7 +2169,7 @@ "visibility": "visible" }, "paint": { - "line-color": "rgba(166, 166, 166, 1)", + "line-color": "hsl(0, 0%, 65%)", "line-width": { "base": 1.4, "stops": [ @@ -2241,10 +2202,10 @@ "rail" ] ], - "order": 60 + "order": 95 }, { - "id": "tunnel_major_rail_hatching", + "id": "Major rail tunnel hatching", "type": "line", "source": "openmaptiles", "source-layer": "transportation", @@ -2257,14 +2218,18 @@ "stops": [ [ 8, - "rgba(114, 114, 114, 0.44)" + "hsla(0, 0%, 45%, 0.44)" ], [ 10, - "rgba(199, 199, 199, 1)" + "hsl(0, 0%, 78%)" ] ] }, + "line-dasharray": [ + 2, + 2 + ], "line-width": { "base": 1.4, "stops": [ @@ -2281,11 +2246,7 @@ 4 ] ] - }, - "line-dasharray": [ - 2, - 2 - ] + } }, "metadata": {}, "filter": [ @@ -2293,7 +2254,7 @@ [ "in", "brunnel", - "tunnel", + "bridge", "tunnel" ], [ @@ -2302,10 +2263,10 @@ "rail" ] ], - "order": 61 + "order": 96 }, { - "id": "road_area_pier", + "id": "Pier", "type": "fill", "source": "openmaptiles", "source-layer": "transportation", @@ -2313,8 +2274,8 @@ "visibility": "visible" }, "paint": { - "fill-color": "rgba(246, 241, 229, 1)", - "fill-antialias": true + "fill-antialias": true, + "fill-color": "hsl(42, 49%, 93%)" }, "metadata": {}, "filter": [ @@ -2330,10 +2291,10 @@ "pier" ] ], - "order": 62 + "order": 97 }, { - "id": "road_pier", + "id": "Pier road", "type": "line", "source": "openmaptiles", "source-layer": "transportation", @@ -2342,7 +2303,7 @@ "line-join": "round" }, "paint": { - "line-color": "rgba(246, 241, 229, 1)", + "line-color": "hsl(42, 49%, 93%)", "line-width": { "base": 1.2, "stops": [ @@ -2371,10 +2332,10 @@ "pier" ] ], - "order": 63 + "order": 98 }, { - "id": "road_area_bridge", + "id": "Bridge area", "type": "fill", "source": "openmaptiles", "source-layer": "transportation", @@ -2383,8 +2344,8 @@ "visibility": "visible" }, "paint": { - "fill-color": "#b8b8b8", - "fill-antialias": true + "fill-antialias": true, + "fill-color": "hsl(0, 0%, 72%)" }, "metadata": {}, "filter": [ @@ -2400,10 +2361,10 @@ "bridge" ] ], - "order": 64 + "order": 99 }, { - "id": "road_area_platform", + "id": "Platform area", "type": "fill", "source": "openmaptiles", "source-layer": "transportation", @@ -2411,7 +2372,7 @@ "visibility": "visible" }, "paint": { - "fill-color": "#bababa" + "fill-color": "hsl(0, 0%, 73%)" }, "metadata": {}, "filter": [ @@ -2436,10 +2397,10 @@ "platform" ] ], - "order": 65 + "order": 100 }, { - "id": "road_area_pedestrian", + "id": "Pedestrian area", "type": "fill", "source": "openmaptiles", "source-layer": "transportation", @@ -2447,7 +2408,7 @@ "visibility": "visible" }, "paint": { - "fill-color": "#dddde8" + "fill-color": "hsl(240, 19%, 89%)" }, "metadata": {}, "filter": [ @@ -2468,10 +2429,10 @@ "pier" ] ], - "order": 66 + "order": 101 }, { - "id": "road_service_track_casing", + "id": "Service road link outline", "type": "line", "source": "openmaptiles", "source-layer": "transportation", @@ -2481,7 +2442,7 @@ "line-join": "round" }, "paint": { - "line-color": "#bbbbbb", + "line-color": "hsl(0, 0%, 73%)", "line-width": { "base": 1.2, "stops": [ @@ -2528,10 +2489,10 @@ "track" ] ], - "order": 67 + "order": 102 }, { - "id": "road_primary_link_casing", + "id": "Primary road link outline", "type": "line", "source": "openmaptiles", "source-layer": "transportation", @@ -2546,11 +2507,11 @@ "stops": [ [ 11, - "#c38a27" + "hsl(38, 67%, 46%)" ], [ 12, - "#a06b00" + "hsl(40, 100%, 31%)" ] ] }, @@ -2608,10 +2569,10 @@ "primary" ] ], - "order": 68 + "order": 103 }, { - "id": "road_trunk_link_casing", + "id": "Trunk road link outline", "type": "line", "source": "openmaptiles", "source-layer": "transportation", @@ -2626,11 +2587,11 @@ "stops": [ [ 11, - "#cf6649" + "hsl(13, 58%, 55%)" ], [ 12, - "#c84e2f" + "hsl(12, 62%, 48%)" ] ] }, @@ -2684,10 +2645,10 @@ "trunk" ] ], - "order": 69 + "order": 104 }, { - "id": "road_motorway_link_casing", + "id": "Highway link outline", "type": "line", "source": "openmaptiles", "source-layer": "transportation", @@ -2702,14 +2663,15 @@ "stops": [ [ 11, - "#c24e6b" + "hsl(345, 49%, 53%)" ], [ 12, - "#dc2a67" + "hsl(339, 72%, 51%)" ] ] }, + "line-opacity": 1, "line-width": { "base": 1.2, "stops": [ @@ -2742,8 +2704,7 @@ 17 ] ] - }, - "line-opacity": 1 + } }, "metadata": {}, "filter": [ @@ -2765,10 +2726,10 @@ 1 ] ], - "order": 70 + "order": 105 }, { - "id": "road_minor_casing", + "id": "Minor road outline", "type": "line", "source": "openmaptiles", "source-layer": "transportation", @@ -2779,7 +2740,19 @@ "visibility": "visible" }, "paint": { - "line-color": "#bbbbbb", + "line-color": "hsl(0, 0%, 73%)", + "line-opacity": { + "stops": [ + [ + 10, + 0 + ], + [ + 12.5, + 1 + ] + ] + }, "line-width": { "base": 1.2, "stops": [ @@ -2808,18 +2781,6 @@ 17 ] ] - }, - "line-opacity": { - "stops": [ - [ - 10, - 0 - ], - [ - 12.5, - 1 - ] - ] } }, "metadata": {}, @@ -2847,10 +2808,10 @@ "1" ] ], - "order": 71 + "order": 106 }, { - "id": "road_tertiary_casing", + "id": "Tertiary road outline", "type": "line", "source": "openmaptiles", "source-layer": "transportation", @@ -2861,7 +2822,8 @@ "visibility": "visible" }, "paint": { - "line-color": "#8f8f8f", + "line-color": "hsl(0, 0%, 56%)", + "line-opacity": 1, "line-width": { "base": 1.2, "stops": [ @@ -2898,8 +2860,7 @@ 27 ] ] - }, - "line-opacity": 1 + } }, "metadata": {}, "filter": [ @@ -2921,10 +2882,10 @@ 1 ] ], - "order": 72 + "order": 107 }, { - "id": "road_secondary_link_casing", + "id": "Secondary road link outline", "type": "line", "source": "openmaptiles", "source-layer": "transportation", @@ -2939,14 +2900,15 @@ "stops": [ [ 11, - "#9eae23" + "hsl(67, 67%, 41%)" ], [ 12, - "#707d05" + "hsl(67, 92%, 25%)" ] ] }, + "line-opacity": 1, "line-width": { "base": 1.2, "stops": [ @@ -2983,8 +2945,7 @@ 27 ] ] - }, - "line-opacity": 1 + } }, "metadata": {}, "filter": [ @@ -3006,10 +2967,10 @@ 1 ] ], - "order": 73 + "order": 108 }, { - "id": "road_secondary_casing", + "id": "Secondary road outline", "type": "line", "source": "openmaptiles", "source-layer": "transportation", @@ -3024,14 +2985,15 @@ "stops": [ [ 11, - "#9eae23" + "hsl(67, 67%, 41%)" ], [ 12, - "#707d05" + "hsl(67, 92%, 25%)" ] ] }, + "line-opacity": 1, "line-width": { "base": 1.2, "stops": [ @@ -3068,8 +3030,7 @@ 27 ] ] - }, - "line-opacity": 1 + } }, "metadata": {}, "filter": [ @@ -3091,10 +3052,10 @@ 1 ] ], - "order": 74 + "order": 109 }, { - "id": "road_trunk_casing", + "id": "Trunk road outline", "type": "line", "source": "openmaptiles", "source-layer": "transportation", @@ -3109,14 +3070,15 @@ "stops": [ [ 11, - "rgba(160, 116, 0, 1)" + "hsl(44, 100%, 31%)" ], [ 12, - "#c84e2f" + "hsl(12, 62%, 48%)" ] ] }, + "line-opacity": 1, "line-width": { "base": 1.2, "stops": [ @@ -3153,8 +3115,7 @@ 27 ] ] - }, - "line-opacity": 1 + } }, "metadata": {}, "filter": [ @@ -3181,10 +3142,10 @@ 1 ] ], - "order": 75 + "order": 110 }, { - "id": "road_primary_casing", + "id": "Primary road outline", "type": "line", "source": "openmaptiles", "source-layer": "transportation", @@ -3199,14 +3160,15 @@ "stops": [ [ 10.9, - "rgba(255, 250, 234, 0.47)" + "hsla(46, 100%, 96%, 0.47)" ], [ 11, - "rgba(160, 116, 0, 1)" + "hsl(44, 100%, 31%)" ] ] }, + "line-opacity": 1, "line-width": { "base": 1.2, "stops": [ @@ -3243,8 +3205,7 @@ 27 ] ] - }, - "line-opacity": 1 + } }, "metadata": {}, "filter": [ @@ -3271,10 +3232,10 @@ 1 ] ], - "order": 76 + "order": 111 }, { - "id": "road_motorway_casing", + "id": "Highway road outline", "type": "line", "source": "openmaptiles", "source-layer": "transportation", @@ -3289,11 +3250,11 @@ "stops": [ [ 11, - "#c24e6b" + "hsl(345, 49%, 53%)" ], [ 12, - "#dc2a67" + "hsl(339, 72%, 51%)" ] ] }, @@ -3335,10 +3296,10 @@ 1 ] ], - "order": 77 + "order": 112 }, { - "id": "road_pedestrian_casing", + "id": "Pedestrian road outline", "type": "line", "source": "openmaptiles", "source-layer": "transportation", @@ -3346,7 +3307,7 @@ "visibility": "visible" }, "paint": { - "line-color": "#999999", + "line-color": "hsl(0, 0%, 60%)", "line-width": { "stops": [ [ @@ -3399,10 +3360,10 @@ "tunnel" ] ], - "order": 78 + "order": 113 }, { - "id": "road_pedestrian", + "id": "Pedestrian road", "type": "line", "source": "openmaptiles", "source-layer": "transportation", @@ -3410,7 +3371,7 @@ "visibility": "visible" }, "paint": { - "line-color": "#dddde8", + "line-color": "hsl(240, 19%, 89%)", "line-width": { "stops": [ [ @@ -3463,10 +3424,10 @@ "tunnel" ] ], - "order": 79 + "order": 114 }, { - "id": "road_path_steps_casing", + "id": "Steps path outline", "type": "line", "source": "openmaptiles", "source-layer": "transportation", @@ -3476,7 +3437,8 @@ "visibility": "visible" }, "paint": { - "line-color": "rgba(236, 236, 236, 1)", + "line-color": "hsl(0, 0%, 93%)", + "line-opacity": 0.6, "line-width": { "base": 1.2, "stops": [ @@ -3497,8 +3459,7 @@ 4.6 ] ] - }, - "line-opacity": 0.6 + } }, "metadata": {}, "filter": [ @@ -3525,10 +3486,10 @@ "steps" ] ], - "order": 80 + "order": 115 }, { - "id": "road_path_bridleway_casing", + "id": "Bridleway path outline", "type": "line", "source": "openmaptiles", "source-layer": "transportation", @@ -3538,7 +3499,8 @@ "visibility": "visible" }, "paint": { - "line-color": "rgba(236, 236, 236, 1)", + "line-color": "hsl(0, 0%, 93%)", + "line-opacity": 0.6, "line-width": { "base": 1.2, "stops": [ @@ -3559,8 +3521,7 @@ 3.6 ] ] - }, - "line-opacity": 0.6 + } }, "metadata": {}, "filter": [ @@ -3600,10 +3561,10 @@ "designated" ] ], - "order": 81 + "order": 116 }, { - "id": "road_path_cycleway_casing", + "id": "Cycleway path outline", "type": "line", "source": "openmaptiles", "source-layer": "transportation", @@ -3613,7 +3574,8 @@ "visibility": "visible" }, "paint": { - "line-color": "rgba(236, 236, 236, 1)", + "line-color": "hsl(0, 0%, 93%)", + "line-opacity": 0.6, "line-width": { "base": 1.2, "stops": [ @@ -3634,8 +3596,7 @@ 3.6 ] ] - }, - "line-opacity": 0.6 + } }, "metadata": {}, "filter": [ @@ -3670,10 +3631,10 @@ ] ] ], - "order": 82 + "order": 117 }, { - "id": "road_path_footway_casing", + "id": "Footway path outline", "type": "line", "source": "openmaptiles", "source-layer": "transportation", @@ -3683,7 +3644,8 @@ "visibility": "visible" }, "paint": { - "line-color": "rgba(236, 236, 236, 1)", + "line-color": "hsl(0, 0%, 93%)", + "line-opacity": 0.6, "line-width": { "base": 1.2, "stops": [ @@ -3704,8 +3666,7 @@ 3.6 ] ] - }, - "line-opacity": 0.6 + } }, "metadata": {}, "filter": [ @@ -3743,10 +3704,10 @@ "designated" ] ], - "order": 83 + "order": 118 }, { - "id": "road_path_cycleway", + "id": "Cycleway path", "type": "line", "source": "openmaptiles", "source-layer": "transportation", @@ -3756,7 +3717,11 @@ "visibility": "visible" }, "paint": { - "line-color": "#0000ff", + "line-color": "hsl(240, 100%, 50%)", + "line-dasharray": [ + 2, + 2 + ], "line-width": { "base": 1.2, "stops": [ @@ -3777,11 +3742,7 @@ 1.3 ] ] - }, - "line-dasharray": [ - 2, - 2 - ] + } }, "metadata": {}, "filter": [ @@ -3816,10 +3777,10 @@ ] ] ], - "order": 84 + "order": 119 }, { - "id": "road_path_steps", + "id": "Steps path", "type": "line", "source": "openmaptiles", "source-layer": "transportation", @@ -3829,7 +3790,11 @@ "visibility": "visible" }, "paint": { - "line-color": "#fa8072", + "line-color": "hsl(6, 93%, 71%)", + "line-dasharray": [ + 0.5, + 0.5 + ], "line-width": { "base": 1.2, "stops": [ @@ -3850,11 +3815,7 @@ 2.3 ] ] - }, - "line-dasharray": [ - 0.5, - 0.5 - ] + } }, "metadata": {}, "filter": [ @@ -3881,10 +3842,10 @@ "steps" ] ], - "order": 85 + "order": 120 }, { - "id": "road_path_bridleway", + "id": "Bridleway path", "type": "line", "source": "openmaptiles", "source-layer": "transportation", @@ -3894,7 +3855,11 @@ "visibility": "visible" }, "paint": { - "line-color": "#008000", + "line-color": "hsl(120, 100%, 25%)", + "line-dasharray": [ + 2, + 2 + ], "line-width": { "base": 1.2, "stops": [ @@ -3915,11 +3880,7 @@ 1.3 ] ] - }, - "line-dasharray": [ - 2, - 2 - ] + } }, "metadata": {}, "filter": [ @@ -3959,10 +3920,10 @@ "designated" ] ], - "order": 86 + "order": 121 }, { - "id": "road_path_footway", + "id": "Footway path", "type": "line", "source": "openmaptiles", "source-layer": "transportation", @@ -3972,7 +3933,11 @@ "visibility": "visible" }, "paint": { - "line-color": "#fa8072", + "line-color": "hsl(6, 93%, 71%)", + "line-dasharray": [ + 2, + 1 + ], "line-width": { "base": 1.2, "stops": [ @@ -3997,11 +3962,7 @@ 1.6 ] ] - }, - "line-dasharray": [ - 2, - 1 - ] + } }, "metadata": {}, "filter": [ @@ -4039,10 +4000,10 @@ "designated" ] ], - "order": 87 + "order": 122 }, { - "id": "road_primary_link", + "id": "Primary road link", "type": "line", "source": "openmaptiles", "source-layer": "transportation", @@ -4052,7 +4013,7 @@ "visibility": "visible" }, "paint": { - "line-color": "#fcd6a4", + "line-color": "hsl(34, 94%, 82%)", "line-width": { "base": 1.2, "stops": [ @@ -4107,10 +4068,10 @@ "primary" ] ], - "order": 88 + "order": 123 }, { - "id": "road_trunk_link", + "id": "Trunk road link", "type": "line", "source": "openmaptiles", "source-layer": "transportation", @@ -4125,11 +4086,11 @@ "stops": [ [ 6, - "#fdb59e" + "hsl(15, 96%, 81%)" ], [ 11, - "#f9b29c" + "hsl(14, 89%, 79%)" ] ] }, @@ -4183,10 +4144,10 @@ "trunk" ] ], - "order": 89 + "order": 124 }, { - "id": "road_motorway_link", + "id": "Highway road link", "type": "line", "source": "openmaptiles", "source-layer": "transportation", @@ -4201,11 +4162,11 @@ "stops": [ [ 6, - "#e66e89" + "hsl(347, 71%, 67%)" ], [ 10, - "#e892a2" + "hsl(349, 65%, 74%)" ] ] }, @@ -4267,10 +4228,10 @@ 1 ] ], - "order": 90 + "order": 125 }, { - "id": "road_service_track", + "id": "Service road", "type": "line", "source": "openmaptiles", "source-layer": "transportation", @@ -4281,7 +4242,7 @@ "visibility": "visible" }, "paint": { - "line-color": "#fff", + "line-color": "hsl(0, 0%, 100%)", "line-width": { "base": 1.2, "stops": [ @@ -4332,21 +4293,23 @@ "track" ] ], - "order": 91 + "order": 126 }, { - "id": "road_service_track_construction", + "id": "Service road under construction", "type": "line", "source": "openmaptiles", "source-layer": "transportation", "minzoom": 12, "layout": { - "line-cap": "round", - "line-join": "round", "visibility": "visible" }, "paint": { - "line-color": "#fff", + "line-color": "hsl(0, 0%, 100%)", + "line-dasharray": [ + 1, + 1 + ], "line-width": { "base": 1.2, "stops": [ @@ -4379,11 +4342,7 @@ 10.4 ] ] - }, - "line-dasharray": [ - 2, - 2 - ] + } }, "metadata": {}, "filter": [ @@ -4401,10 +4360,10 @@ "track_construction" ] ], - "order": 92 + "order": 127 }, { - "id": "road_raceway", + "id": "Raceway road", "type": "line", "source": "openmaptiles", "source-layer": "transportation", @@ -4415,7 +4374,7 @@ "visibility": "visible" }, "paint": { - "line-color": "rgba(254, 190, 200, 1)", + "line-color": "hsl(351, 97%, 87%)", "line-width": { "base": 1.2, "stops": [ @@ -4463,10 +4422,10 @@ "raceway" ] ], - "order": 93 + "order": 128 }, { - "id": "road_minor", + "id": "Minor road under construction", "type": "line", "source": "openmaptiles", "source-layer": "transportation", @@ -4477,52 +4436,26 @@ "visibility": "visible" }, "paint": { - "line-color": { - "stops": [ - [ - 12, - "#d3d3d3" - ], - [ - 13, - "rgba(255, 255, 255, 1)" - ] - ] - }, - "line-width": { - "base": 1.2, - "stops": [ - [ - 12, - 1 - ], - [ - 13, - 1.9 - ], - [ - 14, - 3.8 - ], - [ - 15, - 4.8 - ], - [ - 16, - 10.4 - ], - [ - 17, - 11.4 - ], - [ - 18, - 15.4 - ] - ] - }, - "line-opacity": 1 + "line-color": "hsl(0, 0%, 83%)", + "line-opacity": 1, + "line-width": [ + "interpolate", + [ + "exponential", + 1.2 + ], + [ + "zoom" + ], + 11, + 1, + 12, + 2, + 13, + 4, + 16, + 7 + ] }, "metadata": {}, "filter": [ @@ -4533,24 +4466,89 @@ "LineString" ], [ - "all", - [ - "!in", - "brunnel", - "bridge", - "tunnel" - ], - [ - "in", - "class", - "minor" - ] + "!in", + "brunnel", + "bridge", + "tunnel" + ], + [ + "==", + "class", + "minor_construction" ] ], - "order": 94 + "order": 129 }, { - "id": "road_minor_construction", + "id": "Minor road under construction dash", + "type": "line", + "source": "openmaptiles", + "source-layer": "transportation", + "minzoom": 12, + "layout": { + "visibility": "visible" + }, + "paint": { + "line-color": { + "stops": [ + [ + 12, + "hsl(0, 0%, 83%)" + ], + [ + 13, + "hsl(0, 0%, 100%)" + ] + ] + }, + "line-dasharray": [ + 1, + 1 + ], + "line-opacity": 1, + "line-width": [ + "interpolate", + [ + "exponential", + 1.2 + ], + [ + "zoom" + ], + 11, + 0, + 12, + 2, + 13, + 4, + 16, + 7 + ] + }, + "metadata": {}, + "filter": [ + "all", + [ + "==", + "$type", + "LineString" + ], + [ + "!in", + "brunnel", + "bridge", + "tunnel" + ], + [ + "==", + "class", + "minor_construction" + ] + ], + "order": 130 + }, + { + "id": "Minor road", "type": "line", "source": "openmaptiles", "source-layer": "transportation", @@ -4565,52 +4563,48 @@ "stops": [ [ 12, - "#d3d3d3" + "hsl(0, 0%, 83%)" ], [ 13, - "rgba(255, 255, 255, 1)" - ] - ] - }, - "line-width": { - "base": 1.2, - "stops": [ - [ - 12, - 1 - ], - [ - 13, - 1.9 - ], - [ - 14, - 3.8 - ], - [ - 15, - 4.8 - ], - [ - 16, - 10.4 - ], - [ - 17, - 11.4 - ], - [ - 18, - 15.4 + "hsl(0, 0%, 100%)" ] ] }, "line-opacity": 1, - "line-dasharray": [ - 2, - 2 - ] + "line-width": { + "base": 1.2, + "stops": [ + [ + 12, + 1 + ], + [ + 13, + 1.9 + ], + [ + 14, + 3.8 + ], + [ + 15, + 4.8 + ], + [ + 16, + 10.4 + ], + [ + 17, + 11.4 + ], + [ + 18, + 15.4 + ] + ] + } }, "metadata": {}, "filter": [ @@ -4621,24 +4615,330 @@ "LineString" ], [ - "all", - [ - "!in", - "brunnel", - "bridge", - "tunnel" - ], - [ - "in", - "class", - "minor_construction" - ] + "!in", + "brunnel", + "bridge", + "tunnel" + ], + [ + "==", + "class", + "minor" ] ], - "order": 95 + "order": 131 }, { - "id": "road_secondary", + "id": "Tertiary road under construction", + "type": "line", + "source": "openmaptiles", + "source-layer": "transportation", + "minzoom": 9, + "layout": { + "visibility": "visible" + }, + "paint": { + "line-color": "hsl(0, 0%, 73%)", + "line-width": [ + "interpolate", + [ + "exponential", + 1.2 + ], + [ + "zoom" + ], + 11, + 1, + 12, + 2, + 13, + 4, + 16, + 7 + ] + }, + "metadata": {}, + "filter": [ + "all", + [ + "!in", + "brunnel", + "bridge", + "tunnel" + ], + [ + "in", + "class", + "tertiary_construction" + ] + ], + "order": 132 + }, + { + "id": "Tertiary road under construction dash", + "type": "line", + "source": "openmaptiles", + "source-layer": "transportation", + "minzoom": 9, + "layout": { + "visibility": "visible" + }, + "paint": { + "line-color": { + "stops": [ + [ + 10.5, + "hsl(0, 0%, 73%)" + ], + [ + 10.6, + "hsl(0, 0%, 100%)" + ] + ] + }, + "line-dasharray": [ + 1, + 1 + ], + "line-width": [ + "interpolate", + [ + "exponential", + 1.2 + ], + [ + "zoom" + ], + 11, + 0, + 12, + 2, + 13, + 4, + 16, + 7 + ] + }, + "metadata": {}, + "filter": [ + "all", + [ + "!in", + "brunnel", + "bridge", + "tunnel" + ], + [ + "in", + "class", + "tertiary_construction" + ] + ], + "order": 133 + }, + { + "id": "Tertiary road", + "type": "line", + "source": "openmaptiles", + "source-layer": "transportation", + "minzoom": 9, + "layout": { + "line-cap": "round", + "line-join": "round", + "visibility": "visible" + }, + "paint": { + "line-color": { + "stops": [ + [ + 10.5, + "hsl(0, 0%, 73%)" + ], + [ + 10.6, + "hsl(0, 0%, 100%)" + ] + ] + }, + "line-width": { + "base": 1.2, + "stops": [ + [ + 9, + 0.7 + ], + [ + 10, + 0.7 + ], + [ + 11, + 1.9 + ], + [ + 12, + 3 + ], + [ + 13, + 3.9 + ], + [ + 14, + 7.8 + ], + [ + 15, + 8.8 + ], + [ + 16, + 16.4 + ], + [ + 17, + 19.4 + ], + [ + 18, + 25.4 + ] + ] + } + }, + "metadata": {}, + "filter": [ + "all", + [ + "!in", + "brunnel", + "bridge", + "tunnel" + ], + [ + "in", + "class", + "tertiary" + ] + ], + "order": 134 + }, + { + "id": "Secondary road under construction", + "type": "line", + "source": "openmaptiles", + "source-layer": "transportation", + "minzoom": 8, + "layout": { + "line-cap": "round", + "line-join": "round", + "visibility": "visible" + }, + "paint": { + "line-color": [ + "interpolate", + [ + "exponential", + 1 + ], + [ + "zoom" + ], + 10.5, + "hsl(0, 0%, 73%)", + 10.6, + "hsl(63, 86%, 86%)" + ], + "line-width": [ + "interpolate", + [ + "exponential", + 1.2 + ], + [ + "zoom" + ], + 11, + 1, + 12, + 2, + 13, + 4, + 16, + 7 + ] + }, + "metadata": {}, + "filter": [ + "all", + [ + "!in", + "brunnel", + "bridge", + "tunnel" + ], + [ + "in", + "class", + "secondary_construction" + ] + ], + "order": 135 + }, + { + "id": "Secondary road under construction dash", + "type": "line", + "source": "openmaptiles", + "source-layer": "transportation", + "minzoom": 8, + "layout": { + "visibility": "visible" + }, + "paint": { + "line-color": "hsl(0, 0%, 100%)", + "line-dasharray": [ + 1, + 1 + ], + "line-width": [ + "interpolate", + [ + "exponential", + 1.2 + ], + [ + "zoom" + ], + 11, + 0, + 12, + 2, + 13, + 4, + 16, + 7 + ] + }, + "metadata": {}, + "filter": [ + "all", + [ + "!in", + "brunnel", + "bridge", + "tunnel" + ], + [ + "in", + "class", + "secondary_construction" + ] + ], + "order": 136 + }, + { + "id": "Secondary road", "type": "line", "source": "openmaptiles", "source-layer": "transportation", @@ -4653,11 +4953,11 @@ "stops": [ [ 10.5, - "#bbbbbb" + "hsl(0, 0%, 73%)" ], [ 10.6, - "#f7fabf" + "hsl(63, 86%, 86%)" ] ] }, @@ -4726,279 +5026,10 @@ "secondary" ] ], - "order": 96 + "order": 137 }, { - "id": "road_tertiary", - "type": "line", - "source": "openmaptiles", - "source-layer": "transportation", - "minzoom": 9, - "layout": { - "line-cap": "round", - "line-join": "round", - "visibility": "visible" - }, - "paint": { - "line-color": { - "stops": [ - [ - 10.5, - "#bbbbbb" - ], - [ - 10.6, - "#FFFFFF" - ] - ] - }, - "line-width": { - "base": 1.2, - "stops": [ - [ - 9, - 0.7 - ], - [ - 10, - 0.7 - ], - [ - 11, - 1.9 - ], - [ - 12, - 3 - ], - [ - 13, - 3.9 - ], - [ - 14, - 7.8 - ], - [ - 15, - 8.8 - ], - [ - 16, - 16.4 - ], - [ - 17, - 19.4 - ], - [ - 18, - 25.4 - ] - ] - } - }, - "metadata": {}, - "filter": [ - "all", - [ - "!in", - "brunnel", - "bridge", - "tunnel" - ], - [ - "in", - "class", - "tertiary" - ] - ], - "order": 97 - }, - { - "id": "road_tertiary_construction", - "type": "line", - "source": "openmaptiles", - "source-layer": "transportation", - "minzoom": 9, - "layout": { - "line-cap": "round", - "line-join": "round", - "visibility": "visible" - }, - "paint": { - "line-color": { - "stops": [ - [ - 10.5, - "#bbbbbb" - ], - [ - 10.6, - "#fff" - ] - ] - }, - "line-width": { - "base": 1.2, - "stops": [ - [ - 9, - 0.7 - ], - [ - 11, - 1.9 - ], - [ - 12, - 3 - ], - [ - 13, - 3.9 - ], - [ - 14, - 7.8 - ], - [ - 15, - 8.8 - ], - [ - 16, - 16.4 - ], - [ - 17, - 19.4 - ], - [ - 18, - 25.4 - ] - ] - }, - "line-dasharray": [ - 2, - 2 - ] - }, - "metadata": {}, - "filter": [ - "all", - [ - "!in", - "brunnel", - "bridge", - "tunnel" - ], - [ - "in", - "class", - "tertiary_construction" - ] - ], - "order": 98 - }, - { - "id": "road_secondary_construction", - "type": "line", - "source": "openmaptiles", - "source-layer": "transportation", - "minzoom": 8, - "layout": { - "line-cap": "round", - "line-join": "round", - "visibility": "visible" - }, - "paint": { - "line-color": { - "stops": [ - [ - 10.5, - "#bbbbbb" - ], - [ - 10.6, - "#f7fabf" - ] - ] - }, - "line-width": { - "base": 1.2, - "stops": [ - [ - 8, - 1 - ], - [ - 9, - 1.1 - ], - [ - 10, - 1.1 - ], - [ - 11, - 2.9 - ], - [ - 12, - 4.3 - ], - [ - 13, - 4.3 - ], - [ - 14, - 7.6 - ], - [ - 15, - 8.6 - ], - [ - 16, - 16 - ], - [ - 17, - 19 - ], - [ - 18, - 25 - ] - ] - }, - "line-dasharray": [ - 2, - 2 - ] - }, - "metadata": {}, - "filter": [ - "all", - [ - "!in", - "brunnel", - "bridge", - "tunnel" - ], - [ - "in", - "class", - "secondary_construction" - ] - ], - "order": 99 - }, - { - "id": "road_primary_construction", + "id": "Primary road under construction", "type": "line", "source": "openmaptiles", "source-layer": "transportation", @@ -5013,63 +5044,32 @@ "stops": [ [ 7, - "#f3c380" + "hsl(35, 83%, 73%)" ], [ 11, - "#fcd6a4" + "hsl(34, 94%, 82%)" ] ] }, - "line-width": { - "base": 1.2, - "stops": [ - [ - 7, - 1 - ], - [ - 8, - 1.4 - ], - [ - 9, - 1.8 - ], - [ - 10, - 1.8 - ], - [ - 11, - 2.5 - ], - [ - 12, - 4 - ], - [ - 13, - 4 - ], - [ - 15, - 8.6 - ], - [ - 16, - 16 - ], - [ - 17, - 19 - ], - [ - 18, - 25 - ] - ] - } + "line-width": [ + "interpolate", + [ + "exponential", + 1.2 + ], + [ + "zoom" + ], + 11, + 1, + 12, + 2, + 13, + 4, + 16, + 7 + ] }, "metadata": {}, "filter": [ @@ -5091,10 +5091,66 @@ "primary_construction" ] ], - "order": 100 + "order": 138 }, { - "id": "road_primary", + "id": "Primary road under construction dash", + "type": "line", + "source": "openmaptiles", + "source-layer": "transportation", + "minzoom": 7, + "layout": { + "visibility": "visible" + }, + "paint": { + "line-color": "hsl(35, 0%, 100%)", + "line-dasharray": [ + 1, + 1 + ], + "line-width": [ + "interpolate", + [ + "exponential", + 1.2 + ], + [ + "zoom" + ], + 11, + 0, + 12, + 2, + 13, + 4, + 16, + 7 + ] + }, + "metadata": {}, + "filter": [ + "all", + [ + "!in", + "brunnel", + "bridge", + "tunnel" + ], + [ + "!=", + "ramp", + 1 + ], + [ + "in", + "class", + "primary_construction" + ] + ], + "order": 139 + }, + { + "id": "Primary road", "type": "line", "source": "openmaptiles", "source-layer": "transportation", @@ -5109,11 +5165,11 @@ "stops": [ [ 7, - "#f3c380" + "hsl(35, 83%, 73%)" ], [ 11, - "#fcd6a4" + "hsl(34, 94%, 82%)" ] ] }, @@ -5187,10 +5243,10 @@ "primary" ] ], - "order": 101 + "order": 140 }, { - "id": "road_trunk", + "id": "Trunk road under construction", "type": "line", "source": "openmaptiles", "source-layer": "transportation", @@ -5204,18 +5260,147 @@ "line-color": { "stops": [ [ - 5, - "#fdb59e" + 6, + "hsl(15, 96%, 81%)" ], [ 11, - "#f9b29c" + "hsl(14, 89%, 79%)" + ] + ] + }, + "line-width": [ + "interpolate", + [ + "exponential", + 1.2 + ], + [ + "zoom" + ], + 11, + 1, + 12, + 2, + 13, + 4, + 16, + 7 + ] + }, + "metadata": {}, + "filter": [ + "all", + [ + "!in", + "brunnel", + "bridge", + "tunnel" + ], + [ + "!=", + "ramp", + 1 + ], + [ + "in", + "class", + "trunk_construction" + ] + ], + "order": 141 + }, + { + "id": "Trunk road under construction dash", + "type": "line", + "source": "openmaptiles", + "source-layer": "transportation", + "minzoom": 7, + "layout": { + "visibility": "visible" + }, + "paint": { + "line-color": "hsl(15, 0%, 100%)", + "line-dasharray": [ + 1, + 1 + ], + "line-width": [ + "interpolate", + [ + "exponential", + 1.2 + ], + [ + "zoom" + ], + 11, + 0, + 12, + 2, + 13, + 4, + 16, + 7 + ] + }, + "metadata": {}, + "filter": [ + "all", + [ + "!in", + "brunnel", + "bridge", + "tunnel" + ], + [ + "!=", + "ramp", + 1 + ], + [ + "in", + "class", + "trunk_construction" + ] + ], + "order": 142 + }, + { + "id": "Trunk road", + "type": "line", + "source": "openmaptiles", + "source-layer": "transportation", + "minzoom": 5, + "layout": { + "line-cap": "round", + "line-join": "round", + "visibility": "visible" + }, + "paint": { + "line-color": { + "stops": [ + [ + 5, + "hsl(15, 96%, 81%)" + ], + [ + 11, + "hsl(14, 89%, 79%)" ] ] }, "line-width": { "base": 1.2, "stops": [ + [ + 5, + 0.3 + ], + [ + 6, + 0.5 + ], [ 7, 1 @@ -5283,14 +5468,14 @@ "trunk" ] ], - "order": 102 + "order": 143 }, { - "id": "road_trunk_construction", + "id": "Highway road under construction", "type": "line", "source": "openmaptiles", "source-layer": "transportation", - "minzoom": 7, + "minzoom": 5, "layout": { "line-cap": "round", "line-join": "round", @@ -5298,69 +5483,37 @@ }, "paint": { "line-color": { + "base": 1, "stops": [ [ 6, - "#fdb59e" - ], - [ - 11, - "#f9b29c" - ] - ] - }, - "line-width": { - "base": 1.2, - "stops": [ - [ - 7, - 1 - ], - [ - 8, - 1.4 - ], - [ - 9, - 1.8 + "hsl(349, 65%, 74%)" ], [ 10, - 1.8 - ], - [ - 11, - 2.5 - ], - [ - 12, - 4 - ], - [ - 13, - 4 - ], - [ - 15, - 8.6 - ], - [ - 16, - 16 - ], - [ - 17, - 19 - ], - [ - 18, - 25 + "hsl(347, 71%, 67%)" ] ] }, - "line-dasharray": [ + "line-width": [ + "interpolate", + [ + "exponential", + 1.2 + ], + [ + "zoom" + ], + 5, + 1, + 11, + 1, + 12, 2, - 2 + 13, + 4, + 16, + 7 ] }, "metadata": {}, @@ -5372,21 +5525,79 @@ "bridge", "tunnel" ], + [ + "==", + "class", + "motorway_construction" + ], [ "!=", "ramp", 1 - ], - [ - "in", - "class", - "trunk_construction" ] ], - "order": 103 + "order": 144 }, { - "id": "road_motorway", + "id": "Highway road under construction dash", + "type": "line", + "source": "openmaptiles", + "source-layer": "transportation", + "minzoom": 5, + "layout": { + "visibility": "visible" + }, + "paint": { + "line-color": "hsl(349, 0%, 100%)", + "line-dasharray": [ + 1, + 1 + ], + "line-width": [ + "interpolate", + [ + "exponential", + 1.2 + ], + [ + "zoom" + ], + 5, + 0, + 11, + 1, + 12, + 2, + 13, + 4, + 16, + 7 + ] + }, + "metadata": {}, + "filter": [ + "all", + [ + "!in", + "brunnel", + "bridge", + "tunnel" + ], + [ + "==", + "class", + "motorway_construction" + ], + [ + "!=", + "ramp", + 1 + ] + ], + "order": 145 + }, + { + "id": "Highway road", "type": "line", "source": "openmaptiles", "source-layer": "transportation", @@ -5401,11 +5612,11 @@ "stops": [ [ 6, - "#e66e89" + "hsl(347, 71%, 67%)" ], [ 10, - "#e892a2" + "hsl(349, 65%, 74%)" ] ] }, @@ -5413,7 +5624,7 @@ "base": 1.2, "stops": [ [ - 5, + 4.9, 0 ], [ @@ -5447,87 +5658,23 @@ 1 ] ], - "order": 104 + "order": 146 }, { - "id": "road_motorway_construction", + "id": "Subway line", "type": "line", "source": "openmaptiles", "source-layer": "transportation", - "minzoom": 5, "layout": { - "line-cap": "round", - "line-join": "round", "visibility": "visible" }, "paint": { - "line-color": { - "base": 1, - "stops": [ - [ - 6, - "#e892a2" - ], - [ - 10, - "#e66e89" - ] - ] - }, - "line-width": { - "base": 1.2, - "stops": [ - [ - 5, - 0 - ], - [ - 7, - 1 - ], - [ - 20, - 18 - ] - ] - }, + "line-color": "hsl(60, 1%, 50%)", "line-dasharray": [ - 2, - 2 - ] - }, - "metadata": {}, - "filter": [ - "all", - [ - "!in", - "brunnel", - "bridge", - "tunnel" + 1, + 1.2 ], - [ - "==", - "class", - "motorway_construction" - ], - [ - "!=", - "ramp", - 1 - ] - ], - "order": 105 - }, - { - "id": "rail_subway", - "type": "line", - "source": "openmaptiles", - "source-layer": "transportation", - "layout": { - "visibility": "visible" - }, - "paint": { - "line-color": "#81817f", + "line-opacity": 1, "line-width": { "stops": [ [ @@ -5539,12 +5686,7 @@ 3 ] ] - }, - "line-opacity": 1, - "line-dasharray": [ - 1, - 1.2 - ] + } }, "metadata": {}, "filter": [ @@ -5560,10 +5702,10 @@ "subway" ] ], - "order": 106 + "order": 147 }, { - "id": "rail_major", + "id": "Major rail", "type": "line", "source": "openmaptiles", "source-layer": "transportation", @@ -5575,11 +5717,11 @@ "stops": [ [ 8, - "#787878" + "hsl(0, 0%, 47%)" ], [ 14, - "rgba(129, 129, 129, 1)" + "hsl(0, 0%, 51%)" ] ] }, @@ -5620,10 +5762,10 @@ "rail" ] ], - "order": 107 + "order": 148 }, { - "id": "rail_minor", + "id": "Minor rail", "type": "line", "source": "openmaptiles", "source-layer": "transportation", @@ -5631,7 +5773,7 @@ "visibility": "visible" }, "paint": { - "line-color": "rgba(129, 129, 129, 1)", + "line-color": "hsl(0, 0%, 51%)", "line-width": { "base": 1.4, "stops": [ @@ -5666,10 +5808,10 @@ "light_rail" ] ], - "order": 108 + "order": 149 }, { - "id": "rail_major_hatching", + "id": "Major rail hatching", "type": "line", "source": "openmaptiles", "source-layer": "transportation", @@ -5682,14 +5824,18 @@ "stops": [ [ 8, - "rgba(255, 255, 255, 0.44)" + "hsla(0, 0%, 100%, 0.44)" ], [ 10, - "rgba(242, 242, 242, 0.44)" + "hsla(0, 0%, 95%, 0.44)" ] ] }, + "line-dasharray": [ + 2, + 2 + ], "line-width": { "base": 1.4, "stops": [ @@ -5706,11 +5852,7 @@ 4 ] ] - }, - "line-dasharray": [ - 2, - 2 - ] + } }, "metadata": {}, "filter": [ @@ -5727,10 +5869,10 @@ "rail" ] ], - "order": 109 + "order": 150 }, { - "id": "rail_minor_hatching", + "id": "Minor rail hatching", "type": "line", "source": "openmaptiles", "source-layer": "transportation", @@ -5738,7 +5880,11 @@ "visibility": "visible" }, "paint": { - "line-color": "#bbb", + "line-color": "hsl(0, 0%, 73%)", + "line-dasharray": [ + 0.2, + 4 + ], "line-width": { "base": 1.4, "stops": [ @@ -5755,11 +5901,7 @@ 6 ] ] - }, - "line-dasharray": [ - 0.2, - 4 - ] + } }, "metadata": {}, "filter": [ @@ -5777,10 +5919,10 @@ "light_rail" ] ], - "order": 110 + "order": 151 }, { - "id": "bridge_motorway_link_casing", + "id": "Highway link bridge outline", "type": "line", "source": "openmaptiles", "source-layer": "transportation", @@ -5793,14 +5935,15 @@ "stops": [ [ 11, - "#c24e6b" + "hsl(345, 49%, 53%)" ], [ 12, - "#dc2a67" + "hsl(339, 72%, 51%)" ] ] }, + "line-opacity": 1, "line-width": { "base": 1.2, "stops": [ @@ -5821,8 +5964,7 @@ 17 ] ] - }, - "line-opacity": 1 + } }, "metadata": {}, "filter": [ @@ -5843,10 +5985,10 @@ "bridge" ] ], - "order": 113 + "order": 154 }, { - "id": "bridge_service_track_casing", + "id": "Service bridge outline", "type": "line", "source": "openmaptiles", "source-layer": "transportation", @@ -5854,7 +5996,7 @@ "line-join": "round" }, "paint": { - "line-color": "#cfcdca", + "line-color": "hsl(36, 5%, 80%)", "line-width": { "base": 1.2, "stops": [ @@ -5888,10 +6030,10 @@ "track" ] ], - "order": 114 + "order": 155 }, { - "id": "bridge_link_casing", + "id": "Link bridge outline", "type": "line", "source": "openmaptiles", "source-layer": "transportation", @@ -5899,7 +6041,8 @@ "line-join": "round" }, "paint": { - "line-color": "#e9ac77", + "line-color": "hsl(28, 72%, 69%)", + "line-opacity": 1, "line-width": { "base": 1.2, "stops": [ @@ -5920,8 +6063,7 @@ 15 ] ] - }, - "line-opacity": 1 + } }, "metadata": {}, "filter": [ @@ -5937,18 +6079,31 @@ "bridge" ] ], - "order": 115 + "order": 156 }, { - "id": "bridge_street_casing", + "id": "Street bridge outline", "type": "line", "source": "openmaptiles", "source-layer": "transportation", "layout": { - "line-join": "round" + "line-join": "round", + "visibility": "visible" }, "paint": { "line-color": "hsl(36, 6%, 74%)", + "line-opacity": { + "stops": [ + [ + 12, + 0 + ], + [ + 12.5, + 1 + ] + ] + }, "line-width": { "base": 1.2, "stops": [ @@ -5969,18 +6124,6 @@ 25 ] ] - }, - "line-opacity": { - "stops": [ - [ - 12, - 0 - ], - [ - 12.5, - 1 - ] - ] } }, "metadata": {}, @@ -5998,10 +6141,10 @@ "street_limited" ] ], - "order": 116 + "order": 157 }, { - "id": "bridge_path_casing_casing", + "id": "Path bridge second outline", "type": "line", "source": "openmaptiles", "source-layer": "transportation", @@ -6011,7 +6154,11 @@ "visibility": "visible" }, "paint": { - "line-color": "rgba(0, 0, 0, 1)", + "line-color": "hsl(0, 0%, 0%)", + "line-dasharray": [ + 1, + 0 + ], "line-width": { "base": 1.2, "stops": [ @@ -6036,11 +6183,7 @@ 4.6 ] ] - }, - "line-dasharray": [ - 1, - 0 - ] + } }, "metadata": {}, "filter": [ @@ -6061,10 +6204,10 @@ "path" ] ], - "order": 117 + "order": 158 }, { - "id": "bridge_path_casing", + "id": "Path bridge outline", "type": "line", "source": "openmaptiles", "source-layer": "transportation", @@ -6074,7 +6217,11 @@ "visibility": "visible" }, "paint": { - "line-color": "rgba(255, 255, 255, 1)", + "line-color": "hsl(0, 0%, 100%)", + "line-dasharray": [ + 1, + 0 + ], "line-width": { "base": 1.2, "stops": [ @@ -6099,11 +6246,7 @@ 3.6 ] ] - }, - "line-dasharray": [ - 1, - 0 - ] + } }, "metadata": {}, "filter": [ @@ -6124,10 +6267,10 @@ "path" ] ], - "order": 118 + "order": 159 }, { - "id": "bridge_secondary_casing", + "id": "Secondary bridge outline", "type": "line", "source": "openmaptiles", "source-layer": "transportation", @@ -6136,7 +6279,8 @@ "line-join": "round" }, "paint": { - "line-color": "#000000", + "line-color": "hsl(0, 0%, 0%)", + "line-opacity": 1, "line-width": { "base": 1.2, "stops": [ @@ -6169,8 +6313,7 @@ 27 ] ] - }, - "line-opacity": 1 + } }, "metadata": {}, "filter": [ @@ -6187,10 +6330,10 @@ "tertiary" ] ], - "order": 119 + "order": 160 }, { - "id": "bridge_tertiary_casing", + "id": "Tertiary bridge outline", "type": "line", "source": "openmaptiles", "source-layer": "transportation", @@ -6198,7 +6341,8 @@ "line-join": "round" }, "paint": { - "line-color": "rgba(195, 189, 187, 1)", + "line-color": "hsl(15, 6%, 75%)", + "line-opacity": 1, "line-width": { "base": 1.2, "stops": [ @@ -6211,8 +6355,7 @@ 17 ] ] - }, - "line-opacity": 1 + } }, "metadata": {}, "filter": [ @@ -6229,10 +6372,10 @@ "tertiary" ] ], - "order": 120 + "order": 161 }, { - "id": "bridge_trunk_casing", + "id": "Trunk bridge outline", "type": "line", "source": "openmaptiles", "source-layer": "transportation", @@ -6245,11 +6388,11 @@ "stops": [ [ 11, - "#cf6649" + "hsl(13, 58%, 55%)" ], [ 12, - "#c84e2f" + "hsl(12, 62%, 48%)" ] ] }, @@ -6297,10 +6440,10 @@ "trunk" ] ], - "order": 121 + "order": 162 }, { - "id": "bridge_primary_casing", + "id": "Primary bridge outline", "type": "line", "source": "openmaptiles", "source-layer": "transportation", @@ -6309,7 +6452,7 @@ "line-join": "round" }, "paint": { - "line-color": "#000000", + "line-color": "hsl(0, 0%, 0%)", "line-width": { "base": 1.2, "stops": [ @@ -6354,10 +6497,10 @@ "primary" ] ], - "order": 122 + "order": 163 }, { - "id": "bridge_motorway_casing", + "id": "Highway bridge outline", "type": "line", "source": "openmaptiles", "source-layer": "transportation", @@ -6366,7 +6509,7 @@ "visibility": "visible" }, "paint": { - "line-color": "#000000", + "line-color": "hsl(0, 0%, 0%)", "line-width": { "base": 1.2, "stops": [ @@ -6404,16 +6547,20 @@ 1 ] ], - "order": 123 + "order": 164 }, { - "id": "bridge_path_cycleway", + "id": "Cycleway bridge", "type": "line", "source": "openmaptiles", "source-layer": "transportation", "minzoom": 13, "paint": { - "line-color": "#0000ff", + "line-color": "hsl(240, 100%, 50%)", + "line-dasharray": [ + 2, + 2 + ], "line-width": { "base": 1.2, "stops": [ @@ -6438,11 +6585,7 @@ 1.6 ] ] - }, - "line-dasharray": [ - 2, - 2 - ] + } }, "metadata": {}, "filter": [ @@ -6476,16 +6619,20 @@ ] ] ], - "order": 124 + "order": 165 }, { - "id": "bridge_path_bridleway", + "id": "Bridleway bridge", "type": "line", "source": "openmaptiles", "source-layer": "transportation", "minzoom": 13, "paint": { - "line-color": "#008000", + "line-color": "hsl(120, 100%, 25%)", + "line-dasharray": [ + 2, + 2 + ], "line-width": { "base": 1.2, "stops": [ @@ -6510,11 +6657,7 @@ 1.6 ] ] - }, - "line-dasharray": [ - 2, - 2 - ] + } }, "metadata": {}, "filter": [ @@ -6553,16 +6696,20 @@ "designated" ] ], - "order": 125 + "order": 166 }, { - "id": "bridge_path_footway", + "id": "Footway bridge", "type": "line", "source": "openmaptiles", "source-layer": "transportation", "minzoom": 13, "paint": { - "line-color": "#fa8072", + "line-color": "hsl(6, 93%, 71%)", + "line-dasharray": [ + 2, + 2 + ], "line-width": { "base": 1.2, "stops": [ @@ -6587,11 +6734,7 @@ 1.6 ] ] - }, - "line-dasharray": [ - 2, - 2 - ] + } }, "metadata": {}, "filter": [ @@ -6628,10 +6771,10 @@ "designated" ] ], - "order": 126 + "order": 167 }, { - "id": "bridge_motorway_link", + "id": "Highway link bridge", "type": "line", "source": "openmaptiles", "source-layer": "transportation", @@ -6644,11 +6787,11 @@ "stops": [ [ 6, - "#e66e89" + "hsl(347, 71%, 67%)" ], [ 10, - "#e892a2" + "hsl(349, 65%, 74%)" ] ] }, @@ -6693,10 +6836,10 @@ "bridge" ] ], - "order": 127 + "order": 168 }, { - "id": "bridge_service_track", + "id": "Service bridge under construction", "type": "line", "source": "openmaptiles", "source-layer": "transportation", @@ -6705,7 +6848,57 @@ "visibility": "visible" }, "paint": { - "line-color": "#fff", + "line-color": "hsl(0, 0%, 100%)", + "line-dasharray": [ + 2, + 2 + ], + "line-width": { + "base": 1.2, + "stops": [ + [ + 15.5, + 0 + ], + [ + 16, + 2 + ], + [ + 20, + 7.5 + ] + ] + } + }, + "metadata": {}, + "filter": [ + "all", + [ + "==", + "brunnel", + "bridge" + ], + [ + "in", + "class", + "service_construction", + "track_construction" + ] + ], + "order": 169 + }, + { + "id": "Service bridge", + "type": "line", + "source": "openmaptiles", + "source-layer": "transportation", + "layout": { + "line-join": "round", + "visibility": "visible" + }, + "paint": { + "line-color": "hsl(0, 0%, 100%)", "line-width": { "base": 1.2, "stops": [ @@ -6739,10 +6932,10 @@ "track" ] ], - "order": 128 + "order": 170 }, { - "id": "bridge_service_track_construction", + "id": "Link bridge", "type": "line", "source": "openmaptiles", "source-layer": "transportation", @@ -6751,57 +6944,7 @@ "visibility": "visible" }, "paint": { - "line-color": "#fff", - "line-width": { - "base": 1.2, - "stops": [ - [ - 15.5, - 0 - ], - [ - 16, - 2 - ], - [ - 20, - 7.5 - ] - ] - }, - "line-dasharray": [ - 2, - 2 - ] - }, - "metadata": {}, - "filter": [ - "all", - [ - "==", - "brunnel", - "bridge" - ], - [ - "in", - "class", - "service_construction", - "track_construction" - ] - ], - "order": 129 - }, - { - "id": "bridge_link", - "type": "line", - "source": "openmaptiles", - "source-layer": "transportation", - "layout": { - "line-join": "round", - "visibility": "visible" - }, - "paint": { - "line-color": "#fea", + "line-color": "hsl(48, 100%, 83%)", "line-width": { "base": 1.2, "stops": [ @@ -6838,55 +6981,10 @@ "bridge" ] ], - "order": 130 + "order": 171 }, { - "id": "bridge_minor", - "type": "line", - "source": "openmaptiles", - "source-layer": "transportation", - "layout": { - "line-join": "round" - }, - "paint": { - "line-color": "#fff", - "line-width": { - "base": 1.2, - "stops": [ - [ - 13.5, - 0 - ], - [ - 14, - 2.5 - ], - [ - 20, - 18 - ] - ] - }, - "line-opacity": 1 - }, - "metadata": {}, - "filter": [ - "all", - [ - "==", - "brunnel", - "bridge" - ], - [ - "in", - "class", - "minor" - ] - ], - "order": 131 - }, - { - "id": "bridge_minor_construction", + "id": "Minor bridge under construction", "type": "line", "source": "openmaptiles", "source-layer": "transportation", @@ -6895,28 +6993,25 @@ "visibility": "visible" }, "paint": { - "line-color": "#fff", - "line-width": { - "base": 1.2, - "stops": [ - [ - 13.5, - 0 - ], - [ - 14, - 2.5 - ], - [ - 20, - 18 - ] - ] - }, + "line-color": "hsl(0, 0%, 83%)", "line-opacity": 1, - "line-dasharray": [ + "line-width": [ + "interpolate", + [ + "exponential", + 1.2 + ], + [ + "zoom" + ], + 11, + 0, + 12, 2, - 2 + 13, + 4, + 16, + 7 ] }, "metadata": {}, @@ -6933,10 +7028,196 @@ "minor_construction" ] ], - "order": 132 + "order": 172 }, { - "id": "bridge_tertiary", + "id": "Minor bridge under construction dash", + "type": "line", + "source": "openmaptiles", + "source-layer": "transportation", + "layout": { + "visibility": "visible" + }, + "paint": { + "line-color": "hsl(0, 0%, 100%)", + "line-dasharray": [ + 1, + 1 + ], + "line-opacity": 1, + "line-width": [ + "interpolate", + [ + "exponential", + 1.2 + ], + [ + "zoom" + ], + 11, + 0, + 12, + 2, + 13, + 4, + 16, + 7 + ] + }, + "metadata": {}, + "filter": [ + "all", + [ + "==", + "brunnel", + "bridge" + ], + [ + "in", + "class", + "minor_construction" + ] + ], + "order": 173 + }, + { + "id": "Minor bridge", + "type": "line", + "source": "openmaptiles", + "source-layer": "transportation", + "layout": { + "line-join": "round" + }, + "paint": { + "line-color": "hsl(0, 0%, 100%)", + "line-opacity": 1, + "line-width": { + "base": 1.2, + "stops": [ + [ + 13.5, + 0 + ], + [ + 14, + 2.5 + ], + [ + 20, + 18 + ] + ] + } + }, + "metadata": {}, + "filter": [ + "all", + [ + "==", + "brunnel", + "bridge" + ], + [ + "in", + "class", + "minor" + ] + ], + "order": 174 + }, + { + "id": "Tertiary bridge under construction", + "type": "line", + "source": "openmaptiles", + "source-layer": "transportation", + "layout": { + "line-join": "round" + }, + "paint": { + "line-color": "hsl(0, 0%, 83%)", + "line-width": [ + "interpolate", + [ + "exponential", + 1.2 + ], + [ + "zoom" + ], + 11, + 0, + 12, + 2, + 13, + 4, + 16, + 7 + ] + }, + "metadata": {}, + "filter": [ + "all", + [ + "==", + "brunnel", + "bridge" + ], + [ + "in", + "class", + "tertiary_construction" + ] + ], + "order": 175 + }, + { + "id": "Tertiary bridge under construction dash", + "type": "line", + "source": "openmaptiles", + "source-layer": "transportation", + "paint": { + "line-color": "hsl(0, 0%, 100%)", + "line-dasharray": [ + 1, + 1 + ], + "line-width": [ + "interpolate", + [ + "exponential", + 1.2 + ], + [ + "zoom" + ], + 11, + 0, + 12, + 2, + 13, + 4, + 16, + 7 + ] + }, + "metadata": {}, + "filter": [ + "all", + [ + "==", + "brunnel", + "bridge" + ], + [ + "in", + "class", + "tertiary_construction" + ] + ], + "order": 176 + }, + { + "id": "Tertiary bridge", "type": "line", "source": "openmaptiles", "source-layer": "transportation", @@ -6946,7 +7227,7 @@ "visibility": "visible" }, "paint": { - "line-color": "#ffffff", + "line-color": "hsl(0, 0%, 100%)", "line-width": { "base": 1.2, "stops": [ @@ -6999,10 +7280,101 @@ "tertiary" ] ], - "order": 133 + "order": 177 }, { - "id": "bridge_secondary", + "id": "Secondary bridge under construction", + "type": "line", + "source": "openmaptiles", + "source-layer": "transportation", + "layout": { + "line-join": "round" + }, + "paint": { + "line-color": "hsl(63, 86%, 86%)", + "line-width": [ + "interpolate", + [ + "exponential", + 1.2 + ], + [ + "zoom" + ], + 11, + 0, + 12, + 2, + 13, + 4, + 16, + 7 + ] + }, + "metadata": {}, + "filter": [ + "all", + [ + "==", + "brunnel", + "bridge" + ], + [ + "in", + "class", + "secondary_construction" + ] + ], + "order": 178 + }, + { + "id": "Secondary bridge under construction dash", + "type": "line", + "source": "openmaptiles", + "source-layer": "transportation", + "paint": { + "line-color": "hsl(0, 0%, 100%)", + "line-dasharray": [ + 1, + 1 + ], + "line-width": [ + "interpolate", + [ + "exponential", + 1.2 + ], + [ + "zoom" + ], + 11, + 0, + 12, + 2, + 13, + 4, + 16, + 7 + ] + }, + "metadata": {}, + "filter": [ + "all", + [ + "==", + "brunnel", + "bridge" + ], + [ + "in", + "class", + "secondary_construction" + ] + ], + "order": 179 + }, + { + "id": "Secondary bridge", "type": "line", "source": "openmaptiles", "source-layer": "transportation", @@ -7012,7 +7384,7 @@ "visibility": "visible" }, "paint": { - "line-color": "#f7fabf", + "line-color": "hsl(63, 86%, 86%)", "line-width": { "base": 1.2, "stops": [ @@ -7069,106 +7441,10 @@ "secondary" ] ], - "order": 134 + "order": 180 }, { - "id": "bridge_secondary_construction-copy", - "type": "line", - "source": "openmaptiles", - "source-layer": "transportation", - "layout": { - "line-join": "round" - }, - "paint": { - "line-color": "#fff", - "line-width": { - "base": 1.2, - "stops": [ - [ - 6.5, - 0 - ], - [ - 8, - 0.5 - ], - [ - 20, - 13 - ] - ] - }, - "line-dasharray": [ - 2, - 2 - ] - }, - "metadata": {}, - "filter": [ - "all", - [ - "==", - "brunnel", - "bridge" - ], - [ - "in", - "class", - "secondary_construction" - ] - ], - "order": 135 - }, - { - "id": "bridge_tertiary_construction", - "type": "line", - "source": "openmaptiles", - "source-layer": "transportation", - "layout": { - "line-join": "round" - }, - "paint": { - "line-color": "#fff", - "line-width": { - "base": 1.2, - "stops": [ - [ - 6.5, - 0 - ], - [ - 8, - 0.5 - ], - [ - 20, - 13 - ] - ] - }, - "line-dasharray": [ - 2, - 2 - ] - }, - "metadata": {}, - "filter": [ - "all", - [ - "==", - "brunnel", - "bridge" - ], - [ - "in", - "class", - "tertiary_construction" - ] - ], - "order": 136 - }, - { - "id": "bridge_primary", + "id": "Primary bridge under construction", "type": "line", "source": "openmaptiles", "source-layer": "transportation", @@ -7177,7 +7453,102 @@ "visibility": "visible" }, "paint": { - "line-color": "#fcd6a4", + "line-color": "hsl(34, 94%, 82%)", + "line-width": [ + "interpolate", + [ + "exponential", + 1.2 + ], + [ + "zoom" + ], + 11, + 0, + 12, + 2, + 13, + 4, + 16, + 7 + ] + }, + "metadata": {}, + "filter": [ + "all", + [ + "==", + "brunnel", + "bridge" + ], + [ + "==", + "class", + "primary_construction" + ] + ], + "order": 181 + }, + { + "id": "Primary bridge under construction dash", + "type": "line", + "source": "openmaptiles", + "source-layer": "transportation", + "layout": { + "visibility": "visible" + }, + "paint": { + "line-color": "hsl(34, 0%, 100%)", + "line-dasharray": [ + 1, + 1 + ], + "line-width": [ + "interpolate", + [ + "exponential", + 1.2 + ], + [ + "zoom" + ], + 11, + 0, + 12, + 2, + 13, + 4, + 16, + 7 + ] + }, + "metadata": {}, + "filter": [ + "all", + [ + "==", + "brunnel", + "bridge" + ], + [ + "==", + "class", + "primary_construction" + ] + ], + "order": 182 + }, + { + "id": "Primary bridge", + "type": "line", + "source": "openmaptiles", + "source-layer": "transportation", + "layout": { + "line-join": "round", + "visibility": "visible" + }, + "paint": { + "line-color": "hsl(34, 94%, 82%)", "line-width": { "base": 1.2, "stops": [ @@ -7230,10 +7601,10 @@ "primary" ] ], - "order": 137 + "order": 183 }, { - "id": "bridge_trunk", + "id": "Trunk bridge under construction", "type": "line", "source": "openmaptiles", "source-layer": "transportation", @@ -7242,7 +7613,104 @@ "visibility": "visible" }, "paint": { - "line-color": "#f9b29c", + "line-color": "hsl(14, 89%, 79%)", + "line-width": [ + "interpolate", + [ + "exponential", + 1.2 + ], + [ + "zoom" + ], + 11, + 0, + 12, + 2, + 13, + 4, + 16, + 7 + ] + }, + "metadata": {}, + "filter": [ + "all", + [ + "==", + "brunnel", + "bridge" + ], + [ + "==", + "class", + "trunk_construction" + ] + ], + "order": 184 + }, + { + "id": "Trunk bridge under construction dash", + "type": "line", + "source": "openmaptiles", + "source-layer": "transportation", + "layout": { + "line-join": "round", + "visibility": "visible" + }, + "paint": { + "line-color": "hsl(48, 0%, 100%)", + "line-dasharray": [ + 1, + 1 + ], + "line-width": [ + "interpolate", + [ + "exponential", + 1.2 + ], + [ + "zoom" + ], + 11, + 0, + 12, + 2, + 13, + 4, + 16, + 7 + ] + }, + "metadata": {}, + "filter": [ + "all", + [ + "==", + "brunnel", + "bridge" + ], + [ + "in", + "class", + "primary_construction", + "trunk_construction" + ] + ], + "order": 185 + }, + { + "id": "Trunk bridge", + "type": "line", + "source": "openmaptiles", + "source-layer": "transportation", + "layout": { + "line-join": "round", + "visibility": "visible" + }, + "paint": { + "line-color": "hsl(14, 89%, 79%)", "line-width": { "base": 1.2, "stops": [ @@ -7291,60 +7759,10 @@ "trunk" ] ], - "order": 138 + "order": 186 }, { - "id": "bridge_trunk_primary_construction", - "type": "line", - "source": "openmaptiles", - "source-layer": "transportation", - "layout": { - "line-join": "round", - "visibility": "visible" - }, - "paint": { - "line-color": "#fea", - "line-width": { - "base": 1.2, - "stops": [ - [ - 5, - 0 - ], - [ - 7, - 1 - ], - [ - 20, - 18 - ] - ] - }, - "line-dasharray": [ - 2, - 2 - ] - }, - "metadata": {}, - "filter": [ - "all", - [ - "==", - "brunnel", - "bridge" - ], - [ - "in", - "class", - "primary_construction", - "trunk_construction" - ] - ], - "order": 139 - }, - { - "id": "bridge_motorway", + "id": "Highway bridge under construction", "type": "line", "source": "openmaptiles", "source-layer": "transportation", @@ -7356,11 +7774,127 @@ "stops": [ [ 6, - "#e66e89" + "hsl(349, 65%, 74%)" ], [ 10, - "#e892a2" + "hsl(347, 71%, 67%)" + ] + ] + }, + "line-width": [ + "interpolate", + [ + "exponential", + 1.2 + ], + [ + "zoom" + ], + 5, + 1, + 11, + 1, + 12, + 2, + 13, + 4, + 16, + 7 + ] + }, + "metadata": {}, + "filter": [ + "all", + [ + "==", + "class", + "motorway_construction" + ], + [ + "==", + "brunnel", + "bridge" + ], + [ + "!=", + "ramp", + 1 + ] + ], + "order": 187 + }, + { + "id": "Highway bridge under construction dash", + "type": "line", + "source": "openmaptiles", + "source-layer": "transportation", + "paint": { + "line-color": "hsl(349, 0%, 100%)", + "line-dasharray": [ + 1, + 1 + ], + "line-width": [ + "interpolate", + [ + "exponential", + 1.2 + ], + [ + "zoom" + ], + 5, + 0, + 11, + 1, + 12, + 2, + 13, + 4, + 16, + 7 + ] + }, + "metadata": {}, + "filter": [ + "all", + [ + "==", + "class", + "motorway_construction" + ], + [ + "==", + "brunnel", + "bridge" + ], + [ + "!=", + "ramp", + 1 + ] + ], + "order": 188 + }, + { + "id": "Highway bridge", + "type": "line", + "source": "openmaptiles", + "source-layer": "transportation", + "layout": { + "line-join": "round" + }, + "paint": { + "line-color": { + "stops": [ + [ + 6, + "hsl(347, 71%, 67%)" + ], + [ + 10, + "hsl(349, 65%, 74%)" ] ] }, @@ -7401,74 +7935,10 @@ 1 ] ], - "order": 140 + "order": 189 }, { - "id": "bridge_motorway_construction", - "type": "line", - "source": "openmaptiles", - "source-layer": "transportation", - "layout": { - "line-join": "round" - }, - "paint": { - "line-color": { - "stops": [ - [ - 6, - "#e892a2" - ], - [ - 10, - "#e66e89" - ] - ] - }, - "line-width": { - "base": 1.2, - "stops": [ - [ - 5, - 0 - ], - [ - 7, - 1 - ], - [ - 18, - 25 - ] - ] - }, - "line-dasharray": [ - 2, - 2 - ] - }, - "metadata": {}, - "filter": [ - "all", - [ - "==", - "class", - "motorway_construction" - ], - [ - "==", - "brunnel", - "bridge" - ], - [ - "!=", - "ramp", - 1 - ] - ], - "order": 141 - }, - { - "id": "bridge_major_rail", + "id": "Major rail bridge", "type": "line", "source": "openmaptiles", "source-layer": "transportation", @@ -7480,15 +7950,15 @@ "stops": [ [ 6, - "rgba(147, 147, 147, 1)" + "hsl(0, 0%, 58%)" ], [ 12, - "rgba(139, 139, 139, 1)" + "hsl(0, 0%, 55%)" ], [ 14, - "rgba(129, 129, 129, 1)" + "hsl(0, 0%, 51%)" ] ] }, @@ -7524,10 +7994,10 @@ "rail" ] ], - "order": 142 + "order": 190 }, { - "id": "bridge_major_rail_hatching", + "id": "Major rail bridge hatching", "type": "line", "source": "openmaptiles", "source-layer": "transportation", @@ -7540,14 +8010,18 @@ "stops": [ [ 8, - "rgba(255, 255, 255, 0.44)" + "hsla(0, 0%, 100%, 0.44)" ], [ 10, - "rgba(201, 201, 201, 1)" + "hsl(0, 0%, 79%)" ] ] }, + "line-dasharray": [ + 2, + 2 + ], "line-width": { "base": 1.4, "stops": [ @@ -7564,11 +8038,7 @@ 4 ] ] - }, - "line-dasharray": [ - 2, - 2 - ] + } }, "metadata": {}, "filter": [ @@ -7584,10 +8054,10 @@ "rail" ] ], - "order": 143 + "order": 191 }, { - "id": "cablecar", + "id": "Cablecar", "type": "line", "source": "openmaptiles", "source-layer": "transportation", @@ -7597,7 +8067,7 @@ "visibility": "visible" }, "paint": { - "line-color": "#808080", + "line-color": "hsl(0, 0%, 50%)", "line-width": { "base": 1, "stops": [ @@ -7617,10 +8087,10 @@ "class", "aerialway" ], - "order": 144 + "order": 192 }, { - "id": "cablecar-dash", + "id": "Cablecar dash", "type": "line", "source": "openmaptiles", "source-layer": "transportation", @@ -7630,7 +8100,11 @@ "visibility": "visible" }, "paint": { - "line-color": "rgba(67, 67, 67, 1)", + "line-color": "hsl(0, 0%, 26%)", + "line-dasharray": [ + 0.5, + 10 + ], "line-width": { "base": 1, "stops": [ @@ -7643,26 +8117,25 @@ 3 ] ] - }, - "line-dasharray": [ - 0.5, - 10 - ] + } }, "filter": [ "==", "class", "aerialway" ], - "order": 145 + "order": 193 }, { - "id": "road_path_oneway", + "id": "Oneway path", "type": "symbol", "source": "openmaptiles", "source-layer": "transportation", "minzoom": 15, "layout": { + "icon-image": "oneway-path", + "icon-padding": 2, + "icon-rotation-alignment": "map", "icon-size": { "stops": [ [ @@ -7675,12 +8148,9 @@ ] ] }, - "icon-image": "oneway-path", - "visibility": "visible", - "icon-padding": 2, - "symbol-spacing": 125, "symbol-placement": "line", - "icon-rotation-alignment": "map" + "symbol-spacing": 125, + "visibility": "visible" }, "paint": { "icon-opacity": 1 @@ -7698,15 +8168,18 @@ "path" ] ], - "order": 181 + "order": 222 }, { - "id": "road_oneway", + "id": "Oneway", "type": "symbol", "source": "openmaptiles", "source-layer": "transportation", "minzoom": 15, "layout": { + "icon-image": "oneway", + "icon-padding": 2, + "icon-rotation-alignment": "map", "icon-size": { "stops": [ [ @@ -7719,12 +8192,9 @@ ] ] }, - "icon-image": "oneway", - "visibility": "visible", - "icon-padding": 2, - "symbol-spacing": 95, "symbol-placement": "line", - "icon-rotation-alignment": "map" + "symbol-spacing": 95, + "visibility": "visible" }, "paint": { "icon-opacity": 1 @@ -7748,15 +8218,19 @@ "service" ] ], - "order": 182 + "order": 223 }, { - "id": "road_oneway_opposite", + "id": "Oneway opposite", "type": "symbol", "source": "openmaptiles", "source-layer": "transportation", "minzoom": 15, "layout": { + "icon-image": "oneway", + "icon-padding": 2, + "icon-rotate": -90, + "icon-rotation-alignment": "map", "icon-size": { "stops": [ [ @@ -7769,13 +8243,9 @@ ] ] }, - "icon-image": "oneway", - "visibility": "visible", - "icon-rotate": -90, - "icon-padding": 2, - "symbol-spacing": 75, "symbol-placement": "line", - "icon-rotation-alignment": "map" + "symbol-spacing": 75, + "visibility": "visible" }, "paint": { "icon-opacity": 0.5 @@ -7799,7 +8269,59 @@ "service" ] ], - "order": 183 + "order": 224 + }, + { + "id": "Ferry line", + "type": "line", + "source": "openmaptiles", + "source-layer": "transportation", + "minzoom": 6, + "layout": { + "line-join": "round", + "visibility": "visible" + }, + "paint": { + "line-color": "hsl(240, 90%, 73%)", + "line-dasharray": [ + 2, + 2 + ], + "line-opacity": [ + "interpolate", + [ + "linear" + ], + [ + "zoom" + ], + 5, + 0, + 9, + 1 + ], + "line-width": { + "stops": [ + [ + 10, + 0.5 + ], + [ + 14, + 1.1 + ] + ] + } + }, + "filter": [ + "all", + [ + "in", + "class", + "ferry" + ] + ], + "order": 225 } ] -} +} \ No newline at end of file diff --git a/layers/transportation_name/style.json b/layers/transportation_name/style.json index 2ca6dada..17dd1bd1 100644 --- a/layers/transportation_name/style.json +++ b/layers/transportation_name/style.json @@ -1,51 +1,104 @@ { "layers": [ { - "id": "ferry_label", + "id": "Ferry labels", "type": "symbol", "source": "openmaptiles", "source-layer": "transportation_name", "minzoom": 14, "layout": { + "symbol-placement": "line", + "text-anchor": "center", + "text-field": [ + "coalesce", + [ + "get", + "name:en" + ], + [ + "get", + "name" + ] + ], "text-font": [ + "Open Sans Regular", "Noto Sans Regular" ], - "text-size": 10, - "text-field": "{name}", - "text-anchor": "center", "text-offset": [ 0, 0 ], - "symbol-placement": "line" + "text-size": [ + "interpolate", + [ + "linear" + ], + [ + "zoom" + ], + 14, + 10, + 18, + 12 + ] }, "paint": { - "text-color": "#6666ff", - "text-halo-blur": 1, - "text-halo-color": "rgba(255, 255, 255, 0.34)", - "text-halo-width": 1 + "text-color": "hsl(240, 100%, 70%)", + "text-halo-blur": 0, + "text-halo-color": "hsl(195, 45%, 77%)", + "text-halo-width": 2 }, "metadata": {}, "filter": [ "all", [ "==", - "subclass", + "class", "ferry" ] ], - "order": 184 + "order": 226 }, { - "id": "road_label", + "id": "Road labels", "type": "symbol", "source": "openmaptiles", "source-layer": "transportation_name", - "minzoom": 14, + "minzoom": 11, + "maxzoom": 22, "layout": { + "symbol-placement": "line", + "symbol-spacing": [ + "step", + [ + "zoom" + ], + 250, + 20, + 600, + 21, + 1100 + ], + "text-anchor": "center", + "text-field": [ + "coalesce", + [ + "get", + "name:en" + ], + [ + "get", + "name" + ] + ], "text-font": [ + "Open Sans Regular", "Noto Sans Regular" ], + "text-offset": [ + 0, + 0 + ], "text-size": { "base": 1, "stops": [ @@ -58,18 +111,11 @@ 13 ] ] - }, - "text-field": "{name}", - "text-anchor": "center", - "text-offset": [ - 0, - 0 - ], - "symbol-placement": "line" + } }, "paint": { - "text-color": "#000000", - "text-halo-color": "rgba(255, 255, 255, 0.97)", + "text-color": "hsl(0, 0%, 0%)", + "text-halo-color": "hsla(0, 0%, 100%, 0.97)", "text-halo-width": 1 }, "metadata": {}, @@ -77,23 +123,51 @@ "all", [ "!=", - "subclass", + "class", "ferry" ] ], - "order": 185 + "order": 227 }, { - "id": "highway-shield-tertiary", + "id": "Tertiary road shield", "type": "symbol", "source": "openmaptiles", "source-layer": "transportation_name", "minzoom": 9, "layout": { + "icon-anchor": "center", + "icon-image": "road_tertiary", + "icon-padding": 2, + "icon-rotation-alignment": "viewport", "icon-size": 1, + "icon-text-fit": "both", + "icon-text-fit-padding": [ + 3, + 4, + 3, + 4 + ], + "symbol-avoid-edges": true, + "symbol-placement": { + "base": 1, + "stops": [ + [ + 10, + "point" + ], + [ + 11, + "line" + ] + ] + }, + "symbol-spacing": 560, + "text-field": "{ref}", "text-font": [ "Noto Sans Regular" ], + "text-rotation-alignment": "viewport", "text-size": { "stops": [ [ @@ -110,38 +184,10 @@ ] ] }, - "icon-image": "road_tertiary", - "text-field": "{ref}", - "visibility": "visible", - "icon-anchor": "center", - "icon-padding": 2, - "icon-text-fit": "both", - "symbol-spacing": 560, - "symbol-placement": { - "base": 1, - "stops": [ - [ - 10, - "point" - ], - [ - 11, - "line" - ] - ] - }, - "symbol-avoid-edges": true, - "icon-text-fit-padding": [ - 3, - 4, - 3, - 4 - ], - "icon-rotation-alignment": "viewport", - "text-rotation-alignment": "viewport" + "visibility": "visible" }, "paint": { - "text-color": "#3b3b3b" + "text-color": "hsl(0, 0%, 23%)" }, "filter": [ "all", @@ -160,19 +206,47 @@ "ref" ] ], - "order": 186 + "order": 228 }, { - "id": "highway-shield-secondary", + "id": "Secondary road shield", "type": "symbol", "source": "openmaptiles", "source-layer": "transportation_name", "minzoom": 9, "layout": { + "icon-anchor": "center", + "icon-image": "road_secondary", + "icon-padding": 2, + "icon-rotation-alignment": "viewport", "icon-size": 1, + "icon-text-fit": "both", + "icon-text-fit-padding": [ + 3, + 4, + 3, + 4 + ], + "symbol-avoid-edges": true, + "symbol-placement": { + "base": 1, + "stops": [ + [ + 10, + "point" + ], + [ + 11, + "line" + ] + ] + }, + "symbol-spacing": 560, + "text-field": "{ref}", "text-font": [ "Noto Sans Regular" ], + "text-rotation-alignment": "viewport", "text-size": { "stops": [ [ @@ -189,38 +263,10 @@ ] ] }, - "icon-image": "road_secondary", - "text-field": "{ref}", - "visibility": "visible", - "icon-anchor": "center", - "icon-padding": 2, - "icon-text-fit": "both", - "symbol-spacing": 560, - "symbol-placement": { - "base": 1, - "stops": [ - [ - 10, - "point" - ], - [ - 11, - "line" - ] - ] - }, - "symbol-avoid-edges": true, - "icon-text-fit-padding": [ - 3, - 4, - 3, - 4 - ], - "icon-rotation-alignment": "viewport", - "text-rotation-alignment": "viewport" + "visibility": "visible" }, "paint": { - "text-color": "#323b00" + "text-color": "hsl(69, 100%, 12%)" }, "filter": [ "all", @@ -239,19 +285,47 @@ "ref" ] ], - "order": 187 + "order": 229 }, { - "id": "highway-shield-primary", + "id": "Primary road shield", "type": "symbol", "source": "openmaptiles", "source-layer": "transportation_name", "minzoom": 9, "layout": { + "icon-anchor": "center", + "icon-image": "road_primary", + "icon-padding": 2, + "icon-rotation-alignment": "viewport", "icon-size": 1, + "icon-text-fit": "both", + "icon-text-fit-padding": [ + 3, + 4, + 3, + 4 + ], + "symbol-avoid-edges": true, + "symbol-placement": { + "base": 1, + "stops": [ + [ + 10, + "point" + ], + [ + 11, + "line" + ] + ] + }, + "symbol-spacing": 560, + "text-field": "{ref}", "text-font": [ "Noto Sans Regular" ], + "text-rotation-alignment": "viewport", "text-size": { "stops": [ [ @@ -268,38 +342,10 @@ ] ] }, - "icon-image": "road_primary", - "text-field": "{ref}", - "visibility": "visible", - "icon-anchor": "center", - "icon-padding": 2, - "icon-text-fit": "both", - "symbol-spacing": 560, - "symbol-placement": { - "base": 1, - "stops": [ - [ - 10, - "point" - ], - [ - 11, - "line" - ] - ] - }, - "symbol-avoid-edges": true, - "icon-text-fit-padding": [ - 3, - 4, - 3, - 4 - ], - "icon-rotation-alignment": "viewport", - "text-rotation-alignment": "viewport" + "visibility": "visible" }, "paint": { - "text-color": "#4c2e00" + "text-color": "hsl(36, 100%, 15%)" }, "filter": [ "all", @@ -318,19 +364,50 @@ "ref" ] ], - "order": 188 + "order": 230 }, { - "id": "highway-shield-motorway", + "id": "Highway shield", "type": "symbol", "source": "openmaptiles", "source-layer": "transportation_name", "minzoom": 9, "layout": { + "icon-anchor": "center", + "icon-image": "road_motorway", + "icon-padding": 2, + "icon-rotation-alignment": "viewport", "icon-size": 1, + "icon-text-fit": "both", + "icon-text-fit-padding": [ + 3, + 4, + 3, + 4 + ], + "symbol-avoid-edges": true, + "symbol-placement": { + "base": 1, + "stops": [ + [ + 10, + "point" + ], + [ + 11, + "line" + ] + ] + }, + "symbol-spacing": 760, + "text-field": "{ref}", "text-font": [ "Noto Sans Regular" ], + "text-keep-upright": true, + "text-max-width": 10, + "text-optional": false, + "text-rotation-alignment": "viewport", "text-size": { "stops": [ [ @@ -347,41 +424,10 @@ ] ] }, - "icon-image": "road_motorway", - "text-field": "{ref}", - "visibility": "visible", - "icon-anchor": "center", - "icon-padding": 2, - "icon-text-fit": "both", - "text-optional": false, - "symbol-spacing": 760, - "text-max-width": 10, - "symbol-placement": { - "base": 1, - "stops": [ - [ - 10, - "point" - ], - [ - 11, - "line" - ] - ] - }, - "text-keep-upright": true, - "symbol-avoid-edges": true, - "icon-text-fit-padding": [ - 3, - 4, - 3, - 4 - ], - "icon-rotation-alignment": "viewport", - "text-rotation-alignment": "viewport" + "visibility": "visible" }, "paint": { - "text-color": "#620728" + "text-color": "hsl(338, 87%, 21%)" }, "filter": [ "all", @@ -400,7 +446,7 @@ "ref" ] ], - "order": 189 + "order": 231 } ] } \ No newline at end of file diff --git a/layers/water/style.json b/layers/water/style.json index 9ce2fcab..9bcd4286 100644 --- a/layers/water/style.json +++ b/layers/water/style.json @@ -1,7 +1,7 @@ { "layers": [ { - "id": "water_intermittent", + "id": "Water intermittent", "type": "fill", "source": "openmaptiles", "source-layer": "water", @@ -9,7 +9,7 @@ "visibility": "visible" }, "paint": { - "fill-color": "rgba(172, 218, 251, 1)", + "fill-color": "hsl(205, 91%, 83%)", "fill-opacity": 0.85 }, "metadata": {}, @@ -21,10 +21,10 @@ 1 ] ], - "order": 17 + "order": 53 }, { - "id": "water", + "id": "Water", "type": "fill", "source": "openmaptiles", "source-layer": "water", @@ -32,7 +32,7 @@ "visibility": "visible" }, "paint": { - "fill-color": "#aad3df" + "fill-color": "hsl(194, 45%, 77%)" }, "metadata": {}, "filter": [ @@ -48,7 +48,7 @@ "tunnel" ] ], - "order": 18 + "order": 54 } ] } \ No newline at end of file diff --git a/layers/water_name/style.json b/layers/water_name/style.json index 283beab1..e4e67ad2 100644 --- a/layers/water_name/style.json +++ b/layers/water_name/style.json @@ -1,25 +1,35 @@ { "layers": [ { - "id": "water_name_line", + "id": "Lakeline labels", "type": "symbol", "source": "openmaptiles", "source-layer": "water_name", "minzoom": 0, "layout": { - "text-font": [ - "Noto Sans Regular", - "Noto Sans Bold" + "symbol-placement": "line", + "text-field": [ + "coalesce", + [ + "get", + "name:en" + ], + [ + "get", + "name" + ] + ], + "text-font": [ + "Open Sans Regular", + "Noto Sans Regular" ], - "text-size": 12, - "text-field": "{name:latin}\n{name:nonlatin}", - "visibility": "visible", "text-max-width": 5, - "symbol-placement": "line" + "text-size": 12, + "visibility": "visible" }, "paint": { - "text-color": "#5d60be", - "text-halo-color": "rgba(255,255,255,0.7)", + "text-color": "hsl(238, 43%, 55%)", + "text-halo-color": "hsla(0, 0%, 100%, 0.7)", "text-halo-width": 1 }, "metadata": {}, @@ -31,27 +41,37 @@ "LineString" ] ], - "order": 152 + "order": 198 }, { - "id": "water_name_point", + "id": "Water labels", "type": "symbol", "source": "openmaptiles", "source-layer": "water_name", - "minzoom": 16, - "maxzoom": 24, + "minzoom": 15, "layout": { - "text-font": [ - "Noto Sans Regular" + "text-field": [ + "coalesce", + [ + "get", + "name:en" + ], + [ + "get", + "name" + ] ], + "text-font": [ + "Open Sans Regular", + "Open Sans Light" + ], + "text-max-width": 5, "text-size": 11, - "text-field": "{name:latin}\n{name:nonlatin}", - "visibility": "visible", - "text-max-width": 5 + "visibility": "visible" }, "paint": { - "text-color": "rgba(76, 125, 173, 1)", - "text-halo-color": "rgba(255,255,255,0)", + "text-color": "hsl(210, 39%, 49%)", + "text-halo-color": "hsla(0, 0%, 100%, 0.8)", "text-halo-width": 1 }, "metadata": {}, @@ -68,7 +88,7 @@ "ocean" ] ], - "order": 153 + "order": 199 } ] } \ No newline at end of file diff --git a/layers/waterway/style.json b/layers/waterway/style.json index 67218da7..8f1810cd 100644 --- a/layers/waterway/style.json +++ b/layers/waterway/style.json @@ -1,7 +1,7 @@ { "layers": [ { - "id": "waterway_tunnel", + "id": "River tunnel", "type": "line", "source": "openmaptiles", "source-layer": "waterway", @@ -11,7 +11,11 @@ "visibility": "visible" }, "paint": { - "line-color": "#a0c8f0", + "line-color": "hsl(210, 73%, 78%)", + "line-dasharray": [ + 2, + 4 + ], "line-width": { "base": 1.3, "stops": [ @@ -24,11 +28,7 @@ 6 ] ] - }, - "line-dasharray": [ - 2, - 4 - ] + } }, "filter": [ "all", @@ -38,10 +38,10 @@ "tunnel" ] ], - "order": 12 + "order": 48 }, { - "id": "waterway_river", + "id": "River", "type": "line", "source": "openmaptiles", "source-layer": "waterway", @@ -50,7 +50,7 @@ "visibility": "visible" }, "paint": { - "line-color": "#a0c8f0", + "line-color": "hsl(210, 73%, 78%)", "line-width": { "base": 1.2, "stops": [ @@ -84,10 +84,10 @@ 1 ] ], - "order": 13 + "order": 49 }, { - "id": "waterway_river_intermittent", + "id": "River intermittent", "type": "line", "source": "openmaptiles", "source-layer": "waterway", @@ -95,7 +95,11 @@ "line-cap": "round" }, "paint": { - "line-color": "#a0c8f0", + "line-color": "hsl(210, 73%, 78%)", + "line-dasharray": [ + 3, + 2 + ], "line-width": { "base": 1.2, "stops": [ @@ -108,11 +112,7 @@ 6 ] ] - }, - "line-dasharray": [ - 3, - 2 - ] + } }, "metadata": {}, "filter": [ @@ -133,10 +133,10 @@ 1 ] ], - "order": 14 + "order": 50 }, { - "id": "waterway_other", + "id": "Other waterway", "type": "line", "source": "openmaptiles", "source-layer": "waterway", @@ -145,7 +145,7 @@ "visibility": "visible" }, "paint": { - "line-color": "#a0c8f0", + "line-color": "hsl(210, 73%, 78%)", "line-width": { "base": 1.3, "stops": [ @@ -179,10 +179,10 @@ 1 ] ], - "order": 15 + "order": 51 }, { - "id": "waterway_other_intermittent", + "id": "Other waterway intermittent", "type": "line", "source": "openmaptiles", "source-layer": "waterway", @@ -191,7 +191,11 @@ "visibility": "visible" }, "paint": { - "line-color": "#a0c8f0", + "line-color": "hsl(210, 73%, 78%)", + "line-dasharray": [ + 4, + 3 + ], "line-width": { "base": 1.3, "stops": [ @@ -204,11 +208,7 @@ 6 ] ] - }, - "line-dasharray": [ - 4, - 3 - ] + } }, "metadata": {}, "filter": [ @@ -229,10 +229,10 @@ 1 ] ], - "order": 16 + "order": 52 }, { - "id": "waterway-bridge-case", + "id": "River bridge outline", "type": "line", "source": "openmaptiles", "source-layer": "waterway", @@ -241,20 +241,7 @@ "line-join": "miter" }, "paint": { - "line-color": "#bbbbbb", - "line-width": { - "base": 1.6, - "stops": [ - [ - 12, - 0.5 - ], - [ - 20, - 5 - ] - ] - }, + "line-color": "hsl(0, 0%, 73%)", "line-gap-width": { "base": 1.3, "stops": [ @@ -267,6 +254,19 @@ 6 ] ] + }, + "line-width": { + "base": 1.6, + "stops": [ + [ + 12, + 0.5 + ], + [ + 20, + 5 + ] + ] } }, "filter": [ @@ -282,10 +282,10 @@ "bridge" ] ], - "order": 111 + "order": 152 }, { - "id": "waterway-bridge", + "id": "River bridge", "type": "line", "source": "openmaptiles", "source-layer": "waterway", @@ -294,7 +294,7 @@ "line-join": "round" }, "paint": { - "line-color": "rgba(134, 204, 250, 1)", + "line-color": "hsl(204, 92%, 75%)", "line-width": { "base": 1.3, "stops": [ @@ -322,19 +322,33 @@ "bridge" ] ], - "order": 112 + "order": 153 }, { - "id": "water_way_name", + "id": "River labels", "type": "symbol", "source": "openmaptiles", "source-layer": "waterway", - "minzoom": 0, + "minzoom": 3, "layout": { - "text-font": [ - "Noto Sans Regular", - "Noto Sans Bold" + "symbol-placement": "line", + "symbol-spacing": 400, + "text-field": [ + "coalesce", + [ + "get", + "name:en" + ], + [ + "get", + "name" + ] ], + "text-font": [ + "Open Sans Regular", + "Noto Sans Regular" + ], + "text-max-width": 5, "text-size": { "stops": [ [ @@ -347,15 +361,11 @@ ] ] }, - "text-field": "{name:latin}\n{name:nonlatin}", - "visibility": "visible", - "symbol-spacing": 400, - "text-max-width": 5, - "symbol-placement": "line" + "visibility": "visible" }, "paint": { - "text-color": "#4d80b3", - "text-halo-color": "rgba(255, 255, 255, 0.8)", + "text-color": "hsl(210, 40%, 50%)", + "text-halo-color": "hsla(0, 0%, 100%, 0.8)", "text-halo-width": 1 }, "metadata": {}, @@ -367,7 +377,7 @@ "LineString" ] ], - "order": 151 + "order": 197 } ] } \ No newline at end of file diff --git a/style/style-header.json b/style/style-header.json index ba3ec2d1..b792e522 100644 --- a/style/style-header.json +++ b/style/style-header.json @@ -23,13 +23,13 @@ "sprite": "sprite", "layers": [ { - "id": "background", + "id": "Background", "type": "background", "layout": { "visibility": "visible" }, "paint": { - "background-color": "#f2efe9" + "background-color": "hsl(40, 26%, 93%)" } } ]