From cbbb7ef445f7e7ffe7ec10ac5b0de6d0e6cc0602 Mon Sep 17 00:00:00 2001 From: Kalin Dobrev Date: Mon, 8 Jul 2019 14:15:31 +0200 Subject: [PATCH] updated all styles --- .../map_files/styles/mono-blue-water.json | 640 +++++++------ configuration/map_files/styles/mono-blue.json | 629 +++++++------ configuration/map_files/styles/mono-bw.json | 618 ++++++++----- .../map_files/styles/mono-chrome.json | 843 ++++++++++++------ configuration/map_files/styles/mono.json | 11 +- 5 files changed, 1657 insertions(+), 1084 deletions(-) diff --git a/configuration/map_files/styles/mono-blue-water.json b/configuration/map_files/styles/mono-blue-water.json index 90559d1..cefcce3 100755 --- a/configuration/map_files/styles/mono-blue-water.json +++ b/configuration/map_files/styles/mono-blue-water.json @@ -104,25 +104,7 @@ } }, { - "id": "landuse_park", - "type": "fill", - "metadata": { - "mapbox:group": "1444849388993.3071" - }, - "source": "mapbox", - "source-layer": "landcover", - "filter": [ - "==", - "class", - "park" - ], - "paint": { - "fill-color": "hsla(0, 0%, 77%, 0)", - "fill-outline-color": "hsla(0, 0%, 77%, 0)" - } - }, - { - "id": "landuse_cemetery", + "id": "landuse_school", "type": "fill", "metadata": { "mapbox:group": "1444849388993.3071" @@ -132,11 +114,31 @@ "filter": [ "==", "class", - "cemetery" + "school" ], "paint": { - "fill-color": "hsla(0, 0%, 88%, 0)", - "fill-outline-color": "hsla(0, 0%, 88%, 0)" + "fill-color": "hsla(0, 0%, 94%, 0)", + "fill-outline-color": "hsla(0, 0%, 94%, 0)" + } + }, + { + "id": "landuse_wood", + "type": "fill", + "metadata": { + "mapbox:group": "1444849388993.3071" + }, + "source": "mapbox", + "source-layer": "landcover", + "filter": [ + "in", + "class", + "wood", + "grass" + ], + "paint": { + "fill-color": "hsla(0, 0%, 47%, 0)", + "fill-opacity": 0.2, + "fill-outline-color": "hsla(0, 0%, 47%, 0)" } }, { @@ -158,7 +160,7 @@ } }, { - "id": "landuse_school", + "id": "landuse_cemetery", "type": "fill", "metadata": { "mapbox:group": "1444849388993.3071" @@ -168,36 +170,15 @@ "filter": [ "==", "class", - "school" + "cemetery" ], "paint": { - "fill-color": "hsla(0, 0%, 94%, 0)", - "fill-outline-color": "hsla(0, 0%, 94%, 0)" + "fill-color": "hsla(0, 0%, 88%, 0)", + "fill-outline-color": "hsla(0, 0%, 88%, 0)" } }, { - "id": "landuse_pitch", - "type": "fill", - "metadata": { - "mapbox:group": "1444849388993.3071" - }, - "source": "mapbox", - "source-layer": "landuse", - "filter": [ - "all", - [ - "==", - "class", - "pitch" - ] - ], - "paint": { - "fill-color": "hsla(0, 0%, 94%, 0)", - "fill-outline-color": "hsla(0, 0%, 94%, 0)" - } - }, - { - "id": "landuse_wood", + "id": "landuse_park", "type": "fill", "metadata": { "mapbox:group": "1444849388993.3071" @@ -207,12 +188,24 @@ "filter": [ "==", "class", - "wood" + "park" ], "paint": { - "fill-color": "hsla(0, 0%, 47%, 0)", - "fill-opacity": 0.2, - "fill-outline-color": "hsla(0, 0%, 47%, 0)" + "fill-color": "hsla(0, 0%, 77%, 0)", + "fill-outline-color": "hsla(0, 0%, 77%, 0)" + } + }, + { + "id": "water", + "type": "fill", + "metadata": { + "mapbox:group": "1444849382550.77" + }, + "source": "mapbox", + "source-layer": "water", + "paint": { + "fill-color": "#46BCEC", + "fill-outline-color": "#46BCEC" } }, { @@ -328,19 +321,6 @@ } } }, - { - "id": "water", - "type": "fill", - "metadata": { - "mapbox:group": "1444849382550.77" - }, - "source": "mapbox", - "source-layer": "water", - "paint": { - "fill-color": "#46BCEC", - "fill-outline-color": "#46BCEC" - } - }, { "id": "aeroway_fill", "type": "fill", @@ -1234,6 +1214,48 @@ "line-opacity": 1 } }, + { + "id": "road_minor", + "metadata": { + "mapbox:group": "1444849345966.4436" + }, + "paint": { + "line-color": "#ffffff", + "line-width": { + "base": 1.2, + "stops": [ + [ + 12, + 0 + ], + [ + 14, + 2 + ], + [ + 20, + 11.5 + ] + ] + }, + "line-opacity": 1 + }, + "type": "line", + "source": "mapbox", + "source-layer": "transportation", + "filter": [ + "all", + [ + "in", + "class", + "minor" + ] + ], + "layout": { + "line-cap": "round", + "line-join": "round" + } + }, { "id": "road_service_track_casing", "type": "line", @@ -2498,31 +2520,6 @@ } } }, - { - "id": "road_minor", - "metadata": { - "mapbox:group": "1444849345966.4436" - }, - "paint": { - "line-color": "#ffffff", - "line-width": 2 - }, - "type": "line", - "source": "mapbox", - "source-layer": "transportation", - "filter": [ - "all", - [ - "in", - "class", - "minor" - ] - ], - "layout": { - "line-cap": "round", - "line-join": "round" - } - }, { "id": "admin_level_3", "type": "line", @@ -2542,6 +2539,11 @@ ">=", "admin_level", 3 + ], + [ + "<", + "admin_level", + 5 ] ], "layout": { @@ -2777,6 +2779,39 @@ } } }, + { + "id": "railway_line", + "type": "line", + "source": "mapbox", + "source-layer": "transportation", + "filter": [ + "all", + [ + "in", + "subclass", + "rail", + "subway", + "light_rail" + ], + [ + "==", + "class", + "rail" + ] + ], + "paint": { + "line-width": 1, + "line-color": "rgba(188, 188, 188, 1)", + "line-offset": 0 + }, + "line-opacity": 1, + "minzoom": 5, + "layout": { + "line-cap": "round", + "line-join": "round", + "visibility": "visible" + } + }, { "id": "water_label", "type": "symbol", @@ -2784,7 +2819,7 @@ "mapbox:group": "1444849320558.5054" }, "source": "mapbox", - "source-layer": "water", + "source-layer": "water_name", "filter": [ "==", "$type", @@ -2794,7 +2829,7 @@ "text-font": [ "Open Sans Italic" ], - "text-field": "{name_en}", + "text-field": "{name:en}", "text-max-width": 5, "text-size": 12 }, @@ -2805,14 +2840,14 @@ } }, { - "id": "poi_label_r1", + "id": "poi_label_r10+", "type": "symbol", "metadata": { "mapbox:group": "1444849297111.495" }, "source": "mapbox", "source-layer": "poi", - "minzoom": 14, + "minzoom": 16, "filter": [ "all", [ @@ -2821,9 +2856,9 @@ "Point" ], [ - "==", + ">=", "rank", - 1 + 10 ] ], "layout": { @@ -2831,51 +2866,7 @@ "text-font": [ "Open Sans Semibold" ], - "text-field": "{name_en}", - "text-max-width": 9, - "text-padding": 2, - "text-offset": [ - 0, - 0.6 - ], - "text-anchor": "top", - "text-size": 12 - }, - "paint": { - "text-color": "hsl(0, 0%, 40%)", - "text-halo-color": "hsl(0, 0%, 100%)", - "text-halo-width": 1, - "text-halo-blur": 0.5 - } - }, - { - "id": "poi_label_r2", - "type": "symbol", - "metadata": { - "mapbox:group": "1444849297111.495" - }, - "source": "mapbox", - "source-layer": "poi", - "minzoom": 15, - "filter": [ - "all", - [ - "==", - "$type", - "Point" - ], - [ - "==", - "rank", - 2 - ] - ], - "layout": { - "icon-image": "{class}-11", - "text-font": [ - "Open Sans Semibold" - ], - "text-field": "{name_en}", + "text-field": "{name:latin}", "text-max-width": 9, "text-padding": 2, "text-offset": [ @@ -2924,7 +2915,95 @@ "text-font": [ "Open Sans Semibold" ], - "text-field": "{name_en}", + "text-field": "{name:latin}", + "text-max-width": 9, + "text-padding": 2, + "text-offset": [ + 0, + 0.6 + ], + "text-anchor": "top", + "text-size": 12 + }, + "paint": { + "text-color": "hsl(0, 0%, 40%)", + "text-halo-color": "hsl(0, 0%, 100%)", + "text-halo-width": 1, + "text-halo-blur": 0.5 + } + }, + { + "id": "poi_label_r2", + "type": "symbol", + "metadata": { + "mapbox:group": "1444849297111.495" + }, + "source": "mapbox", + "source-layer": "poi", + "minzoom": 15, + "filter": [ + "all", + [ + "==", + "$type", + "Point" + ], + [ + "==", + "rank", + 2 + ] + ], + "layout": { + "icon-image": "{class}-11", + "text-font": [ + "Open Sans Semibold" + ], + "text-field": "{name:latin}", + "text-max-width": 9, + "text-padding": 2, + "text-offset": [ + 0, + 0.6 + ], + "text-anchor": "top", + "text-size": 12 + }, + "paint": { + "text-color": "hsl(0, 0%, 40%)", + "text-halo-color": "hsl(0, 0%, 100%)", + "text-halo-width": 1, + "text-halo-blur": 0.5 + } + }, + { + "id": "poi_label_r1", + "type": "symbol", + "metadata": { + "mapbox:group": "1444849297111.495" + }, + "source": "mapbox", + "source-layer": "poi", + "minzoom": 14, + "filter": [ + "all", + [ + "==", + "$type", + "Point" + ], + [ + "==", + "rank", + 1 + ] + ], + "layout": { + "icon-image": "{class}-11", + "text-font": [ + "Open Sans Semibold" + ], + "text-field": "{name:latin}", "text-max-width": 9, "text-padding": 2, "text-offset": [ @@ -2949,9 +3028,10 @@ }, "source": "mapbox", "source-layer": "poi", + "minzoom": 13, "layout": { "text-size": 12, - "icon-image": "{class}-11", + "icon-image": "rail-11", "text-font": [ "Open Sans Semibold" ], @@ -2962,7 +3042,7 @@ 0.6 ], "text-anchor": "top", - "text-field": "{name_en}", + "text-field": "{name:latin}", "text-max-width": 9 }, "paint": { @@ -2977,58 +3057,10 @@ "==", "class", "railway" - ] + ] ] }, - { - "id": "poi_label_r10+", - "type": "symbol", - "metadata": { - "mapbox:group": "1444849297111.495" - }, - "source": "mapbox", - "source-layer": "poi", - "minzoom": 16, - "filter": [ - "all", - [ - "==", - "$type", - "Point" - ], - [ - ">=", - "rank", - 10 - ], - [ - "<", - "rank", - 20 - ] - ], - "layout": { - "icon-image": "{class}-11", - "text-font": [ - "Open Sans Semibold" - ], - "text-field": "{name_en}", - "text-max-width": 9, - "text-padding": 2, - "text-offset": [ - 0, - 0.6 - ], - "text-anchor": "top", - "text-size": 12 - }, - "paint": { - "text-color": "hsl(0, 0%, 40%)", - "text-halo-color": "hsl(0, 0%, 100%)", - "text-halo-width": 1, - "text-halo-blur": 0.5 - } - }, + { "id": "airport_label", "type": "symbol", @@ -3036,7 +3068,7 @@ "mapbox:group": "1444849297111.495" }, "source": "mapbox", - "source-layer": "poi", + "source-layer": "aerodrome_label", "minzoom": 11, "filter": [ "all", @@ -3044,21 +3076,14 @@ "==", "$type", "Point" - ], - [ - "in", - "rank", - 1, - 2, - 3 ] ], "layout": { - "icon-image": "{class}-11", + "icon-image": "airport-11", "text-font": [ "Open Sans Semibold" ], - "text-field": "{name_en}", + "text-field": "{name:latin}", "text-max-width": 9, "text-padding": 2, "text-offset": [ @@ -3075,37 +3100,7 @@ "text-halo-blur": 0.5 } }, - { - "id": "railway_line", - "type": "line", - "source": "mapbox", - "source-layer": "transportation", - "filter": [ - "all", - [ - "==", - "subclass", - "rail" - ], - [ - "==", - "class", - "rail" - ] - ], - "paint": { - "line-width": 1, - "line-color": "rgba(188, 188, 188, 1)", - "line-offset": 0 - }, - "line-opacity": 1, - "minzoom": 5, - "layout": { - "line-cap": "round", - "line-join": "round", - "visibility": "visible" - } - }, + { "id": "road_label", "type": "symbol", @@ -3114,13 +3109,18 @@ }, "source": "mapbox", "source-layer": "transportation_name", + "minzoom": 13, "filter": [ - "!=", - "class", - "ferry" + "all", + [ + "!in", + "class", + "ferry", + "path" + ] ], "layout": { - "text-field": "{name_en}", + "text-field": "{name:latin}", "text-font": [ "Open Sans Regular" ], @@ -3146,18 +3146,26 @@ } }, { - "id": "road_label_highway_shield", + "id": "road_motorway_shield", "type": "symbol", "metadata": { "mapbox:group": "1456163609504.0715" }, "source": "mapbox", - "source-layer": "transportation", + "source-layer": "transportation_name", "minzoom": 8, "filter": [ - "<=", - "reflen", - 6 + "all", + [ + "<=", + "ref_length", + 4 + ], + [ + "==", + "class", + "motorway" + ] ], "layout": { "text-field": "{ref}", @@ -3165,7 +3173,7 @@ "Open Sans Semibold" ], "text-size": 11, - "icon-image": "motorway_{reflen}", + "icon-image": "motorway_{ref_length}", "symbol-placement": { "base": 1, "stops": [ @@ -3185,6 +3193,51 @@ }, "paint": {} }, + { + "id": "road_shield", + "type": "symbol", + "metadata": { + "mapbox:group": "1456163609504.0715" + }, + "source": "mapbox", + "source-layer": "transportation_name", + "minzoom": 12, + "filter": [ + "all", + [ + "<=", + "ref_length", + 6 + ] + ], + "layout": { + "text-field": "{ref}", + "text-font": [ + "Open Sans Semibold" + ], + "text-size": 11, + "icon-image": "motorway_{ref_length}", + "symbol-placement": { + "base": 1, + "stops": [ + [ + 10, + "point" + ], + [ + 11, + "line" + ] + ] + }, + "visibility": "visible", + "symbol-spacing": 500, + "text-rotation-alignment": "viewport", + "icon-rotation-alignment": "viewport" + }, + "paint": {}, + "maxzoom": 24 + }, { "id": "place_label_other", "type": "symbol", @@ -3193,9 +3246,10 @@ }, "source": "mapbox", "source-layer": "place", + "minzoom": 10, "filter": [ "in", - "type", + "class", "hamlet", "island", "islet", @@ -3208,7 +3262,7 @@ ], "text-transform": "uppercase", "text-letter-spacing": 0.1, - "text-field": "{name_en}", + "text-field": "{name}", "text-max-width": 9, "text-size": { "base": 1.2, @@ -3240,14 +3294,14 @@ "source-layer": "place", "filter": [ "==", - "type", + "class", "village" ], "layout": { "text-font": [ "Open Sans Regular" ], - "text-field": "{name_en}", + "text-field": "{name:en}", "text-max-width": 8, "text-size": { "base": 1.2, @@ -3279,14 +3333,14 @@ "source-layer": "place", "filter": [ "==", - "type", + "class", "town" ], "layout": { "text-font": [ "Open Sans Regular" ], - "text-field": "{name_en}", + "text-field": "{name:en}", "text-max-width": 8, "text-size": { "base": 1.2, @@ -3318,14 +3372,14 @@ "source-layer": "place", "filter": [ "==", - "type", + "class", "city" ], "layout": { "text-font": [ "Open Sans Semibold" ], - "text-field": "{name_en}", + "text-field": "{name:en}", "text-max-width": 8, "text-size": { "base": 1.2, @@ -3372,7 +3426,7 @@ "text-font": [ "Open Sans Italic" ], - "text-field": "{name_en}", + "text-field": "{name:en}", "text-letter-spacing": 0.2, "symbol-placement": "line", "text-size": { @@ -3420,7 +3474,7 @@ "text-font": [ "Open Sans Italic" ], - "text-field": "{name_en}", + "text-field": "{name:en}", "text-max-width": 6, "text-letter-spacing": 0.2, "symbol-placement": "point", @@ -3469,7 +3523,7 @@ "text-font": [ "Open Sans Italic" ], - "text-field": "{name_en}", + "text-field": "{name:en}", "text-letter-spacing": 0.2, "symbol-placement": "line", "text-size": { @@ -3517,7 +3571,7 @@ "text-font": [ "Open Sans Italic" ], - "text-field": "{name_en}", + "text-field": "{name:en}", "text-max-width": 5, "text-letter-spacing": 0.2, "symbol-placement": "point", @@ -3566,7 +3620,7 @@ "text-font": [ "Open Sans Italic" ], - "text-field": "{name_en}", + "text-field": "{name:en}", "text-letter-spacing": 0.2, "symbol-placement": "line", "text-size": { @@ -3614,7 +3668,7 @@ "text-font": [ "Open Sans Italic" ], - "text-field": "{name_en}", + "text-field": "{name:en}", "text-max-width": 5, "text-letter-spacing": 0.2, "symbol-placement": "point", @@ -3663,7 +3717,7 @@ "text-font": [ "Open Sans Italic" ], - "text-field": "{name_en}", + "text-field": "{name:en}", "text-letter-spacing": 0.2, "symbol-placement": "line", "text-size": { @@ -3711,7 +3765,7 @@ "text-font": [ "Open Sans Italic" ], - "text-field": "{name_en}", + "text-field": "{name:en}", "text-max-width": 5, "text-letter-spacing": 0.2, "text-line-height": 1.6, @@ -3749,15 +3803,23 @@ "source": "mapbox", "source-layer": "place", "filter": [ - ">=", - "rank", - 4 + "all", + [ + ">=", + "rank", + 4 + ], + [ + "==", + "class", + "country" + ] ], "layout": { "text-font": [ "Open Sans Bold" ], - "text-field": "{name_en}", + "text-field": "{name:en}", "text-max-width": 6.25, "text-transform": "uppercase", "text-size": { @@ -3789,15 +3851,23 @@ "source": "mapbox", "source-layer": "place", "filter": [ - "==", - "rank", - 3 + "all", + [ + "==", + "rank", + 3 + ], + [ + "==", + "class", + "country" + ] ], "layout": { "text-font": [ "Open Sans Bold" ], - "text-field": "{name_en}", + "text-field": "{name:en}", "text-max-width": 6.25, "text-transform": "uppercase", "text-size": { @@ -3829,15 +3899,23 @@ "source": "mapbox", "source-layer": "place", "filter": [ - "==", - "rank", - 2 + "all", + [ + "==", + "rank", + 2 + ], + [ + "==", + "class", + "country" + ] ], "layout": { "text-font": [ "Open Sans Bold" ], - "text-field": "{name_en}", + "text-field": "{name:en}", "text-max-width": 6.25, "text-transform": "uppercase", "text-size": { @@ -3869,15 +3947,23 @@ "source": "mapbox", "source-layer": "place", "filter": [ - "==", - "rank", - 1 + "all", + [ + "==", + "rank", + 1 + ], + [ + "==", + "class", + "country" + ] ], "layout": { "text-font": [ "Open Sans Bold" ], - "text-field": "{name_en}", + "text-field": "{name:en}", "text-max-width": 6.25, "text-transform": "uppercase", "text-size": { diff --git a/configuration/map_files/styles/mono-blue.json b/configuration/map_files/styles/mono-blue.json index 0ade950..7cafb80 100755 --- a/configuration/map_files/styles/mono-blue.json +++ b/configuration/map_files/styles/mono-blue.json @@ -104,25 +104,7 @@ } }, { - "id": "landuse_park", - "type": "fill", - "metadata": { - "mapbox:group": "1444849388993.3071" - }, - "source": "mapbox", - "source-layer": "landcover", - "filter": [ - "==", - "class", - "park" - ], - "paint": { - "fill-color": "#2C5A71", - "fill-outline-color": "#2C5A71" - } - }, - { - "id": "landuse_cemetery", + "id": "landuse_school", "type": "fill", "metadata": { "mapbox:group": "1444849388993.3071" @@ -132,11 +114,31 @@ "filter": [ "==", "class", - "cemetery" + "school" ], "paint": { - "fill-color": "#406D80", - "fill-outline-color": "#406D80" + "fill-color": "#2C5A71", + "fill-outline-color": "#2C5A71" + } + }, + { + "id": "landuse_wood", + "type": "fill", + "metadata": { + "mapbox:group": "1444849388993.3071" + }, + "source": "mapbox", + "source-layer": "landcover", + "filter": [ + "in", + "class", + "wood", + "grass" + ], + "paint": { + "fill-color": "#2C5A71", + "fill-opacity": 0.2, + "fill-outline-color": "#2C5A71" } }, { @@ -158,7 +160,7 @@ } }, { - "id": "landuse_school", + "id": "landuse_cemetery", "type": "fill", "metadata": { "mapbox:group": "1444849388993.3071" @@ -168,36 +170,15 @@ "filter": [ "==", "class", - "school" + "cemetery" ], "paint": { - "fill-color": "#2C5A71", - "fill-outline-color": "#2C5A71" + "fill-color": "#406D80", + "fill-outline-color": "#406D80" } }, { - "id": "landuse_pitch", - "type": "fill", - "metadata": { - "mapbox:group": "1444849388993.3071" - }, - "source": "mapbox", - "source-layer": "landuse", - "filter": [ - "all", - [ - "==", - "class", - "pitch" - ] - ], - "paint": { - "fill-color": "#2C5A71", - "fill-outline-color": "#2C5A71" - } - }, - { - "id": "landuse_wood", + "id": "landuse_park", "type": "fill", "metadata": { "mapbox:group": "1444849388993.3071" @@ -207,14 +188,26 @@ "filter": [ "==", "class", - "wood" + "park" ], "paint": { "fill-color": "#2C5A71", - "fill-opacity": 0.2, "fill-outline-color": "#2C5A71" } }, + { + "id": "water", + "type": "fill", + "metadata": { + "mapbox:group": "1444849382550.77" + }, + "source": "mapbox", + "source-layer": "water", + "paint": { + "fill-color": "#193341", + "fill-outline-color": "#193341" + } + }, { "id": "waterway", "type": "line", @@ -328,19 +321,6 @@ } } }, - { - "id": "water", - "type": "fill", - "metadata": { - "mapbox:group": "1444849382550.77" - }, - "source": "mapbox", - "source-layer": "water", - "paint": { - "fill-color": "#193341", - "fill-outline-color": "#193341" - } - }, { "id": "aeroway_fill", "type": "fill", @@ -549,31 +529,6 @@ "line-opacity": 1 } }, - { - "id": "road_minor", - "metadata": { - "mapbox:group": "1444849345966.4436" - }, - "paint": { - "line-color": "rgba(25, 74, 87, 1)", - "line-width": 2 - }, - "type": "line", - "source": "mapbox", - "source-layer": "transportation", - "filter": [ - "all", - [ - "in", - "class", - "minor" - ] - ], - "layout": { - "line-cap": "round", - "line-join": "round" - } - }, { "id": "tunnel_service_track_casing", "type": "line", @@ -1259,6 +1214,48 @@ "line-opacity": 1 } }, + { + "id": "road_minor", + "metadata": { + "mapbox:group": "1444849345966.4436" + }, + "paint": { + "line-color": "rgba(25, 74, 87, 1)", + "line-width": { + "base": 1.2, + "stops": [ + [ + 12, + 0 + ], + [ + 14, + 2 + ], + [ + 20, + 11.5 + ] + ] + }, + "line-opacity": 1 + }, + "type": "line", + "source": "mapbox", + "source-layer": "transportation", + "filter": [ + "all", + [ + "in", + "class", + "minor" + ] + ], + "layout": { + "line-cap": "round", + "line-join": "round" + } + }, { "id": "road_service_track_casing", "type": "line", @@ -2542,6 +2539,11 @@ ">=", "admin_level", 3 + ], + [ + "<", + "admin_level", + 5 ] ], "layout": { @@ -2777,6 +2779,39 @@ } } }, + { + "id": "railway_line", + "type": "line", + "source": "mapbox", + "source-layer": "transportation", + "filter": [ + "all", + [ + "in", + "subclass", + "rail", + "subway", + "light_rail" + ], + [ + "==", + "class", + "rail" + ] + ], + "paint": { + "line-width": 1, + "line-color": "rgba(188, 188, 188, 1)", + "line-offset": 0 + }, + "line-opacity": 1, + "minzoom": 5, + "layout": { + "line-cap": "round", + "line-join": "round", + "visibility": "visible" + } + }, { "id": "water_label", "type": "symbol", @@ -2784,7 +2819,7 @@ "mapbox:group": "1444849320558.5054" }, "source": "mapbox", - "source-layer": "water", + "source-layer": "water_name", "filter": [ "==", "$type", @@ -2794,7 +2829,7 @@ "text-font": [ "Open Sans Italic" ], - "text-field": "{name_en}", + "text-field": "{name:en}", "text-max-width": 5, "text-size": 12 }, @@ -2804,14 +2839,14 @@ } }, { - "id": "poi_label_r1", + "id": "poi_label_r10+", "type": "symbol", "metadata": { "mapbox:group": "1444849297111.495" }, "source": "mapbox", "source-layer": "poi", - "minzoom": 14, + "minzoom": 16, "filter": [ "all", [ @@ -2820,9 +2855,9 @@ "Point" ], [ - "==", + ">=", "rank", - 1 + 10 ] ], "layout": { @@ -2830,50 +2865,7 @@ "text-font": [ "Open Sans Semibold" ], - "text-field": "{name_en}", - "text-max-width": 9, - "text-padding": 2, - "text-offset": [ - 0, - 0.6 - ], - "text-anchor": "top", - "text-size": 12 - }, - "paint": { - "text-color": "hsl(0, 0%, 100%)", - "text-halo-blur": 0.5, - "text-halo-width": 1 - } - }, - { - "id": "poi_label_r2", - "type": "symbol", - "metadata": { - "mapbox:group": "1444849297111.495" - }, - "source": "mapbox", - "source-layer": "poi", - "minzoom": 15, - "filter": [ - "all", - [ - "==", - "$type", - "Point" - ], - [ - "==", - "rank", - 2 - ] - ], - "layout": { - "icon-image": "{class}-11", - "text-font": [ - "Open Sans Semibold" - ], - "text-field": "{name_en}", + "text-field": "{name:latin}", "text-max-width": 9, "text-padding": 2, "text-offset": [ @@ -2921,7 +2913,7 @@ "text-font": [ "Open Sans Semibold" ], - "text-field": "{name_en}", + "text-field": "{name:latin}", "text-max-width": 9, "text-padding": 2, "text-offset": [ @@ -2937,6 +2929,94 @@ "text-halo-width": 1 } }, + { + "id": "poi_label_r2", + "type": "symbol", + "metadata": { + "mapbox:group": "1444849297111.495" + }, + "source": "mapbox", + "source-layer": "poi", + "minzoom": 15, + "filter": [ + "all", + [ + "==", + "$type", + "Point" + ], + [ + "==", + "rank", + 2 + ] + ], + "layout": { + "icon-image": "{class}-11", + "text-font": [ + "Open Sans Semibold" + ], + "text-field": "{name:latin}", + "text-max-width": 9, + "text-padding": 2, + "text-offset": [ + 0, + 0.6 + ], + "text-anchor": "top", + "text-size": 12 + }, + "paint": { + "text-color": "hsl(0, 0%, 100%)", + "text-halo-blur": 0.5, + "text-halo-width": 1 + } + }, + { + "id": "poi_label_r1", + "type": "symbol", + "metadata": { + "mapbox:group": "1444849297111.495" + }, + "source": "mapbox", + "source-layer": "poi", + "minzoom": 14, + "filter": [ + "all", + [ + "==", + "$type", + "Point" + ], + [ + "==", + "rank", + 1 + ] + ], + "layout": { + "icon-image": "{class}-11", + "text-font": [ + "Open Sans Semibold" + ], + "text-field": "{name:latin}", + "text-max-width": 9, + "text-padding": 2, + "text-offset": [ + 0, + 0.6 + ], + "text-anchor": "top", + "text-size": 12 + }, + "paint": { + "text-color": "hsl(0, 0%, 100%)", + "text-halo-blur": 0.5, + "text-halo-width": 1 + } + }, + + { "id": "rail_station_label", "type": "symbol", @@ -2945,9 +3025,10 @@ }, "source": "mapbox", "source-layer": "poi", + "minzoom": 13, "layout": { "text-size": 12, - "icon-image": "{class}-11", + "icon-image": "rail-11", "text-font": [ "Open Sans Semibold" ], @@ -2958,7 +3039,7 @@ 0.6 ], "text-anchor": "top", - "text-field": "{name_en}", + "text-field": "{name:latin}", "text-max-width": 9 }, "paint": { @@ -2972,88 +3053,10 @@ "==", "class", "railway" - ] + ] ] }, - { - "id": "poi_label_r10+", - "type": "symbol", - "metadata": { - "mapbox:group": "1444849297111.495" - }, - "source": "mapbox", - "source-layer": "poi", - "minzoom": 16, - "filter": [ - "all", - [ - "==", - "$type", - "Point" - ], - [ - ">=", - "rank", - 10 - ], - [ - "<", - "rank", - 20 - ] - ], - "layout": { - "icon-image": "{class}-11", - "text-font": [ - "Open Sans Semibold" - ], - "text-field": "{name_en}", - "text-max-width": 9, - "text-padding": 2, - "text-offset": [ - 0, - 0.6 - ], - "text-anchor": "top", - "text-size": 12 - }, - "paint": { - "text-color": "hsl(0, 0%, 100%)", - "text-halo-blur": 0.5, - "text-halo-width": 1 - } - }, - { - "id": "railway_line", - "type": "line", - "source": "mapbox", - "source-layer": "transportation", - "filter": [ - "all", - [ - "==", - "subclass", - "rail" - ], - [ - "==", - "class", - "rail" - ] - ], - "paint": { - "line-width": 1, - "line-color": "rgba(188, 188, 188, 1)", - "line-offset": 0 - }, - "line-opacity": 1, - "minzoom": 5, - "layout": { - "line-cap": "round", - "line-join": "round", - "visibility": "visible" - } - }, + { "id": "airport_label", "type": "symbol", @@ -3061,7 +3064,7 @@ "mapbox:group": "1444849297111.495" }, "source": "mapbox", - "source-layer": "poi", + "source-layer": "aerodome_label", "minzoom": 11, "filter": [ "all", @@ -3069,21 +3072,14 @@ "==", "$type", "Point" - ], - [ - "in", - "rank", - 1, - 2, - 3 ] ], "layout": { - "icon-image": "{class}-11", + "icon-image": "airport-11", "text-font": [ "Open Sans Semibold" ], - "text-field": "{name_en}", + "text-field": "{name:latin}", "text-max-width": 9, "text-padding": 2, "text-offset": [ @@ -3107,13 +3103,18 @@ }, "source": "mapbox", "source-layer": "transportation_name", + "minzoom": 13, "filter": [ - "!=", - "class", - "ferry" + "all", + [ + "!in", + "class", + "ferry", + "path" + ] ], "layout": { - "text-field": "{name_en}", + "text-field": "{name:latin}", "text-font": [ "Open Sans Regular" ], @@ -3139,18 +3140,26 @@ } }, { - "id": "road_label_highway_shield", + "id": "road_motorway_shield", "type": "symbol", "metadata": { "mapbox:group": "1456163609504.0715" }, "source": "mapbox", - "source-layer": "transportation", + "source-layer": "transportation_name", "minzoom": 8, "filter": [ - "<=", - "reflen", - 6 + "all", + [ + "<=", + "ref_length", + 4 + ], + [ + "==", + "class", + "motorway" + ] ], "layout": { "text-field": "{ref}", @@ -3158,7 +3167,7 @@ "Open Sans Semibold" ], "text-size": 11, - "icon-image": "motorway_{reflen}", + "icon-image": "motorway_{ref_length}", "symbol-placement": { "base": 1, "stops": [ @@ -3180,6 +3189,51 @@ "text-color": "#194A57" } }, + { + "id": "road_shield", + "type": "symbol", + "metadata": { + "mapbox:group": "1456163609504.0715" + }, + "source": "mapbox", + "source-layer": "transportation_name", + "minzoom": 12, + "filter": [ + "all", + [ + "<=", + "ref_length", + 6 + ] + ], + "layout": { + "text-field": "{ref}", + "text-font": [ + "Open Sans Semibold" + ], + "text-size": 11, + "icon-image": "motorway_{ref_length}", + "symbol-placement": { + "base": 1, + "stops": [ + [ + 10, + "point" + ], + [ + 11, + "line" + ] + ] + }, + "visibility": "visible", + "symbol-spacing": 500, + "text-rotation-alignment": "viewport", + "icon-rotation-alignment": "viewport" + }, + "paint": {}, + "maxzoom": 24 + }, { "id": "place_label_other", "type": "symbol", @@ -3188,9 +3242,10 @@ }, "source": "mapbox", "source-layer": "place", + "minzoom": 10, "filter": [ "in", - "type", + "class", "hamlet", "island", "islet", @@ -3203,7 +3258,7 @@ ], "text-transform": "uppercase", "text-letter-spacing": 0.1, - "text-field": "{name_en}", + "text-field": "{name}", "text-max-width": 9, "text-size": { "base": 1.2, @@ -3234,14 +3289,14 @@ "source-layer": "place", "filter": [ "==", - "type", + "class", "village" ], "layout": { "text-font": [ "Open Sans Regular" ], - "text-field": "{name_en}", + "text-field": "{name:en}", "text-max-width": 8, "text-size": { "base": 1.2, @@ -3272,14 +3327,14 @@ "source-layer": "place", "filter": [ "==", - "type", + "class", "town" ], "layout": { "text-font": [ "Open Sans Regular" ], - "text-field": "{name_en}", + "text-field": "{name:en}", "text-max-width": 8, "text-size": { "base": 1.2, @@ -3310,14 +3365,14 @@ "source-layer": "place", "filter": [ "==", - "type", + "class", "city" ], "layout": { "text-font": [ "Open Sans Semibold" ], - "text-field": "{name_en}", + "text-field": "{name:en}", "text-max-width": 8, "text-size": { "base": 1.2, @@ -3363,7 +3418,7 @@ "text-font": [ "Open Sans Italic" ], - "text-field": "{name_en}", + "text-field": "{name:en}", "text-letter-spacing": 0.2, "symbol-placement": "line", "text-size": { @@ -3410,7 +3465,7 @@ "text-font": [ "Open Sans Italic" ], - "text-field": "{name_en}", + "text-field": "{name:en}", "text-max-width": 6, "text-letter-spacing": 0.2, "symbol-placement": "point", @@ -3458,7 +3513,7 @@ "text-font": [ "Open Sans Italic" ], - "text-field": "{name_en}", + "text-field": "{name:en}", "text-letter-spacing": 0.2, "symbol-placement": "line", "text-size": { @@ -3505,7 +3560,7 @@ "text-font": [ "Open Sans Italic" ], - "text-field": "{name_en}", + "text-field": "{name:en}", "text-max-width": 5, "text-letter-spacing": 0.2, "symbol-placement": "point", @@ -3553,7 +3608,7 @@ "text-font": [ "Open Sans Italic" ], - "text-field": "{name_en}", + "text-field": "{name:en}", "text-letter-spacing": 0.2, "symbol-placement": "line", "text-size": { @@ -3600,7 +3655,7 @@ "text-font": [ "Open Sans Italic" ], - "text-field": "{name_en}", + "text-field": "{name:en}", "text-max-width": 5, "text-letter-spacing": 0.2, "symbol-placement": "point", @@ -3732,15 +3787,23 @@ "source": "mapbox", "source-layer": "place", "filter": [ - ">=", - "rank", - 4 + "all", + [ + ">=", + "rank", + 4 + ], + [ + "==", + "class", + "country" + ] ], "layout": { "text-font": [ "Open Sans Bold" ], - "text-field": "{name_en}", + "text-field": "{name:en}", "text-max-width": 6.25, "text-transform": "uppercase", "text-size": { @@ -3771,15 +3834,23 @@ "source": "mapbox", "source-layer": "place", "filter": [ - "==", - "rank", - 3 + "all", + [ + "==", + "rank", + 3 + ], + [ + "==", + "class", + "country" + ] ], "layout": { "text-font": [ "Open Sans Bold" ], - "text-field": "{name_en}", + "text-field": "{name:en}", "text-max-width": 6.25, "text-transform": "uppercase", "text-size": { @@ -3810,15 +3881,23 @@ "source": "mapbox", "source-layer": "place", "filter": [ - "==", - "rank", - 2 + "all", + [ + "==", + "rank", + 2 + ], + [ + "==", + "class", + "country" + ] ], "layout": { "text-font": [ "Open Sans Bold" ], - "text-field": "{name_en}", + "text-field": "{name:en}", "text-max-width": 6.25, "text-transform": "uppercase", "text-size": { @@ -3849,15 +3928,23 @@ "source": "mapbox", "source-layer": "place", "filter": [ - "==", - "rank", - 1 + "all", + [ + "==", + "rank", + 1 + ], + [ + "==", + "class", + "country" + ] ], "layout": { "text-font": [ "Open Sans Bold" ], - "text-field": "{name_en}", + "text-field": "{name:en}", "text-max-width": 6.25, "text-transform": "uppercase", "text-size": { diff --git a/configuration/map_files/styles/mono-bw.json b/configuration/map_files/styles/mono-bw.json index de6c64e..5f3727a 100644 --- a/configuration/map_files/styles/mono-bw.json +++ b/configuration/map_files/styles/mono-bw.json @@ -84,6 +84,46 @@ "background-color": "hsl(30, 0%, 91%)" } }, + { + "id": "landuse_prot_area", + "type": "fill", + "metadata": { + "mapbox:group": "1444849388993.3071" + }, + "source": "mapbox", + "source-layer": "park", + "filter": [ + "all", + [ + "==", + "class", + "protected_area" + ] + ], + "paint": { + "fill-color": "#dddddd" + } + }, + { + "id": "landuse_nat_park", + "type": "fill", + "metadata": { + "mapbox:group": "1444849388993.3071" + }, + "source": "mapbox", + "source-layer": "park", + "filter": [ + "all", + [ + "==", + "class", + "national_park" + ] + ], + "paint": { + "fill-color": "#dddddd" + } + }, { "id": "landuse_overlay_national_park", "type": "fill", @@ -104,25 +144,7 @@ } }, { - "id": "landuse_park", - "type": "fill", - "metadata": { - "mapbox:group": "1444849388993.3071" - }, - "source": "mapbox", - "source-layer": "landcover", - "filter": [ - "==", - "class", - "park" - ], - "paint": { - "fill-color": "hsl(84, 0%, 77%)", - "fill-outline-color": "hsl(84, 0%, 77%)" - } - }, - { - "id": "landuse_cemetery", + "id": "landuse_school", "type": "fill", "metadata": { "mapbox:group": "1444849388993.3071" @@ -132,11 +154,31 @@ "filter": [ "==", "class", - "cemetery" + "school" ], "paint": { - "fill-color": "hsl(94, 0%, 88%)", - "fill-outline-color": "hsl(94, 0%, 88%)" + "fill-color": "hsl(270,0%, 94%)", + "fill-outline-color": "hsl(270, 0%, 94%)" + } + }, + { + "id": "landuse_wood", + "type": "fill", + "metadata": { + "mapbox:group": "1444849388993.3071" + }, + "source": "mapbox", + "source-layer": "landcover", + "filter": [ + "in", + "class", + "wood", + "grass" + ], + "paint": { + "fill-color": "hsl(100,0%, 47%)", + "fill-opacity": 0.2, + "fill-outline-color": "hsl(100, 0%, 47%)" } }, { @@ -157,24 +199,6 @@ "fill-outline-color": "hsl(330, 0%, 94%)" } }, - { - "id": "landuse_school", - "type": "fill", - "metadata": { - "mapbox:group": "1444849388993.3071" - }, - "source": "mapbox", - "source-layer": "landuse", - "filter": [ - "==", - "class", - "school" - ], - "paint": { - "fill-color": "hsl(270,0%, 94%)", - "fill-outline-color": "hsl(270, 0%, 94%)" - } - }, { "id": "landuse_pitch", "type": "fill", @@ -197,22 +221,34 @@ } }, { - "id": "landuse_wood", + "id": "landuse_cemetery", "type": "fill", "metadata": { "mapbox:group": "1444849388993.3071" }, "source": "mapbox", - "source-layer": "landcover", + "source-layer": "landuse", "filter": [ "==", "class", - "wood" + "cemetery" ], "paint": { - "fill-color": "hsl(100,0%, 47%)", - "fill-opacity": 0.2, - "fill-outline-color": "hsl(100, 0%, 47%)" + "fill-color": "hsl(94, 0%, 88%)", + "fill-outline-color": "hsl(94, 0%, 88%)" + } + }, + { + "id": "water", + "type": "fill", + "metadata": { + "mapbox:group": "1444849382550.77" + }, + "source": "mapbox", + "source-layer": "water", + "paint": { + "fill-color": "hsl(213, 0%, 82%)", + "fill-outline-color": "hsl(213, 0%, 82%)" } }, { @@ -328,19 +364,6 @@ } } }, - { - "id": "water", - "type": "fill", - "metadata": { - "mapbox:group": "1444849382550.77" - }, - "source": "mapbox", - "source-layer": "water", - "paint": { - "fill-color": "hsl(213, 0%, 82%)", - "fill-outline-color": "hsl(213, 0%, 82%)" - } - }, { "id": "aeroway_fill", "type": "fill", @@ -1252,8 +1275,25 @@ "mapbox:group": "1444849345966.4436" }, "paint": { - "line-color": "rgba(255, 255, 255, 1)", - "line-width": 2 + "line-color": "rgba(255, 255, 255, 1)", + "line-width": { + "base": 1.2, + "stops": [ + [ + 12, + 0 + ], + [ + 14, + 2 + ], + [ + 20, + 11.5 + ] + ] + }, + "line-opacity": 1 }, "type": "line", "source": "mapbox", @@ -2554,6 +2594,11 @@ ">=", "admin_level", 3 + ], + [ + "<", + "admin_level", + 5 ] ], "layout": { @@ -2789,6 +2834,39 @@ } } }, + { + "id": "railway_line", + "type": "line", + "source": "mapbox", + "source-layer": "transportation", + "filter": [ + "any", + [ + "in", + "subclass", + "rail", + "subway", + "light_rail" + ], + [ + "==", + "class", + "rail" + ] + ], + "paint": { + "line-width": 1, + "line-color": "rgba(188, 188, 188, 1)", + "line-offset": 0 + }, + "line-opacity": 1, + "minzoom": 5, + "layout": { + "line-cap": "round", + "line-join": "round", + "visibility": "visible" + } + }, { "id": "water_label", "type": "symbol", @@ -2796,7 +2874,7 @@ "mapbox:group": "1444849320558.5054" }, "source": "mapbox", - "source-layer": "water", + "source-layer": "water_name", "filter": [ "==", "$type", @@ -2806,7 +2884,7 @@ "text-font": [ "Open Sans Italic" ], - "text-field": "{name_en}", + "text-field": "{name:en}", "text-max-width": 5, "text-size": 12 }, @@ -2817,14 +2895,14 @@ } }, { - "id": "poi_label_r1", + "id": "poi_label_r10+", "type": "symbol", "metadata": { "mapbox:group": "1444849297111.495" }, "source": "mapbox", "source-layer": "poi", - "minzoom": 14, + "minzoom": 16, "filter": [ "all", [ @@ -2833,9 +2911,9 @@ "Point" ], [ - "==", + ">=", "rank", - 1 + 10 ] ], "layout": { @@ -2843,51 +2921,7 @@ "text-font": [ "Open Sans Semibold" ], - "text-field": "{name_en}", - "text-max-width": 9, - "text-padding": 2, - "text-offset": [ - 0, - 0.6 - ], - "text-anchor": "top", - "text-size": 12 - }, - "paint": { - "text-color": "hsl(0, 0%, 40%)", - "text-halo-color": "hsl(0, 0%, 100%)", - "text-halo-width": 1, - "text-halo-blur": 0.5 - } - }, - { - "id": "poi_label_r2", - "type": "symbol", - "metadata": { - "mapbox:group": "1444849297111.495" - }, - "source": "mapbox", - "source-layer": "poi", - "minzoom": 15, - "filter": [ - "all", - [ - "==", - "$type", - "Point" - ], - [ - "==", - "rank", - 2 - ] - ], - "layout": { - "icon-image": "{class}-11", - "text-font": [ - "Open Sans Semibold" - ], - "text-field": "{name_en}", + "text-field": "{name:en}", "text-max-width": 9, "text-padding": 2, "text-offset": [ @@ -2936,7 +2970,95 @@ "text-font": [ "Open Sans Semibold" ], - "text-field": "{name_en}", + "text-field": "{name:en}", + "text-max-width": 9, + "text-padding": 2, + "text-offset": [ + 0, + 0.6 + ], + "text-anchor": "top", + "text-size": 12 + }, + "paint": { + "text-color": "hsl(0, 0%, 40%)", + "text-halo-color": "hsl(0, 0%, 100%)", + "text-halo-width": 1, + "text-halo-blur": 0.5 + } + }, + { + "id": "poi_label_r2", + "type": "symbol", + "metadata": { + "mapbox:group": "1444849297111.495" + }, + "source": "mapbox", + "source-layer": "poi", + "minzoom": 15, + "filter": [ + "all", + [ + "==", + "$type", + "Point" + ], + [ + "==", + "rank", + 2 + ] + ], + "layout": { + "icon-image": "{class}-11", + "text-font": [ + "Open Sans Semibold" + ], + "text-field": "{name:en}", + "text-max-width": 9, + "text-padding": 2, + "text-offset": [ + 0, + 0.6 + ], + "text-anchor": "top", + "text-size": 12 + }, + "paint": { + "text-color": "hsl(0, 0%, 40%)", + "text-halo-color": "hsl(0, 0%, 100%)", + "text-halo-width": 1, + "text-halo-blur": 0.5 + } + }, + { + "id": "poi_label_r1", + "type": "symbol", + "metadata": { + "mapbox:group": "1444849297111.495" + }, + "source": "mapbox", + "source-layer": "poi", + "minzoom": 14, + "filter": [ + "all", + [ + "==", + "$type", + "Point" + ], + [ + "==", + "rank", + 1 + ] + ], + "layout": { + "icon-image": "{class}-11", + "text-font": [ + "Open Sans Semibold" + ], + "text-field": "{name:en}", "text-max-width": 9, "text-padding": 2, "text-offset": [ @@ -2961,9 +3083,10 @@ }, "source": "mapbox", "source-layer": "poi", + "minzoom": 13, "layout": { "text-size": 12, - "icon-image": "{class}-11", + "icon-image": "rail-11", "text-font": [ "Open Sans Semibold" ], @@ -2974,7 +3097,7 @@ 0.6 ], "text-anchor": "top", - "text-field": "{name_en}", + "text-field": "{name:latin}", "text-max-width": 9 }, "paint": { @@ -2989,88 +3112,8 @@ "==", "class", "railway" - ] - ] - }, - { - "id": "poi_label_r10+", - "type": "symbol", - "metadata": { - "mapbox:group": "1444849297111.495" - }, - "source": "mapbox", - "source-layer": "poi", - "minzoom": 16, - "filter": [ - "all", - [ - "==", - "$type", - "Point" - ], - [ - ">=", - "rank", - 10 - ], - [ - "<", - "rank", - 20 - ] - ], - "layout": { - "icon-image": "{class}-11", - "text-font": [ - "Open Sans Semibold" - ], - "text-field": "{name_en}", - "text-max-width": 9, - "text-padding": 2, - "text-offset": [ - 0, - 0.6 - ], - "text-anchor": "top", - "text-size": 12 - }, - "paint": { - "text-color": "hsl(0, 0%, 40%)", - "text-halo-color": "hsl(0, 0%, 100%)", - "text-halo-width": 1, - "text-halo-blur": 0.5 - } - }, - { - "id": "railway_line", - "type": "line", - "source": "mapbox", - "source-layer": "transportation", - "filter": [ - "all", - [ - "==", - "subclass", - "rail" - ], - [ - "==", - "class", - "rail" ] - ], - "paint": { - "line-width": 1, - "line-color": "rgba(188, 188, 188, 1)", - "line-offset": 0 - }, - "line-opacity": 1, - "minzoom": 5, - "layout": { - "line-cap": "round", - "line-join": "round", - "visibility": "visible" - } + ] }, { "id": "airport_label", @@ -3079,7 +3122,7 @@ "mapbox:group": "1444849297111.495" }, "source": "mapbox", - "source-layer": "poi", + "source-layer": "aerodome_label", "minzoom": 11, "filter": [ "all", @@ -3097,11 +3140,11 @@ ] ], "layout": { - "icon-image": "{class}-11", + "icon-image": "airport-11", "text-font": [ "Open Sans Semibold" ], - "text-field": "{name_en}", + "text-field": "{name:latin}", "text-max-width": 9, "text-padding": 2, "text-offset": [ @@ -3126,13 +3169,18 @@ }, "source": "mapbox", "source-layer": "transportation_name", + "minzoom": 13, "filter": [ - "!=", - "class", - "ferry" + "all", + [ + "!in", + "class", + "ferry", + "path" + ] ], "layout": { - "text-field": "{name_en}", + "text-field": "{name:latin}", "text-font": [ "Open Sans Regular" ], @@ -3158,18 +3206,26 @@ } }, { - "id": "road_label_highway_shield", + "id": "road_motorway_shield", "type": "symbol", "metadata": { "mapbox:group": "1456163609504.0715" }, "source": "mapbox", - "source-layer": "transportation", - "minzoom": 8, + "source-layer": "transportation_name", + "minzoom": 9, "filter": [ - "<=", - "reflen", - 6 + "all", + [ + "<=", + "ref_length", + 4 + ], + [ + "==", + "class", + "motorway" + ] ], "layout": { "text-field": "{ref}", @@ -3177,7 +3233,7 @@ "Open Sans Semibold" ], "text-size": 11, - "icon-image": "motorway_{reflen}", + "icon-image": "motorway_{ref_length}", "symbol-placement": { "base": 1, "stops": [ @@ -3197,6 +3253,51 @@ }, "paint": {} }, + { + "id": "road_shield", + "type": "symbol", + "metadata": { + "mapbox:group": "1456163609504.0715" + }, + "source": "mapbox", + "source-layer": "transportation_name", + "minzoom": 12, + "filter": [ + "all", + [ + "<=", + "ref_length", + 6 + ] + ], + "layout": { + "text-field": "{ref}", + "text-font": [ + "Open Sans Semibold" + ], + "text-size": 11, + "icon-image": "motorway_{ref_length}", + "symbol-placement": { + "base": 1, + "stops": [ + [ + 10, + "point" + ], + [ + 11, + "line" + ] + ] + }, + "visibility": "visible", + "symbol-spacing": 500, + "text-rotation-alignment": "viewport", + "icon-rotation-alignment": "viewport" + }, + "paint": {}, + "maxzoom": 24 + }, { "id": "place_label_other", "type": "symbol", @@ -3205,9 +3306,10 @@ }, "source": "mapbox", "source-layer": "place", + "minzoom": 10, "filter": [ "in", - "type", + "class", "hamlet", "island", "islet", @@ -3220,7 +3322,7 @@ ], "text-transform": "uppercase", "text-letter-spacing": 0.1, - "text-field": "{name_en}", + "text-field": "{name}", "text-max-width": 9, "text-size": { "base": 1.2, @@ -3252,14 +3354,14 @@ "source-layer": "place", "filter": [ "==", - "type", + "class", "village" ], "layout": { "text-font": [ "Open Sans Regular" ], - "text-field": "{name_en}", + "text-field": "{name:en}", "text-max-width": 8, "text-size": { "base": 1.2, @@ -3291,14 +3393,14 @@ "source-layer": "place", "filter": [ "==", - "type", + "class", "town" ], "layout": { "text-font": [ "Open Sans Regular" ], - "text-field": "{name_en}", + "text-field": "{name:en}", "text-max-width": 8, "text-size": { "base": 1.2, @@ -3330,14 +3432,14 @@ "source-layer": "place", "filter": [ "==", - "type", + "class", "city" ], "layout": { "text-font": [ "Open Sans Semibold" ], - "text-field": "{name_en}", + "text-field": "{name:en}", "text-max-width": 8, "text-size": { "base": 1.2, @@ -3384,7 +3486,7 @@ "text-font": [ "Open Sans Italic" ], - "text-field": "{name_en}", + "text-field": "{name:en}", "text-letter-spacing": 0.2, "symbol-placement": "line", "text-size": { @@ -3432,7 +3534,7 @@ "text-font": [ "Open Sans Italic" ], - "text-field": "{name_en}", + "text-field": "{name:en}", "text-max-width": 6, "text-letter-spacing": 0.2, "symbol-placement": "point", @@ -3481,7 +3583,7 @@ "text-font": [ "Open Sans Italic" ], - "text-field": "{name_en}", + "text-field": "{name:en}", "text-letter-spacing": 0.2, "symbol-placement": "line", "text-size": { @@ -3529,7 +3631,7 @@ "text-font": [ "Open Sans Italic" ], - "text-field": "{name_en}", + "text-field": "{name:en}", "text-max-width": 5, "text-letter-spacing": 0.2, "symbol-placement": "point", @@ -3578,7 +3680,7 @@ "text-font": [ "Open Sans Italic" ], - "text-field": "{name_en}", + "text-field": "{name:en}", "text-letter-spacing": 0.2, "symbol-placement": "line", "text-size": { @@ -3626,7 +3728,7 @@ "text-font": [ "Open Sans Italic" ], - "text-field": "{name_en}", + "text-field": "{name:en}", "text-max-width": 5, "text-letter-spacing": 0.2, "symbol-placement": "point", @@ -3675,7 +3777,7 @@ "text-font": [ "Open Sans Italic" ], - "text-field": "{name_en}", + "text-field": "{name:en}", "text-letter-spacing": 0.2, "symbol-placement": "line", "text-size": { @@ -3723,7 +3825,7 @@ "text-font": [ "Open Sans Italic" ], - "text-field": "{name_en}", + "text-field": "{name:en}", "text-max-width": 5, "text-letter-spacing": 0.2, "text-line-height": 1.6, @@ -3761,15 +3863,23 @@ "source": "mapbox", "source-layer": "place", "filter": [ - ">=", - "rank", - 4 + "all", + [ + ">=", + "rank", + 4 + ], + [ + "==", + "class", + "country" + ] ], "layout": { "text-font": [ "Open Sans Bold" ], - "text-field": "{name_en}", + "text-field": "{name:en}", "text-max-width": 6.25, "text-transform": "uppercase", "text-size": { @@ -3801,15 +3911,23 @@ "source": "mapbox", "source-layer": "place", "filter": [ - "==", - "rank", - 3 + "all", + [ + "==", + "rank", + 3 + ], + [ + "==", + "class", + "country" + ] ], "layout": { "text-font": [ "Open Sans Bold" ], - "text-field": "{name_en}", + "text-field": "{name:en}", "text-max-width": 6.25, "text-transform": "uppercase", "text-size": { @@ -3841,15 +3959,23 @@ "source": "mapbox", "source-layer": "place", "filter": [ - "==", - "rank", - 2 + "all", + [ + "==", + "rank", + 2 + ], + [ + "==", + "class", + "country" + ] ], "layout": { "text-font": [ "Open Sans Bold" ], - "text-field": "{name_en}", + "text-field": "{name:en}", "text-max-width": 6.25, "text-transform": "uppercase", "text-size": { @@ -3881,15 +4007,23 @@ "source": "mapbox", "source-layer": "place", "filter": [ - "==", - "rank", - 1 + "all", + [ + "==", + "rank", + 1 + ], + [ + "==", + "class", + "country" + ] ], "layout": { "text-font": [ "Open Sans Bold" ], - "text-field": "{name_en}", + "text-field": "{name:en}", "text-max-width": 6.25, "text-transform": "uppercase", "text-size": { diff --git a/configuration/map_files/styles/mono-chrome.json b/configuration/map_files/styles/mono-chrome.json index 74a19ca..f31d794 100644 --- a/configuration/map_files/styles/mono-chrome.json +++ b/configuration/map_files/styles/mono-chrome.json @@ -102,6 +102,111 @@ "fill-color": "hsla(0, 0%, 0%, 0)" } }, + { + "id": "landuse_school", + "type": "fill", + "metadata": { + "mapbox:group": "1444849388993.3071" + }, + "source": "mapbox", + "source-layer": "landuse", + "filter": [ + "==", + "class", + "school" + ], + "paint": { + "fill-color": "hsla(0, 0%, 94%, 0)", + "fill-outline-color": "hsla(0, 0%, 94%, 0)" + } + }, + { + "id": "landuse_wood", + "type": "fill", + "metadata": { + "mapbox:group": "1444849388993.3071" + }, + "source": "mapbox", + "source-layer": "landcover", + "filter": [ + "in", + "class", + "wood", + "grass" + ], + "paint": { + "fill-color": "hsla(0, 0%, 47%, 0)", + "fill-opacity": 0.2, + "fill-outline-color": "hsla(0, 0%, 47%, 0)" + } + }, + { + "id": "landuse_hospital", + "type": "fill", + "metadata": { + "mapbox:group": "1444849388993.3071" + }, + "source": "mapbox", + "source-layer": "landuse", + "filter": [ + "==", + "class", + "hospital" + ], + "paint": { + "fill-color": "hsla(0, 0%, 94%, 0)", + "fill-outline-color": "hsla(0, 0%, 94%, 0)" + } + }, + { + "id": "landuse_cemetery", + "type": "fill", + "metadata": { + "mapbox:group": "1444849388993.3071" + }, + "source": "mapbox", + "source-layer": "landuse", + "filter": [ + "==", + "class", + "cemetery" + ], + "paint": { + "fill-color": "hsla(0, 0%, 88%, 0)", + "fill-outline-color": "hsla(0, 0%, 88%, 0)" + } + }, + { + "id": "landuse_park", + "type": "fill", + "metadata": { + "mapbox:group": "1444849388993.3071" + }, + "source": "mapbox", + "source-layer": "landcover", + "filter": [ + "==", + "class", + "park" + ], + "paint": { + "fill-color": "hsla(0, 0%, 77%, 0)", + "fill-outline-color": "hsla(0, 0%, 77%, 0)" + } + }, + { + "id": "water", + "type": "fill", + "metadata": { + "mapbox:group": "1444849382550.77" + }, + "source": "mapbox", + "source-layer": "water", + "paint": { + "fill-color": "#EDF0F4", + "fill-outline-color": "#EDF0F4" + } + }, { "id": "waterway", "type": "line", @@ -181,118 +286,6 @@ } } }, - { - "id": "landuse_park", - "type": "fill", - "metadata": { - "mapbox:group": "1444849388993.3071" - }, - "source": "mapbox", - "source-layer": "landcover", - "filter": [ - "==", - "class", - "park" - ], - "paint": { - "fill-color": "hsla(0, 0%, 77%, 0)", - "fill-outline-color": "hsla(0, 0%, 77%, 0)" - } - }, - { - "id": "landuse_cemetery", - "type": "fill", - "metadata": { - "mapbox:group": "1444849388993.3071" - }, - "source": "mapbox", - "source-layer": "landuse", - "filter": [ - "==", - "class", - "cemetery" - ], - "paint": { - "fill-color": "hsla(0, 0%, 88%, 0)", - "fill-outline-color": "hsla(0, 0%, 88%, 0)" - } - }, - { - "id": "landuse_hospital", - "type": "fill", - "metadata": { - "mapbox:group": "1444849388993.3071" - }, - "source": "mapbox", - "source-layer": "landuse", - "filter": [ - "==", - "class", - "hospital" - ], - "paint": { - "fill-color": "hsla(0, 0%, 94%, 0)", - "fill-outline-color": "hsla(0, 0%, 94%, 0)" - } - }, - { - "id": "landuse_school", - "type": "fill", - "metadata": { - "mapbox:group": "1444849388993.3071" - }, - "source": "mapbox", - "source-layer": "landuse", - "filter": [ - "==", - "class", - "school" - ], - "paint": { - "fill-color": "hsla(0, 0%, 94%, 0)", - "fill-outline-color": "hsla(0, 0%, 94%, 0)" - } - }, - { - "id": "landuse_pitch", - "type": "fill", - "metadata": { - "mapbox:group": "1444849388993.3071" - }, - "source": "mapbox", - "source-layer": "landuse", - "filter": [ - "all", - [ - "==", - "class", - "pitch" - ] - ], - "paint": { - "fill-color": "hsla(0, 0%, 94%, 0)", - "fill-outline-color": "hsla(0, 0%, 94%, 0)" - } - }, - { - "id": "landuse_wood", - "type": "fill", - "metadata": { - "mapbox:group": "1444849388993.3071" - }, - "source": "mapbox", - "source-layer": "landcover", - "filter": [ - "==", - "class", - "wood" - ], - "paint": { - "fill-color": "hsla(0, 0%, 47%, 0)", - "fill-opacity": 0.2, - "fill-outline-color": "hsla(0, 0%, 47%, 0)" - } - }, { "id": "waterway_stream_canal", "type": "line", @@ -327,19 +320,6 @@ } } }, - { - "id": "water", - "type": "fill", - "metadata": { - "mapbox:group": "1444849382550.77" - }, - "source": "mapbox", - "source-layer": "water", - "paint": { - "fill-color": "#EDF0F4", - "fill-outline-color": "#EDF0F4" - } - }, { "id": "aeroway_fill", "type": "fill", @@ -1238,8 +1218,25 @@ "mapbox:group": "1444849345966.4436" }, "paint": { - "line-color": "rgba(226, 228, 230, 1)", - "line-width": 2 + "line-color": "rgba(226, 228, 230, 1)", + "line-width": { + "base": 1.2, + "stops": [ + [ + 12, + 0 + ], + [ + 14, + 2 + ], + [ + 20, + 11.5 + ] + ] + }, + "line-opacity": 1 }, "type": "line", "source": "mapbox", @@ -1582,7 +1579,6 @@ "metadata": { "mapbox:group": "1444849345966.4436" }, - "ref": "road_motorway_link_casing", "paint": { "line-color": "#E2E4E6", "line-width": { @@ -1606,6 +1602,28 @@ ] ] } + }, + "type": "line", + "source": "mapbox", + "source-layer": "transportation", + "minzoom": 12, + "filter": [ + "all", + [ + "!in", + "structure", + "bridge", + "tunnel" + ], + [ + "==", + "class", + "motorway_link" + ] + ], + "layout": { + "line-cap": "round", + "line-join": "round" } }, { @@ -1613,7 +1631,6 @@ "metadata": { "mapbox:group": "1444849345966.4436" }, - "ref": "road_service_track_casing", "paint": { "line-color": "#E2E4E6", "line-width": { @@ -1633,6 +1650,29 @@ ] ] } + }, + "type": "line", + "source": "mapbox", + "source-layer": "transportation", + "minzoom": 13, + "filter": [ + "all", + [ + "!in", + "structure", + "bridge", + "tunnel" + ], + [ + "in", + "class", + "service", + "track" + ] + ], + "layout": { + "line-cap": "round", + "line-join": "round" } }, { @@ -1640,7 +1680,6 @@ "metadata": { "mapbox:group": "1444849345966.4436" }, - "ref": "road_link_casing", "paint": { "line-color": "#E2E4E6", "line-width": { @@ -1664,6 +1703,29 @@ ] ] } + }, + "type": "line", + "source": "mapbox", + "source-layer": "transportation", + "minzoom": 13, + "filter": [ + "all", + [ + "!in", + "structure", + "bridge", + "tunnel" + ], + [ + "==", + "class", + "link" + ] + ], + "layout": { + "line-cap": "round", + "line-join": "round", + "visibility": "visible" } }, { @@ -1671,7 +1733,6 @@ "metadata": { "mapbox:group": "1444849345966.4436" }, - "ref": "road_street_casing", "paint": { "line-color": "#E2E4E6", "line-width": { @@ -1692,6 +1753,36 @@ ] }, "line-opacity": 1 + }, + "type": "line", + "source": "mapbox", + "source-layer": "transportation", + "filter": [ + "all", + [ + "==", + "$type", + "LineString" + ], + [ + "all", + [ + "!in", + "structure", + "bridge", + "tunnel" + ], + [ + "in", + "class", + "street", + "street_limited" + ] + ] + ], + "layout": { + "line-cap": "round", + "line-join": "round" } }, { @@ -1699,7 +1790,6 @@ "metadata": { "mapbox:group": "1444849345966.4436" }, - "ref": "road_secondary_tertiary_casing", "paint": { "line-color": "#E2E4E6", "line-width": { @@ -1719,6 +1809,29 @@ ] ] } + }, + "type": "line", + "source": "mapbox", + "source-layer": "transportation", + "filter": [ + "all", + [ + "!in", + "structure", + "bridge", + "tunnel" + ], + [ + "in", + "class", + "secondary", + "tertiary" + ] + ], + "layout": { + "line-cap": "round", + "line-join": "round", + "visibility": "visible" } }, { @@ -1726,7 +1839,6 @@ "metadata": { "mapbox:group": "1444849345966.4436" }, - "ref": "road_trunk_primary_casing", "paint": { "line-color": "#E2E4E6", "line-width": { @@ -1746,6 +1858,29 @@ ] ] } + }, + "type": "line", + "source": "mapbox", + "source-layer": "transportation", + "filter": [ + "all", + [ + "!in", + "structure", + "bridge", + "tunnel" + ], + [ + "in", + "class", + "primary", + "trunk" + ] + ], + "layout": { + "line-cap": "round", + "line-join": "round", + "visibility": "visible" } }, { @@ -1753,7 +1888,6 @@ "metadata": { "mapbox:group": "1444849345966.4436" }, - "ref": "road_motorway_casing", "paint": { "line-color": "#E2E4E6", "line-width": { @@ -1773,6 +1907,29 @@ ] ] } + }, + "type": "line", + "source": "mapbox", + "source-layer": "transportation", + "minzoom": 5, + "filter": [ + "all", + [ + "!in", + "structure", + "bridge", + "tunnel" + ], + [ + "==", + "class", + "motorway" + ] + ], + "layout": { + "line-cap": "round", + "line-join": "round", + "visibility": "visible" } }, { @@ -1823,7 +1980,6 @@ "metadata": { "mapbox:group": "1444849345966.4436" }, - "ref": "road_major_rail", "paint": { "line-color": "#E2E4E6", "line-dasharray": [ @@ -1847,7 +2003,24 @@ ] ] } - } + }, + "type": "line", + "source": "mapbox", + "source-layer": "transportation", + "filter": [ + "all", + [ + "!in", + "structure", + "bridge", + "tunnel" + ], + [ + "==", + "class", + "major_rail" + ] + ] }, { "id": "bridge_motorway_link_casing", @@ -2540,6 +2713,11 @@ ">=", "admin_level", 3 + ], + [ + "<", + "admin_level", + 5 ] ], "layout": { @@ -2775,6 +2953,39 @@ } } }, + { + "id": "railway_line", + "type": "line", + "source": "mapbox", + "source-layer": "transportation", + "filter": [ + "all", + [ + "in", + "subclass", + "rail", + "subway", + "light_rail" + ], + [ + "==", + "class", + "rail" + ] + ], + "paint": { + "line-width": 1, + "line-color": "rgba(188, 188, 188, 1)", + "line-offset": 0 + }, + "line-opacity": 1, + "minzoom": 5, + "layout": { + "line-cap": "round", + "line-join": "round", + "visibility": "visible" + } + }, { "id": "water_label", "type": "symbol", @@ -2782,7 +2993,7 @@ "mapbox:group": "1444849320558.5054" }, "source": "mapbox", - "source-layer": "water", + "source-layer": "water_name", "filter": [ "==", "$type", @@ -2792,7 +3003,7 @@ "text-font": [ "Open Sans Italic" ], - "text-field": "{name_en}", + "text-field": "{name:en}", "text-max-width": 5, "text-size": 12 }, @@ -2803,14 +3014,14 @@ } }, { - "id": "poi_label_r1", + "id": "poi_label_r10+", "type": "symbol", "metadata": { "mapbox:group": "1444849297111.495" }, "source": "mapbox", "source-layer": "poi", - "minzoom": 14, + "minzoom": 16, "filter": [ "all", [ @@ -2819,16 +3030,65 @@ "Point" ], [ - "==", + ">=", "rank", - 1 + 10 + ] + ], + "layout": { + "text-font": [ + "Open Sans Semibold" + ], + "text-field": "{name:latin}", + "text-max-width": 9, + "text-padding": 2, + "text-offset": [ + 0, + 0.6 + ], + "text-anchor": "top", + "text-size": 12, + "icon-image": "{class}-11" + }, + "paint": { + "text-color": "hsl(0, 0%, 40%)", + "text-halo-color": "hsl(0, 0%, 100%)", + "text-halo-width": 1, + "text-halo-blur": 0.5 + } + }, + { + "id": "poi_label_r3-9", + "type": "symbol", + "metadata": { + "mapbox:group": "1444849297111.495" + }, + "source": "mapbox", + "source-layer": "poi", + "minzoom": 15, + "filter": [ + "all", + [ + "==", + "$type", + "Point" + ], + [ + ">", + "rank", + 2 + ], + [ + "<", + "rank", + 10 ] ], "layout": { "text-font": [ "Open Sans Semibold" ], - "text-field": "{name_en}", + "text-field": "{name:latin}", "text-max-width": 9, "text-padding": 2, "text-offset": [ @@ -2872,7 +3132,7 @@ "text-font": [ "Open Sans Semibold" ], - "text-field": "{name_en}", + "text-field": "{name:latin}", "text-max-width": 9, "text-padding": 2, "text-offset": [ @@ -2891,14 +3151,14 @@ } }, { - "id": "poi_label_r3-9", + "id": "poi_label_r1", "type": "symbol", "metadata": { "mapbox:group": "1444849297111.495" }, "source": "mapbox", "source-layer": "poi", - "minzoom": 15, + "minzoom": 14, "filter": [ "all", [ @@ -2907,21 +3167,16 @@ "Point" ], [ - ">", + "==", "rank", - 2 - ], - [ - "<", - "rank", - 10 + 1 ] ], "layout": { "text-font": [ "Open Sans Semibold" ], - "text-field": "{name_en}", + "text-field": "{name:latin}", "text-max-width": 9, "text-padding": 2, "text-offset": [ @@ -2939,55 +3194,6 @@ "text-halo-blur": 0.5 } }, - { - "id": "poi_label_r10+", - "type": "symbol", - "metadata": { - "mapbox:group": "1444849297111.495" - }, - "source": "mapbox", - "source-layer": "poi", - "minzoom": 16, - "filter": [ - "all", - [ - "==", - "$type", - "Point" - ], - [ - ">=", - "rank", - 10 - ], - [ - "<", - "rank", - 20 - ] - ], - "layout": { - "text-font": [ - "Open Sans Semibold" - ], - "text-field": "{name_en}", - "text-max-width": 9, - "text-padding": 2, - "text-offset": [ - 0, - 0.6 - ], - "text-anchor": "top", - "text-size": 12, - "icon-image": "{class}-11" - }, - "paint": { - "text-color": "hsl(0, 0%, 40%)", - "text-halo-color": "hsl(0, 0%, 100%)", - "text-halo-width": 1, - "text-halo-blur": 0.5 - } - }, { "id": "rail_station_label", "type": "symbol", @@ -2996,9 +3202,10 @@ }, "source": "mapbox", "source-layer": "poi", + "minzoom": 13, "layout": { "text-size": 12, - "icon-image": "{class}-11", + "icon-image": "rail-11", "text-font": [ "Open Sans Semibold" ], @@ -3009,7 +3216,7 @@ 0.6 ], "text-anchor": "top", - "text-field": "{name_en}", + "text-field": "{name:latin}", "text-max-width": 9 }, "paint": { @@ -3024,40 +3231,10 @@ "==", "class", "railway" - ] + ] ] }, - { - "id": "railway_line", - "type": "line", - "source": "mapbox", - "source-layer": "transportation", - "filter": [ - "all", - [ - "==", - "subclass", - "rail" - ], - [ - "==", - "class", - "rail" - ] - ], - "paint": { - "line-width": 1, - "line-color": "rgba(188, 188, 188, 1)", - "line-offset": 0 - }, - "line-opacity": 1, - "minzoom": 5, - "layout": { - "line-cap": "round", - "line-join": "round", - "visibility": "visible" - } - }, + { "id": "airport_label", "type": "symbol", @@ -3065,7 +3242,7 @@ "mapbox:group": "1444849297111.495" }, "source": "mapbox", - "source-layer": "poi", + "source-layer": "aerodrome_label", "minzoom": 11, "filter": [ "all", @@ -3073,21 +3250,14 @@ "==", "$type", "Point" - ], - [ - "in", - "rank", - 1, - 2, - 3 ] ], "layout": { - "icon-image": "{class}-11", + "icon-image": "airport-11", "text-font": [ "Open Sans Semibold" ], - "text-field": "{name_en}", + "text-field": "{name:latin}", "text-max-width": 9, "text-padding": 2, "text-offset": [ @@ -3112,13 +3282,18 @@ }, "source": "mapbox", "source-layer": "transportation_name", + "minzoom": 13, "filter": [ - "!=", - "class", - "ferry" + "all", + [ + "!in", + "class", + "ferry", + "path" + ] ], "layout": { - "text-field": "{name_en}", + "text-field": "{name:latin}", "text-font": [ "Open Sans Regular" ], @@ -3144,26 +3319,34 @@ } }, { - "id": "road_label_highway_shield", + "id": "road_motorway_shield", "type": "symbol", "metadata": { "mapbox:group": "1456163609504.0715" }, "source": "mapbox", - "source-layer": "transportation", - "minzoom": 8, + "source-layer": "transportation_name", + "minzoom": 9, "filter": [ - "<=", - "reflen", - 6 + "all", + [ + "<=", + "ref_length", + 4 + ], + [ + "==", + "class", + "motorway" + ] ], "layout": { "text-field": "{ref}", "text-font": [ "Open Sans Semibold" ], - "text-size": 11, - "icon-image": "motorway_{reflen}", + "text-size": 10, + "icon-image": "motorway_{ref_length}", "symbol-placement": { "base": 1, "stops": [ @@ -3183,6 +3366,51 @@ }, "paint": {} }, + { + "id": "road_shield", + "type": "symbol", + "metadata": { + "mapbox:group": "1456163609504.0715" + }, + "source": "mapbox", + "source-layer": "transportation_name", + "minzoom": 12, + "filter": [ + "all", + [ + "<=", + "ref_length", + 6 + ] + ], + "layout": { + "text-field": "{ref}", + "text-font": [ + "Open Sans Semibold" + ], + "text-size": 11, + "icon-image": "motorway_{ref_length}", + "symbol-placement": { + "base": 1, + "stops": [ + [ + 10, + "point" + ], + [ + 11, + "line" + ] + ] + }, + "visibility": "visible", + "symbol-spacing": 500, + "text-rotation-alignment": "viewport", + "icon-rotation-alignment": "viewport" + }, + "paint": {}, + "maxzoom": 24 + }, { "id": "place_label_other", "type": "symbol", @@ -3191,9 +3419,10 @@ }, "source": "mapbox", "source-layer": "place", + "minzoom": 10, "filter": [ "in", - "type", + "class", "hamlet", "island", "islet", @@ -3206,7 +3435,7 @@ ], "text-transform": "uppercase", "text-letter-spacing": 0.1, - "text-field": "{name_en}", + "text-field": "{name}", "text-max-width": 9, "text-size": { "base": 1.2, @@ -3238,14 +3467,14 @@ "source-layer": "place", "filter": [ "==", - "type", + "class", "village" ], "layout": { "text-font": [ "Open Sans Regular" ], - "text-field": "{name_en}", + "text-field": "{name:en}", "text-max-width": 8, "text-size": { "base": 1.2, @@ -3277,14 +3506,14 @@ "source-layer": "place", "filter": [ "==", - "type", + "class", "town" ], "layout": { "text-font": [ "Open Sans Regular" ], - "text-field": "{name_en}", + "text-field": "{name:en}", "text-max-width": 8, "text-size": { "base": 1.2, @@ -3316,14 +3545,14 @@ "source-layer": "place", "filter": [ "==", - "type", + "class", "city" ], "layout": { "text-font": [ "Open Sans Semibold" ], - "text-field": "{name_en}", + "text-field": "{name:en}", "text-max-width": 8, "text-size": { "base": 1.2, @@ -3370,7 +3599,7 @@ "text-font": [ "Open Sans Italic" ], - "text-field": "{name_en}", + "text-field": "{name:en}", "text-letter-spacing": 0.2, "symbol-placement": "line", "text-size": { @@ -3418,7 +3647,7 @@ "text-font": [ "Open Sans Italic" ], - "text-field": "{name_en}", + "text-field": "{name:en}", "text-max-width": 6, "text-letter-spacing": 0.2, "symbol-placement": "point", @@ -3467,7 +3696,7 @@ "text-font": [ "Open Sans Italic" ], - "text-field": "{name_en}", + "text-field": "{name:en}", "text-letter-spacing": 0.2, "symbol-placement": "line", "text-size": { @@ -3515,7 +3744,7 @@ "text-font": [ "Open Sans Italic" ], - "text-field": "{name_en}", + "text-field": "{name:en}", "text-max-width": 5, "text-letter-spacing": 0.2, "symbol-placement": "point", @@ -3564,7 +3793,7 @@ "text-font": [ "Open Sans Italic" ], - "text-field": "{name_en}", + "text-field": "{name:en}", "text-letter-spacing": 0.2, "symbol-placement": "line", "text-size": { @@ -3612,7 +3841,7 @@ "text-font": [ "Open Sans Italic" ], - "text-field": "{name_en}", + "text-field": "{name:en}", "text-max-width": 5, "text-letter-spacing": 0.2, "symbol-placement": "point", @@ -3661,7 +3890,7 @@ "text-font": [ "Open Sans Italic" ], - "text-field": "{name_en}", + "text-field": "{name:en}", "text-letter-spacing": 0.2, "symbol-placement": "line", "text-size": { @@ -3709,7 +3938,7 @@ "text-font": [ "Open Sans Italic" ], - "text-field": "{name_en}", + "text-field": "{name:en}", "text-max-width": 5, "text-letter-spacing": 0.2, "text-line-height": 1.6, @@ -3747,15 +3976,23 @@ "source": "mapbox", "source-layer": "place", "filter": [ - ">=", - "rank", - 4 + "all", + [ + ">=", + "rank", + 4 + ], + [ + "==", + "class", + "country" + ] ], "layout": { "text-font": [ "Open Sans Bold" ], - "text-field": "{name_en}", + "text-field": "{name:en}", "text-max-width": 6.25, "text-transform": "uppercase", "text-size": { @@ -3787,15 +4024,23 @@ "source": "mapbox", "source-layer": "place", "filter": [ - "==", - "rank", - 3 + "all", + [ + "==", + "rank", + 3 + ], + [ + "==", + "class", + "country" + ] ], "layout": { "text-font": [ "Open Sans Bold" ], - "text-field": "{name_en}", + "text-field": "{name:en}", "text-max-width": 6.25, "text-transform": "uppercase", "text-size": { @@ -3827,15 +4072,23 @@ "source": "mapbox", "source-layer": "place", "filter": [ - "==", - "rank", - 2 + "all", + [ + "==", + "rank", + 2 + ], + [ + "==", + "class", + "country" + ] ], "layout": { "text-font": [ "Open Sans Bold" ], - "text-field": "{name_en}", + "text-field": "{name:en}", "text-max-width": 6.25, "text-transform": "uppercase", "text-size": { @@ -3867,15 +4120,23 @@ "source": "mapbox", "source-layer": "place", "filter": [ - "==", - "rank", - 1 + "all", + [ + "==", + "rank", + 1 + ], + [ + "==", + "class", + "country" + ] ], "layout": { "text-font": [ "Open Sans Bold" ], - "text-field": "{name_en}", + "text-field": "{name:en}", "text-max-width": 6.25, "text-transform": "uppercase", "text-size": { diff --git a/configuration/map_files/styles/mono.json b/configuration/map_files/styles/mono.json index b084a0d..388df12 100644 --- a/configuration/map_files/styles/mono.json +++ b/configuration/map_files/styles/mono.json @@ -3349,7 +3349,7 @@ "text-font": [ "Open Sans Italic" ], - "text-field": "{name:latin}", + "text-field": "{name:en}", "text-max-width": 5, "text-size": 12 }, @@ -3367,7 +3367,7 @@ }, "source": "mapbox", "source-layer": "poi", - "minzoom": 17, + "minzoom": 16, "filter": [ "all", [ @@ -3766,6 +3766,7 @@ }, "source": "mapbox", "source-layer": "place", + "minzoom": 10, "filter": [ "in", "class", @@ -3780,7 +3781,7 @@ "Open Sans Bold" ], "text-letter-spacing": 0.1, - "text-field": "{name:en}", + "text-field": "{name}", "text-max-width": 9, "text-size": { "base": 1.2, @@ -4320,6 +4321,7 @@ }, "source": "mapbox", "source-layer": "place", + "minzoom": 2, "filter": [ "all", [ @@ -4368,6 +4370,7 @@ }, "source": "mapbox", "source-layer": "place", + "minzoom": 2, "filter": [ "all", [ @@ -4416,6 +4419,7 @@ }, "source": "mapbox", "source-layer": "place", + "minzoom": 2, "filter": [ "all", [ @@ -4464,6 +4468,7 @@ }, "source": "mapbox", "source-layer": "place", + "minzoom": 1, "filter": [ "all", [