diff --git a/styles/src/base_layers.ts b/styles/src/base_layers.ts index e7f4afa2..023029c1 100644 --- a/styles/src/base_layers.ts +++ b/styles/src/base_layers.ts @@ -1506,22 +1506,37 @@ export function labels_layers( ["get", "kind"], [ "literal", - ["beach", "forest", "marina", "park", "peak", "zoo"], + ["beach", "forest", "marina", "park", "peak", "zoo", "garden", "bench", "aerodrome", "station", "bus_stop", "ferry_terminal", "stadium", "university", "library", "school", "animal", "toilets", "drinking_water"] ], ], - [">=", ["zoom"], ["get", "min_zoom"]], + [">=", ["zoom"], ["+",["get", "min_zoom"],0]], ], layout: { - "icon-image": ["get", "kind"], + "icon-image": [ + "match", + ["get", "kind"], + "station", + "train_station", + ["get", "kind"] + ], "text-font": [t.regular || "Noto Sans Regular"], "text-justify": "auto", "text-field": get_multiline_name( lang, script, + t.regular ) as DataDrivenPropertyValueSpecification, - "text-size": 10, + "text-size": [ + "interpolate", + ["linear"], + ["zoom"], + 17, + 10, + 19, + 16, + ], "text-max-width": 8, - "text-offset": [1, 0], + "text-offset": [1.1, 0], "text-variable-anchor": ["left", "right"], }, paint: { @@ -1532,10 +1547,28 @@ export function labels_layers( ["get", "kind"], [ "literal", - ["beach", "forest", "marina", "park", "peak", "zoo"], + ["beach", "forest", "marina", "park", "peak", "zoo", "garden", "bench"], ], ], t.pois.green, + [ + "in", + ["get", "kind"], + [ + "literal", + ["aerodrome", "station", "bus_stop", "ferry_terminal"], + ], + ], + t.pois.lapis, + [ + "in", + ["get", "kind"], + [ + "literal", + ["stadium", "university", "library", "school", "animal", "toilets", "drinking_water"], + ], + ], + t.pois.slategray, t.earth, ], }, diff --git a/styles/src/themes.ts b/styles/src/themes.ts index 50d79784..61ae3fac 100644 --- a/styles/src/themes.ts +++ b/styles/src/themes.ts @@ -192,7 +192,7 @@ export const CONTRAST: Theme = { export const LIGHT: Theme = { background: "#cccccc", - earth: "#e0e0e0", + earth: "#e2dfda", park_a: "#cfddd5", park_b: "#9cd3b4", hospital: "#e4dad9",