pull/80/merge
Kyle Barron 4 years ago committed by GitHub
commit 2db265a04c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

@ -28,6 +28,22 @@ For printed and static maps a similar attribution should be made in a textual de
OSM Liberty is using the [Maki POI icon set](https://github.com/mapbox/maki/blob/master/LICENSE.txt) which is licensed under CC0 1.0 Universal. OSM Liberty is using the [Maki POI icon set](https://github.com/mapbox/maki/blob/master/LICENSE.txt) which is licensed under CC0 1.0 Universal.
U.S. Interstate shields come from [Wikipedia][wikipedia_us_interstate] and are in the public domain.
U.S. Highway shields come from [Wikipedia][wikipedia_us_highway] and are in the public domain.
U.S. State Highway shields come from [Wikipedia][wikipedia_us_state] and are in the public domain.
Canada Transcanada shields come from [Wikipedia][wikipedia_ca_transcanada] and are in the public domain.
GB motorway shields come from [Wikipedia][wikipedia_gb_motorway] and are in the public domain.
[wikipedia_us_interstate]: https://commons.m.wikimedia.org/wiki/Category:Interstate_Highway_shield_blanks
[wikipedia_us_highway]: https://commons.m.wikimedia.org/wiki/Category:US_Highway_shield_blanks
[wikipedia_us_state]: https://commons.wikimedia.org/wiki/Category:Circle_shield_blanks
[wikipedia_ca_transcanada]: https://commons.wikimedia.org/wiki/File:TCH_blank.svg
[wikipedia_gb_motorway]: https://commons.wikimedia.org/wiki/File:Road_marker_UK_A2.svg
## Fonts ## Fonts
OSM Liberty is using the Roboto font family (Copyright 2011 Google). OSM Liberty is using the Roboto font family (Copyright 2011 Google).

File diff suppressed because it is too large Load Diff

Binary file not shown.

Before

Width:  |  Height:  |  Size: 48 KiB

After

Width:  |  Height:  |  Size: 55 KiB

File diff suppressed because it is too large Load Diff

Binary file not shown.

Before

Width:  |  Height:  |  Size: 114 KiB

After

Width:  |  Height:  |  Size: 129 KiB

@ -19,7 +19,7 @@
"type": "raster" "type": "raster"
} }
}, },
"sprite": "https://maputnik.github.io/osm-liberty/sprites/osm-liberty", "sprite": "https://raw.githubusercontent.com/kylebarron/osm-liberty/highway-shields/sprites/osm-liberty",
"glyphs": "https://api.maptiler.com/fonts/{fontstack}/{range}.pbf?key={key}", "glyphs": "https://api.maptiler.com/fonts/{fontstack}/{range}.pbf?key={key}",
"layers": [ "layers": [
{ {
@ -1453,13 +1453,175 @@
"text-halo-width": 1 "text-halo-width": 1
} }
}, },
{
"id": "road_shield_us-interstate-2",
"type": "symbol",
"source": "openmaptiles",
"source-layer": "transportation_name",
"minzoom": 7,
"filter": [
"all",
["<=", "ref_length", 2],
["in", "network", "us-interstate"]
],
"layout": {
"icon-image": "{network}_2",
"icon-rotation-alignment": "viewport",
"symbol-placement": {"base": 1, "stops": [[10, "point"], [11, "line"]]},
"symbol-spacing": 500,
"text-field": "{ref}",
"text-font": ["Roboto Regular"],
"text-offset": [0, 0.2],
"text-rotation-alignment": "viewport",
"text-size": 10,
"icon-size": 0.8
},
"paint": {"text-color": "#fff"}
},
{
"id": "road_shield_us-interstate-3",
"type": "symbol",
"source": "openmaptiles",
"source-layer": "transportation_name",
"minzoom": 7,
"filter": [
"all",
["==", "ref_length", 3],
["in", "network", "us-interstate"]
],
"layout": {
"icon-image": "{network}_3",
"icon-rotation-alignment": "viewport",
"symbol-placement": {"base": 1, "stops": [[10, "point"], [11, "line"]]},
"symbol-spacing": 500,
"text-field": "{ref}",
"text-font": ["Roboto Regular"],
"text-offset": [0, 0.2],
"text-rotation-alignment": "viewport",
"text-size": 10,
"icon-size": 0.8
},
"paint": {"text-color": "#fff"}
},
{
"id": "road_shield_us-highway-2",
"type": "symbol",
"source": "openmaptiles",
"source-layer": "transportation_name",
"minzoom": 7,
"filter": [
"all",
["<=", "ref_length", 2],
["in", "network", "us-highway", "us-state"]
],
"layout": {
"icon-image": "{network}_2",
"icon-rotation-alignment": "viewport",
"symbol-placement": {"base": 1, "stops": [[10, "point"], [11, "line"]]},
"symbol-spacing": 500,
"text-field": "{ref}",
"text-font": ["Roboto Regular"],
"text-offset": [0, 0.2],
"text-rotation-alignment": "viewport",
"text-size": 10,
"icon-size": 0.8
},
"paint": {"text-color": "#000"}
},
{
"id": "road_shield_us-highway-3",
"type": "symbol",
"source": "openmaptiles",
"source-layer": "transportation_name",
"minzoom": 7,
"filter": [
"all",
["==", "ref_length", 3],
["in", "network", "us-highway", "us-state"]
],
"layout": {
"icon-image": "{network}_3",
"icon-rotation-alignment": "viewport",
"symbol-placement": {"base": 1, "stops": [[10, "point"], [11, "line"]]},
"symbol-spacing": 500,
"text-field": "{ref}",
"text-font": ["Roboto Regular"],
"text-offset": [0, 0.2],
"text-rotation-alignment": "viewport",
"text-size": 10,
"icon-size": 0.8
},
"paint": {"text-color": "#000"}
},
{
"id": "road_shield_ca-transcanada-2",
"type": "symbol",
"source": "openmaptiles",
"source-layer": "transportation_name",
"minzoom": 7,
"filter": [
"all",
["<=", "ref_length", 2],
["in", "network", "ca-transcanada"]
],
"layout": {
"icon-image": "{network}_2",
"icon-rotation-alignment": "viewport",
"symbol-placement": {"base": 1, "stops": [[10, "point"], [11, "line"]]},
"symbol-spacing": 500,
"text-field": "{ref}",
"text-font": ["Roboto Regular"],
"text-offset": [0, 0.2],
"text-rotation-alignment": "viewport",
"text-size": 10,
"icon-size": 0.8
},
"paint": {"text-color": "#000"}
},
{
"id": "road_shield_gb-motorway-3",
"type": "symbol",
"source": "openmaptiles",
"source-layer": "transportation_name",
"minzoom": 7,
"filter": [
"all",
["<=", "ref_length", 3],
["in", "network", "gb-motorway"]
],
"layout": {
"icon-image": "{network}_3",
"icon-rotation-alignment": "viewport",
"symbol-placement": {"base": 1, "stops": [[10, "point"], [11, "line"]]},
"symbol-spacing": 500,
"text-field": "{ref}",
"text-font": ["Roboto Regular"],
"text-offset": [0, 0.2],
"text-rotation-alignment": "viewport",
"text-size": 10,
"icon-size": 0.8
},
"paint": {"text-color": "#fff"}
},
{ {
"id": "road_shield", "id": "road_shield",
"type": "symbol", "type": "symbol",
"source": "openmaptiles", "source": "openmaptiles",
"source-layer": "transportation_name", "source-layer": "transportation_name",
"minzoom": 7, "minzoom": 7,
"filter": ["all", ["<=", "ref_length", 6]], "filter": [
"all",
["<=", "ref_length", 6],
[
"!in",
"network",
"us-interstate",
"us-highway",
"us-state",
"ca-transcanada",
"gb-motorway"
]
],
"layout": { "layout": {
"icon-image": "default_{ref_length}", "icon-image": "default_{ref_length}",
"icon-rotation-alignment": "viewport", "icon-rotation-alignment": "viewport",

File diff suppressed because one or more lines are too long

After

Width:  |  Height:  |  Size: 20 KiB

@ -0,0 +1,9 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<svg xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg"
version="1.0" width="50" height="30" viewBox="0 0 1000 600">
<g>
<path fill="#00693F" stroke="white" stroke-width="40"
d="M20,60 A40,40,0,0,1,60,20 L940,20 A40,40,0,0,1,980,60 L980,540 A40,40,0,0,1,940,580 L60,580 A40,40,0,0,1,20,540 z"
/>
</g>
</svg>

After

Width:  |  Height:  |  Size: 414 B

@ -0,0 +1,28 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Generator: Adobe Illustrator 12.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 51448) -->
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
<!ENTITY ns_svg "http://www.w3.org/2000/svg">
<!ENTITY ns_xlink "http://www.w3.org/1999/xlink">
]>
<svg version="1.1" id="Layer_1" xmlns="&ns_svg;" xmlns:xlink="&ns_xlink;" width="30" height="30" viewBox="0 0 600 600"
overflow="visible" enable-background="new 0 0 600 600" xml:space="preserve">
<g>
<path fill-rule="evenodd" clip-rule="evenodd" stroke="#000000" stroke-width="30" fill="#FFFFFF" d="M300,10.0024414
c23.5644531,20.0751953,54.1171875,32.1914063,87.5,32.1914063S451.4355469,30.0751953,475,10l115,115
c-21.1621094,30.0805664-33.5878906,66.753418-33.5878906,106.3271484c0,28.4628906,6.4267578,55.4238281,17.9101563,79.5117188
C584.2441406,331.6640625,590,355.3945313,590,380c0,88.3671875-71.6328125,160-160,160h-25.1132813
C362.5419922,540,324.7509766,559.4951172,300,590c-24.7514648-30.5048828-62.5419922-50-104.8867188-50h-25.1137695
c-88.3666992,0-160-71.6328125-160-160c0-24.6054688,5.7563477-48.3359375,15.6787109-69.1611328
c11.4824219-24.0878906,17.9101563-51.0488281,17.9101563-79.5117188C43.5883789,191.753418,31.1616211,155.0805664,10,125L125,10
c23.5644531,20.0751953,54.1166992,32.1938477,87.5,32.1938477C245.8828125,42.1938477,276.4355469,30.0776367,300,10.0024414z"/>
<path fill-rule="evenodd" clip-rule="evenodd" fill="none" stroke="#000000" stroke-linecap="round" stroke-linejoin="round" stroke-miterlimit="3.863693" d="
M300,10.0024414c23.5644531,20.0751953,54.1171875,32.1914063,87.5,32.1914063S451.4355469,30.0751953,475,10l115,115
c-21.1621094,30.0805664-33.5878906,66.753418-33.5878906,106.3271484c0,28.4628906,6.4267578,55.4238281,17.9101563,79.5117188
C584.2441406,331.6640625,590,355.3945313,590,380c0,88.3671875-71.6328125,160-160,160h-25.1132813
C362.5419922,540,324.7509766,559.4951172,300,590c-24.7514648-30.5048828-62.5419922-50-104.8867188-50h-25.1137695
c-88.3666992,0-160-71.6328125-160-160c0-24.6054688,5.7563477-48.3359375,15.6787109-69.1611328
c11.4824219-24.0878906,17.9101563-51.0488281,17.9101563-79.5117188C43.5883789,191.753418,31.1616211,155.0805664,10,125L125,10
c23.5644531,20.0751953,54.1166992,32.1938477,87.5,32.1938477C245.8828125,42.1938477,276.4355469,30.0776367,300,10.0024414z"/>
</g>
</svg>

After

Width:  |  Height:  |  Size: 2.4 KiB

@ -0,0 +1,20 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Generator: Adobe Illustrator 12.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 51448) -->
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" [
<!ENTITY ns_svg "http://www.w3.org/2000/svg">
<!ENTITY ns_xlink "http://www.w3.org/1999/xlink">
]>
<svg version="1.1" id="Layer_1" xmlns="&ns_svg;" xmlns:xlink="&ns_xlink;" width="37.5" height="30" viewBox="0 0 750 600"
overflow="visible" enable-background="new 0 0 750 600" xml:space="preserve">
<g>
<path fill-rule="evenodd" clip-rule="evenodd" stroke="#000000" stroke-width="30" fill="#FFFFFF" d="M375,10.0019531
c-36.3276367,22.4638672-79.1499023,35.4287109-125.0004883,35.4287109C204.1494141,45.4306641,161.3271484,32.4638672,125,10
L10,125c21.1630859,30.0810547,33.5883789,66.7524414,33.5883789,106.3271484
c0,28.5605469-6.472168,55.6088867-18.0288086,79.7587891C15.5854492,331.9560547,9.9995117,355.3261719,9.9995117,380
c0,88.3671875,71.6333008,160,160,160h100.1157227C312.4584961,540,350.2485352,559.4941406,375,589.9980469
C399.7509766,559.4941406,437.5410156,540,479.8847656,540H580c88.3671875,0,160-71.6328125,160-160
c0-24.6738281-5.5839844-48.0439453-15.5605469-68.9140625c-11.5566406-24.1499023-18.0273438-51.1982422-18.0273438-79.7587891
C706.4121094,191.7524414,718.8369141,155.0810547,740,125L625,10c-36.328125,22.4638672-79.1503906,35.4306641-125,35.4306641
C454.1494141,45.4306641,411.3271484,32.4658203,375,10.0019531z"/>
</g>
</svg>

After

Width:  |  Height:  |  Size: 1.5 KiB

File diff suppressed because one or more lines are too long

After

Width:  |  Height:  |  Size: 9.6 KiB

File diff suppressed because one or more lines are too long

After

Width:  |  Height:  |  Size: 9.5 KiB

@ -0,0 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
<svg xmlns="http://www.w3.org/2000/svg" version="1.1" width="30" height="30" viewBox="0 0 600 600">
<circle r="287.5" cx="300" cy="300" fill="#ffffff" fill-opacity="1" stroke="#000000" stroke-width="30"/>
</svg>

After

Width:  |  Height:  |  Size: 350 B

@ -0,0 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
<svg xmlns="http://www.w3.org/2000/svg" version="1.1" width="37.5" height="30" viewBox="0 0 750 600">
<ellipse rx="362.5" ry="287.5" cx="375" cy="300" fill="#ffffff" fill-opacity="1" stroke="#000000" stroke-width="30"/>
</svg>

After

Width:  |  Height:  |  Size: 365 B

Loading…
Cancel
Save