Skip to content

Commit b67516e

Browse files
committed
* add initial set of lapis and slategray icons. [#238]
* adjust light earth color * adjust POI text scaling at z17+
1 parent 79010b9 commit b67516e

File tree

2 files changed

+40
-7
lines changed

2 files changed

+40
-7
lines changed

styles/src/base_layers.ts

Lines changed: 39 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1506,22 +1506,37 @@ export function labels_layers(
15061506
["get", "kind"],
15071507
[
15081508
"literal",
1509-
["beach", "forest", "marina", "park", "peak", "zoo"],
1509+
["beach", "forest", "marina", "park", "peak", "zoo", "garden", "bench", "aerodrome", "station", "bus_stop", "ferry_terminal", "stadium", "university", "library", "school", "animal", "toilets", "drinking_water"]
15101510
],
15111511
],
1512-
[">=", ["zoom"], ["get", "min_zoom"]],
1512+
[">=", ["zoom"], ["+",["get", "min_zoom"],0]],
15131513
],
15141514
layout: {
1515-
"icon-image": ["get", "kind"],
1515+
"icon-image": [
1516+
"match",
1517+
["get", "kind"],
1518+
"station",
1519+
"train_station",
1520+
["get", "kind"]
1521+
],
15161522
"text-font": [t.regular || "Noto Sans Regular"],
15171523
"text-justify": "auto",
15181524
"text-field": get_multiline_name(
15191525
lang,
15201526
script,
1527+
t.regular
15211528
) as DataDrivenPropertyValueSpecification<string>,
1522-
"text-size": 10,
1529+
"text-size": [
1530+
"interpolate",
1531+
["linear"],
1532+
["zoom"],
1533+
17,
1534+
10,
1535+
19,
1536+
16,
1537+
],
15231538
"text-max-width": 8,
1524-
"text-offset": [1, 0],
1539+
"text-offset": [1.1, 0],
15251540
"text-variable-anchor": ["left", "right"],
15261541
},
15271542
paint: {
@@ -1532,10 +1547,28 @@ export function labels_layers(
15321547
["get", "kind"],
15331548
[
15341549
"literal",
1535-
["beach", "forest", "marina", "park", "peak", "zoo"],
1550+
["beach", "forest", "marina", "park", "peak", "zoo", "garden", "bench"],
15361551
],
15371552
],
15381553
t.pois.green,
1554+
[
1555+
"in",
1556+
["get", "kind"],
1557+
[
1558+
"literal",
1559+
["aerodrome", "station", "bus_stop", "ferry_terminal"],
1560+
],
1561+
],
1562+
t.pois.lapis,
1563+
[
1564+
"in",
1565+
["get", "kind"],
1566+
[
1567+
"literal",
1568+
["stadium", "university", "library", "school", "animal", "toilets", "drinking_water"],
1569+
],
1570+
],
1571+
t.pois.slategray,
15391572
t.earth,
15401573
],
15411574
},

styles/src/themes.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -192,7 +192,7 @@ export const CONTRAST: Theme = {
192192

193193
export const LIGHT: Theme = {
194194
background: "#cccccc",
195-
earth: "#e0e0e0",
195+
earth: "#e2dfda",
196196
park_a: "#cfddd5",
197197
park_b: "#9cd3b4",
198198
hospital: "#e4dad9",

0 commit comments

Comments
 (0)