From a5b5bf07f356461b5e82f791b6bc8065199dc43e Mon Sep 17 00:00:00 2001 From: Wentao Kuang Date: Mon, 30 Oct 2023 10:38:09 +1300 Subject: [PATCH] Update format --- config/style/topographic.json | 1890 ++++++++++++++++----------------- 1 file changed, 945 insertions(+), 945 deletions(-) diff --git a/config/style/topographic.json b/config/style/topographic.json index 5d12239e0..9958f9b7e 100644 --- a/config/style/topographic.json +++ b/config/style/topographic.json @@ -6,7 +6,7 @@ "sources": { "LINZ Basemaps": { "type": "vector", "url": "/v1/tiles/topographic/EPSG:3857/tile.json", "attribution": "© 2022 Toitū Te Whenua - CC BY 4.0" }, "LINZ-Texture-Relief": { "type": "raster", "tiles": ["/v1/tiles/texturereliefshade/EPSG:3857/{z}/{x}/{y}.webp"], "tileSize": 256, "minzoom": 0, "maxzoom": 20 } - }, + }, "sprite": "/v1/sprites/topographic", "glyphs": "/v1/fonts/{fontstack}/{range}.pbf", "layers": [ @@ -37,15 +37,15 @@ "filter": ["all", ["==", "class", "rock"], ["!=", "rock_feature", "embankment"]], "layout": { "visibility": "visible", "line-cap": "round", "line-join": "round" }, "paint": { - "line-color": "rgba(0, 0, 0, 1)", - "line-pattern": "rock_narrow_poly_thin", - "line-width": 30, "line-opacity": { "stops": [ [14, 0.01], [15, 0.75] ] - } + }, + "line-width": 30, + "line-pattern": "rock_narrow_poly_thin", + "line-color": "rgba(0, 0, 0, 1)" } }, { @@ -75,7 +75,7 @@ "minzoom": 12, "filter": ["any", ["==", "class", "mine"], ["==", "class", "quarry"]], "layout": { "visibility": "visible" }, - "paint": { "fill-opacity": 0.5, "fill-color": "rgba(205, 205, 205, 1)" } + "paint": { "fill-color": "rgba(205, 205, 205, 1)", "fill-opacity": 0.5 } }, { "id": "Vegetation-Scatteredscrub", @@ -132,6 +132,7 @@ "filter": ["all", ["==", "tree", "exotic"], ["==", "landuse", "wood"]], "layout": { "visibility": "visible" }, "paint": { + "fill-pattern": "exotic_con_poly_random_dense_quarter", "fill-opacity": { "stops": [ [1, 0.2], @@ -141,8 +142,7 @@ ] }, "fill-antialias": true, - "fill-translate-anchor": "viewport", - "fill-pattern": "exotic_con_poly_random_dense_quarter" + "fill-translate-anchor": "viewport" } }, { @@ -155,6 +155,7 @@ "filter": ["all", ["==", "tree", "exotic"], ["==", "landuse", "wood"]], "layout": { "visibility": "visible" }, "paint": { + "fill-pattern": "exotic_con_poly_random_dense_half", "fill-opacity": { "stops": [ [1, 0.2], @@ -164,8 +165,7 @@ ] }, "fill-antialias": true, - "fill-translate-anchor": "viewport", - "fill-pattern": "exotic_con_poly_random_dense_half" + "fill-translate-anchor": "viewport" } }, { @@ -177,6 +177,7 @@ "filter": ["all", ["==", "tree", "exotic"], ["==", "landuse", "wood"]], "layout": { "visibility": "visible" }, "paint": { + "fill-pattern": "exotic_con_poly_random_dense", "fill-opacity": { "stops": [ [1, 0.1], @@ -186,8 +187,7 @@ ] }, "fill-antialias": true, - "fill-translate-anchor": "viewport", - "fill-pattern": "exotic_con_poly_random_dense" + "fill-translate-anchor": "viewport" } }, { @@ -235,7 +235,7 @@ "minzoom": 10, "filter": ["all", ["==", "landuse", "orchard"]], "layout": { "visibility": "visible" }, - "paint": { "fill-color": "rgba(27, 127, 36, 0.1)", "fill-outline-color": "rgba(255, 255, 255, 1)", "fill-translate-anchor": "viewport" } + "paint": { "fill-color": "rgba(27, 127, 36, 0.1)", "fill-translate-anchor": "viewport", "fill-outline-color": "rgba(255, 255, 255, 1)" } }, { "id": "Landcover-Vineyard-Fill", @@ -245,7 +245,7 @@ "minzoom": 10, "filter": ["all", ["==", "landuse", "vineyard"]], "layout": { "visibility": "visible" }, - "paint": { "fill-color": "rgba(27, 127, 36, 0.2)", "fill-translate-anchor": "viewport", "fill-outline-color": "rgba(255, 255, 255, 1)", "fill-antialias": false } + "paint": { "fill-color": "rgba(27, 127, 36, 0.2)", "fill-translate-anchor": "viewport", "fill-antialias": false, "fill-outline-color": "rgba(255, 255, 255, 1)" } }, { "id": "Landcover-Swamp-Fill", @@ -271,7 +271,7 @@ "minzoom": 16, "filter": ["all", ["==", "class", "wetland"], ["==", "wetland_type", "swamp"]], "layout": { "visibility": "visible" }, - "paint": { "fill-antialias": true, "fill-opacity": 0.5, "fill-color": "rgba(156, 156, 156, 1)", "fill-pattern": "swamp_poly_sparse" } + "paint": { "fill-pattern": "swamp_poly_sparse", "fill-color": "rgba(156, 156, 156, 1)", "fill-opacity": 0.5, "fill-antialias": true } }, { "id": "Landcover-Swamp-sparse-half", @@ -282,7 +282,7 @@ "maxzoom": 16, "filter": ["all", ["==", "class", "wetland"], ["==", "wetland_type", "swamp"]], "layout": { "visibility": "visible" }, - "paint": { "fill-antialias": true, "fill-opacity": 0.5, "fill-color": "rgba(156, 156, 156, 1)", "fill-pattern": "swamp_poly_sparse_half" } + "paint": { "fill-pattern": "swamp_poly_sparse_half", "fill-color": "rgba(156, 156, 156, 1)", "fill-opacity": 0.5, "fill-antialias": true } }, { "id": "Landcover-Swamp-Ln", @@ -293,14 +293,14 @@ "filter": ["all", ["==", "class", "wetland"], ["==", "wetland_type", "swamp"]], "layout": { "visibility": "visible" }, "paint": { + "line-width": 0.5, "line-dasharray": [6, 6, 4, 4], "line-color": { "stops": [ [10, "rgba(0, 140, 204, 0.1)"], [11, "rgba(0, 140, 204, 0.8)"] ] - }, - "line-width": 0.5 + } } }, { @@ -312,13 +312,13 @@ "filter": ["all", ["!has", "designated"], ["!=", "type", "index"], ["!has", "nat_form"]], "layout": { "visibility": "visible" }, "paint": { - "line-color": "rgba(206, 103, 6, 0.75)", "line-width": { "stops": [ [12, 0.3], [16, 0.2] ] - } + }, + "line-color": "rgba(206, 103, 6, 0.75)" } }, { @@ -329,7 +329,7 @@ "minzoom": 9, "filter": ["all", ["has", "designated"]], "layout": { "visibility": "visible" }, - "paint": { "line-color": "rgba(206, 103, 6, 0.75)", "line-width": 0.4, "line-dasharray": [30, 30] } + "paint": { "line-width": 0.4, "line-color": "rgba(206, 103, 6, 0.75)", "line-dasharray": [30, 30] } }, { "id": "Contours-Index", @@ -340,17 +340,17 @@ "filter": ["all", ["==", "type", "index"]], "layout": { "visibility": "visible" }, "paint": { - "line-color": { - "stops": [ - [10, "rgba(205, 128, 31, 0.5)"], - [15, "rgba(207, 129, 43, 0.75)"] - ] - }, "line-width": { "stops": [ [10, 0.5], [15, 1.2] ] + }, + "line-color": { + "stops": [ + [10, "rgba(205, 128, 31, 0.5)"], + [15, "rgba(207, 129, 43, 0.75)"] + ] } } }, @@ -362,7 +362,7 @@ "minzoom": 9, "filter": ["all", ["has", "nat_form"]], "layout": { "visibility": "visible" }, - "paint": { "line-color": "rgba(206, 103, 6, 0.75)", "line-width": 0.6, "line-dasharray": [30, 10, 10, 10] } + "paint": { "line-width": 0.6, "line-color": "rgba(206, 103, 6, 0.75)", "line-dasharray": [30, 10, 10, 10] } }, { "id": "Contours-Label", @@ -372,28 +372,28 @@ "maxzoom": 16, "filter": ["any", ["==", "type", "index"], ["has", "designated"]], "layout": { - "symbol-placement": "line", - "text-field": "{elevation}", + "symbol-spacing": { + "stops": [ + [10, 150], + [16, 300] + ] + }, + "text-line-height": 1, "visibility": "visible", + "text-field": "{elevation}", + "text-keep-upright": false, "text-size": { "stops": [ [13, 8], [15, 12] ] }, - "text-line-height": 1, - "text-padding": 0, "text-allow-overlap": false, - "text-font": ["Open Sans Bold"], - "text-keep-upright": false, - "symbol-spacing": { - "stops": [ - [10, 150], - [16, 300] - ] - } + "symbol-placement": "line", + "text-padding": 0, + "text-font": ["Open Sans Bold"] }, - "paint": { "text-color": "rgba(193, 104, 9, 1)", "text-halo-color": "rgba(243, 243, 242, 1)", "text-halo-width": 1, "text-halo-blur": 0.5 } + "paint": { "text-halo-blur": 0.5, "text-color": "rgba(193, 104, 9, 1)", "text-halo-color": "rgba(243, 243, 242, 1)", "text-halo-width": 1 } }, { "id": "Parcels-Ln", @@ -404,17 +404,17 @@ "filter": ["none", ["==", "parcel_intent", "Road"], ["==", "parcel_intent", "Hydro"]], "layout": { "visibility": "visible" }, "paint": { - "line-color": { - "stops": [ - [16, "rgba(220, 220, 220, 1)"], - [24, "rgba(147, 147, 147, 1)"] - ] - }, "line-width": { "stops": [ [16, 0.75], [24, 1.5] ] + }, + "line-color": { + "stops": [ + [16, "rgba(220, 220, 220, 1)"], + [24, "rgba(147, 147, 147, 1)"] + ] } } }, @@ -426,13 +426,13 @@ "filter": ["all", ["==", "class", "shingle"]], "layout": { "visibility": "visible" }, "paint": { - "fill-antialias": false, "fill-color": { "stops": [ [10, "rgba(216, 213, 213, 0.5)"], [19, "rgba(216, 213, 213, 0.75)"] ] - } + }, + "fill-antialias": false } }, { @@ -474,14 +474,14 @@ "filter": ["all", ["==", "class", "runway"], ["==", "surface", "sealed"]], "layout": { "visibility": "visible" }, "paint": { - "line-color": "rgba(125, 125, 125, 1)", "line-width": { "stops": [ [2, 1], [10, 0.7], [19, 0.5] ] - } + }, + "line-color": "rgba(125, 125, 125, 1)" } }, { @@ -491,22 +491,22 @@ "source-layer": "water", "minzoom": 11, "filter": ["any", ["==", "class", "lake"], ["==", "class", "river"], ["==", "class", "canal"], ["==", "class", "lagoon"]], - "layout": { "line-cap": "round", "line-join": "round", "visibility": "visible" }, + "layout": { "visibility": "visible", "line-cap": "round", "line-join": "round" }, "paint": { - "line-color": { - "stops": [ - [6, "rgba(184, 220, 242, 1)"], - [13, "rgba(0, 140, 204, 0.3)"], - [19, "rgba(0, 140, 204, 1)"] - ] - }, "line-width": { "stops": [ [9, 1], [15, 2.5] ] }, - "line-offset": 0 + "line-offset": 0, + "line-color": { + "stops": [ + [6, "rgba(184, 220, 242, 1)"], + [13, "rgba(0, 140, 204, 0.3)"], + [19, "rgba(0, 140, 204, 1)"] + ] + } } }, { @@ -520,16 +520,16 @@ "layout": { "visibility": "visible" }, "paint": { "fill-color": "rgba(204, 232, 245, 1)", + "fill-opacity": 1, + "fill-translate-anchor": "map", + "fill-antialias": true, "fill-outline-color": { "stops": [ [6, "rgba(184, 220, 242, 1)"], [13, "rgba(0, 140, 204, 0.3)"], [19, "rgba(0, 140, 204, 1)"] ] - }, - "fill-opacity": 1, - "fill-translate-anchor": "map", - "fill-antialias": true + } } }, { @@ -601,7 +601,7 @@ "maxzoom": 13, "filter": ["all", ["==", "class", "sand"]], "layout": { "visibility": "visible" }, - "paint": { "fill-opacity": 0.8, "fill-color": "rgba(135, 122, 122, 1)", "fill-pattern": "sand_land_poly_quarter" } + "paint": { "fill-color": "rgba(135, 122, 122, 1)", "fill-opacity": 0.8, "fill-pattern": "sand_land_poly_quarter" } }, { "id": "Landcover-Sand-land-pattern-half", @@ -611,7 +611,7 @@ "minzoom": 13, "filter": ["all", ["==", "class", "sand"]], "layout": { "visibility": "visible" }, - "paint": { "fill-opacity": 0.45, "fill-color": "rgba(135, 122, 122, 1)", "fill-pattern": "sand_land_poly_half" } + "paint": { "fill-color": "rgba(135, 122, 122, 1)", "fill-opacity": 0.45, "fill-pattern": "sand_land_poly_half" } }, { "id": "Landcover-Scree-poly-half", @@ -622,7 +622,7 @@ "maxzoom": 15, "filter": ["all", ["==", "class", "scree"]], "layout": { "visibility": "visible" }, - "paint": { "fill-pattern": "gravel_poly_half", "fill-opacity": 0.25 } + "paint": { "fill-opacity": 0.25, "fill-pattern": "gravel_poly_half" } }, { "id": "Landcover-Scree-poly", @@ -632,7 +632,7 @@ "minzoom": 15, "filter": ["all", ["==", "class", "scree"]], "layout": { "visibility": "visible" }, - "paint": { "fill-pattern": "gravel_poly", "fill-opacity": 0.25 } + "paint": { "fill-opacity": 0.25, "fill-pattern": "gravel_poly" } }, { "id": "Landcover-Shingle-poly-quarter", @@ -643,7 +643,7 @@ "maxzoom": 15, "filter": ["all", ["==", "class", "shingle"]], "layout": { "visibility": "visible" }, - "paint": { "fill-antialias": false, "fill-color": "rgba(211, 207, 207, 0.75)", "fill-opacity": 0.85, "fill-pattern": "sand_land_poly_quarter" } + "paint": { "fill-pattern": "sand_land_poly_quarter", "fill-color": "rgba(211, 207, 207, 0.75)", "fill-opacity": 0.85, "fill-antialias": false } }, { "id": "Landcover-Shingle-poly", @@ -653,7 +653,7 @@ "minzoom": 15, "filter": ["all", ["==", "class", "shingle"]], "layout": { "visibility": "visible" }, - "paint": { "fill-antialias": false, "fill-color": "rgba(211, 207, 207, 0.75)", "fill-opacity": 0.85, "fill-pattern": "sand_land_poly_half" } + "paint": { "fill-pattern": "sand_land_poly_half", "fill-color": "rgba(211, 207, 207, 0.75)", "fill-opacity": 0.85, "fill-antialias": false } }, { "id": "Landcover-Moraine-poly-half", @@ -702,14 +702,14 @@ "filter": ["all", ["==", "class", "reef"]], "layout": { "visibility": "visible" }, "paint": { - "line-color": "rgba(0, 140, 204, 1)", - "line-dasharray": [12, 2], "line-width": { "stops": [ [2, 0.5], [10, 1] ] - } + }, + "line-color": "rgba(0, 140, 204, 1)", + "line-dasharray": [12, 2] } }, { @@ -721,13 +721,6 @@ "filter": ["all", ["==", "class", "canal"]], "layout": { "visibility": "visible" }, "paint": { - "line-color": { - "stops": [ - [11, "rgba(167, 209, 232, 0.75)"], - [13, "rgba(76, 147, 226, 0.75)"], - [20, "rgba(0, 140, 204, 0.75)"] - ] - }, "line-opacity": 1, "line-width": { "stops": [ @@ -735,6 +728,13 @@ [13, 0.75], [18, 0.5] ] + }, + "line-color": { + "stops": [ + [11, "rgba(167, 209, 232, 0.75)"], + [13, "rgba(76, 147, 226, 0.75)"], + [20, "rgba(0, 140, 204, 0.75)"] + ] } } }, @@ -748,6 +748,13 @@ "filter": ["all", ["==", "class", "canal"], ["has", "name"]], "layout": { "visibility": "visible" }, "paint": { + "line-opacity": 1, + "line-width": { + "stops": [ + [12, 1.5], + [13, 1] + ] + }, "line-color": { "stops": [ [9, "rgba(125, 198, 215, 0.01)"], @@ -756,13 +763,6 @@ [12, "rgba(167, 209, 232, 0.75)"], [13, "rgba(76, 147, 226, 0.75)"] ] - }, - "line-opacity": 1, - "line-width": { - "stops": [ - [12, 1.5], - [13, 1] - ] } } }, @@ -775,13 +775,6 @@ "filter": ["all", ["==", "class", "drain"]], "layout": { "visibility": "visible" }, "paint": { - "line-color": { - "stops": [ - [11, "rgba(167, 209, 232, 0.75)"], - [13, "rgba(76, 147, 226, 0.75)"], - [20, "rgba(0, 140, 204, 0.75)"] - ] - }, "line-opacity": 1, "line-width": { "stops": [ @@ -789,6 +782,13 @@ [13, 0.75], [18, 0.5] ] + }, + "line-color": { + "stops": [ + [11, "rgba(167, 209, 232, 0.75)"], + [13, "rgba(76, 147, 226, 0.75)"], + [20, "rgba(0, 140, 204, 0.75)"] + ] } } }, @@ -802,6 +802,13 @@ "filter": ["all", ["==", "class", "drain"], ["has", "name"]], "layout": { "visibility": "visible" }, "paint": { + "line-opacity": 1, + "line-width": { + "stops": [ + [12, 1.5], + [13, 1] + ] + }, "line-color": { "stops": [ [9, "rgba(125, 198, 215, 0.01)"], @@ -810,13 +817,6 @@ [12, "rgba(167, 209, 232, 0.75)"], [13, "rgba(76, 147, 226, 0.75)"] ] - }, - "line-opacity": 1, - "line-width": { - "stops": [ - [12, 1.5], - [13, 1] - ] } } }, @@ -829,18 +829,18 @@ "filter": ["all", ["==", "class", "river"]], "layout": { "visibility": "visible" }, "paint": { - "line-color": { - "stops": [ - [13, "rgba(76, 147, 226, 0.75)"], - [20, "rgba(0, 140, 204, 0.75)"] - ] - }, "line-opacity": 1, "line-width": { "stops": [ [13, 1], [18, 0.75] ] + }, + "line-color": { + "stops": [ + [13, "rgba(76, 147, 226, 0.75)"], + [20, "rgba(0, 140, 204, 0.75)"] + ] } } }, @@ -854,6 +854,13 @@ "filter": ["all", ["==", "class", "river"], ["has", "name"]], "layout": { "visibility": "visible" }, "paint": { + "line-opacity": 1, + "line-width": { + "stops": [ + [12, 1.5], + [13, 1] + ] + }, "line-color": { "stops": [ [9, "rgba(125, 198, 215, 0.01)"], @@ -862,13 +869,6 @@ [12, "rgba(167, 209, 232, 0.75)"], [13, "rgba(76, 147, 226, 0.75)"] ] - }, - "line-opacity": 1, - "line-width": { - "stops": [ - [12, 1.5], - [13, 1] - ] } } }, @@ -929,14 +929,14 @@ "filter": ["all", ["==", "class", "stream"], ["==", "stream_feature", "rapid_cl"]], "layout": { "visibility": "visible" }, "paint": { - "line-color": "rgba(0, 140, 204, 1)", - "line-dasharray": [0.15, 12], "line-width": { "stops": [ [13, 8], [15, 10] ] - } + }, + "line-color": "rgba(0, 140, 204, 1)", + "line-dasharray": [0.15, 12] } }, { @@ -956,7 +956,7 @@ "source-layer": "waterway", "filter": ["all", ["==", "class", "spillway"]], "layout": { "visibility": "visible" }, - "paint": { "line-color": "rgba(78, 78, 78, 1)", "line-width": 1.5 } + "paint": { "line-width": 1.5, "line-color": "rgba(78, 78, 78, 1)" } }, { "id": "Waterway-Waterfall-Edge", @@ -966,13 +966,13 @@ "filter": ["all", ["==", "class", "waterfall_edge"]], "layout": { "visibility": "visible" }, "paint": { - "line-color": "rgba(0, 140, 204, 1)", "line-width": { "stops": [ [13, 1], [15, 1.25] ] - } + }, + "line-color": "rgba(0, 140, 204, 1)" } }, { @@ -983,13 +983,13 @@ "filter": ["all", ["==", "class", "waterfall_ln"]], "layout": { "visibility": "visible" }, "paint": { - "line-color": "rgba(0, 140, 204, 1)", "line-width": { "stops": [ [12, 6], [15, 14] ] }, + "line-color": "rgba(0, 140, 204, 1)", "line-dasharray": [0.1, 2.5] } }, @@ -1010,13 +1010,13 @@ "filter": ["all", ["==", "class", "channel"], ["==", "channel_type", "water_race"]], "layout": { "visibility": "visible" }, "paint": { + "line-width": 0.5, "line-color": { "stops": [ [13, "rgba(0, 140, 204, 0.3)"], [19, "rgba(0, 140, 204, 1)"] ] - }, - "line-width": 0.5 + } } }, { @@ -1025,6 +1025,7 @@ "source": "LINZ-Texture-Relief", "layout": { "visibility": "visible" }, "paint": { + "raster-brightness-min": 0, "raster-opacity": { "stops": [ [1, 0.35], @@ -1035,7 +1036,6 @@ ] }, "raster-resampling": "nearest", - "raster-brightness-min": 0, "raster-contrast": 0 } }, @@ -1138,7 +1138,7 @@ "maxzoom": 15, "filter": ["all", ["==", "class", "marine_farm"]], "layout": { "visibility": "visible" }, - "paint": { "fill-color": "rgba(25, 114, 242, 0.45)", "fill-pattern": "marine_farm_poly_half", "fill-opacity": 0.5 } + "paint": { "fill-color": "rgba(25, 114, 242, 0.45)", "fill-opacity": 0.5, "fill-pattern": "marine_farm_poly_half" } }, { "id": "Landuse-MarineFarm", @@ -1148,7 +1148,7 @@ "minzoom": 15, "filter": ["all", ["==", "class", "marine_farm"]], "layout": { "visibility": "visible" }, - "paint": { "fill-color": "rgba(25, 114, 242, 0.45)", "fill-pattern": "marine_farm_poly", "fill-opacity": 0.5 } + "paint": { "fill-color": "rgba(25, 114, 242, 0.45)", "fill-opacity": 0.5, "fill-pattern": "marine_farm_poly" } }, { "id": "Landuse-Pond", @@ -1238,7 +1238,7 @@ "minzoom": 13, "filter": ["all", ["==", "class", "relief"], ["==", "sand_feature", "cutting"]], "layout": { "visibility": "visible" }, - "paint": { "line-color": "rgba(81, 79, 79, 1)", "line-pattern": "cutting_edge", "line-width": 20, "line-offset": -3 } + "paint": { "line-width": 20, "line-pattern": "cutting_edge", "line-offset": -3, "line-color": "rgba(81, 79, 79, 1)" } }, { "id": "Landcover-Embankment", @@ -1266,8 +1266,8 @@ "source-layer": "landcover", "minzoom": 13, "filter": ["all", ["==", "class", "relief"], ["==", "sand_feature", "slip"]], - "layout": { "line-join": "round", "line-cap": "round", "visibility": "visible" }, - "paint": { "line-color": "rgba(81, 79, 79, 1)", "line-width": 15, "line-offset": 0, "line-pattern": "cliff_edge" } + "layout": { "visibility": "visible", "line-join": "round", "line-cap": "round" }, + "paint": { "line-width": 15, "line-pattern": "cliff_edge", "line-offset": 0, "line-color": "rgba(81, 79, 79, 1)" } }, { "id": "Landcover-Stopbank", @@ -1278,7 +1278,6 @@ "filter": ["all", ["==", "class", "rock"], ["==", "rock_feature", "embankment"], ["==", "embkmt_use", "stopbank"]], "paint": { "line-opacity": 1, - "line-color": "rgba(61, 58, 58, 1)", "line-width": { "stops": [ [13, 8], @@ -1286,7 +1285,8 @@ [18, 16] ] }, - "line-dasharray": [0.1, 0.5] + "line-dasharray": [0.1, 0.5], + "line-color": "rgba(61, 58, 58, 1)" } }, { @@ -1298,13 +1298,13 @@ "filter": ["all", ["==", "barrier", "fence"], ["==", "class", "farmland"]], "layout": { "visibility": "visible" }, "paint": { + "line-width": 1, "line-color": { "stops": [ [15, "rgba(100, 100, 100, 0.4)"], [19, "rgba(100, 100, 100, 0.8)"] ] - }, - "line-width": 1 + } } }, { @@ -1316,15 +1316,15 @@ "filter": ["all", ["==", "barrier", "fence"], ["==", "class", "farmland"]], "layout": { "visibility": "visible" }, "paint": { + "line-width": 1.5, + "line-dasharray": [1, 7], + "line-offset": 1, "line-color": { "stops": [ [15, "rgba(160, 90, 26, 0.4)"], [19, "rgba(160, 90, 26, 0.6)"] ] - }, - "line-width": 1.5, - "line-dasharray": [1, 7], - "line-offset": 1 + } } }, { @@ -1335,7 +1335,7 @@ "minzoom": 14, "filter": ["all", ["==", "natural", "tree_row"]], "layout": { "visibility": "visible" }, - "paint": { "line-color": "rgba(148, 199, 111, 0.75)", "line-width": 4, "line-translate-anchor": "map" } + "paint": { "line-translate-anchor": "map", "line-width": 4, "line-color": "rgba(148, 199, 111, 0.75)" } }, { "id": "Coastline-Ln-2", @@ -1345,14 +1345,7 @@ "minzoom": 0, "layout": { "visibility": "visible" }, "paint": { - "line-color": { - "stops": [ - [1, "rgba(9, 132, 186, 1)"], - [6, "rgba(9, 132, 186, 1)"], - [10, "rgba(27, 152, 193, 1)"], - [16, "rgba(34, 164, 212, 1)"] - ] - }, + "line-translate-anchor": "map", "line-width": { "stops": [ [6, 0.5], @@ -1361,7 +1354,14 @@ [20, 3.5] ] }, - "line-translate-anchor": "map" + "line-color": { + "stops": [ + [1, "rgba(9, 132, 186, 1)"], + [6, "rgba(9, 132, 186, 1)"], + [10, "rgba(27, 152, 193, 1)"], + [16, "rgba(34, 164, 212, 1)"] + ] + } } }, { @@ -1387,7 +1387,7 @@ "source": "LINZ Basemaps", "source-layer": "poi", "filter": ["all", ["==", "class", "rifle_range"]], - "paint": { "line-color": "rgba(55, 54, 54, 0.85)", "line-dasharray": [5, 3], "line-width": 1.5 } + "paint": { "line-width": 1.5, "line-color": "rgba(55, 54, 54, 0.85)", "line-dasharray": [5, 3] } }, { "id": "Poi-Showground", @@ -1421,14 +1421,14 @@ [10, "rgba(240, 240, 240, 0.85)"] ] }, - "fill-outline-color": "rgba(67, 67, 67, 1)", - "fill-antialias": true, "fill-opacity": { "stops": [ [14, 1], [20, 0.2] ] - } + }, + "fill-antialias": true, + "fill-outline-color": "rgba(67, 67, 67, 1)" } }, { @@ -1441,14 +1441,14 @@ "layout": { "visibility": "visible" }, "paint": { "fill-color": "rgba(67, 67, 67, 1)", - "fill-outline-color": "rgba(67, 67, 67, 1)", - "fill-antialias": false, "fill-opacity": { "stops": [ [14, 1], [20, 0.2] ] - } + }, + "fill-antialias": false, + "fill-outline-color": "rgba(67, 67, 67, 1)" } }, { @@ -1461,14 +1461,14 @@ "layout": { "visibility": "visible" }, "paint": { "fill-color": "rgba(110, 167, 205, 1)", - "fill-outline-color": "rgba(67, 67, 67, 1)", - "fill-antialias": true, "fill-opacity": { "stops": [ [14, 1], [20, 0.2] ] - } + }, + "fill-antialias": true, + "fill-outline-color": "rgba(67, 67, 67, 1)" } }, { "id": "Poi-Siphon", "type": "fill", "source": "LINZ Basemaps", "source-layer": "poi", "minzoom": 12, "filter": ["all", ["==", "class", "siphon"]] }, @@ -1481,20 +1481,20 @@ "filter": ["all", ["==", "class", "storage_tank_pt"]], "layout": { "visibility": "visible" }, "paint": { - "circle-radius": { - "stops": [ - [12, 2], - [15, 5] - ] - }, - "circle-pitch-alignment": "map", "circle-stroke-color": "rgba(67, 67, 67, 1)", "circle-opacity": { "stops": [ [14, 1], [20, 0.2] ] - } + }, + "circle-radius": { + "stops": [ + [12, 2], + [15, 5] + ] + }, + "circle-pitch-alignment": "map" } }, { @@ -1506,20 +1506,20 @@ "filter": ["all", ["==", "class", "storage_tank_pt"], ["!has", "store_item"]], "layout": { "visibility": "visible" }, "paint": { - "circle-color": "rgba(255, 255, 255, 1)", + "circle-opacity": { + "stops": [ + [14, 1], + [20, 0.2] + ] + }, "circle-radius": { "stops": [ [12, 1.5], [15, 3.5] ] }, - "circle-pitch-alignment": "map", - "circle-opacity": { - "stops": [ - [14, 1], - [20, 0.2] - ] - } + "circle-color": "rgba(255, 255, 255, 1)", + "circle-pitch-alignment": "map" } }, { @@ -1531,20 +1531,20 @@ "filter": ["all", ["==", "class", "storage_tank_pt"], ["==", "store_item", "fuel"]], "layout": { "visibility": "visible" }, "paint": { - "circle-color": "rgba(67, 67, 67, 1)", - "circle-radius": { + "circle-opacity": { "stops": [ - [12, 1.5], - [15, 3.5] + [14, 1], + [20, 0.2] ] }, - "circle-pitch-alignment": "map", - "circle-opacity": { + "circle-radius": { "stops": [ - [14, 1], - [20, 0.2] + [12, 1.5], + [15, 3.5] ] - } + }, + "circle-color": "rgba(67, 67, 67, 1)", + "circle-pitch-alignment": "map" } }, { @@ -1556,20 +1556,20 @@ "filter": ["all", ["==", "class", "storage_tank_pt"], ["==", "store_item", "water"]], "layout": { "visibility": "visible" }, "paint": { - "circle-color": "rgba(110, 167, 205, 1)", + "circle-opacity": { + "stops": [ + [14, 1], + [20, 0.2] + ] + }, "circle-radius": { "stops": [ [12, 1.5], [15, 3.5] ] }, - "circle-pitch-alignment": "map", - "circle-opacity": { - "stops": [ - [14, 1], - [20, 0.2] - ] - } + "circle-color": "rgba(110, 167, 205, 1)", + "circle-pitch-alignment": "map" } }, { @@ -1580,14 +1580,14 @@ "minzoom": 13, "filter": ["all", ["==", "class", "boatramp"]], "paint": { - "line-color": "rgba(78, 78, 78, 1)", "line-width": { "stops": [ [10, 2], [15, 5], [19, 8] ] - } + }, + "line-color": "rgba(78, 78, 78, 1)" } }, { @@ -1598,14 +1598,14 @@ "minzoom": 13, "filter": ["all", ["==", "class", "boatramp"]], "paint": { - "line-color": "rgba(255, 255, 255, 1)", "line-width": { "stops": [ [10, 0.4], [15, 2.5], [19, 6.5] ] - } + }, + "line-color": "rgba(255, 255, 255, 1)" } }, { @@ -1615,7 +1615,7 @@ "source-layer": "poi", "minzoom": 12, "filter": ["all", ["==", "class", "dredge_tailing"]], - "paint": { "line-color": "rgba(55, 55, 55, 1)", "line-pattern": "dredge_tailing_pnt", "line-width": 10, "line-opacity": 0.9 } + "paint": { "line-opacity": 0.9, "line-width": 10, "line-pattern": "dredge_tailing_pnt", "line-color": "rgba(55, 55, 55, 1)" } }, { "id": "Poi-Mine-Quarry-Outline", @@ -1624,7 +1624,7 @@ "source-layer": "poi", "minzoom": 12, "filter": ["any", ["==", "class", "mine"], ["==", "class", "quarry"]], - "paint": { "line-color": "rgba(59, 59, 59, 1)", "line-width": 1.5, "line-dasharray": [2, 2] } + "paint": { "line-width": 1.5, "line-color": "rgba(59, 59, 59, 1)", "line-dasharray": [2, 2] } }, { "id": "Poi-Pipeline", @@ -1651,7 +1651,7 @@ "source-layer": "poi", "minzoom": 13, "filter": ["any", ["==", "class", "racetrack"], ["==", "class", "racetrack_ln"]], - "paint": { "line-color": "rgba(84, 84, 84, 1)", "line-width": 0.75 } + "paint": { "line-width": 0.75, "line-color": "rgba(84, 84, 84, 1)" } }, { "id": "Poi-Slipway-Symbol-Dash", @@ -1660,13 +1660,13 @@ "source-layer": "poi", "filter": ["all", ["==", "class", "slipway"]], "paint": { - "line-color": "rgba(64, 64, 64, 1)", "line-width": { "stops": [ [12, 1], [16, 4] ] - } + }, + "line-color": "rgba(64, 64, 64, 1)" } }, { @@ -1677,14 +1677,14 @@ "filter": ["all", ["==", "class", "slipway"]], "layout": { "visibility": "visible" }, "paint": { - "line-color": "rgba(64, 64, 64, 1)", - "line-dasharray": [0.15, 0.4], "line-width": { "stops": [ [12, 4], [16, 18] ] - } + }, + "line-color": "rgba(64, 64, 64, 1)", + "line-dasharray": [0.15, 0.4] } }, { @@ -1695,7 +1695,7 @@ "minzoom": 10, "filter": ["all", ["==", "class", "wharf_edge"]], "layout": { "visibility": "visible" }, - "paint": { "line-color": "rgba(73, 73, 73, 1)", "line-width": 1.3 } + "paint": { "line-width": 1.3, "line-color": "rgba(73, 73, 73, 1)" } }, { "id": "Poi-Wharf-Ln", @@ -1731,8 +1731,8 @@ [19, "rgba(125, 125, 125, 1)"] ] }, - "fill-antialias": true, "fill-opacity": 1, + "fill-antialias": true, "fill-translate": { "base": 1, "stops": [ @@ -1759,8 +1759,8 @@ [19, "rgba(190, 190, 190, 0.7)"] ] }, - "fill-antialias": true, - "fill-opacity": 1 + "fill-opacity": 1, + "fill-antialias": true } }, { @@ -1772,13 +1772,13 @@ "maxzoom": 18, "layout": { "visibility": "visible" }, "paint": { - "line-color": "rgba(152, 145, 145,0.75)", "line-width": { "stops": [ [17, 0.5], [24, 1] ] - } + }, + "line-color": "rgba(152, 145, 145,0.75)" } }, { @@ -1790,7 +1790,7 @@ "maxzoom": 18, "filter": ["all", ["==", "class", "peak"]], "layout": { "visibility": "visible" }, - "paint": { "circle-color": "rgba(47, 47, 46, 1)", "circle-radius": 2 } + "paint": { "circle-radius": 2, "circle-color": "rgba(47, 47, 46, 1)" } }, { "id": "Height-Point-Labels", @@ -1801,9 +1801,13 @@ "maxzoom": 18, "filter": ["all", ["==", "class", "peak"]], "layout": { - "text-font": ["Open Sans Italic"], - "text-field": "{elevation}", + "icon-pitch-alignment": "auto", + "text-variable-anchor": ["bottom-left", "bottom-right"], + "text-optional": false, "text-justify": "auto", + "visibility": "visible", + "text-field": "{elevation}", + "text-offset": [0.2, -0.2], "text-anchor": "bottom-left", "text-size": { "stops": [ @@ -1811,15 +1815,11 @@ [15, 11] ] }, - "text-offset": [0.2, -0.2], - "visibility": "visible", - "icon-pitch-alignment": "auto", "text-allow-overlap": false, "text-ignore-placement": false, - "text-variable-anchor": ["bottom-left", "bottom-right"], - "text-optional": false + "text-font": ["Open Sans Italic"] }, - "paint": { "text-halo-color": "rgba(243, 243, 242, 0.75)", "text-halo-width": 1, "text-halo-blur": 0.5, "text-translate-anchor": "map" } + "paint": { "text-halo-blur": 0.5, "text-halo-color": "rgba(243, 243, 242, 0.75)", "text-halo-width": 1, "text-translate-anchor": "map" } }, { "id": "Transport-FerryCrossing", @@ -1839,14 +1839,14 @@ "filter": ["all", ["==", "class", "track"], ["==", "track_use", "cycle only"]], "layout": { "visibility": "visible", "line-cap": "butt", "line-join": "bevel" }, "paint": { - "line-color": "rgba(231, 231, 231, 0.4)", "line-width": { "stops": [ [13, 1.5], [15, 2.5], [19, 5] ] - } + }, + "line-color": "rgba(231, 231, 231, 0.4)" } }, { @@ -1858,14 +1858,14 @@ "filter": ["all", ["==", "class", "track"], ["==", "track_use", "foot"]], "layout": { "visibility": "visible", "line-cap": "butt", "line-join": "bevel" }, "paint": { - "line-color": "rgba(231, 231, 231, 0.4)", "line-width": { "stops": [ [13, 1.5], [15, 2.5], [19, 5] ] - } + }, + "line-color": "rgba(231, 231, 231, 0.4)" } }, { @@ -1877,14 +1877,14 @@ "filter": ["all", ["==", "class", "track"], ["==", "subclass", "foot_route_closed"]], "layout": { "visibility": "visible", "line-cap": "butt", "line-join": "bevel" }, "paint": { - "line-color": "rgba(205, 53, 53, 0.4)", "line-width": { "stops": [ [13, 1.5], [15, 2.5], [19, 5] ] - } + }, + "line-color": "rgba(205, 53, 53, 0.4)" } }, { @@ -1896,14 +1896,14 @@ "filter": ["all", ["==", "class", "track"], ["==", "subclass", "foot_closed"]], "layout": { "visibility": "visible", "line-cap": "butt", "line-join": "bevel" }, "paint": { - "line-color": "rgba(205, 53, 53, 0.4)", "line-width": { "stops": [ [13, 1.5], [15, 2.5], [19, 5] ] - } + }, + "line-color": "rgba(205, 53, 53, 0.4)" } }, { @@ -1915,7 +1915,6 @@ "filter": ["all", ["==", "class", "track"], ["==", "track_use", "cycle only"]], "layout": { "visibility": "visible", "line-cap": "butt", "line-join": "bevel" }, "paint": { - "line-color": "rgba(78, 78, 78, 0.8)", "line-width": { "stops": [ [13, 1], @@ -1923,6 +1922,7 @@ [19, 3] ] }, + "line-color": "rgba(78, 78, 78, 0.8)", "line-dasharray": { "base": 1, "stops": [ @@ -1942,7 +1942,6 @@ "filter": ["all", ["==", "class", "track"], ["==", "track_use", "foot"]], "layout": { "visibility": "visible", "line-cap": "butt", "line-join": "bevel" }, "paint": { - "line-color": "rgba(78, 78, 78, 0.8)", "line-width": { "stops": [ [13, 1], @@ -1950,6 +1949,7 @@ [19, 3] ] }, + "line-color": "rgba(78, 78, 78, 0.8)", "line-dasharray": { "base": 1, "stops": [ @@ -1969,7 +1969,6 @@ "filter": ["all", ["==", "class", "track"], ["==", "track_use", "vehicle"]], "layout": { "visibility": "visible", "line-cap": "butt", "line-join": "bevel" }, "paint": { - "line-color": "rgba(231, 231, 231, 0.4)", "line-width": { "stops": [ [13, 2], @@ -1978,8 +1977,9 @@ ], "base": 1 }, + "line-blur": 0.75, "line-dasharray": [8], - "line-blur": 0.75 + "line-color": "rgba(231, 231, 231, 0.4)" } }, { @@ -1991,7 +1991,6 @@ "filter": ["all", ["==", "class", "track"], ["==", "track_use", "vehicle"]], "layout": { "visibility": "visible", "line-cap": "butt", "line-join": "bevel" }, "paint": { - "line-color": "rgba(78, 78, 78, 0.8)", "line-width": { "stops": [ [13, 1.25], @@ -2000,6 +1999,7 @@ ], "base": 1 }, + "line-color": "rgba(78, 78, 78, 0.8)", "line-dasharray": { "base": 1, "stops": [ @@ -2020,13 +2020,6 @@ "filter": ["all", ["==", "lane_count", 1], ["!=", "class", "motorway"]], "layout": { "visibility": "visible", "line-cap": "butt", "line-join": "bevel" }, "paint": { - "line-color": { - "stops": [ - [10, "rgba(78, 78, 78, 1)"], - [17, "rgba(78, 78, 78, 1)"], - [18, "rgba(96, 96, 96, 1)"] - ] - }, "line-width": { "stops": [ [10, 1.5], @@ -2037,6 +2030,13 @@ [19, 40], [22, 200] ] + }, + "line-color": { + "stops": [ + [10, "rgba(78, 78, 78, 1)"], + [17, "rgba(78, 78, 78, 1)"], + [18, "rgba(96, 96, 96, 1)"] + ] } } }, @@ -2049,13 +2049,6 @@ "filter": ["all", ["in", "lane_count", 2, 3, 4, 5, 6, 7, 8], ["!=", "class", "motorway"]], "layout": { "visibility": "visible", "line-cap": "butt", "line-join": "bevel" }, "paint": { - "line-color": { - "stops": [ - [10, "rgba(78, 78, 78, 1)"], - [17, "rgba(78, 78, 78, 1)"], - [18, "rgba(96, 96, 96, 1)"] - ] - }, "line-width": { "stops": [ [10, 3.25], @@ -2066,6 +2059,13 @@ [19, 60], [22, 400] ] + }, + "line-color": { + "stops": [ + [10, "rgba(78, 78, 78, 1)"], + [17, "rgba(78, 78, 78, 1)"], + [18, "rgba(96, 96, 96, 1)"] + ] } } }, @@ -2078,7 +2078,6 @@ "filter": ["all", ["==", "class", "motorway"], ["in", "lane_count", 1]], "layout": { "visibility": "visible", "line-join": "round", "line-cap": "round" }, "paint": { - "line-color": "rgba(120, 120, 120, 1)", "line-width": { "stops": [ [8, 1.5], @@ -2090,7 +2089,8 @@ [19, 50], [22, 220] ] - } + }, + "line-color": "rgba(120, 120, 120, 1)" } }, { @@ -2102,7 +2102,6 @@ "filter": ["all", ["==", "class", "motorway"], ["in", "lane_count", 2, 3]], "layout": { "visibility": "visible", "line-join": "round", "line-cap": "round" }, "paint": { - "line-color": "rgba(120, 120, 120, 1)", "line-width": { "stops": [ [8, 3.25], @@ -2114,7 +2113,8 @@ [19, 70], [22, 450] ] - } + }, + "line-color": "rgba(120, 120, 120, 1)" } }, { @@ -2126,7 +2126,6 @@ "filter": ["all", ["==", "class", "motorway"], ["in", "lane_count", 4, 5, 6, 7]], "layout": { "visibility": "visible", "line-join": "round", "line-cap": "round" }, "paint": { - "line-color": "rgba(120, 120, 120, 1)", "line-width": { "stops": [ [8, 3.5], @@ -2138,7 +2137,8 @@ [19, 80], [22, 470] ] - } + }, + "line-color": "rgba(120, 120, 120, 1)" } }, { @@ -2150,7 +2150,7 @@ "filter": ["all", ["==", "surface", "unmetalled"]], "layout": { "visibility": "visible", "line-cap": "butt", "line-join": "bevel" }, "paint": { - "line-color": "rgba(255, 254, 252, 1)", + "line-translate-anchor": "map", "line-width": { "stops": [ [10, 0.5], @@ -2163,7 +2163,7 @@ ] }, "line-gap-width": 0, - "line-translate-anchor": "map" + "line-color": "rgba(255, 254, 252, 1)" } }, { @@ -2175,7 +2175,7 @@ "filter": ["all", ["==", "surface", "metalled"], ["==", "lane_count", 1]], "layout": { "visibility": "visible", "line-cap": "butt", "line-join": "bevel" }, "paint": { - "line-color": "rgba(255, 254, 252, 1)", + "line-translate-anchor": "map", "line-width": { "stops": [ [10, 0.5], @@ -2188,7 +2188,7 @@ ] }, "line-gap-width": 0, - "line-translate-anchor": "map" + "line-color": "rgba(255, 254, 252, 1)" } }, { @@ -2200,13 +2200,7 @@ "filter": ["all", ["==", "surface", "metalled"], ["==", "lane_count", 1]], "layout": { "visibility": "visible", "line-cap": "butt", "line-join": "bevel" }, "paint": { - "line-color": { - "stops": [ - [10, "rgba(210, 162, 84, 1)"], - [17, "rgba(210, 162, 84, 1)"], - [19, "rgba(217, 184, 127, 1)"] - ] - }, + "line-translate-anchor": "map", "line-width": { "stops": [ [10, 0.5], @@ -2219,8 +2213,14 @@ ] }, "line-gap-width": 0, - "line-translate-anchor": "map", - "line-dasharray": [8, 5] + "line-dasharray": [8, 5], + "line-color": { + "stops": [ + [10, "rgba(210, 162, 84, 1)"], + [17, "rgba(210, 162, 84, 1)"], + [19, "rgba(217, 184, 127, 1)"] + ] + } } }, { @@ -2232,7 +2232,6 @@ "filter": ["all", ["==", "lane_count", 1], ["!=", "class", "motorway"], ["==", "status", "under construction"]], "layout": { "visibility": "visible", "line-cap": "butt", "line-join": "bevel" }, "paint": { - "line-color": "rgba(133, 130, 130, 1)", "line-width": { "stops": [ [10, 0.5], @@ -2244,6 +2243,7 @@ [22, 180] ] }, + "line-color": "rgba(133, 130, 130, 1)", "line-dasharray": [1, 5] } }, @@ -2256,13 +2256,7 @@ "filter": ["all", ["==", "surface", "sealed"], ["==", "lane_count", 1], ["!=", "class", "motorway"]], "layout": { "visibility": "visible", "line-cap": "butt", "line-join": "bevel" }, "paint": { - "line-color": { - "stops": [ - [10, "rgba(210, 162, 84, 1)"], - [17, "rgba(210, 162, 84, 1)"], - [19, "rgba(217, 184, 127, 1)"] - ] - }, + "line-translate-anchor": "map", "line-width": { "stops": [ [10, 0.5], @@ -2275,7 +2269,13 @@ ] }, "line-gap-width": 0, - "line-translate-anchor": "map" + "line-color": { + "stops": [ + [10, "rgba(210, 162, 84, 1)"], + [17, "rgba(210, 162, 84, 1)"], + [19, "rgba(217, 184, 127, 1)"] + ] + } } }, { @@ -2287,7 +2287,7 @@ "filter": ["all", ["==", "surface", "unmetalled"], ["in", "lane_count", 2, 3, 4, 5, 6, 7]], "layout": { "visibility": "visible", "line-cap": "butt", "line-join": "bevel" }, "paint": { - "line-color": "rgba(255, 255, 255, 1)", + "line-translate-anchor": "map", "line-width": { "stops": [ [10, 1.35], @@ -2300,7 +2300,7 @@ ] }, "line-gap-width": 0, - "line-translate-anchor": "map" + "line-color": "rgba(255, 255, 255, 1)" } }, { @@ -2312,7 +2312,7 @@ "filter": ["all", ["==", "surface", "metalled"], ["in", "lane_count", 2, 3, 4, 5, 6, 7]], "layout": { "visibility": "visible", "line-cap": "butt", "line-join": "bevel" }, "paint": { - "line-color": "rgba(255, 255, 255, 1)", + "line-translate-anchor": "map", "line-width": { "stops": [ [10, 1.35], @@ -2325,7 +2325,7 @@ ] }, "line-gap-width": 0, - "line-translate-anchor": "map" + "line-color": "rgba(255, 255, 255, 1)" } }, { @@ -2337,7 +2337,6 @@ "filter": ["all", ["in", "lane_count", 2, 3, 4, 5, 6, 7, 8], ["!=", "class", "motorway"], ["==", "status", "under construction"]], "layout": { "visibility": "visible", "line-cap": "butt", "line-join": "bevel" }, "paint": { - "line-color": "rgba(133, 130, 130, 1)", "line-width": { "stops": [ [10, 1.35], @@ -2348,7 +2347,8 @@ [19, 55], [22, 380] ] - } + }, + "line-color": "rgba(133, 130, 130, 1)" } }, { @@ -2360,7 +2360,7 @@ "filter": ["all", ["==", "status", "under construction"], ["in", "lane_count", 2, 3, 4, 5, 6, 7]], "layout": { "visibility": "visible", "line-cap": "butt", "line-join": "bevel" }, "paint": { - "line-color": "rgba(255, 254, 252, 1)", + "line-translate-anchor": "map", "line-width": { "stops": [ [10, 1.35], @@ -2373,8 +2373,8 @@ ] }, "line-gap-width": 0, - "line-translate-anchor": "map", - "line-dasharray": [5, 1] + "line-dasharray": [5, 1], + "line-color": "rgba(255, 254, 252, 1)" } }, { @@ -2386,13 +2386,7 @@ "filter": ["all", ["==", "surface", "metalled"], ["in", "lane_count", 2, 3, 4, 5, 6, 7]], "layout": { "visibility": "visible", "line-cap": "butt", "line-join": "bevel" }, "paint": { - "line-color": { - "stops": [ - [10, "rgba(210, 162, 84, 1)"], - [17, "rgba(210, 162, 84, 1)"], - [19, "rgba(217, 184, 127, 1)"] - ] - }, + "line-translate-anchor": "map", "line-width": { "stops": [ [10, 1.35], @@ -2405,8 +2399,14 @@ ] }, "line-gap-width": 0, - "line-translate-anchor": "map", - "line-dasharray": [8, 5] + "line-dasharray": [8, 5], + "line-color": { + "stops": [ + [10, "rgba(210, 162, 84, 1)"], + [17, "rgba(210, 162, 84, 1)"], + [19, "rgba(217, 184, 127, 1)"] + ] + } } }, { @@ -2418,13 +2418,7 @@ "filter": ["all", ["==", "surface", "sealed"], ["in", "lane_count", 2, 3, 4, 5, 6, 7], ["!=", "class", "motorway"]], "layout": { "visibility": "visible", "line-cap": "butt", "line-join": "bevel" }, "paint": { - "line-color": { - "stops": [ - [10, "rgba(210, 162, 84, 1)"], - [17, "rgba(210, 162, 84, 1)"], - [19, "rgba(217, 184, 127, 1)"] - ] - }, + "line-translate-anchor": "map", "line-width": { "stops": [ [10, 1.35], @@ -2437,7 +2431,13 @@ ] }, "line-gap-width": 0, - "line-translate-anchor": "map" + "line-color": { + "stops": [ + [10, "rgba(210, 162, 84, 1)"], + [17, "rgba(210, 162, 84, 1)"], + [19, "rgba(217, 184, 127, 1)"] + ] + } } }, { @@ -2446,7 +2446,7 @@ "source": "LINZ Basemaps", "source-layer": "transportation", "filter": ["all", ["==", "class", "cable_car"], ["==", "feature_type", "people"]], - "paint": { "line-color": "rgba(24, 23, 23, 0.80)", "line-width": 1.25 } + "paint": { "line-width": 1.25, "line-color": "rgba(24, 23, 23, 0.80)" } }, { "id": "Transport-Cable-Car-Industrial", @@ -2454,7 +2454,7 @@ "source": "LINZ Basemaps", "source-layer": "transportation", "filter": ["all", ["==", "class", "cable_car"], ["==", "feature_type", "industrial"]], - "paint": { "line-color": "rgba(24, 23, 23, 0.80)", "line-width": 2.5 } + "paint": { "line-width": 2.5, "line-color": "rgba(24, 23, 23, 0.80)" } }, { "id": "Transport-Ski-Tow", @@ -2462,7 +2462,7 @@ "source": "LINZ Basemaps", "source-layer": "transportation", "filter": ["all", ["==", "class", "ski_tow"]], - "paint": { "line-color": "rgba(24, 23, 23, 0.80)", "line-width": 1.25 } + "paint": { "line-width": 1.25, "line-color": "rgba(24, 23, 23, 0.80)" } }, { "id": "Transport-Ski-Lift", @@ -2470,7 +2470,7 @@ "source": "LINZ Basemaps", "source-layer": "transportation", "filter": ["all", ["==", "class", "ski_lift"]], - "paint": { "line-color": "rgba(24, 23, 23, 0.80)", "line-width": 2.5 } + "paint": { "line-width": 2.5, "line-color": "rgba(24, 23, 23, 0.80)" } }, { "id": "Transport-Railway-Siding", @@ -2480,7 +2480,7 @@ "minzoom": 11, "filter": ["all", ["==", "class", "rail"], ["has", "rway_use"]], "layout": { "visibility": "visible", "line-join": "round", "line-cap": "round" }, - "paint": { "line-color": "rgba(67, 61, 61, 0.95)", "line-width": 1 } + "paint": { "line-width": 1, "line-color": "rgba(67, 61, 61, 0.95)" } }, { "id": "Transport-Railway-Single", @@ -2490,7 +2490,7 @@ "minzoom": 11, "filter": ["all", ["==", "class", "rail"], ["==", "track_type", "single"], ["!has", "rway_use"]], "layout": { "visibility": "visible", "line-join": "round", "line-cap": "round" }, - "paint": { "line-color": "rgba(67, 61, 61, 0.95)", "line-width": 2 } + "paint": { "line-width": 2, "line-color": "rgba(67, 61, 61, 0.95)" } }, { "id": "Transport-Railway-Multiple", @@ -2501,14 +2501,14 @@ "filter": ["all", ["==", "class", "rail"], ["==", "track_type", "multiple"]], "layout": { "visibility": "visible", "line-join": "round", "line-cap": "round" }, "paint": { - "line-color": "rgba(67, 61, 61, 0.95)", "line-width": { "stops": [ [11, 2.5], [19, 4], [20, 4] ] - } + }, + "line-color": "rgba(67, 61, 61, 0.95)" } }, { @@ -2521,13 +2521,13 @@ "filter": ["all", ["==", "class", "rail"]], "layout": { "visibility": "visible", "line-join": "round", "line-cap": "butt" }, "paint": { + "line-width": 2, "line-color": { "stops": [ [8, "rgba(158, 153, 153, 1)"], [10, "rgba(96, 90, 90, 0.95)"] ] - }, - "line-width": 2 + } } }, { @@ -2540,7 +2540,6 @@ "filter": ["all", ["==", "class", "motorway"], ["in", "lane_count", 1]], "layout": { "visibility": "visible", "line-join": "round", "line-cap": "round" }, "paint": { - "line-color": "rgba(120, 120, 120, 1)", "line-width": { "stops": [ [8, 1.5], @@ -2552,7 +2551,8 @@ [19, 50], [22, 220] ] - } + }, + "line-color": "rgba(120, 120, 120, 1)" } }, { @@ -2565,7 +2565,6 @@ "filter": ["all", ["==", "class", "motorway"], ["in", "lane_count", 2, 3]], "layout": { "visibility": "visible", "line-join": "round", "line-cap": "round" }, "paint": { - "line-color": "rgba(120, 120, 120, 1)", "line-width": { "stops": [ [8, 3.25], @@ -2577,7 +2576,8 @@ [19, 70], [22, 450] ] - } + }, + "line-color": "rgba(120, 120, 120, 1)" } }, { @@ -2590,7 +2590,6 @@ "filter": ["all", ["==", "class", "motorway"], ["in", "lane_count", 4, 5, 6, 7]], "layout": { "visibility": "visible", "line-join": "round", "line-cap": "round" }, "paint": { - "line-color": "rgba(120, 120, 120, 1)", "line-width": { "stops": [ [8, 3.5], @@ -2602,7 +2601,8 @@ [19, 80], [22, 470] ] - } + }, + "line-color": "rgba(120, 120, 120, 1)" } }, { @@ -2615,7 +2615,6 @@ "filter": ["all", ["==", "class", "motorway"]], "layout": { "visibility": "visible" }, "paint": { - "line-color": "rgba(120, 120, 120, 1)", "line-width": { "stops": [ [1, 0.2], @@ -2623,7 +2622,8 @@ [7, 2], [8, 3.5] ] - } + }, + "line-color": "rgba(120, 120, 120, 1)" } }, { @@ -2635,7 +2635,6 @@ "filter": ["all", ["==", "class", "motorway"], ["==", "lane_count", 1]], "layout": { "visibility": "visible", "line-join": "round", "line-cap": "round" }, "paint": { - "line-color": "rgba(240, 164, 82, 1)", "line-width": { "stops": [ [8, 0.75], @@ -2647,7 +2646,8 @@ [19, 40], [22, 200] ] - } + }, + "line-color": "rgba(240, 164, 82, 1)" } }, { @@ -2659,7 +2659,6 @@ "filter": ["all", ["==", "class", "motorway"], ["in", "lane_count", 2, 3]], "layout": { "visibility": "visible", "line-join": "round", "line-cap": "round" }, "paint": { - "line-color": "rgba(240, 164, 82, 1)", "line-width": { "stops": [ [8, 1.35], @@ -2672,7 +2671,8 @@ [22, 420] ] }, - "line-blur": 0 + "line-blur": 0, + "line-color": "rgba(240, 164, 82, 1)" } }, { @@ -2684,7 +2684,6 @@ "filter": ["all", ["==", "class", "motorway"], ["in", "lane_count", 4, 5, 6, 7]], "layout": { "visibility": "visible", "line-join": "round", "line-cap": "round" }, "paint": { - "line-color": "rgba(240, 164, 82, 1)", "line-width": { "stops": [ [8, 1.5], @@ -2696,7 +2695,8 @@ [19, 70], [22, 440] ] - } + }, + "line-color": "rgba(240, 164, 82, 1)" } }, { @@ -2709,7 +2709,6 @@ "filter": ["all", ["==", "class", "motorway"]], "layout": { "visibility": "visible", "line-cap": "round", "line-join": "round" }, "paint": { - "line-color": "rgba(210, 162, 84, 1)", "line-width": { "stops": [ [1, 0.1], @@ -2717,7 +2716,8 @@ [7, 1.4], [8, 2.5] ] - } + }, + "line-color": "rgba(210, 162, 84, 1)" } }, { @@ -2729,14 +2729,14 @@ "filter": ["all", ["==", "brunnel", "bridge"], ["==", "use_1", "foot traffic"]], "layout": { "visibility": "visible", "line-cap": "butt", "line-join": "bevel" }, "paint": { - "line-color": "rgba(78, 78, 78, 1)", "line-width": { "stops": [ [10, 0.5], [15, 4], [19, 6] ] - } + }, + "line-color": "rgba(78, 78, 78, 1)" } }, { @@ -2748,7 +2748,6 @@ "filter": ["all", ["==", "brunnel", "bridge"], ["in", "use_1", "train", "vehicle"]], "layout": { "visibility": "visible", "line-cap": "butt", "line-join": "bevel" }, "paint": { - "line-color": "rgba(78, 78, 78, 1)", "line-width": { "stops": [ [12, 8], @@ -2757,7 +2756,8 @@ [19, 75], [22, 450] ] - } + }, + "line-color": "rgba(78, 78, 78, 1)" } }, { @@ -2768,16 +2768,16 @@ "minzoom": 12, "filter": ["all", ["==", "brunnel", "ford"]], "paint": { - "circle-color": "rgba(0, 140, 204, 1)", + "circle-translate-anchor": "map", + "circle-pitch-scale": "map", "circle-radius": { "stops": [ [12, 3], [20, 8] ] }, - "circle-pitch-alignment": "map", - "circle-pitch-scale": "map", - "circle-translate-anchor": "map" + "circle-color": "rgba(0, 140, 204, 1)", + "circle-pitch-alignment": "map" } }, { @@ -2788,10 +2788,11 @@ "minzoom": 13, "filter": ["all", ["has", "name"], ["==", "class", "track"], ["in", "subclass", "foot_route_closed"]], "layout": { - "symbol-placement": "point", + "icon-rotation-alignment": "viewport", + "icon-pitch-alignment": "auto", + "icon-allow-overlap": false, + "visibility": "visible", "text-field": "{name} {status}", - "text-font": ["Open Sans Regular"], - "icon-text-fit": "none", "text-size": { "stops": [ [13, 8], @@ -2801,25 +2802,24 @@ [22, 140] ] }, - "symbol-spacing": 100, - "visibility": "visible", "text-anchor": "top", - "text-justify": "center", - "text-transform": "none", - "icon-pitch-alignment": "auto", + "text-allow-overlap": true, + "icon-text-fit": "none", + "symbol-placement": "point", "icon-ignore-placement": false, "icon-image": "track_walking_pnt_fill", + "text-font": ["Open Sans Regular"], + "symbol-spacing": 100, + "text-transform": "none", + "text-pitch-alignment": "viewport", + "text-justify": "center", + "text-max-width": 4, "icon-anchor": "bottom", "icon-offset": [0, -3], - "text-allow-overlap": true, - "icon-allow-overlap": false, - "text-pitch-alignment": "viewport", "text-rotation-alignment": "viewport", - "icon-rotation-alignment": "viewport", - "text-ignore-placement": false, - "text-max-width": 4 + "text-ignore-placement": false }, - "paint": { "text-halo-width": 2.5, "text-halo-color": "rgba(205, 53, 53, 0.4)", "text-opacity": 0.9 } + "paint": { "text-halo-width": 2.5, "text-opacity": 0.9, "text-halo-color": "rgba(205, 53, 53, 0.4)" } }, { "id": "All-ClosedFootTrack-Labels", @@ -2829,10 +2829,11 @@ "minzoom": 13, "filter": ["all", ["has", "name"], ["==", "class", "track"], ["in", "subclass", "foot_closed"]], "layout": { - "symbol-placement": "point", + "icon-rotation-alignment": "viewport", + "icon-pitch-alignment": "auto", + "icon-allow-overlap": false, + "visibility": "visible", "text-field": "{name} {status}", - "text-font": ["Open Sans Regular"], - "icon-text-fit": "none", "text-size": { "stops": [ [13, 8], @@ -2842,25 +2843,24 @@ [22, 140] ] }, - "symbol-spacing": 100, - "visibility": "visible", "text-anchor": "top", - "text-justify": "center", - "text-transform": "none", - "icon-pitch-alignment": "auto", + "text-allow-overlap": true, + "icon-text-fit": "none", + "symbol-placement": "point", "icon-ignore-placement": false, "icon-image": "track_walking_pnt_fill", + "text-font": ["Open Sans Regular"], + "symbol-spacing": 100, + "text-transform": "none", + "text-pitch-alignment": "viewport", + "text-justify": "center", + "text-max-width": 4, "icon-anchor": "bottom", "icon-offset": [0, -3], - "text-allow-overlap": true, - "icon-allow-overlap": false, - "text-pitch-alignment": "viewport", "text-rotation-alignment": "viewport", - "icon-rotation-alignment": "viewport", - "text-ignore-placement": false, - "text-max-width": 4 + "text-ignore-placement": false }, - "paint": { "text-halo-width": 2.5, "text-halo-color": "rgba(205, 53, 53, 0.4)", "text-opacity": 0.9, "icon-halo-color": "rgba(205, 53, 53, 0.4)", "icon-halo-width": 10, "icon-halo-blur": 0.5 } + "paint": { "text-halo-color": "rgba(205, 53, 53, 0.4)", "icon-halo-width": 10, "text-halo-width": 2.5, "icon-halo-color": "rgba(205, 53, 53, 0.4)", "icon-halo-blur": 0.5, "text-opacity": 0.9 } }, { "id": "All-CycleTrack-Labels", @@ -2870,10 +2870,11 @@ "minzoom": 13, "filter": ["all", ["has", "name"], ["==", "class", "track"], ["==", "track_use", "cycle only"]], "layout": { - "symbol-placement": "point", - "text-field": "{name}", - "text-font": ["Open Sans Regular"], - "icon-text-fit": "none", + "icon-rotation-alignment": "viewport", + "icon-pitch-alignment": "auto", + "icon-allow-overlap": false, + "visibility": "visible", + "text-field": "{name}", "text-size": { "stops": [ [13, 8], @@ -2883,31 +2884,30 @@ [22, 140] ] }, - "symbol-spacing": 100, - "visibility": "visible", "text-anchor": "top", - "text-justify": "center", - "text-transform": "none", - "icon-pitch-alignment": "auto", - "icon-ignore-placement": false, - "icon-anchor": "bottom", - "icon-offset": [0, -3], "text-allow-overlap": true, - "icon-allow-overlap": false, - "text-pitch-alignment": "viewport", - "text-rotation-alignment": "viewport", - "icon-rotation-alignment": "viewport", - "text-ignore-placement": false, - "text-max-width": 4, - "icon-image": "racetrack_cycle_pnt", + "icon-text-fit": "none", "icon-size": { "stops": [ [10, 1], [17, 1.3] ] - } + }, + "symbol-placement": "point", + "icon-ignore-placement": false, + "icon-image": "racetrack_cycle_pnt", + "text-font": ["Open Sans Regular"], + "symbol-spacing": 100, + "text-transform": "none", + "text-pitch-alignment": "viewport", + "text-justify": "center", + "text-max-width": 4, + "icon-anchor": "bottom", + "icon-offset": [0, -3], + "text-rotation-alignment": "viewport", + "text-ignore-placement": false }, - "paint": { "text-halo-width": 2.5, "text-halo-color": "rgba(243, 243, 242, 0.9)", "text-opacity": 0.9 } + "paint": { "text-halo-width": 2.5, "text-opacity": 0.9, "text-halo-color": "rgba(243, 243, 242, 0.9)" } }, { "id": "All-FootTrack-Labels", @@ -2917,10 +2917,11 @@ "minzoom": 13, "filter": ["all", ["has", "name"], ["==", "class", "track"], ["==", "track_use", "foot"], ["!=", "subclass", "foot_route_closed"], ["!=", "subclass", "foot_closed"]], "layout": { - "symbol-placement": "point", + "icon-rotation-alignment": "viewport", + "icon-pitch-alignment": "auto", + "icon-allow-overlap": false, + "visibility": "visible", "text-field": "{name} {status}", - "text-font": ["Open Sans Regular"], - "icon-text-fit": "none", "text-size": { "stops": [ [13, 8], @@ -2930,25 +2931,24 @@ [22, 140] ] }, - "symbol-spacing": 100, - "visibility": "visible", "text-anchor": "top", - "text-justify": "center", - "text-transform": "none", - "icon-pitch-alignment": "auto", + "text-allow-overlap": true, + "icon-text-fit": "none", + "symbol-placement": "point", "icon-ignore-placement": false, "icon-image": "track_walking_pnt_fill", + "text-font": ["Open Sans Regular"], + "symbol-spacing": 100, + "text-transform": "none", + "text-pitch-alignment": "viewport", + "text-justify": "center", + "text-max-width": 4, "icon-anchor": "bottom", "icon-offset": [0, -3], - "text-allow-overlap": true, - "icon-allow-overlap": false, - "text-pitch-alignment": "viewport", "text-rotation-alignment": "viewport", - "icon-rotation-alignment": "viewport", - "text-ignore-placement": false, - "text-max-width": 4 + "text-ignore-placement": false }, - "paint": { "text-halo-width": 2.5, "text-halo-color": "rgba(243, 243, 242, 0.9)", "text-opacity": 0.9 } + "paint": { "text-halo-width": 2.5, "text-opacity": 0.9, "text-halo-color": "rgba(243, 243, 242, 0.9)" } }, { "id": "Landuse-Boom", @@ -2993,14 +2993,14 @@ "source-layer": "landuse", "filter": ["all", ["==", "class", "dam_ln"]], "paint": { - "line-color": "rgba(78, 78, 78, 1)", "line-width": { "stops": [ [10, 4], [15, 8.5], [19, 14.5] ] - } + }, + "line-color": "rgba(78, 78, 78, 1)" } }, { "id": "Landuse-Ladder", "type": "line", "source": "LINZ Basemaps", "source-layer": "landuse", "filter": ["all", ["==", "class", "ladder"]], "paint": { "line-color": "rgba(65, 63, 63, 1)" } }, @@ -3010,7 +3010,7 @@ "source": "LINZ Basemaps", "source-layer": "landuse", "filter": ["all", ["==", "class", "marine_farm_ln"]], - "paint": { "line-color": "rgba(25, 114, 242, 0.45)", "line-width": 3 } + "paint": { "line-width": 3, "line-color": "rgba(25, 114, 242, 0.45)" } }, { "id": "Poi-Beacon", @@ -3020,22 +3020,22 @@ "minzoom": 12, "filter": ["all", ["==", "class", "beacon"], ["!has", "type"]], "layout": { - "text-font": ["Open Sans Italic"], + "text-justify": "right", + "visibility": "visible", "text-field": "{name}", + "icon-anchor": "right", "text-size": 8, - "text-justify": "right", "text-anchor": "left", - "icon-anchor": "right", - "visibility": "visible", "icon-size": { "stops": [ [12, 1.3], [15, 1.6] ] }, - "icon-image": "beacon_beacon_water_pnt" + "icon-image": "beacon_beacon_water_pnt", + "text-font": ["Open Sans Italic"] }, - "paint": { "text-color": "rgba(224, 168, 33, 1)", "text-halo-color": "rgba(255, 255, 255, 1)", "text-halo-width": 2, "text-halo-blur": 0.5, "icon-opacity": 0.9 } + "paint": { "text-halo-blur": 0.5, "text-color": "rgba(224, 168, 33, 1)", "text-halo-color": "rgba(255, 255, 255, 1)", "text-halo-width": 2, "icon-opacity": 0.9 } }, { "id": "Poi-Beacon-Lighthouse", @@ -3045,18 +3045,18 @@ "minzoom": 12, "filter": ["all", ["==", "class", "beacon"], ["==", "type", "lighthouse"]], "layout": { - "text-font": ["Open Sans Italic"], + "icon-allow-overlap": true, + "text-justify": "right", "text-field": "{name}", + "icon-anchor": "center", "text-size": 12, - "text-justify": "right", "text-anchor": "left", - "icon-anchor": "center", "text-allow-overlap": true, - "icon-allow-overlap": true, "icon-size": 1.3, - "icon-image": "beacon_lighthouse_land_pnt" + "icon-image": "beacon_lighthouse_land_pnt", + "text-font": ["Open Sans Italic"] }, - "paint": { "text-color": "rgba(131, 82, 19, 1)", "text-halo-color": "rgba(255, 255, 255, 1)", "text-halo-width": 2, "text-halo-blur": 0.5, "text-translate": [15, 0] } + "paint": { "text-halo-blur": 0.5, "text-color": "rgba(131, 82, 19, 1)", "text-halo-color": "rgba(255, 255, 255, 1)", "text-halo-width": 2, "text-translate": [15, 0] } }, { "id": "Poi-Bivouac-Rock", @@ -3065,16 +3065,16 @@ "source-layer": "poi", "filter": ["all", ["==", "class", "bivouac_pt"], ["==", "materials", "rock"]], "layout": { + "text-max-width": 3, "text-field": "{name}", - "text-font": ["Roboto Light"], - "icon-image": "cave_pnt", - "icon-size": 1, + "text-offset": [0, 0.5], "text-size": 10, "text-anchor": "top", - "text-offset": [0, 0.5], - "text-max-width": 3 + "icon-size": 1, + "icon-image": "cave_pnt", + "text-font": ["Roboto Light"] }, - "paint": { "text-halo-color": "rgba(255, 255, 255, 1)", "text-halo-width": 1.5, "text-halo-blur": 1 } + "paint": { "text-halo-width": 1.5, "text-halo-blur": 1, "text-halo-color": "rgba(255, 255, 255, 1)" } }, { "id": "Poi-Bivouac", @@ -3083,16 +3083,16 @@ "source-layer": "poi", "filter": ["all", ["==", "class", "bivouac_pt"], ["!=", "materials", "rock"]], "layout": { + "text-max-width": 3, "text-field": "{name} {status}", - "text-font": ["Roboto Light"], - "icon-image": "building_pnt_hut", - "icon-size": 1, + "text-offset": [0, 0.5], "text-size": 10, "text-anchor": "top", - "text-offset": [0, 0.5], - "text-max-width": 3 + "icon-size": 1, + "icon-image": "building_pnt_hut", + "text-font": ["Roboto Light"] }, - "paint": { "text-halo-color": "rgba(255, 255, 255, 1)", "text-halo-width": 1.5, "text-halo-blur": 1 } + "paint": { "text-halo-width": 1.5, "text-halo-blur": 1, "text-halo-color": "rgba(255, 255, 255, 1)" } }, { "id": "Poi-Buoy", @@ -3101,7 +3101,7 @@ "source-layer": "poi", "minzoom": 12, "filter": ["all", ["==", "class", "buoy"]], - "layout": { "icon-image": "circle_pnt_line", "text-field": "Buoy", "text-font": ["Open Sans Regular"], "text-size": 12, "text-offset": [1.5, -1], "icon-size": 0.7 } + "layout": { "icon-size": 0.7, "icon-image": "circle_pnt_line", "text-field": "Buoy", "text-offset": [1.5, -1], "text-font": ["Open Sans Regular"], "text-size": 12 } }, { "id": "Poi-Cave-Pt", @@ -3112,15 +3112,15 @@ "filter": ["any", ["==", "class", "cave"]], "layout": { "visibility": "visible", - "icon-image": "cave_pnt", + "text-justify": "left", + "text-max-width": 4, "text-field": "{name}", - "text-font": ["Open Sans Regular"], "text-size": 10, - "text-justify": "left", "text-anchor": "left", - "text-max-width": 4 + "icon-image": "cave_pnt", + "text-font": ["Open Sans Regular"] }, - "paint": { "text-halo-color": "rgba(255, 255, 255, 1)", "text-halo-width": 1.5, "text-halo-blur": 0.5, "text-translate": [15, 0] } + "paint": { "text-halo-blur": 0.5, "text-halo-color": "rgba(255, 255, 255, 1)", "text-halo-width": 1.5, "text-translate": [15, 0] } }, { "id": "Poi-Cemetery-Pt", @@ -3130,40 +3130,40 @@ "minzoom": 12, "filter": ["all", ["==", "class", "cemetery"]], "layout": { - "icon-size": { - "stops": [ - [12, 0.8], - [18, 1.2] - ] - }, - "icon-image": "grave_pnt", - "text-font": ["Open Sans Regular"], "text-field": { "stops": [ [12, ""], [13, "{class}"] ] }, + "text-offset": [0, 0.5], "text-size": 10, "text-anchor": "top", - "text-offset": [0, 0.5] + "icon-size": { + "stops": [ + [12, 0.8], + [18, 1.2] + ] + }, + "icon-image": "grave_pnt", + "text-font": ["Open Sans Regular"] }, "paint": { + "text-halo-blur": 0.5, + "text-halo-color": "rgba(255, 255, 255, 1)", "icon-opacity": { "stops": [ [12, 0.2], [13, 0.9] ] }, + "text-halo-width": 1.5, "text-opacity": { "stops": [ [13, 0.1], [14, 1] ] - }, - "text-halo-width": 1.5, - "text-halo-blur": 0.5, - "text-halo-color": "rgba(255, 255, 255, 1)" + } } }, { @@ -3173,7 +3173,7 @@ "source-layer": "poi", "minzoom": 12, "filter": ["all", ["==", "class", "chimney"]], - "layout": { "icon-image": "chimney_pnt", "text-font": ["Open Sans Regular"], "text-field": "", "text-justify": "right", "text-anchor": "left", "text-offset": [1, 0], "icon-size": 1.5 } + "layout": { "text-justify": "right", "text-field": "", "text-offset": [1, 0], "text-anchor": "left", "icon-size": 1.5, "icon-image": "chimney_pnt", "text-font": ["Open Sans Regular"] } }, { "id": "Poi-Dredge", @@ -3182,7 +3182,7 @@ "source-layer": "poi", "minzoom": 12, "filter": ["all", ["==", "class", "dredge"]], - "layout": { "text-field": "", "text-font": ["Open Sans Regular"], "text-justify": "left", "text-anchor": "bottom-left", "icon-image": "square_pnt_fill", "icon-size": 0.8 } + "layout": { "icon-size": 0.8, "text-justify": "left", "text-field": "", "icon-image": "square_pnt_fill", "text-font": ["Open Sans Regular"], "text-anchor": "bottom-left" } }, { "id": "Poi-FishFarm-Label", @@ -3191,8 +3191,8 @@ "source-layer": "poi", "minzoom": 16, "filter": ["all", ["==", "class", "fish_farm"]], - "layout": { "text-font": ["Roboto Bold Italic"], "text-field": "{species}", "text-size": 10 }, - "paint": { "text-color": "rgba(0, 140, 204, 1)", "text-halo-color": "rgba(239, 239, 239, 1)", "text-halo-width": 1.5, "text-halo-blur": 0.5 } + "layout": { "text-field": "{species}", "text-font": ["Roboto Bold Italic"], "text-size": 10 }, + "paint": { "text-halo-blur": 0.5, "text-color": "rgba(0, 140, 204, 1)", "text-halo-color": "rgba(239, 239, 239, 1)", "text-halo-width": 1.5 } }, { "id": "Poi-Flare", @@ -3201,13 +3201,13 @@ "source-layer": "poi", "minzoom": 12, "filter": ["all", ["==", "class", "flare"]], - "layout": { "icon-image": "square_pnt_fill", "text-field": "{class}", "icon-size": 0.8, "text-font": ["Open Sans Regular"], "text-size": 12, "text-anchor": "top", "text-offset": [0, 0.5] }, + "layout": { "text-field": "{class}", "text-offset": [0, 0.5], "text-size": 12, "text-anchor": "top", "icon-size": 0.8, "icon-image": "square_pnt_fill", "text-font": ["Open Sans Regular"] }, "paint": { - "text-halo-width": 1, "text-halo-blur": 0.5, "text-color": "rgba(0, 0, 0, 1)", - "icon-opacity": 0.9, "text-halo-color": "rgba(255, 255, 255, 1)", + "text-halo-width": 1, + "icon-opacity": 0.9, "text-opacity": { "stops": [ [14, 0.2], @@ -3224,21 +3224,21 @@ "minzoom": 13, "filter": ["all", ["==", "class", "floodgate"]], "layout": { + "icon-size": { + "stops": [ + [12, 1], + [15, 1.5] + ] + }, "text-field": { "stops": [ [12, ""], [16, "floodgate"] ] }, - "text-font": ["Open Sans Regular"], "icon-image": "gate_pnt", - "icon-size": { - "stops": [ - [12, 1], - [15, 1.5] - ] - }, "text-offset": [2.5, -0.8], + "text-font": ["Open Sans Regular"], "text-size": { "stops": [ [13, 12], @@ -3254,16 +3254,16 @@ "source-layer": "poi", "filter": ["all", ["==", "class", "gas_valve"]], "layout": { + "text-field": "{class}", + "text-offset": [0, 1], + "icon-image": "circle_pnt_line", + "text-font": ["Open Sans Regular"], "text-size": { "stops": [ [12, 8], [14, 10] ] - }, - "text-field": "{class}", - "text-font": ["Open Sans Regular"], - "text-offset": [0, 1], - "icon-image": "circle_pnt_line" + } } }, { @@ -3274,19 +3274,19 @@ "minzoom": 12, "filter": ["all", ["==", "class", "gate"]], "layout": { + "icon-allow-overlap": false, + "icon-pitch-alignment": "map", "text-field": "", - "text-font": [], - "icon-image": "gate_pnt", + "text-allow-overlap": true, "icon-size": { "stops": [ [12, 1], [16, 1.5] ] }, - "icon-allow-overlap": false, - "icon-pitch-alignment": "map", - "text-allow-overlap": true, - "icon-rotate": 0 + "icon-rotate": 0, + "icon-image": "gate_pnt", + "text-font": [] }, "paint": { "icon-opacity": { @@ -3303,15 +3303,15 @@ "source": "LINZ Basemaps", "source-layer": "poi", "filter": ["all", ["==", "class", "geo_bore"]], - "layout": { "icon-allow-overlap": true, "text-font": [], "icon-image": "geobore_pnt_thick", "icon-size": 0.85 }, + "layout": { "icon-allow-overlap": true, "icon-size": 0.85, "icon-image": "geobore_pnt_thick", "text-font": [] }, "paint": { - "text-opacity": 1, "icon-opacity": { "stops": [ [12, 0.25], [13, 1] ] - } + }, + "text-opacity": 1 } }, { @@ -3321,7 +3321,7 @@ "source-layer": "poi", "minzoom": 19, "filter": ["all", ["==", "class", "geo_bore"]], - "layout": { "icon-allow-overlap": true, "visibility": "visible", "icon-size": 1, "text-font": ["Open Sans Regular"], "text-field": "{class}", "text-size": 10, "text-offset": [0, 1] } + "layout": { "icon-allow-overlap": true, "visibility": "visible", "text-field": "{class}", "text-offset": [0, 1], "text-size": 10, "icon-size": 1, "text-font": ["Open Sans Regular"] } }, { "id": "Poi-Grave-Pt", @@ -3331,14 +3331,14 @@ "minzoom": 12, "filter": ["all", ["==", "class", "grave"]], "layout": { + "visibility": "visible", "icon-image": "grave_pnt", "icon-size": { "stops": [ [12, 0.9], [18, 1.2] ] - }, - "visibility": "visible" + } }, "paint": { "icon-opacity": 0.9 } }, @@ -3349,18 +3349,18 @@ "source-layer": "poi", "minzoom": 12, "filter": ["all", ["==", "class", "historic_site"]], - "layout": { "text-field": "{ref}", "icon-image": "historic_site_pnt", "text-font": ["Open Sans Regular"], "text-justify": "left", "text-anchor": "left", "text-offset": [1, 0], "text-size": 10 }, + "layout": { "text-justify": "left", "text-field": "{ref}", "text-offset": [1, 0], "text-anchor": "left", "text-size": 10, "icon-image": "historic_site_pnt", "text-font": ["Open Sans Regular"] }, "paint": { + "text-halo-blur": 0.5, "text-color": "rgba(203, 12, 12, 1)", + "text-halo-color": "rgba(255, 255, 255, 1)", "icon-opacity": { "stops": [ [12, 0.1], [14, 1] ] }, - "text-halo-color": "rgba(255, 255, 255, 1)", "text-halo-width": 1.5, - "text-halo-blur": 0.5, "text-opacity": { "stops": [ [16, 0.1], @@ -3376,23 +3376,23 @@ "source-layer": "poi", "filter": ["any", ["==", "class", "hut"]], "layout": { + "icon-allow-overlap": true, + "text-justify": "left", + "text-max-width": 5, "text-field": { "stops": [ [6, ""], [12, "{name}"] ] }, - "text-font": ["Roboto Bold"], + "text-offset": [1, 0], "text-size": 10, - "icon-size": 1, - "text-justify": "left", "text-anchor": "left", - "icon-allow-overlap": true, - "text-offset": [1, 0], - "text-max-width": 5, - "icon-image": "building_pnt_hut" + "icon-size": 1, + "icon-image": "building_pnt_hut", + "text-font": ["Roboto Bold"] }, - "paint": { "text-halo-color": "rgba(255, 255, 255, 1)", "text-halo-width": 1.5, "text-color": "rgba(73, 68, 68, 1)", "text-opacity": 1 } + "paint": { "text-halo-color": "rgba(255, 255, 255, 1)", "text-color": "rgba(73, 68, 68, 1)", "text-halo-width": 1.5, "text-opacity": 1 } }, { "id": "Poi-Kiln", @@ -3402,16 +3402,16 @@ "minzoom": 12, "filter": ["all", ["==", "class", "kiln"]], "layout": { - "text-font": ["Roboto Light"], - "icon-image": "circle_pnt_line", + "text-justify": "right", "text-field": "{class}", + "text-offset": [1, 0], "text-size": 10, "text-anchor": "left", - "text-justify": "right", "icon-size": 0.75, - "text-offset": [1, 0] + "icon-image": "circle_pnt_line", + "text-font": ["Roboto Light"] }, - "paint": { "text-color": "rgba(0, 0, 0, 1)", "text-halo-width": 1.5, "text-halo-blur": 0.5, "text-halo-color": "rgba(255, 255, 255, 1)" } + "paint": { "text-halo-blur": 0.5, "text-color": "rgba(0, 0, 0, 1)", "text-halo-color": "rgba(255, 255, 255, 1)", "text-halo-width": 1.5 } }, { "id": "Poi-Ladder", @@ -3419,7 +3419,7 @@ "source": "LINZ Basemaps", "source-layer": "landuse", "filter": ["all", ["==", "class", "ladder"]], - "layout": { "text-font": ["Roboto Light"], "text-field": "ladder", "symbol-placement": "line", "text-anchor": "top" } + "layout": { "symbol-placement": "line", "text-field": "ladder", "text-font": ["Roboto Light"], "text-anchor": "top" } }, { "id": "Poi-Ladder-Pt", @@ -3428,16 +3428,16 @@ "source-layer": "poi", "filter": ["all", ["==", "class", "ladder_pt"]], "layout": { - "icon-image": "circle_pnt_fill", "text-field": "ladder", - "text-font": ["Roboto Light"], + "text-offset": [0, 0.5], "text-size": 13, - "text-allow-overlap": true, "text-anchor": "top", - "text-offset": [0, 0.5], - "icon-size": 0.5 + "text-allow-overlap": true, + "icon-size": 0.5, + "icon-image": "circle_pnt_fill", + "text-font": ["Roboto Light"] }, - "paint": { "text-halo-color": "rgba(255, 255, 255, 1)", "text-halo-blur": 1, "text-halo-width": 1.5 } + "paint": { "text-halo-width": 1.5, "text-halo-blur": 1, "text-halo-color": "rgba(255, 255, 255, 1)" } }, { "id": "Poi-Mast-Label-Triangle", @@ -3447,15 +3447,15 @@ "minzoom": 12, "filter": ["all", ["==", "class", "mast"]], "layout": { - "icon-image": "mast_pnt", - "text-allow-overlap": false, - "visibility": "visible", "icon-allow-overlap": true, + "visibility": "visible", "text-field": "", - "text-font": ["Open Sans Regular"], - "text-size": 10, "text-offset": [0, 1], - "icon-size": 1.1 + "text-size": 10, + "text-allow-overlap": false, + "icon-size": 1.1, + "icon-image": "mast_pnt", + "text-font": ["Open Sans Regular"] }, "paint": { "icon-opacity": 0.85 } }, @@ -3467,19 +3467,19 @@ "minzoom": 13, "filter": ["all", ["==", "class", "mine"]], "layout": { - "text-font": ["Open Sans Bold Italic"], - "text-field": "{name} {substance} {visibility} {status} ", - "text-size": 10, "text-justify": "left", - "text-anchor": "left", + "text-max-width": 4, + "visibility": "visible", + "text-field": "{name} {substance} {visibility} {status} ", "text-offset": [1, 0], "icon-anchor": "center", + "text-size": 10, + "text-anchor": "left", "icon-size": 0.7, - "text-max-width": 4, - "visibility": "visible", - "icon-image": "square_pnt_fill" + "icon-image": "square_pnt_fill", + "text-font": ["Open Sans Bold Italic"] }, - "paint": { "text-halo-color": "rgba(255, 255, 255, 1)", "text-halo-width": 0.75, "text-halo-blur": 0.75, "icon-opacity": 0.8, "text-opacity": 0.9 } + "paint": { "text-halo-blur": 0.75, "text-halo-color": "rgba(255, 255, 255, 1)", "text-halo-width": 0.75, "icon-opacity": 0.8, "text-opacity": 0.9 } }, { "id": "Poi-Monument", @@ -3489,27 +3489,27 @@ "minzoom": 12, "filter": ["all", ["==", "class", "monument"]], "layout": { - "text-font": ["Open Sans Italic"], + "icon-allow-overlap": true, + "text-radial-offset": 0, + "visibility": "visible", "text-field": "{name}", "text-size": 9, - "text-justify": "left", "text-anchor": "left", - "icon-anchor": "center", - "visibility": "visible", - "icon-allow-overlap": true, - "text-offset": [1.5, 0], "text-allow-overlap": true, - "text-max-width": 5, "icon-size": { "stops": [ [12, 1.2], [16, 1.6] ] }, - "text-radial-offset": 0, - "icon-image": "monument_pnt" + "icon-image": "monument_pnt", + "text-font": ["Open Sans Italic"], + "text-justify": "left", + "text-max-width": 5, + "icon-anchor": "center", + "text-offset": [1.5, 0] }, - "paint": { "text-color": "rgba(98, 53, 0, 1)", "text-halo-color": "rgba(255, 255, 255, 1)", "text-halo-width": 2, "text-halo-blur": 0.5, "icon-opacity": 0.85 } + "paint": { "text-halo-blur": 0.5, "text-color": "rgba(98, 53, 0, 1)", "text-halo-color": "rgba(255, 255, 255, 1)", "text-halo-width": 2, "icon-opacity": 0.85 } }, { "id": "Poi-Pa", @@ -3518,7 +3518,7 @@ "source-layer": "poi", "minzoom": 12, "filter": ["all", ["==", "class", "pa"]], - "layout": { "text-ignore-placement": true, "icon-image": "pa_pnt", "icon-allow-overlap": true, "text-anchor": "center" }, + "layout": { "text-ignore-placement": true, "icon-allow-overlap": true, "icon-image": "pa_pnt", "text-anchor": "center" }, "paint": { "icon-opacity": { "stops": [ @@ -3537,7 +3537,7 @@ "source-layer": "poi", "minzoom": 15, "filter": ["all", ["==", "class", "pylon"]], - "layout": { "text-font": [], "text-pitch-alignment": "map", "text-rotation-alignment": "map", "icon-pitch-alignment": "map", "icon-rotation-alignment": "auto", "icon-image": "square_pnt_line" }, + "layout": { "icon-rotation-alignment": "auto", "icon-pitch-alignment": "map", "text-pitch-alignment": "map", "icon-image": "square_pnt_line", "text-font": [], "text-rotation-alignment": "map" }, "paint": { "icon-opacity": { "stops": [ @@ -3555,20 +3555,20 @@ "minzoom": 13, "filter": ["all", ["==", "class", "quarry"], ["!has", "name"]], "layout": { - "text-font": ["Open Sans Bold Italic"], - "text-field": "{class} {substance} {status}", - "text-size": 10, - "icon-anchor": "center", + "icon-allow-overlap": true, "visibility": "visible", "text-justify": "center", + "text-max-width": 4, + "text-field": "{class} {substance} {status}", + "icon-anchor": "center", + "text-offset": [0, 0.5], + "text-size": 10, "text-anchor": "top", - "icon-image": "square_pnt_fill", - "icon-allow-overlap": true, "icon-size": 0.6, - "text-max-width": 4, - "text-offset": [0, 0.5] + "icon-image": "square_pnt_fill", + "text-font": ["Open Sans Bold Italic"] }, - "paint": { "text-color": "rgba(47, 47, 47, 1)", "text-halo-width": 1, "text-halo-blur": 0.75, "text-halo-color": "rgba(255, 255, 255, 1)", "icon-opacity": 0.65 } + "paint": { "text-halo-blur": 0.75, "text-color": "rgba(47, 47, 47, 1)", "text-halo-color": "rgba(255, 255, 255, 1)", "text-halo-width": 1, "icon-opacity": 0.65 } }, { "id": "Poi-Quarry-Poly-Name", @@ -3578,28 +3578,28 @@ "minzoom": 13, "filter": ["all", ["==", "class", "quarry"], ["has", "name"]], "layout": { - "text-font": ["Open Sans Bold Italic"], + "icon-allow-overlap": true, + "visibility": "visible", "text-field": "{name} {substance} {status}", "text-size": 10, - "icon-anchor": "center", - "visibility": "visible", - "text-justify": "left", "text-anchor": "left", - "icon-image": "square_pnt_fill", - "icon-allow-overlap": true, - "icon-size": 0.6, - "icon-offset": [0, 0], "text-allow-overlap": true, - "text-offset": [1, 0], - "text-max-width": 4 - }, - "paint": { - "text-color": "rgba(47, 47, 47, 1)", - "text-halo-width": 0.75, + "icon-size": 0.6, + "icon-image": "square_pnt_fill", + "text-font": ["Open Sans Bold Italic"], + "text-justify": "left", + "text-max-width": 4, + "icon-anchor": "center", + "text-offset": [1, 0], + "icon-offset": [0, 0] + }, + "paint": { "text-halo-blur": 0.75, + "icon-translate-anchor": "viewport", + "text-color": "rgba(47, 47, 47, 1)", "text-halo-color": "rgba(255, 255, 255, 1)", - "icon-opacity": 0.65, - "icon-translate-anchor": "viewport" + "text-halo-width": 0.75, + "icon-opacity": 0.65 } }, { @@ -3609,14 +3609,14 @@ "source-layer": "poi", "minzoom": 13, "filter": ["any", ["==", "class", "racetrack"], ["==", "class", "racetrack_ln"]], - "layout": { "text-field": "{name}", "text-font": ["Open Sans Bold"], "text-size": 10, "text-pitch-alignment": "viewport", "text-rotation-alignment": "viewport" }, + "layout": { "text-pitch-alignment": "viewport", "text-field": "{name}", "text-font": ["Open Sans Bold"], "text-rotation-alignment": "viewport", "text-size": 10 }, "paint": { - "text-translate-anchor": "viewport", + "text-halo-blur": 0.5, + "icon-translate-anchor": "viewport", "text-color": "rgba(129, 123, 123, 1)", "text-halo-color": "rgba(255, 255, 255, 1)", - "text-halo-width": 1, - "text-halo-blur": 0.5, - "icon-translate-anchor": "viewport" + "text-translate-anchor": "viewport", + "text-halo-width": 1 } }, { @@ -3636,16 +3636,15 @@ "minzoom": 12, "filter": ["all", ["==", "class", "railway"]], "layout": { - "text-font": ["Open Sans Bold Italic"], + "icon-allow-overlap": true, + "visibility": "visible", "text-field": { "stops": [ [12, "{name}"], [13, "{name}"] ] }, - "text-justify": "left", "text-anchor": "left", - "icon-anchor": "center", "text-size": { "stops": [ [13, 10], @@ -3654,7 +3653,6 @@ [18, 19] ] }, - "icon-allow-overlap": true, "icon-size": { "stops": [ [12, 0.4], @@ -3662,18 +3660,20 @@ [20, 2] ] }, - "text-max-width": 5, "icon-image": { "stops": [ [12, "rail_station_pnt_red"], [13, "rail_station_train_diesel_pnt_red"] ] }, - "text-offset": [1.25, 1.5], + "text-font": ["Open Sans Bold Italic"], "icon-optional": true, - "visibility": "visible" + "text-justify": "left", + "text-max-width": 5, + "icon-anchor": "center", + "text-offset": [1.25, 1.5] }, - "paint": { "text-color": "rgba(94, 94, 94, 1)", "text-halo-color": "rgba(255, 255, 255, 1)", "text-halo-width": 1.5, "text-halo-blur": 0.5, "text-translate": [0, -15] } + "paint": { "text-halo-blur": 0.5, "text-color": "rgba(94, 94, 94, 1)", "text-halo-color": "rgba(255, 255, 255, 1)", "text-halo-width": 1.5, "text-translate": [0, -15] } }, { "id": "Poi-Redoubt", @@ -3691,16 +3691,16 @@ "source-layer": "poi", "filter": ["all", ["==", "class", "rifle_range"]], "layout": { - "text-font": ["Open Sans Regular"], - "text-field": "", - "text-size": 9, - "icon-image": "rifle_range_pnt", "icon-size": { "stops": [ [12, 1.2], [15, 1.5] ] - } + }, + "text-field": "", + "icon-image": "rifle_range_pnt", + "text-font": ["Open Sans Regular"], + "text-size": 9 }, "paint": { "icon-opacity": { @@ -3718,8 +3718,6 @@ "source-layer": "poi", "filter": ["all", ["==", "class", "satellite_pt"]], "layout": { - "visibility": "visible", - "icon-image": "satellite_station_pnt", "icon-allow-overlap": false, "icon-size": { "stops": [ @@ -3727,7 +3725,9 @@ [15, 1.5], [17, 1.7] ] - } + }, + "visibility": "visible", + "icon-image": "satellite_station_pnt" } }, { @@ -3767,16 +3767,16 @@ "minzoom": 12, "filter": ["all", ["==", "class", "showground"]], "layout": { - "text-font": ["Open Sans Bold Italic"], - "text-size": 9, - "text-field": "", - "icon-image": "showground_pnt", "icon-size": { "stops": [ [12, 1.2], [15, 1.5] ] - } + }, + "text-field": "", + "icon-image": "showground_pnt", + "text-font": ["Open Sans Bold Italic"], + "text-size": 9 }, "paint": { "text-color": "rgba(121, 195, 128, 0.2)", "text-halo-color": "rgba(255, 255, 255, 1)" } }, @@ -3788,8 +3788,6 @@ "minzoom": 12, "filter": ["all", ["==", "class", "soakhole"]], "layout": { - "visibility": "visible", - "text-field": "", "icon-size": { "stops": [ [12, 0.25], @@ -3797,9 +3795,11 @@ [19, 1] ] }, + "visibility": "visible", + "text-field": "", + "icon-image": "well_pnt_small_fill", "text-font": [], - "text-size": 10, - "icon-image": "well_pnt_small_fill" + "text-size": 10 }, "paint": { "icon-opacity": 0.8 } }, @@ -3810,8 +3810,8 @@ "source-layer": "poi", "minzoom": 12, "filter": ["all", ["==", "class", "sports_field"]], - "layout": { "text-font": ["Open Sans Bold Italic"], "text-field": "{name}", "text-size": 9 }, - "paint": { "text-color": "rgba(37, 108, 41, 1)", "text-halo-color": "rgba(255, 255, 255, 1)", "text-halo-width": 1 } + "layout": { "text-field": "{name}", "text-font": ["Open Sans Bold Italic"], "text-size": 9 }, + "paint": { "text-halo-width": 1, "text-color": "rgba(37, 108, 41, 1)", "text-halo-color": "rgba(255, 255, 255, 1)" } }, { "id": "Poi-Stockyard", @@ -3845,7 +3845,7 @@ "source-layer": "poi", "minzoom": 15, "filter": ["all", ["==", "class", "trig"]], - "layout": { "text-font": ["Open Sans Italic"], "text-size": 9, "text-field": "{elevation} m", "text-justify": "center", "text-anchor": "top", "visibility": "visible", "text-offset": [0, 1.3] }, + "layout": { "text-justify": "center", "visibility": "visible", "text-field": "{elevation} m", "text-offset": [0, 1.3], "text-size": 9, "text-anchor": "top", "text-font": ["Open Sans Italic"] }, "paint": { "text-halo-width": 0.75, "text-halo-blur": 0.75, "text-halo-color": "rgba(255, 255, 255, 1)" } }, { @@ -3856,21 +3856,21 @@ "minzoom": 12, "filter": ["all", ["==", "class", "trig"]], "layout": { - "text-font": ["Open Sans Bold Italic"], - "text-size": 10, - "text-field": "{name}", "text-justify": "left", - "text-anchor": "bottom", - "text-offset": [0, -0.7], "visibility": "visible", + "text-field": "{name}", + "text-offset": [0, -0.7], + "text-size": 10, + "text-anchor": "bottom", "icon-size": 0.75, - "icon-image": "triangle_pnt_fill" + "icon-image": "triangle_pnt_fill", + "text-font": ["Open Sans Bold Italic"] }, "paint": { - "text-halo-color": "rgba(255, 255, 255, 1)", - "text-halo-width": 0.75, "text-halo-blur": 0.75, + "text-halo-color": "rgba(255, 255, 255, 1)", "text-color": "rgba(69, 50, 50, 1)", + "text-halo-width": 0.75, "icon-opacity": 0.6, "text-opacity": { "stops": [ @@ -3888,13 +3888,20 @@ "minzoom": 12, "filter": ["all", ["==", "class", "well"]], "layout": { + "text-justify": "left", "icon-anchor": "center", "text-field": "{status}", - "text-font": ["Open Sans Italic"], + "text-offset": [0.75, 0], "text-size": 10, - "text-justify": "left", "text-anchor": "left", - "text-offset": [0.75, 0], + "icon-size": { + "stops": [ + [12, 1], + [14, 1.4], + [15, 1], + [17, 1.4] + ] + }, "icon-image": { "stops": [ [12, "well_pnt_small_line"], @@ -3903,16 +3910,9 @@ [16, "well_pnt_large_line"] ] }, - "icon-size": { - "stops": [ - [12, 1], - [14, 1.4], - [15, 1], - [17, 1.4] - ] - } + "text-font": ["Open Sans Italic"] }, - "paint": { "text-halo-width": 0.75, "text-halo-blur": 0.75, "text-color": "rgba(133, 112, 112, 1)", "text-halo-color": "rgba(242, 242, 242, 1)" } + "paint": { "text-halo-blur": 0.75, "text-color": "rgba(133, 112, 112, 1)", "text-halo-color": "rgba(242, 242, 242, 1)", "text-halo-width": 0.75 } }, { "id": "Poi-Windmill", @@ -3921,15 +3921,13 @@ "source-layer": "poi", "filter": ["all", ["==", "class", "power"], ["==", "power_source", "wind_turbine"]], "layout": { - "text-font": ["Open Sans Italic"], - "text-field": "", "visibility": "visible", "text-justify": "center", - "text-anchor": "top", - "icon-offset": [0, 0], + "text-field": "", "text-offset": [0, 0], "icon-anchor": "bottom", - "icon-image": "windmill_pnt", + "icon-offset": [0, 0], + "text-anchor": "top", "text-size": 8.5, "icon-size": { "stops": [ @@ -3937,7 +3935,9 @@ [15, 1.5], [18, 1.8] ] - } + }, + "icon-image": "windmill_pnt", + "text-font": ["Open Sans Italic"] }, "paint": { "text-color": "rgba(63, 44, 44, 1)", @@ -3959,24 +3959,24 @@ "minzoom": 12, "filter": ["all", ["==", "class", "wreck"]], "layout": { - "text-font": ["Open Sans Italic"], + "icon-rotation-alignment": "viewport", + "icon-allow-overlap": true, + "text-justify": "left", + "text-max-width": 7, "text-field": "{name}", - "text-size": 11, "icon-anchor": "center", - "text-justify": "left", + "text-size": 11, "text-anchor": "left", - "icon-image": "wreck_ship_pnt", "icon-size": { "stops": [ [12, 1.3], [14, 1.5] ] }, - "icon-allow-overlap": true, - "icon-rotation-alignment": "viewport", - "text-max-width": 7 + "icon-image": "wreck_ship_pnt", + "text-font": ["Open Sans Italic"] }, - "paint": { "text-halo-color": "rgba(255, 255, 255, 1)", "text-halo-width": 1, "text-color": "rgba(69, 50, 50, 1)", "text-translate": [10, 0] } + "paint": { "text-halo-color": "rgba(255, 255, 255, 1)", "text-color": "rgba(69, 50, 50, 1)", "text-halo-width": 1, "text-translate": [10, 0] } }, { "id": "Orchard-Label", @@ -3986,35 +3986,35 @@ "minzoom": 14, "filter": ["all", ["==", "landuse", "orchard"]], "layout": { - "text-font": ["Open Sans Italic"], + "icon-pitch-alignment": "viewport", + "icon-allow-overlap": true, + "text-justify": "auto", + "visibility": "visible", "text-field": { "stops": [ [6, ""], [16, "{landuse}"] ] }, - "text-justify": "auto", + "icon-anchor": "center", "text-size": { "stops": [ [14, 10], [20, 16] ] }, - "visibility": "visible", - "icon-pitch-alignment": "viewport", + "text-anchor": "top", "icon-image": "orchard_pnt_dual", - "icon-anchor": "center", - "icon-allow-overlap": true, - "text-anchor": "top" + "text-font": ["Open Sans Italic"] }, "paint": { - "text-color": "rgba(27, 77, 29, 1)", - "text-translate-anchor": "viewport", "text-halo-color": "rgba(255, 255, 255, 0.59)", - "text-halo-width": 1, + "text-translate-anchor": "viewport", "text-halo-blur": 0.5, - "text-translate": [0, 6], - "icon-opacity": 0.9 + "text-color": "rgba(27, 77, 29, 1)", + "text-halo-width": 1, + "icon-opacity": 0.9, + "text-translate": [0, 6] } }, { @@ -4025,34 +4025,34 @@ "minzoom": 14, "filter": ["all", ["==", "landuse", "vineyard"]], "layout": { - "text-font": ["Open Sans Italic"], + "icon-pitch-alignment": "viewport", + "text-justify": "auto", + "visibility": "visible", "text-field": { "stops": [ [6, ""], [16, "{landuse}"] ] }, - "text-justify": "auto", + "icon-anchor": "center", "text-size": { "stops": [ [14, 10], [20, 16] ] }, - "visibility": "visible", - "icon-pitch-alignment": "viewport", + "text-anchor": "top", "icon-image": "vineyard_pnt_dual", - "icon-anchor": "center", - "text-anchor": "top" + "text-font": ["Open Sans Italic"] }, "paint": { - "text-color": "rgba(17, 63, 29, 0.85)", - "text-translate-anchor": "viewport", "text-halo-color": "rgba(255, 255, 255, 0.59)", - "text-halo-width": 1, + "text-translate-anchor": "viewport", "text-halo-blur": 0.5, - "text-translate": [0, 6], - "icon-opacity": 0.9 + "text-color": "rgba(17, 63, 29, 0.85)", + "text-halo-width": 1, + "icon-opacity": 0.9, + "text-translate": [0, 6] } }, { @@ -4071,10 +4071,10 @@ [14, 2.5] ] }, - "fill-extrusion-color": "rgba(190, 190, 190, 1)", - "fill-extrusion-translate-anchor": "viewport", "fill-extrusion-vertical-gradient": true, - "fill-extrusion-opacity": 0.5 + "fill-extrusion-translate-anchor": "viewport", + "fill-extrusion-opacity": 0.5, + "fill-extrusion-color": "rgba(190, 190, 190, 1)" } }, { @@ -4086,7 +4086,7 @@ "filter": ["all", ["==", "brunnel", "tunnel"]], "layout": { "visibility": "visible", "line-cap": "butt", "line-join": "bevel" }, "paint": { - "line-color": "rgba(98, 88, 13, 1)", + "line-opacity": 1, "line-width": { "stops": [ [10, 0.5], @@ -4094,10 +4094,10 @@ [19, 4] ] }, - "line-dasharray": [4, 2.5], - "line-gap-width": 8, "line-blur": 0, - "line-opacity": 1 + "line-gap-width": 8, + "line-dasharray": [4, 2.5], + "line-color": "rgba(98, 88, 13, 1)" } }, { @@ -4109,16 +4109,16 @@ "filter": ["all", ["==", "class", "powerline"], ["has", "support_ty"]], "layout": { "visibility": "visible", "line-cap": "butt", "line-join": "miter" }, "paint": { - "line-color": "rgba(57, 57, 57, 1)", + "line-translate-anchor": "map", "line-width": { "stops": [ [9, 0.75], [12, 1] ] }, - "line-translate-anchor": "map", + "line-blur": 0.75, "line-gap-width": 0, - "line-blur": 0.75 + "line-color": "rgba(57, 57, 57, 1)" } }, { @@ -4131,16 +4131,16 @@ "filter": ["all", ["==", "class", "powerline"], ["==", "support_ty", "pylon"]], "layout": { "visibility": "visible", "line-cap": "butt", "line-join": "miter" }, "paint": { - "line-color": "rgba(57, 57, 57, 1)", + "line-translate-anchor": "map", "line-width": { "stops": [ [9, 0.75], [12, 1] ] }, - "line-translate-anchor": "map", + "line-blur": 0.75, "line-gap-width": 0, - "line-blur": 0.75 + "line-color": "rgba(57, 57, 57, 1)" } }, { @@ -4152,16 +4152,16 @@ "filter": ["all", ["==", "class", "telephone"]], "layout": { "visibility": "visible", "line-cap": "butt", "line-join": "miter" }, "paint": { - "line-color": "rgba(57, 57, 57, 1)", + "line-translate-anchor": "map", "line-width": { "stops": [ [9, 0.75], [12, 1] ] }, - "line-translate-anchor": "map", + "line-blur": 0.75, "line-gap-width": 0, - "line-blur": 0.75 + "line-color": "rgba(57, 57, 57, 1)" } }, { @@ -4173,7 +4173,7 @@ "filter": ["all", ["==", "class", "walkwire"]], "layout": { "visibility": "visible", "line-cap": "butt", "line-join": "miter" }, "paint": { - "line-color": "rgba(57, 57, 57, 1)", + "line-translate-anchor": "map", "line-width": { "stops": [ [9, 0.75], @@ -4181,9 +4181,9 @@ [18, 5] ] }, - "line-translate-anchor": "map", + "line-blur": 0.75, "line-gap-width": 0, - "line-blur": 0.75 + "line-color": "rgba(57, 57, 57, 1)" } }, { @@ -4194,18 +4194,18 @@ "minzoom": 14, "filter": ["all", ["==", "class", "dam_ln"]], "layout": { - "text-font": ["Roboto Black Italic"], - "text-field": "{name}", - "text-justify": "center", - "text-anchor": "bottom", "text-pitch-alignment": "viewport", - "text-rotation-alignment": "auto", - "symbol-placement": "line", + "text-justify": "center", + "text-field": "{name}", "text-offset": [0, 0], + "text-rotation-alignment": "auto", + "icon-offset": [0, 0], + "text-anchor": "bottom", "icon-keep-upright": false, - "icon-offset": [0, 0] + "symbol-placement": "line", + "text-font": ["Roboto Black Italic"] }, - "paint": { "text-color": "rgba(78, 78, 78, 1)", "text-halo-color": "rgba(252, 252, 252, 1)", "text-halo-width": 0.75, "text-halo-blur": 0.75 } + "paint": { "text-halo-blur": 0.75, "text-color": "rgba(78, 78, 78, 1)", "text-halo-color": "rgba(252, 252, 252, 1)", "text-halo-width": 0.75 } }, { "id": "Landuse-GravelPit-Label", @@ -4215,15 +4215,15 @@ "minzoom": 12, "filter": ["all", ["==", "class", "gravel_pit"]], "layout": { - "text-font": ["Open Sans Regular"], + "icon-size": 0.8, "text-field": "", + "text-font": ["Open Sans Regular"], "text-size": { "stops": [ [12, 6], [15, 10] ] - }, - "icon-size": 0.8 + } } }, { @@ -4233,7 +4233,7 @@ "source-layer": "landuse", "minzoom": 12, "filter": ["all", ["==", "class", "grave"]], - "layout": { "text-field": "", "text-font": ["Open Sans Regular"], "icon-size": 1, "visibility": "visible", "icon-image": "grave_pnt" } + "layout": { "icon-size": 1, "visibility": "visible", "text-field": "", "icon-image": "grave_pnt", "text-font": ["Open Sans Regular"] } }, { "id": "Landuse-Landfill-Symbol", @@ -4244,23 +4244,23 @@ "filter": ["all", ["==", "class", "landfill"]], "layout": { "text-justify": "left", - "text-anchor": "left", + "text-max-width": 4, + "visibility": "visible", "text-field": "{name}", - "text-font": ["Roboto Light Italic"], "icon-anchor": "right", - "text-size": 12, "text-offset": [0.5, 0], + "text-anchor": "left", + "text-size": 12, "icon-size": { "stops": [ [12, 1.2], [16, 1.5] ] }, - "text-max-width": 4, - "visibility": "visible", - "icon-image": "landfill_pnt" + "icon-image": "landfill_pnt", + "text-font": ["Roboto Condensed Italic"] }, - "paint": { "text-color": "rgba(28, 25, 17, 1)", "text-halo-width": 1.5, "text-halo-blur": 0.5, "text-halo-color": "rgba(247, 165, 66, 0.75)" } + "paint": { "text-halo-blur": 0.5, "text-color": "rgba(28, 25, 17, 1)", "text-halo-color": "rgba(247, 165, 66, 0.75)", "text-halo-width": 1.5 } }, { "id": "Landuse-Mangrove-Symbol", @@ -4270,7 +4270,7 @@ "minzoom": 13, "maxzoom": 14, "filter": ["all", ["==", "wetland_feature", "mangrove"]], - "layout": { "text-font": [], "icon-image": "mangrove_pnt" }, + "layout": { "icon-image": "mangrove_pnt", "text-font": [] }, "paint": { "icon-opacity": 0.8 } }, { @@ -4281,7 +4281,7 @@ "minzoom": 15, "filter": ["all", ["==", "class", "marine_farm"]], "layout": { "text-field": "{species}", "text-font": ["Roboto Bold Italic"], "text-size": 10 }, - "paint": { "text-color": "rgba(0, 140, 204, 1)", "text-halo-color": "rgba(239, 239, 239, 1)", "text-halo-width": 1.5 } + "paint": { "text-halo-width": 1.5, "text-color": "rgba(0, 140, 204, 1)", "text-halo-color": "rgba(239, 239, 239, 1)" } }, { "id": "Landuse-PumicePit-Label", @@ -4291,13 +4291,13 @@ "minzoom": 12, "filter": ["all", ["==", "class", "pumice_pit"]], "layout": { - "text-font": ["Open Sans Regular"], "text-field": { "stops": [ [6, ""], [15, "{class}"] ] }, + "text-font": ["Open Sans Regular"], "text-size": { "stops": [ [12, 6], @@ -4305,7 +4305,7 @@ ] } }, - "paint": { "text-halo-color": "rgba(255, 255, 255, 1)", "text-halo-width": 1.5, "text-color": "rgba(34, 34, 34, 1)" } + "paint": { "text-halo-width": 1.5, "text-halo-color": "rgba(255, 255, 255, 1)", "text-color": "rgba(34, 34, 34, 1)" } }, { "id": "Landuse-Tower", @@ -4314,7 +4314,7 @@ "source-layer": "landuse", "minzoom": 12, "filter": ["all", ["==", "class", "tower"]], - "layout": { "text-field": "", "text-font": ["Open Sans Regular"], "icon-image": "tower_pnt", "icon-size": 1 } + "layout": { "icon-size": 1, "text-field": "", "icon-image": "tower_pnt", "text-font": ["Open Sans Regular"] } }, { "id": "Landcover-Tree-Pt", @@ -4340,15 +4340,6 @@ "source-layer": "landcover", "filter": ["all", ["==", "class", "fumarole"]], "layout": { - "icon-image": "fumarole_pnt", - "icon-size": { - "stops": [ - [12, 0.4], - [13, 0.65], - [14, 0.7] - ] - }, - "text-font": ["Open Sans Regular"], "text-field": { "stops": [ [15, ""], @@ -4356,9 +4347,18 @@ [17, "{class}"] ] }, + "text-offset": [0, 0.5], "text-anchor": "top", "text-size": 12, - "text-offset": [0, 0.5] + "icon-size": { + "stops": [ + [12, 0.4], + [13, 0.65], + [14, 0.7] + ] + }, + "icon-image": "fumarole_pnt", + "text-font": ["Open Sans Regular"] }, "paint": { "icon-opacity": { @@ -4367,13 +4367,13 @@ [13, 1] ] }, - "text-color": "rgba(176, 0, 0, 1)", "text-opacity": { "stops": [ [16, 0.2], [17, 1] ] - } + }, + "text-color": "rgba(176, 0, 0, 1)" } }, { @@ -4384,21 +4384,21 @@ "minzoom": 12, "filter": ["all", ["==", "class", "grass"], ["==", "grass_type", "golf_course"]], "layout": { - "text-font": ["Open Sans Italic"], "icon-rotation-alignment": "viewport", + "icon-pitch-alignment": "viewport", + "visibility": "visible", "text-field": "{name}", - "text-offset": [0.5, 0], "text-size": 9, "text-anchor": "left", - "text-justify": "left", - "visibility": "visible", - "icon-anchor": "right", - "icon-pitch-alignment": "viewport", "icon-size": 1.2, "icon-image": "golf_course_pnt_dual", - "text-max-width": 6 + "text-font": ["Open Sans Italic"], + "text-justify": "left", + "text-max-width": 6, + "text-offset": [0.5, 0], + "icon-anchor": "right" }, - "paint": { "text-color": "rgba(27, 77, 29, 1)", "text-halo-width": 1.5, "text-halo-color": "rgba(255, 255, 255, 1)", "text-halo-blur": 0.5 } + "paint": { "text-halo-blur": 0.5, "text-color": "rgba(27, 77, 29, 1)", "text-halo-color": "rgba(255, 255, 255, 1)", "text-halo-width": 1.5 } }, { "id": "Landcover-Rock-Pt", @@ -4406,7 +4406,7 @@ "source": "LINZ Basemaps", "source-layer": "landcover", "filter": ["all", ["==", "class", "rock_pt"]], - "layout": { "icon-size": 1, "icon-image": "rock_pnt_dual" } + "layout": { "icon-image": "rock_pnt_dual", "icon-size": 1 } }, { "id": "Landcover_RockOutcrop", @@ -4414,7 +4414,7 @@ "source": "LINZ Basemaps", "source-layer": "landcover", "filter": ["all", ["==", "class", "rock_outcrop"]], - "layout": { "icon-allow-overlap": false, "icon-offset": [-3, -6], "visibility": "visible", "icon-image": "rock_outcrop_large_pnt" } + "layout": { "icon-allow-overlap": false, "visibility": "visible", "icon-image": "rock_outcrop_large_pnt", "icon-offset": [-3, -6] } }, { "id": "Landcover-Swamp-Name", @@ -4424,17 +4424,17 @@ "minzoom": 14, "filter": ["all", ["==", "class", "wetland"], ["==", "wetland_type", "swamp"], ["has", "name"]], "layout": { + "icon-allow-overlap": true, "visibility": "visible", - "text-font": ["Open Sans Light Italic"], + "text-justify": "center", "text-field": "{name}", + "icon-anchor": "center", "text-size": 12, - "text-justify": "center", "text-anchor": "center", - "icon-anchor": "center", "text-allow-overlap": true, - "icon-allow-overlap": true + "text-font": ["Open Sans Cond Light Italic"] }, - "paint": { "text-color": "rgba(2, 46, 39, 1)", "text-halo-width": 0.5, "text-halo-color": "rgba(252, 252, 252, 1)", "text-halo-blur": 0.5, "text-translate": [8, 0] } + "paint": { "text-halo-blur": 0.5, "text-color": "rgba(2, 46, 39, 1)", "text-halo-color": "rgba(252, 252, 252, 1)", "text-halo-width": 0.5, "text-translate": [8, 0] } }, { "id": "Landcover-Swamp-Symbol", @@ -4445,18 +4445,18 @@ "maxzoom": 14, "filter": ["all", ["==", "class", "wetland"], ["==", "wetland_type", "swamp"]], "layout": { + "icon-allow-overlap": true, "visibility": "visible", - "icon-image": "swamp_pnt", - "text-font": ["Open Sans Light Italic"], + "text-justify": "right", "text-field": "{name}", + "icon-anchor": "center", "text-size": 12, - "text-justify": "right", "text-anchor": "left", - "icon-anchor": "center", "text-allow-overlap": true, - "icon-allow-overlap": true + "icon-image": "swamp_pnt", + "text-font": ["Open Sans Cond Light Italic"] }, - "paint": { "text-color": "rgba(2, 46, 39, 1)", "text-halo-width": 0.5, "text-halo-color": "rgba(252, 252, 252, 1)", "text-halo-blur": 0.5, "text-translate": [8, 0] } + "paint": { "text-halo-blur": 0.5, "text-color": "rgba(2, 46, 39, 1)", "text-halo-color": "rgba(252, 252, 252, 1)", "text-halo-width": 0.5, "text-translate": [8, 0] } }, { "id": "Landcover-Swamp-pt", @@ -4467,6 +4467,7 @@ "filter": ["all", ["==", "class", "wetland"], ["==", "wetland_type", "swamp_pt"]], "layout": { "visibility": "visible", + "icon-image": "swamp_pnt", "icon-size": { "stops": [ [6, 0.4], @@ -4474,8 +4475,7 @@ [15, 1], [19, 1.3] ] - }, - "icon-image": "swamp_pnt" + } } }, { @@ -4485,18 +4485,18 @@ "source-layer": "housenumber", "minzoom": 17, "layout": { - "text-font": ["Roboto Bold Italic"], + "text-allow-overlap": false, "text-field": "{housenumber}", + "text-font": ["Roboto Bold Italic"], "text-size": { "stops": [ [17, 8], [19, 10] ] }, - "text-anchor": "bottom", - "text-allow-overlap": false + "text-anchor": "bottom" }, - "paint": { "text-color": "rgba(47, 47, 47, 1)", "text-halo-color": "rgba(255, 255, 255, 0.7)", "text-halo-blur": 20, "text-halo-width": 0.25, "icon-color": "rgba(0, 0, 0, 1)" } + "paint": { "icon-color": "rgba(0, 0, 0, 1)", "text-halo-blur": 20, "text-color": "rgba(47, 47, 47, 1)", "text-halo-color": "rgba(255, 255, 255, 0.7)", "text-halo-width": 0.25 } }, { "id": "Waterway-Flume-Name", @@ -4506,22 +4506,22 @@ "minzoom": 13, "filter": ["all", ["==", "class", "channel"], ["==", "channel_type", "flume_cl"]], "layout": { + "icon-rotation-alignment": "map", + "icon-pitch-alignment": "map", + "visibility": "visible", "text-field": "", - "text-font": ["Open Sans Italic"], "text-size": 14, - "icon-anchor": "center", "text-anchor": "center", - "visibility": "visible", + "icon-text-fit": "none", "symbol-placement": "line-center", + "icon-image": "flume_pnt_blue", + "text-font": ["Open Sans Italic"], "text-pitch-alignment": "auto", - "text-rotation-alignment": "auto", "text-justify": "center", - "icon-text-fit": "none", - "symbol-z-order": "auto", + "icon-anchor": "center", "text-offset": [0, 0.015], - "icon-image": "flume_pnt_blue", - "icon-rotation-alignment": "map", - "icon-pitch-alignment": "map" + "text-rotation-alignment": "auto", + "symbol-z-order": "auto" }, "paint": { "text-color": "rgba(44, 44, 44, 1)", "text-halo-color": "rgba(239, 239, 239, 0.80)" } }, @@ -4533,16 +4533,16 @@ "minzoom": 13, "filter": ["all", ["==", "class", "stream"], ["==", "stream_feature", "rapid_cl"], ["has", "name"]], "layout": { - "text-field": "{name}", - "text-font": ["Open Sans Italic"], - "symbol-placement": "line", - "text-size": 12, "symbol-spacing": 750, + "visibility": "visible", + "text-field": "{name}", "icon-anchor": "center", + "text-size": 12, "text-anchor": "bottom", - "visibility": "visible" + "symbol-placement": "line", + "text-font": ["Open Sans Italic"] }, - "paint": { "text-color": "rgba(0, 140, 204, 1)", "text-halo-color": "rgba(239, 239, 239, 0.80)", "text-halo-width": 1.5, "text-halo-blur": 1 } + "paint": { "text-halo-blur": 1, "text-color": "rgba(0, 140, 204, 1)", "text-halo-color": "rgba(239, 239, 239, 0.80)", "text-halo-width": 1.5 } }, { "id": "Water-Spring-Cold", @@ -4551,24 +4551,24 @@ "source-layer": "water", "filter": ["all", ["==", "class", "spring"], ["==", "temp", "cold"]], "layout": { - "text-font": ["Open Sans Regular"], + "text-justify": "center", "text-field": { "stops": [ [16, ""], [17, "cold spring"] ] }, - "icon-image": "spring_cold_pnt", + "text-offset": [0, 0.5], + "text-size": 12, + "text-anchor": "top", "icon-size": { "stops": [ [12, 0.3], [15, 0.7] ] }, - "text-size": 12, - "text-justify": "center", - "text-anchor": "top", - "text-offset": [0, 0.5] + "icon-image": "spring_cold_pnt", + "text-font": ["Open Sans Regular"] }, "paint": { "icon-color": "rgba(5, 0, 168, 1)", "text-color": "rgba(20, 125, 228, 1)" } }, @@ -4580,23 +4580,23 @@ "filter": ["all", ["==", "class", "spring"], ["==", "temp", "hot"]], "layout": { "visibility": "visible", - "text-font": ["Open Sans Regular"], "text-field": { "stops": [ [14, ""], [15, "hot spring"] ] }, - "icon-image": "spring_hot_pnt", + "text-offset": [0, 0.5], + "text-size": 10, + "text-anchor": "top", "icon-size": { "stops": [ [12, 0.4], [15, 0.7] ] }, - "text-size": 10, - "text-anchor": "top", - "text-offset": [0, 0.5] + "icon-image": "spring_hot_pnt", + "text-font": ["Open Sans Regular"] }, "paint": { "text-color": "rgba(141, 0, 3, 1)" } }, @@ -4608,10 +4608,10 @@ "minzoom": 8, "filter": ["all", ["in", "hway_num", "25A", "20A", "20B", "29A", "30A", "74A", "67A"]], "layout": { - "symbol-placement": "line", + "icon-rotation-alignment": "viewport", + "icon-pitch-alignment": "viewport", + "visibility": "visible", "text-field": "{hway_num}", - "text-font": ["Open Sans Bold"], - "icon-text-fit": "none", "text-size": { "stops": [ [8, 9], @@ -4619,35 +4619,35 @@ [15, 14] ] }, + "icon-text-fit": "none", + "icon-size": { + "stops": [ + [8, 1.2], + [12, 1.5], + [15, 1.7] + ] + }, + "symbol-placement": "line", + "icon-image": "highway_pnt_wide", + "text-font": ["Open Sans Bold"], + "icon-padding": 2, "symbol-spacing": { "stops": [ [6, 500], [13, 400] ] }, - "visibility": "visible", + "text-pitch-alignment": "viewport", "text-justify": "center", + "icon-text-fit-padding": [1, 4, 3, 3], + "icon-anchor": "center", "text-rotation-alignment": "viewport", - "text-pitch-alignment": "viewport", - "icon-rotation-alignment": "viewport", "icon-offset": [0, 1], - "icon-pitch-alignment": "viewport", - "icon-anchor": "center", - "icon-keep-upright": false, "text-keep-upright": true, - "icon-rotate": 0, - "icon-padding": 2, - "icon-text-fit-padding": [1, 4, 3, 3], - "icon-size": { - "stops": [ - [8, 1.2], - [12, 1.5], - [15, 1.7] - ] - }, - "icon-image": "highway_pnt_wide" + "icon-keep-upright": false, + "icon-rotate": 0 }, - "paint": { "text-translate-anchor": "map", "text-color": "rgba(255, 255, 255, 1)", "icon-translate-anchor": "map" } + "paint": { "text-translate-anchor": "map", "icon-translate-anchor": "map", "text-color": "rgba(255, 255, 255, 1)" } }, { "id": "All-Highway-Labels-standard", @@ -4657,10 +4657,10 @@ "minzoom": 8, "filter": ["all", ["has", "hway_num"], ["!in", "hway_num", "6,94", "2,50", "1,3", "12,15", "14,15", "6,96", "25A", "20A", "20B", "29A", "30A", "74A", "67A"], ["!=", "lane_count", 1]], "layout": { - "symbol-placement": "line", + "icon-rotation-alignment": "viewport", + "icon-pitch-alignment": "viewport", + "visibility": "visible", "text-field": "{hway_num}", - "text-font": ["Open Sans Bold"], - "icon-text-fit": "none", "text-size": { "stops": [ [8, 9], @@ -4668,35 +4668,35 @@ [15, 14] ] }, + "icon-text-fit": "none", + "icon-size": { + "stops": [ + [8, 1.2], + [12, 1.5], + [15, 1.7] + ] + }, + "symbol-placement": "line", + "icon-image": "highway_pnt_standard", + "text-font": ["Open Sans Bold"], + "icon-padding": 2, "symbol-spacing": { "stops": [ [6, 500], [13, 400] ] }, - "visibility": "visible", + "text-pitch-alignment": "viewport", "text-justify": "center", + "icon-text-fit-padding": [1, 4, 3, 3], + "icon-anchor": "center", "text-rotation-alignment": "viewport", - "text-pitch-alignment": "viewport", - "icon-rotation-alignment": "viewport", "icon-offset": [0, 1], - "icon-pitch-alignment": "viewport", - "icon-anchor": "center", - "icon-keep-upright": false, "text-keep-upright": true, - "icon-rotate": 0, - "icon-padding": 2, - "icon-text-fit-padding": [1, 4, 3, 3], - "icon-size": { - "stops": [ - [8, 1.2], - [12, 1.5], - [15, 1.7] - ] - }, - "icon-image": "highway_pnt_standard" + "icon-keep-upright": false, + "icon-rotate": 0 }, - "paint": { "text-translate-anchor": "map", "text-color": "rgba(255, 255, 255, 1)", "icon-translate-anchor": "map" } + "paint": { "text-translate-anchor": "map", "icon-translate-anchor": "map", "text-color": "rgba(255, 255, 255, 1)" } }, { "id": "Transport-Ferry-Symbol", @@ -4706,17 +4706,17 @@ "minzoom": 11, "filter": ["all", ["==", "class", "ferry"]], "layout": { - "icon-text-fit": "none", - "icon-ignore-placement": false, + "icon-rotation-alignment": "viewport", "icon-allow-overlap": false, - "text-justify": "center", "text-pitch-alignment": "auto", - "text-font": [], - "symbol-placement": "line-center", + "text-justify": "center", + "icon-text-fit": "none", "symbol-z-order": "auto", - "icon-rotation-alignment": "viewport", + "icon-size": 0.5, + "symbol-placement": "line-center", + "icon-ignore-placement": false, "icon-image": "star_pnt_fill", - "icon-size": 0.5 + "text-font": [] } }, { @@ -4727,11 +4727,9 @@ "minzoom": 15, "filter": ["all", ["==", "brunnel", "tunnel"]], "layout": { - "text-font": ["Roboto Black"], - "text-field": "{brunnel}", - "symbol-placement": "line", - "text-size": 10, "symbol-spacing": 100, + "visibility": "visible", + "text-field": "{brunnel}", "text-offset": { "stops": [ [15, [0, -1.25]], @@ -4741,9 +4739,11 @@ [22, [0, -16]] ] }, - "visibility": "visible" + "text-size": 10, + "symbol-placement": "line", + "text-font": ["Roboto Black"] }, - "paint": { "text-color": "rgba(80, 75, 75, 1)", "text-halo-color": "rgba(230, 230, 230, 0.5)", "text-halo-width": 2 } + "paint": { "text-halo-width": 2, "text-color": "rgba(80, 75, 75, 1)", "text-halo-color": "rgba(230, 230, 230, 0.5)" } }, { "id": "All-Road-Labels", @@ -4753,10 +4753,12 @@ "minzoom": 13, "filter": ["all", ["has", "name"], ["!=", "subclass", "foot_route_closed"], ["!=", "subclass", "foot_closed"]], "layout": { - "symbol-placement": "line", + "symbol-spacing": 250, + "text-transform": "none", + "icon-pitch-alignment": "auto", + "visibility": "visible", + "text-justify": "center", "text-field": "{name}", - "text-font": ["Open Sans Regular"], - "icon-text-fit": "both", "text-size": { "stops": [ [13, 8], @@ -4766,15 +4768,13 @@ [22, 140] ] }, - "symbol-spacing": 250, - "visibility": "visible", "text-anchor": "center", - "text-justify": "center", - "text-transform": "none", - "icon-pitch-alignment": "auto", - "icon-ignore-placement": false + "icon-text-fit": "both", + "symbol-placement": "line", + "icon-ignore-placement": false, + "text-font": ["Open Sans Regular"] }, - "paint": { "text-halo-width": 2.5, "text-halo-color": "rgba(243, 243, 242, 0.9)", "text-opacity": 0.9 } + "paint": { "text-halo-width": 2.5, "text-opacity": 0.9, "text-halo-color": "rgba(243, 243, 242, 0.9)" } }, { "id": "Aeroway-Aerodrome-Label", @@ -4783,28 +4783,28 @@ "source-layer": "aerodrome_label", "minzoom": 12, "layout": { - "text-field": "{name}", - "visibility": "visible", - "text-size": 10, - "text-pitch-alignment": "auto", - "text-rotation-alignment": "auto", - "text-font": ["Open Sans Bold Italic"], "icon-rotation-alignment": "viewport", - "icon-ignore-placement": false, - "icon-text-fit": "none", - "text-justify": "center", - "symbol-spacing": 250, - "text-padding": 2, - "icon-offset": [0, 0], - "text-allow-overlap": false, "icon-pitch-alignment": "viewport", + "visibility": "visible", + "text-field": "{name}", + "text-size": 10, "text-anchor": "top", - "icon-anchor": "bottom", + "text-allow-overlap": false, + "icon-text-fit": "none", "icon-size": 1.2, + "icon-ignore-placement": false, "icon-image": "airport_airport_pnt_fill", - "text-max-width": 5 + "text-font": ["Open Sans Bold Italic"], + "symbol-spacing": 250, + "text-pitch-alignment": "auto", + "text-justify": "center", + "text-max-width": 5, + "icon-anchor": "bottom", + "text-rotation-alignment": "auto", + "icon-offset": [0, 0], + "text-padding": 2 }, - "paint": { "text-color": "rgba(129, 123, 123, 1)", "text-halo-width": 1, "text-halo-blur": 0.5, "text-halo-color": "rgba(255, 255, 255, 1)", "icon-opacity": 0.8 } + "paint": { "text-halo-blur": 0.5, "text-color": "rgba(129, 123, 123, 1)", "text-halo-color": "rgba(255, 255, 255, 1)", "text-halo-width": 1, "icon-opacity": 0.8 } }, { "id": "Aeroway-Runway-Grass-Label", @@ -4813,8 +4813,8 @@ "source-layer": "aeroway", "minzoom": 15, "filter": ["all", ["==", "class", "runway"], ["!has", "surface"]], - "layout": { "text-font": ["Roboto Light"], "text-field": "airstrip", "text-size": 10, "text-justify": "left", "text-anchor": "left" }, - "paint": { "text-halo-color": "rgba(246, 246, 246, 1)", "text-halo-width": 1.5, "text-halo-blur": 0.5 } + "layout": { "text-justify": "left", "text-field": "airstrip", "text-font": ["Roboto Light"], "text-size": 10, "text-anchor": "left" }, + "paint": { "text-halo-width": 1.5, "text-halo-blur": 0.5, "text-halo-color": "rgba(246, 246, 246, 1)" } }, { "id": "Aeroway-Helipads", @@ -4823,7 +4823,7 @@ "source-layer": "aeroway", "minzoom": 12, "filter": ["all", ["==", "class", "helipad"]], - "layout": { "text-font": ["Open Sans Regular"], "icon-size": 1.25, "icon-image": "helipad_pnt_fill" }, + "layout": { "icon-image": "helipad_pnt_fill", "text-font": ["Open Sans Regular"], "icon-size": 1.25 }, "paint": { "icon-opacity": 0.8 } }, { @@ -4833,8 +4833,8 @@ "source-layer": "water", "minzoom": 13, "filter": ["all", ["==", "class", "reef"], ["has", "name"]], - "layout": { "visibility": "visible", "text-field": "{name}", "text-font": ["Open Sans Italic"], "text-size": 12, "text-max-width": 4, "text-anchor": "center", "text-offset": [0, 1] }, - "paint": { "text-color": "rgba(0, 140, 204, 1)", "text-halo-color": "rgba(239, 239, 239, 1)", "text-halo-width": 2 } + "layout": { "visibility": "visible", "text-max-width": 4, "text-field": "{name}", "text-offset": [0, 1], "text-size": 12, "text-anchor": "center", "text-font": ["Open Sans Italic"] }, + "paint": { "text-halo-width": 2, "text-color": "rgba(0, 140, 204, 1)", "text-halo-color": "rgba(239, 239, 239, 1)" } }, { "id": "All-Lake-Names", @@ -4843,8 +4843,8 @@ "source-layer": "water", "minzoom": 11, "filter": ["all", ["==", "class", "lake"], ["has", "name"]], - "layout": { "visibility": "visible", "text-field": "{name}", "text-font": ["Open Sans Italic"], "text-size": 12, "text-max-width": 4 }, - "paint": { "text-color": "rgba(0, 140, 204, 1)", "text-halo-color": "rgba(239, 239, 239, 1)", "text-halo-width": 2 } + "layout": { "visibility": "visible", "text-max-width": 4, "text-field": "{name}", "text-font": ["Open Sans Italic"], "text-size": 12 }, + "paint": { "text-halo-width": 2, "text-color": "rgba(0, 140, 204, 1)", "text-halo-color": "rgba(239, 239, 239, 1)" } }, { "id": "All-Canal-Names", @@ -4854,21 +4854,21 @@ "minzoom": 12, "filter": ["all", ["==", "class", "canal"], ["has", "name"]], "layout": { + "icon-allow-overlap": false, + "visibility": "visible", "text-field": "{name}", - "text-font": ["Open Sans Italic"], - "symbol-placement": "line", "text-size": 12, - "symbol-spacing": 1000, - "icon-anchor": "center", "text-anchor": "bottom", - "visibility": "visible", - "icon-allow-overlap": false, - "icon-ignore-placement": false, "text-allow-overlap": true, - "text-ignore-placement": true, - "text-justify": "center" + "symbol-placement": "line", + "icon-ignore-placement": false, + "text-font": ["Open Sans Italic"], + "symbol-spacing": 1000, + "text-justify": "center", + "icon-anchor": "center", + "text-ignore-placement": true }, - "paint": { "text-color": "rgba(0, 140, 204, 1)", "text-halo-color": "rgba(239, 239, 239, 0.80)", "text-halo-width": 1.5, "text-halo-blur": 1 } + "paint": { "text-halo-blur": 1, "text-color": "rgba(0, 140, 204, 1)", "text-halo-color": "rgba(239, 239, 239, 0.80)", "text-halo-width": 1.5 } }, { "id": "All-River-Names", @@ -4878,21 +4878,21 @@ "minzoom": 12, "filter": ["all", ["==", "class", "river"], ["has", "name"]], "layout": { + "icon-allow-overlap": false, + "visibility": "visible", "text-field": "{name}", - "text-font": ["Open Sans Italic"], - "symbol-placement": "line", "text-size": 12, - "symbol-spacing": 1000, - "icon-anchor": "center", "text-anchor": "bottom", - "visibility": "visible", - "icon-allow-overlap": false, - "icon-ignore-placement": false, "text-allow-overlap": true, - "text-ignore-placement": true, - "text-justify": "center" + "symbol-placement": "line", + "icon-ignore-placement": false, + "text-font": ["Open Sans Italic"], + "symbol-spacing": 1000, + "text-justify": "center", + "icon-anchor": "center", + "text-ignore-placement": true }, - "paint": { "text-color": "rgba(0, 140, 204, 1)", "text-halo-color": "rgba(239, 239, 239, 0.80)", "text-halo-width": 1.5, "text-halo-blur": 1 } + "paint": { "text-halo-blur": 1, "text-color": "rgba(0, 140, 204, 1)", "text-halo-color": "rgba(239, 239, 239, 0.80)", "text-halo-width": 1.5 } }, { "id": "All-Waterway-Canal-Names", @@ -4902,16 +4902,16 @@ "minzoom": 12, "filter": ["all", ["==", "class", "canal"], ["has", "name"]], "layout": { - "symbol-placement": "line", "symbol-spacing": 1000, "text-field": "{name}", - "text-font": ["Open Sans Italic"], "text-size": 12, "text-anchor": "bottom", "text-ignore-placement": true, - "text-allow-overlap": true + "text-allow-overlap": true, + "symbol-placement": "line", + "text-font": ["Open Sans Italic"] }, - "paint": { "text-color": "rgba(0, 140, 204, 1)", "text-halo-color": "rgba(239, 239, 239, 0.80)", "text-halo-width": 1.5, "text-halo-blur": 1 } + "paint": { "text-halo-blur": 1, "text-color": "rgba(0, 140, 204, 1)", "text-halo-color": "rgba(239, 239, 239, 0.80)", "text-halo-width": 1.5 } }, { "id": "All-Waterway-Drain-Names", @@ -4921,16 +4921,16 @@ "minzoom": 12, "filter": ["all", ["==", "class", "drain"], ["has", "name"]], "layout": { - "symbol-placement": "line", "symbol-spacing": 1000, "text-field": "{name}", - "text-font": ["Open Sans Italic"], "text-size": 12, "text-anchor": "bottom", "text-ignore-placement": true, - "text-allow-overlap": true + "text-allow-overlap": true, + "symbol-placement": "line", + "text-font": ["Open Sans Italic"] }, - "paint": { "text-color": "rgba(0, 140, 204, 1)", "text-halo-color": "rgba(239, 239, 239, 0.80)", "text-halo-width": 1.5, "text-halo-blur": 1 } + "paint": { "text-halo-blur": 1, "text-color": "rgba(0, 140, 204, 1)", "text-halo-color": "rgba(239, 239, 239, 0.80)", "text-halo-width": 1.5 } }, { "id": "All-Waterway-River-Names", @@ -4940,16 +4940,16 @@ "minzoom": 12, "filter": ["all", ["==", "class", "river"], ["has", "name"]], "layout": { - "symbol-placement": "line", "symbol-spacing": 1000, "text-field": "{name}", - "text-font": ["Open Sans Italic"], "text-size": 12, "text-anchor": "bottom", "text-ignore-placement": true, - "text-allow-overlap": true + "text-allow-overlap": true, + "symbol-placement": "line", + "text-font": ["Open Sans Italic"] }, - "paint": { "text-color": "rgba(0, 140, 204, 1)", "text-halo-color": "rgba(239, 239, 239, 0.80)", "text-halo-width": 1.5, "text-halo-blur": 1 } + "paint": { "text-halo-blur": 1, "text-color": "rgba(0, 140, 204, 1)", "text-halo-color": "rgba(239, 239, 239, 0.80)", "text-halo-width": 1.5 } }, { "id": "Waterway-Waterfall-Label", @@ -4958,15 +4958,15 @@ "source-layer": "waterway", "filter": ["any", ["==", "class", "waterfall_edge"], ["==", "class", "waterfall_ln"]], "layout": { - "symbol-placement": "line", + "text-max-width": 3, "text-field": "{name} {height}m", - "text-font": ["Open Sans Regular"], "text-size": 13, "text-anchor": "bottom", "text-allow-overlap": true, - "text-max-width": 3 + "symbol-placement": "line", + "text-font": ["Open Sans Regular"] }, - "paint": { "text-color": "rgba(0, 140, 204, 1)", "text-halo-color": "rgba(239, 239, 239, 1)", "text-halo-width": 1.5, "text-halo-blur": 0.5 } + "paint": { "text-halo-blur": 0.5, "text-color": "rgba(0, 140, 204, 1)", "text-halo-color": "rgba(239, 239, 239, 1)", "text-halo-width": 1.5 } }, { "id": "Waterway-Waterfall-Pt-Ln", @@ -4977,19 +4977,19 @@ "maxzoom": 14, "filter": ["all", ["==", "class", "waterfall_pt"]], "layout": { - "text-field": "", + "icon-allow-overlap": true, "visibility": "visible", - "text-font": ["Open Sans Regular"], + "text-field": "", "text-size": { "stops": [ [12, 8], [16, 14] ] }, - "icon-allow-overlap": true, + "text-anchor": "bottom", "icon-size": 1.5, "icon-image": "rapid_pnt", - "text-anchor": "bottom" + "text-font": ["Open Sans Regular"] }, "paint": { "text-color": "rgba(0, 140, 204, 1)" } }, @@ -5001,24 +5001,24 @@ "minzoom": 14, "filter": ["all", ["==", "class", "waterfall_pt"]], "layout": { - "text-field": "{name} {height}m", + "text-rotate": 0, + "icon-allow-overlap": true, "visibility": "visible", - "text-font": ["Open Sans Regular"], + "text-max-width": 3, + "text-field": "{name} {height}m", + "text-offset": [0, 1], "text-size": { "stops": [ [12, 8], [16, 12] ] }, - "icon-image": "waterfall_pnt", - "icon-allow-overlap": true, - "icon-size": 1.5, "text-anchor": "top", - "text-offset": [0, 1], - "text-max-width": 3, - "text-rotate": 0 + "icon-size": 1.5, + "icon-image": "waterfall_pnt", + "text-font": ["Open Sans Regular"] }, - "paint": { "text-color": "rgba(0, 140, 204, 1)", "text-halo-color": "rgba(232, 232, 232, 1)", "text-halo-width": 1.5, "text-halo-blur": 0.5 } + "paint": { "text-halo-blur": 0.5, "text-color": "rgba(0, 140, 204, 1)", "text-halo-color": "rgba(232, 232, 232, 1)", "text-halo-width": 1.5 } }, { "id": "Place-Names-13", @@ -5027,16 +5027,26 @@ "source-layer": "place", "minzoom": 13, "layout": { - "text-field": "{name}", - "text-font": ["Roboto Regular"], - "text-max-width": 7, + "icon-rotation-alignment": "auto", "text-variable-anchor": ["top", "bottom-left"], - "text-offset": { + "text-optional": true, + "visibility": "visible", + "text-field": "{name}", + "text-size": { "stops": [ - [4, [0, 1.75]], - [6, [0, 1.25]] + [2, 10], + [5, 16], + [8, 16], + [10, 17], + [12, 16], + [14, 16] ] }, + "text-allow-overlap": true, + "icon-text-fit": "both", + "text-font": ["Roboto Regular"], + "text-pitch-alignment": "viewport", + "text-max-width": 7, "text-letter-spacing": { "stops": [ [10, 0.08], @@ -5044,45 +5054,42 @@ [14, 0] ] }, - "text-size": { + "text-offset": { "stops": [ - [2, 10], - [5, 16], - [8, 16], - [10, 17], - [12, 16], - [14, 16] + [4, [0, 1.75]], + [6, [0, 1.25]] ] }, - "icon-text-fit": "both", - "icon-rotation-alignment": "auto", "text-rotation-alignment": "viewport", - "text-pitch-alignment": "viewport", - "text-optional": true, - "text-ignore-placement": false, - "text-allow-overlap": true, - "visibility": "visible" + "text-ignore-placement": false }, "paint": { - "text-halo-blur": 1, - "text-halo-width": { + "text-halo-color": "rgba(255, 252, 252, 1)", + "icon-halo-width": { "stops": [ - [4, 1.5], - [9, 2] + [13, 1], + [14, 2] ] }, - "text-halo-color": "rgba(255, 252, 252, 1)", + "text-translate-anchor": "viewport", + "icon-halo-color": "rgba(255, 255, 255, 1)", + "icon-color": { + "stops": [ + [6, "rgba(53, 53, 53, 1)"], + [10, "rgba(53, 53, 53, 1)"] + ] + }, + "text-halo-blur": 1, "text-color": { "stops": [ [6, "rgba(35, 34, 34, 1)"], [19, "rgba(111, 111, 111, 1)"] ] }, - "text-translate-anchor": "viewport", - "icon-halo-width": { + "text-halo-width": { "stops": [ - [13, 1], - [14, 2] + [4, 1.5], + [9, 2] ] }, "icon-halo-blur": { @@ -5091,14 +5098,7 @@ [14, 0.5] ] }, - "icon-opacity": 1, - "icon-halo-color": "rgba(255, 255, 255, 1)", - "icon-color": { - "stops": [ - [6, "rgba(53, 53, 53, 1)"], - [10, "rgba(53, 53, 53, 1)"] - ] - } + "icon-opacity": 1 } }, { @@ -5109,7 +5109,10 @@ "minzoom": 3, "maxzoom": 13, "layout": { - "text-font": ["Roboto Regular"], + "text-variable-anchor": ["top", "bottom-left"], + "icon-pitch-alignment": "auto", + "text-optional": true, + "visibility": "visible", "text-field": "{name}", "text-size": { "stops": [ @@ -5121,6 +5124,8 @@ [14, 17] ] }, + "text-font": ["Roboto Regular"], + "text-pitch-alignment": "viewport", "text-letter-spacing": { "stops": [ [10, 0.08], @@ -5128,56 +5133,51 @@ [14, 0] ] }, + "text-max-width": 6, "text-offset": { "stops": [ [4, [0, 1.75]], [6, [0, 1.25]] ] }, - "text-max-width": 6, - "text-variable-anchor": ["top", "bottom-left"], - "icon-pitch-alignment": "auto", "text-rotation-alignment": "viewport", - "text-pitch-alignment": "viewport", - "text-ignore-placement": false, - "text-optional": true, - "visibility": "visible" + "text-ignore-placement": false }, "paint": { + "icon-halo-width": { + "stops": [ + [13, 1], + [14, 2] + ] + }, + "text-halo-color": "rgba(255, 252, 252, 1)", + "icon-halo-color": "rgba(255, 255, 255, 1)", "icon-color": { "stops": [ [6, "rgba(53, 53, 53, 1)"], [10, "rgba(53, 53, 53, 1)"] ] }, - "icon-halo-color": "rgba(255, 255, 255, 1)", - "icon-opacity": 1, - "icon-halo-blur": { + "icon-translate-anchor": "viewport", + "text-halo-blur": 1, + "text-color": { "stops": [ - [13, 1], - [14, 0.5] + [6, "rgba(35, 34, 34, 1)"], + [19, "rgba(111, 111, 111, 1)"] ] }, - "icon-translate-anchor": "viewport", - "icon-halo-width": { + "icon-opacity": 1, + "icon-halo-blur": { "stops": [ [13, 1], - [14, 2] + [14, 0.5] ] }, - "text-halo-blur": 1, "text-halo-width": { "stops": [ [4, 1.5], [9, 2] ] - }, - "text-halo-color": "rgba(255, 252, 252, 1)", - "text-color": { - "stops": [ - [6, "rgba(35, 34, 34, 1)"], - [19, "rgba(111, 111, 111, 1)"] - ] } } }