From 4bacf503d78cbaa2d46ca79452bfcb35a904684a Mon Sep 17 00:00:00 2001 From: Kalin Mladenov Dobrev Date: Thu, 20 Jun 2019 13:24:18 +0200 Subject: [PATCH] updated all the syles --- .../map_files/styles/mono-blue-water.json | 446 +++++++++++------- configuration/map_files/styles/mono-blue.json | 442 ++++++++++------- configuration/map_files/styles/mono-bw.json | 10 +- .../map_files/styles/mono-chrome.json | 10 +- 4 files changed, 546 insertions(+), 362 deletions(-) diff --git a/configuration/map_files/styles/mono-blue-water.json b/configuration/map_files/styles/mono-blue-water.json index 962497a..1573ef7 100755 --- a/configuration/map_files/styles/mono-blue-water.json +++ b/configuration/map_files/styles/mono-blue-water.json @@ -1,6 +1,7 @@ { "version": 8, - "name": "Mono-Blue-Water", + "id": "mono-blue-water", + "name": "Updated-Mono-Blue-Water", "sources": { "mapbox": { "url": "mbtiles://planet.mbtiles", @@ -61,6 +62,10 @@ "name": "Place labels", "collapsed": true }, + "1444849290021.1838": { + "name": "Road labels", + "collapsed": true + }, "1444849334699.1902": { "name": "Bridges", "collapsed": true @@ -86,7 +91,7 @@ "mapbox:group": "1444849388993.3071" }, "source": "mapbox", - "source-layer": "landuse_overlay", + "source-layer": "landuse", "filter": [ "==", "class", @@ -105,7 +110,7 @@ "mapbox:group": "1444849388993.3071" }, "source": "mapbox", - "source-layer": "landuse", + "source-layer": "landcover", "filter": [ "==", "class", @@ -171,13 +176,34 @@ } }, { - "id": "landuse_wood", + "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", @@ -475,7 +501,7 @@ "mapbox:group": "1444849354174.1904" }, "source": "mapbox", - "source-layer": "road", + "source-layer": "transportation", "filter": [ "all", [ @@ -530,7 +556,7 @@ "mapbox:group": "1444849354174.1904" }, "source": "mapbox", - "source-layer": "road", + "source-layer": "transportation", "filter": [ "all", [ @@ -580,7 +606,7 @@ "mapbox:group": "1444849354174.1904" }, "source": "mapbox", - "source-layer": "road", + "source-layer": "transportation", "filter": [ "all", [ @@ -630,7 +656,7 @@ "mapbox:group": "1444849354174.1904" }, "source": "mapbox", - "source-layer": "road", + "source-layer": "transportation", "filter": [ "all", [ @@ -692,7 +718,7 @@ "mapbox:group": "1444849354174.1904" }, "source": "mapbox", - "source-layer": "road", + "source-layer": "transportation", "filter": [ "all", [ @@ -735,7 +761,7 @@ "mapbox:group": "1444849354174.1904" }, "source": "mapbox", - "source-layer": "road", + "source-layer": "transportation", "filter": [ "all", [ @@ -785,7 +811,7 @@ "mapbox:group": "1444849354174.1904" }, "source": "mapbox", - "source-layer": "road", + "source-layer": "transportation", "filter": [ "all", [ @@ -839,7 +865,7 @@ "mapbox:group": "1444849354174.1904" }, "source": "mapbox", - "source-layer": "road", + "source-layer": "transportation", "filter": [ "all", [ @@ -1088,7 +1114,7 @@ "mapbox:group": "1444849354174.1904" }, "source": "mapbox", - "source-layer": "road", + "source-layer": "transportation", "filter": [ "all", [ @@ -1162,7 +1188,7 @@ "mapbox:group": "1444849345966.4436" }, "source": "mapbox", - "source-layer": "road", + "source-layer": "transportation", "minzoom": 12, "filter": [ "all", @@ -1215,7 +1241,7 @@ "mapbox:group": "1444849345966.4436" }, "source": "mapbox", - "source-layer": "road", + "source-layer": "transportation", "filter": [ "all", [ @@ -1247,7 +1273,7 @@ "mapbox:group": "1444849345966.4436" }, "source": "mapbox", - "source-layer": "road", + "source-layer": "transportation", "minzoom": 13, "filter": [ "all", @@ -1301,7 +1327,7 @@ "mapbox:group": "1444849345966.4436" }, "source": "mapbox", - "source-layer": "road", + "source-layer": "transportation", "filter": [ "all", [ @@ -1342,7 +1368,7 @@ "mapbox:group": "1444849345966.4436" }, "source": "mapbox", - "source-layer": "road", + "source-layer": "transportation", "filter": [ "all", [ @@ -1376,7 +1402,7 @@ "mapbox:group": "1444849345966.4436" }, "source": "mapbox", - "source-layer": "road", + "source-layer": "transportation", "filter": [ "all", [ @@ -1430,7 +1456,7 @@ "mapbox:group": "1444849345966.4436" }, "source": "mapbox", - "source-layer": "road", + "source-layer": "transportation", "minzoom": 5, "filter": [ "all", @@ -1483,7 +1509,7 @@ "mapbox:group": "1444849345966.4436" }, "source": "mapbox", - "source-layer": "road", + "source-layer": "transportation", "filter": [ "all", [ @@ -1733,7 +1759,7 @@ "mapbox:group": "1444849345966.4436" }, "source": "mapbox", - "source-layer": "road", + "source-layer": "transportation", "filter": [ "all", [ @@ -1807,7 +1833,7 @@ "mapbox:group": "1444849334699.1902" }, "source": "mapbox", - "source-layer": "road", + "source-layer": "transportation", "filter": [ "all", [ @@ -1857,7 +1883,7 @@ "mapbox:group": "1444849334699.1902" }, "source": "mapbox", - "source-layer": "road", + "source-layer": "transportation", "filter": [ "all", [ @@ -1903,7 +1929,7 @@ "mapbox:group": "1444849334699.1902" }, "source": "mapbox", - "source-layer": "road", + "source-layer": "transportation", "filter": [ "all", [ @@ -1953,7 +1979,7 @@ "mapbox:group": "1444849334699.1902" }, "source": "mapbox", - "source-layer": "road", + "source-layer": "transportation", "filter": [ "all", [ @@ -2015,7 +2041,7 @@ "mapbox:group": "1444849334699.1902" }, "source": "mapbox", - "source-layer": "road", + "source-layer": "transportation", "filter": [ "all", [ @@ -2058,7 +2084,7 @@ "mapbox:group": "1444849334699.1902" }, "source": "mapbox", - "source-layer": "road", + "source-layer": "transportation", "filter": [ "all", [ @@ -2108,7 +2134,7 @@ "mapbox:group": "1444849334699.1902" }, "source": "mapbox", - "source-layer": "road", + "source-layer": "transportation", "filter": [ "all", [ @@ -2157,7 +2183,7 @@ "mapbox:group": "1444849334699.1902" }, "source": "mapbox", - "source-layer": "road", + "source-layer": "transportation", "filter": [ "all", [ @@ -2406,7 +2432,7 @@ "mapbox:group": "1444849334699.1902" }, "source": "mapbox", - "source-layer": "road", + "source-layer": "transportation", "filter": [ "all", [ @@ -2472,6 +2498,31 @@ } } }, + { + "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", @@ -2479,7 +2530,7 @@ "mapbox:group": "1444849307123.581" }, "source": "mapbox", - "source-layer": "admin", + "source-layer": "boundary", "filter": [ "all", [ @@ -2530,7 +2581,7 @@ "mapbox:group": "1444849307123.581" }, "source": "mapbox", - "source-layer": "admin", + "source-layer": "boundary", "filter": [ "all", [ @@ -2581,7 +2632,7 @@ "mapbox:group": "1444849307123.581" }, "source": "mapbox", - "source-layer": "admin", + "source-layer": "boundary", "filter": [ "all", [ @@ -2635,7 +2686,7 @@ "mapbox:group": "1444849307123.581" }, "source": "mapbox", - "source-layer": "admin", + "source-layer": "boundary", "filter": [ "all", [ @@ -2687,7 +2738,7 @@ "mapbox:group": "1444849307123.581" }, "source": "mapbox", - "source-layer": "admin", + "source-layer": "boundary", "filter": [ "all", [ @@ -2733,7 +2784,7 @@ "mapbox:group": "1444849320558.5054" }, "source": "mapbox", - "source-layer": "water_label", + "source-layer": "water", "filter": [ "==", "$type", @@ -2754,114 +2805,119 @@ } }, { - "id": "poi_label_4", + "id": "poi_label_r1", "type": "symbol", "metadata": { - "mapbox:group": "1444849297111.495" + "mapbox:group": "1444849297111.495" }, "source": "mapbox", - "source-layer": "poi_label", - "minzoom": 16, - "filter": [ - "all", - [ - "==", - "$type", - "Point" - ], - [ - "==", - "scalerank", - 4 - ] - ], - "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_3", - "type": "symbol", - "metadata": { - "mapbox:group": "1444849297111.495" - }, - "source": "mapbox", - "source-layer": "poi_label", - "minzoom": 15, - "filter": [ - "all", - [ - "==", - "$type", - "Point" - ], - [ - "==", - "scalerank", - 3 - ] - ], - "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_2", - "type": "symbol", - "metadata": { - "mapbox:group": "1444849297111.495" - }, - "source": "mapbox", - "source-layer": "poi_label", + "source-layer": "poi", "minzoom": 14, "filter": [ - "all", - [ - "==", - "$type", - "Point" + "all", + [ + "==", + "$type", + "Point" + ], + [ + "==", + "rank", + 1 + ] + ], + "layout": { + "icon-image": "{class}-11", + "text-font": [ + "Open Sans Semibold" ], - [ - "==", - "scalerank", - 2 - ] + "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_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": { "icon-image": "{class}-11", @@ -2917,26 +2973,31 @@ } }, { - "id": "poi_label_1", + "id": "poi_label_r10+", "type": "symbol", "metadata": { - "mapbox:group": "1444849297111.495" + "mapbox:group": "1444849297111.495" }, "source": "mapbox", - "source-layer": "poi_label", - "minzoom": 13, + "source-layer": "poi", + "minzoom": 16, "filter": [ - "all", - [ - "==", - "$type", - "Point" - ], - [ - "==", - "scalerank", - 1 - ] + "all", + [ + "==", + "$type", + "Point" + ], + [ + ">=", + "rank", + 10 + ], + [ + "<", + "rank", + 20 + ] ], "layout": { "icon-image": "{class}-11", @@ -2967,7 +3028,7 @@ "mapbox:group": "1444849297111.495" }, "source": "mapbox", - "source-layer": "airport_label", + "source-layer": "poi", "minzoom": 11, "filter": [ "all", @@ -2978,7 +3039,7 @@ ], [ "in", - "scalerank", + "rank", 1, 2, 3 @@ -3006,6 +3067,37 @@ "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", @@ -3013,7 +3105,7 @@ "mapbox:group": "1456163609504.0715" }, "source": "mapbox", - "source-layer": "road_label", + "source-layer": "transportation_name", "filter": [ "!=", "class", @@ -3052,7 +3144,7 @@ "mapbox:group": "1456163609504.0715" }, "source": "mapbox", - "source-layer": "road_label", + "source-layer": "transportation", "minzoom": 8, "filter": [ "<=", @@ -3092,7 +3184,7 @@ "mapbox:group": "1444849272561.29" }, "source": "mapbox", - "source-layer": "place_label", + "source-layer": "place", "filter": [ "in", "type", @@ -3137,7 +3229,7 @@ "mapbox:group": "1444849272561.29" }, "source": "mapbox", - "source-layer": "place_label", + "source-layer": "place", "filter": [ "==", "type", @@ -3176,7 +3268,7 @@ "mapbox:group": "1444849272561.29" }, "source": "mapbox", - "source-layer": "place_label", + "source-layer": "place", "filter": [ "==", "type", @@ -3215,7 +3307,7 @@ "mapbox:group": "1444849272561.29" }, "source": "mapbox", - "source-layer": "place_label", + "source-layer": "place", "filter": [ "==", "type", @@ -3254,7 +3346,7 @@ "mapbox:group": "1444849258897.3083" }, "source": "mapbox", - "source-layer": "marine_label", + "source-layer": "waterway", "filter": [ "all", [ @@ -3302,7 +3394,7 @@ "mapbox:group": "1444849258897.3083" }, "source": "mapbox", - "source-layer": "marine_label", + "source-layer": "water_name", "filter": [ "all", [ @@ -3351,7 +3443,7 @@ "mapbox:group": "1444849258897.3083" }, "source": "mapbox", - "source-layer": "marine_label", + "source-layer": "water_name", "filter": [ "all", [ @@ -3399,7 +3491,7 @@ "mapbox:group": "1444849258897.3083" }, "source": "mapbox", - "source-layer": "marine_label", + "source-layer": "water_name", "filter": [ "all", [ @@ -3448,7 +3540,7 @@ "mapbox:group": "1444849258897.3083" }, "source": "mapbox", - "source-layer": "marine_label", + "source-layer": "waterway", "filter": [ "all", [ @@ -3496,7 +3588,7 @@ "mapbox:group": "1444849258897.3083" }, "source": "mapbox", - "source-layer": "marine_label", + "source-layer": "water_name", "filter": [ "all", [ @@ -3545,7 +3637,7 @@ "mapbox:group": "1444849258897.3083" }, "source": "mapbox", - "source-layer": "marine_label", + "source-layer": "waterway", "filter": [ "all", [ @@ -3593,7 +3685,7 @@ "mapbox:group": "1444849258897.3083" }, "source": "mapbox", - "source-layer": "marine_label", + "source-layer": "water_name", "filter": [ "all", [ @@ -3647,10 +3739,10 @@ "mapbox:group": "1444849242106.713" }, "source": "mapbox", - "source-layer": "country_label", + "source-layer": "place", "filter": [ ">=", - "scalerank", + "rank", 4 ], "layout": { @@ -3687,10 +3779,10 @@ "mapbox:group": "1444849242106.713" }, "source": "mapbox", - "source-layer": "country_label", + "source-layer": "place", "filter": [ "==", - "scalerank", + "rank", 3 ], "layout": { @@ -3727,10 +3819,10 @@ "mapbox:group": "1444849242106.713" }, "source": "mapbox", - "source-layer": "country_label", + "source-layer": "place", "filter": [ "==", - "scalerank", + "rank", 2 ], "layout": { @@ -3767,10 +3859,10 @@ "mapbox:group": "1444849242106.713" }, "source": "mapbox", - "source-layer": "country_label", + "source-layer": "place", "filter": [ "==", - "scalerank", + "rank", 1 ], "layout": { diff --git a/configuration/map_files/styles/mono-blue.json b/configuration/map_files/styles/mono-blue.json index 1f3a612..e921400 100755 --- a/configuration/map_files/styles/mono-blue.json +++ b/configuration/map_files/styles/mono-blue.json @@ -1,6 +1,7 @@ { "version": 8, - "name": "Mono-Blue", + "id": "mono-blue", + "name": "Updated-Mono-Blue", "sources": { "mapbox": { "url": "mbtiles://planet.mbtiles", @@ -61,6 +62,10 @@ "name": "Place labels", "collapsed": true }, + "1444849290021.1838": { + "name": "Road labels", + "collapsed": true + }, "1444849334699.1902": { "name": "Bridges", "collapsed": true @@ -86,7 +91,7 @@ "mapbox:group": "1444849388993.3071" }, "source": "mapbox", - "source-layer": "landuse_overlay", + "source-layer": "landuse", "filter": [ "==", "class", @@ -105,7 +110,7 @@ "mapbox:group": "1444849388993.3071" }, "source": "mapbox", - "source-layer": "landuse", + "source-layer": "landcover", "filter": [ "==", "class", @@ -171,13 +176,34 @@ } }, { - "id": "landuse_wood", + "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", + "type": "fill", + "metadata": { + "mapbox:group": "1444849388993.3071" + }, + "source": "mapbox", + "source-layer": "landcover", "filter": [ "==", "class", @@ -475,7 +501,7 @@ "mapbox:group": "1444849354174.1904" }, "source": "mapbox", - "source-layer": "road", + "source-layer": "transportation", "filter": [ "all", [ @@ -523,6 +549,31 @@ "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", @@ -530,7 +581,7 @@ "mapbox:group": "1444849354174.1904" }, "source": "mapbox", - "source-layer": "road", + "source-layer": "transportation", "filter": [ "all", [ @@ -580,7 +631,7 @@ "mapbox:group": "1444849354174.1904" }, "source": "mapbox", - "source-layer": "road", + "source-layer": "transportation", "filter": [ "all", [ @@ -630,7 +681,7 @@ "mapbox:group": "1444849354174.1904" }, "source": "mapbox", - "source-layer": "road", + "source-layer": "transportation", "filter": [ "all", [ @@ -692,7 +743,7 @@ "mapbox:group": "1444849354174.1904" }, "source": "mapbox", - "source-layer": "road", + "source-layer": "transportation", "filter": [ "all", [ @@ -735,7 +786,7 @@ "mapbox:group": "1444849354174.1904" }, "source": "mapbox", - "source-layer": "road", + "source-layer": "transportation", "filter": [ "all", [ @@ -785,7 +836,7 @@ "mapbox:group": "1444849354174.1904" }, "source": "mapbox", - "source-layer": "road", + "source-layer": "transportation", "filter": [ "all", [ @@ -839,7 +890,7 @@ "mapbox:group": "1444849354174.1904" }, "source": "mapbox", - "source-layer": "road", + "source-layer": "transportation", "filter": [ "all", [ @@ -1088,7 +1139,7 @@ "mapbox:group": "1444849354174.1904" }, "source": "mapbox", - "source-layer": "road", + "source-layer": "transportation", "filter": [ "all", [ @@ -1162,7 +1213,7 @@ "mapbox:group": "1444849345966.4436" }, "source": "mapbox", - "source-layer": "road", + "source-layer": "transportation", "minzoom": 12, "filter": [ "all", @@ -1215,7 +1266,7 @@ "mapbox:group": "1444849345966.4436" }, "source": "mapbox", - "source-layer": "road", + "source-layer": "transportation", "filter": [ "all", [ @@ -1247,7 +1298,7 @@ "mapbox:group": "1444849345966.4436" }, "source": "mapbox", - "source-layer": "road", + "source-layer": "transportation", "minzoom": 13, "filter": [ "all", @@ -1301,7 +1352,7 @@ "mapbox:group": "1444849345966.4436" }, "source": "mapbox", - "source-layer": "road", + "source-layer": "transportation", "filter": [ "all", [ @@ -1342,7 +1393,7 @@ "mapbox:group": "1444849345966.4436" }, "source": "mapbox", - "source-layer": "road", + "source-layer": "transportation", "filter": [ "all", [ @@ -1376,7 +1427,7 @@ "mapbox:group": "1444849345966.4436" }, "source": "mapbox", - "source-layer": "road", + "source-layer": "transportation", "filter": [ "all", [ @@ -1430,7 +1481,7 @@ "mapbox:group": "1444849345966.4436" }, "source": "mapbox", - "source-layer": "road", + "source-layer": "transportation", "minzoom": 5, "filter": [ "all", @@ -1483,7 +1534,7 @@ "mapbox:group": "1444849345966.4436" }, "source": "mapbox", - "source-layer": "road", + "source-layer": "transportation", "filter": [ "all", [ @@ -1733,7 +1784,7 @@ "mapbox:group": "1444849345966.4436" }, "source": "mapbox", - "source-layer": "road", + "source-layer": "transportation", "filter": [ "all", [ @@ -1807,7 +1858,7 @@ "mapbox:group": "1444849334699.1902" }, "source": "mapbox", - "source-layer": "road", + "source-layer": "transportation", "filter": [ "all", [ @@ -1857,7 +1908,7 @@ "mapbox:group": "1444849334699.1902" }, "source": "mapbox", - "source-layer": "road", + "source-layer": "transportation", "filter": [ "all", [ @@ -1903,7 +1954,7 @@ "mapbox:group": "1444849334699.1902" }, "source": "mapbox", - "source-layer": "road", + "source-layer": "transportation", "filter": [ "all", [ @@ -1953,7 +2004,7 @@ "mapbox:group": "1444849334699.1902" }, "source": "mapbox", - "source-layer": "road", + "source-layer": "transportation", "filter": [ "all", [ @@ -2015,7 +2066,7 @@ "mapbox:group": "1444849334699.1902" }, "source": "mapbox", - "source-layer": "road", + "source-layer": "transportation", "filter": [ "all", [ @@ -2058,7 +2109,7 @@ "mapbox:group": "1444849334699.1902" }, "source": "mapbox", - "source-layer": "road", + "source-layer": "transportation", "filter": [ "all", [ @@ -2108,7 +2159,7 @@ "mapbox:group": "1444849334699.1902" }, "source": "mapbox", - "source-layer": "road", + "source-layer": "transportation", "filter": [ "all", [ @@ -2157,7 +2208,7 @@ "mapbox:group": "1444849334699.1902" }, "source": "mapbox", - "source-layer": "road", + "source-layer": "transportation", "filter": [ "all", [ @@ -2406,7 +2457,7 @@ "mapbox:group": "1444849334699.1902" }, "source": "mapbox", - "source-layer": "road", + "source-layer": "transportation", "filter": [ "all", [ @@ -2479,7 +2530,7 @@ "mapbox:group": "1444849307123.581" }, "source": "mapbox", - "source-layer": "admin", + "source-layer": "boundary", "filter": [ "all", [ @@ -2530,7 +2581,7 @@ "mapbox:group": "1444849307123.581" }, "source": "mapbox", - "source-layer": "admin", + "source-layer": "boundary", "filter": [ "all", [ @@ -2581,7 +2632,7 @@ "mapbox:group": "1444849307123.581" }, "source": "mapbox", - "source-layer": "admin", + "source-layer": "boundary", "filter": [ "all", [ @@ -2635,7 +2686,7 @@ "mapbox:group": "1444849307123.581" }, "source": "mapbox", - "source-layer": "admin", + "source-layer": "boundary", "filter": [ "all", [ @@ -2687,7 +2738,7 @@ "mapbox:group": "1444849307123.581" }, "source": "mapbox", - "source-layer": "admin", + "source-layer": "boundary", "filter": [ "all", [ @@ -2733,7 +2784,7 @@ "mapbox:group": "1444849320558.5054" }, "source": "mapbox", - "source-layer": "water_label", + "source-layer": "water", "filter": [ "==", "$type", @@ -2753,112 +2804,117 @@ } }, { - "id": "poi_label_4", + "id": "poi_label_r1", "type": "symbol", "metadata": { - "mapbox:group": "1444849297111.495" + "mapbox:group": "1444849297111.495" }, "source": "mapbox", - "source-layer": "poi_label", - "minzoom": 16, - "filter": [ - "all", - [ - "==", - "$type", - "Point" - ], - [ - "==", - "scalerank", - 4 - ] - ], - "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": "poi_label_3", - "type": "symbol", - "metadata": { - "mapbox:group": "1444849297111.495" - }, - "source": "mapbox", - "source-layer": "poi_label", - "minzoom": 15, - "filter": [ - "all", - [ - "==", - "$type", - "Point" - ], - [ - "==", - "scalerank", - 3 - ] - ], - "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": "poi_label_2", - "type": "symbol", - "metadata": { - "mapbox:group": "1444849297111.495" - }, - "source": "mapbox", - "source-layer": "poi_label", + "source-layer": "poi", "minzoom": 14, "filter": [ - "all", - [ - "==", - "$type", - "Point" + "all", + [ + "==", + "$type", + "Point" + ], + [ + "==", + "rank", + 1 + ] + ], + "layout": { + "icon-image": "{class}-11", + "text-font": [ + "Open Sans Semibold" ], - [ - "==", - "scalerank", - 2 - ] + "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-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_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": { "icon-image": "{class}-11", @@ -2912,26 +2968,31 @@ } }, { - "id": "poi_label_1", + "id": "poi_label_r10+", "type": "symbol", "metadata": { - "mapbox:group": "1444849297111.495" + "mapbox:group": "1444849297111.495" }, "source": "mapbox", - "source-layer": "poi_label", - "minzoom": 13, + "source-layer": "poi", + "minzoom": 16, "filter": [ - "all", - [ - "==", - "$type", - "Point" - ], - [ - "==", - "scalerank", - 1 - ] + "all", + [ + "==", + "$type", + "Point" + ], + [ + ">=", + "rank", + 10 + ], + [ + "<", + "rank", + 20 + ] ], "layout": { "icon-image": "{class}-11", @@ -2954,6 +3015,37 @@ "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", @@ -2961,7 +3053,7 @@ "mapbox:group": "1444849297111.495" }, "source": "mapbox", - "source-layer": "airport_label", + "source-layer": "poi", "minzoom": 11, "filter": [ "all", @@ -2972,7 +3064,7 @@ ], [ "in", - "scalerank", + "rank", 1, 2, 3 @@ -3006,7 +3098,7 @@ "mapbox:group": "1456163609504.0715" }, "source": "mapbox", - "source-layer": "road_label", + "source-layer": "transportation_name", "filter": [ "!=", "class", @@ -3045,7 +3137,7 @@ "mapbox:group": "1456163609504.0715" }, "source": "mapbox", - "source-layer": "road_label", + "source-layer": "transportation", "minzoom": 8, "filter": [ "<=", @@ -3087,7 +3179,7 @@ "mapbox:group": "1444849272561.29" }, "source": "mapbox", - "source-layer": "place_label", + "source-layer": "place", "filter": [ "in", "type", @@ -3131,7 +3223,7 @@ "mapbox:group": "1444849272561.29" }, "source": "mapbox", - "source-layer": "place_label", + "source-layer": "place", "filter": [ "==", "type", @@ -3169,7 +3261,7 @@ "mapbox:group": "1444849272561.29" }, "source": "mapbox", - "source-layer": "place_label", + "source-layer": "place", "filter": [ "==", "type", @@ -3207,7 +3299,7 @@ "mapbox:group": "1444849272561.29" }, "source": "mapbox", - "source-layer": "place_label", + "source-layer": "place", "filter": [ "==", "type", @@ -3245,7 +3337,7 @@ "mapbox:group": "1444849258897.3083" }, "source": "mapbox", - "source-layer": "marine_label", + "source-layer": "waterway", "filter": [ "all", [ @@ -3292,7 +3384,7 @@ "mapbox:group": "1444849258897.3083" }, "source": "mapbox", - "source-layer": "marine_label", + "source-layer": "water_name", "filter": [ "all", [ @@ -3340,7 +3432,7 @@ "mapbox:group": "1444849258897.3083" }, "source": "mapbox", - "source-layer": "marine_label", + "source-layer": "water_name", "filter": [ "all", [ @@ -3387,7 +3479,7 @@ "mapbox:group": "1444849258897.3083" }, "source": "mapbox", - "source-layer": "marine_label", + "source-layer": "water_name", "filter": [ "all", [ @@ -3435,7 +3527,7 @@ "mapbox:group": "1444849258897.3083" }, "source": "mapbox", - "source-layer": "marine_label", + "source-layer": "waterway", "filter": [ "all", [ @@ -3482,7 +3574,7 @@ "mapbox:group": "1444849258897.3083" }, "source": "mapbox", - "source-layer": "marine_label", + "source-layer": "water_name", "filter": [ "all", [ @@ -3530,7 +3622,7 @@ "mapbox:group": "1444849258897.3083" }, "source": "mapbox", - "source-layer": "marine_label", + "source-layer": "waterway", "filter": [ "all", [ @@ -3577,7 +3669,7 @@ "mapbox:group": "1444849258897.3083" }, "source": "mapbox", - "source-layer": "marine_label", + "source-layer": "water_name", "filter": [ "all", [ @@ -3630,10 +3722,10 @@ "mapbox:group": "1444849242106.713" }, "source": "mapbox", - "source-layer": "country_label", + "source-layer": "place", "filter": [ ">=", - "scalerank", + "rank", 4 ], "layout": { @@ -3669,10 +3761,10 @@ "mapbox:group": "1444849242106.713" }, "source": "mapbox", - "source-layer": "country_label", + "source-layer": "place", "filter": [ "==", - "scalerank", + "rank", 3 ], "layout": { @@ -3708,10 +3800,10 @@ "mapbox:group": "1444849242106.713" }, "source": "mapbox", - "source-layer": "country_label", + "source-layer": "place", "filter": [ "==", - "scalerank", + "rank", 2 ], "layout": { @@ -3747,10 +3839,10 @@ "mapbox:group": "1444849242106.713" }, "source": "mapbox", - "source-layer": "country_label", + "source-layer": "place", "filter": [ "==", - "scalerank", + "rank", 1 ], "layout": { diff --git a/configuration/map_files/styles/mono-bw.json b/configuration/map_files/styles/mono-bw.json index 909f57b..e109225 100644 --- a/configuration/map_files/styles/mono-bw.json +++ b/configuration/map_files/styles/mono-bw.json @@ -3082,7 +3082,7 @@ ], [ "in", - "scalerank", + "rank", 1, 2, 3 @@ -3754,7 +3754,7 @@ "source-layer": "place", "filter": [ ">=", - "scalerank", + "rank", 4 ], "layout": { @@ -3794,7 +3794,7 @@ "source-layer": "place", "filter": [ "==", - "scalerank", + "rank", 3 ], "layout": { @@ -3834,7 +3834,7 @@ "source-layer": "place", "filter": [ "==", - "scalerank", + "rank", 2 ], "layout": { @@ -3874,7 +3874,7 @@ "source-layer": "place", "filter": [ "==", - "scalerank", + "rank", 1 ], "layout": { diff --git a/configuration/map_files/styles/mono-chrome.json b/configuration/map_files/styles/mono-chrome.json index 8523d32..a166392 100644 --- a/configuration/map_files/styles/mono-chrome.json +++ b/configuration/map_files/styles/mono-chrome.json @@ -3068,7 +3068,7 @@ ], [ "in", - "scalerank", + "rank", 1, 2, 3 @@ -3740,7 +3740,7 @@ "source-layer": "place", "filter": [ ">=", - "scalerank", + "rank", 4 ], "layout": { @@ -3780,7 +3780,7 @@ "source-layer": "place", "filter": [ "==", - "scalerank", + "rank", 3 ], "layout": { @@ -3820,7 +3820,7 @@ "source-layer": "place", "filter": [ "==", - "scalerank", + "rank", 2 ], "layout": { @@ -3860,7 +3860,7 @@ "source-layer": "place", "filter": [ "==", - "scalerank", + "rank", 1 ], "layout": {