Skip to content

Commit 550d627

Browse files
bdonbdon
authored
Shields (#518)
* add generic and US shields to spritesheet [#238] * Will use country-coder to assign a network and shield_text to highways. * update 1 to 5-char shields based on Refill open source assets * cleanup of sprite names * proper shields fields for labeling in tiles * add netherlands S-roads shields * bump tileset version * styles 5.6.0 * update CHANGELOG
1 parent ef94c86 commit 550d627

File tree

23 files changed

+249
-41
lines changed

23 files changed

+249
-41
lines changed

‎CHANGELOG.md‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,11 @@
1+
Tiles 4.12.0, Styles 5.6.0
2+
------
3+
- addition of generic, US:I and NL:S-road highway shields [#238]
4+
- add NL and US CartographicLocales
5+
- add getLocale to CountryCoder
6+
- proper `shield_text` and `network` values in road features
7+
- limit `shield_text` display to 5 characters
8+
19
Styles 5.5.0
210
------
311
- Add oneway arrows to roads [#499]

‎examples/basic.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<link rel="stylesheet" href="https://unpkg.com/maplibre-gl@5.0.1/dist/maplibre-gl.css" crossorigin="anonymous">
66
<script src="https://unpkg.com/maplibre-gl@5.0.1/dist/maplibre-gl.js" crossorigin="anonymous"></script>
77
<script src="https://unpkg.com/pmtiles@4.2.1/dist/pmtiles.js"></script>
8-
<script src="https://unpkg.com/@protomaps/basemaps@5.5.2/dist/basemaps.js"></script>
8+
<script src="https://unpkg.com/@protomaps/basemaps@5.6.0/dist/basemaps.js"></script>
99
<style>
1010
body {
1111
margin: 0;

‎examples/data_sandwich.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<link rel="stylesheet" href="https://unpkg.com/maplibre-gl@5.0.1/dist/maplibre-gl.css" crossorigin="anonymous">
66
<script src="https://unpkg.com/maplibre-gl@5.0.1/dist/maplibre-gl.js" crossorigin="anonymous"></script>
77
<script src="https://unpkg.com/pmtiles@4.2.1/dist/pmtiles.js"></script>
8-
<script src="https://unpkg.com/@protomaps/basemaps@5.5.2/dist/basemaps.js"></script>
8+
<script src="https://unpkg.com/@protomaps/basemaps@5.6.0/dist/basemaps.js"></script>
99
<style>
1010
body {
1111
margin: 0;

‎examples/theme_language.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<link rel="stylesheet" href="https://unpkg.com/maplibre-gl@5.0.1/dist/maplibre-gl.css" crossorigin="anonymous">
66
<script src="https://unpkg.com/maplibre-gl@5.0.1/dist/maplibre-gl.js" crossorigin="anonymous"></script>
77
<script src="https://unpkg.com/pmtiles@4.2.1/dist/pmtiles.js"></script>
8-
<script src="https://unpkg.com/@protomaps/basemaps@5.5.2/dist/basemaps.js"></script>
8+
<script src="https://unpkg.com/@protomaps/basemaps@5.6.0/dist/basemaps.js"></script>
99
<style>
1010
body {
1111
margin: 0;

‎render-tests/tests/roads/access-no/expected.png‎

788 Bytes
Loading

‎sprites/flavors/black.json‎

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,21 @@
66
"icons": {
77
"townspot":"base",
88
"capital":"base",
9-
"arrow":"arrow"
9+
"arrow":"arrow",
10+
"generic_shield-1char":"base",
11+
"generic_shield-2char":"base",
12+
"generic_shield-3char":"base",
13+
"generic_shield-4char":"base",
14+
"generic_shield-5char":"base",
15+
"US:I-1char":"base",
16+
"US:I-2char":"base",
17+
"US:I-3char":"base",
18+
"US:I-4char":"base",
19+
"US:I-5char":"base",
20+
"NL:S-road-1char":"base",
21+
"NL:S-road-2char":"base",
22+
"NL:S-road-3char":"base",
23+
"NL:S-road-4char":"base",
24+
"NL:S-road-5char":"base"
1025
}
1126
}

‎sprites/flavors/dark.json‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,21 @@
1010
"townspot":"base",
1111
"capital":"base",
1212
"arrow":"arrow",
13+
"generic_shield-1char":"base",
14+
"generic_shield-2char":"base",
15+
"generic_shield-3char":"base",
16+
"generic_shield-4char":"base",
17+
"generic_shield-5char":"base",
18+
"US:I-1char":"base",
19+
"US:I-2char":"base",
20+
"US:I-3char":"base",
21+
"US:I-4char":"base",
22+
"US:I-5char":"base",
23+
"NL:S-road-1char":"base",
24+
"NL:S-road-2char":"base",
25+
"NL:S-road-3char":"base",
26+
"NL:S-road-4char":"base",
27+
"NL:S-road-5char":"base",
1328
"beach":"green",
1429
"forest":"green",
1530
"marina":"green",

‎sprites/flavors/grayscale.json‎

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,21 @@
66
"icons": {
77
"townspot":"base",
88
"capital":"base",
9-
"arrow":"arrow"
9+
"arrow":"arrow",
10+
"generic_shield-1char":"base",
11+
"generic_shield-2char":"base",
12+
"generic_shield-3char":"base",
13+
"generic_shield-4char":"base",
14+
"generic_shield-5char":"base",
15+
"US:I-1char":"base",
16+
"US:I-2char":"base",
17+
"US:I-3char":"base",
18+
"US:I-4char":"base",
19+
"US:I-5char":"base",
20+
"NL:S-road-1char":"base",
21+
"NL:S-road-2char":"base",
22+
"NL:S-road-3char":"base",
23+
"NL:S-road-4char":"base",
24+
"NL:S-road-5char":"base"
1025
}
1126
}

‎sprites/flavors/light.json‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,21 @@
1010
"townspot":"base",
1111
"capital":"base",
1212
"arrow": "arrow",
13+
"generic_shield-1char":"base",
14+
"generic_shield-2char":"base",
15+
"generic_shield-3char":"base",
16+
"generic_shield-4char":"base",
17+
"generic_shield-5char":"base",
18+
"US:I-1char":"base",
19+
"US:I-2char":"base",
20+
"US:I-3char":"base",
21+
"US:I-4char":"base",
22+
"US:I-5char":"base",
23+
"NL:S-road-1char":"base",
24+
"NL:S-road-2char":"base",
25+
"NL:S-road-3char":"base",
26+
"NL:S-road-4char":"base",
27+
"NL:S-road-5char":"base",
1328
"beach":"green",
1429
"forest":"green",
1530
"marina":"green",

‎sprites/flavors/white.json‎

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,21 @@
66
"icons": {
77
"townspot":"base",
88
"capital":"base",
9-
"arrow":"arrow"
9+
"arrow":"arrow",
10+
"generic_shield-1char":"base",
11+
"generic_shield-2char":"base",
12+
"generic_shield-3char":"base",
13+
"generic_shield-4char":"base",
14+
"generic_shield-5char":"base",
15+
"US:I-1char":"base",
16+
"US:I-2char":"base",
17+
"US:I-3char":"base",
18+
"US:I-4char":"base",
19+
"US:I-5char":"base",
20+
"NL:S-road-1char":"base",
21+
"NL:S-road-2char":"base",
22+
"NL:S-road-3char":"base",
23+
"NL:S-road-4char":"base",
24+
"NL:S-road-5char":"base"
1025
}
1126
}

0 commit comments

Comments
 (0)