organicmaps/organicmaps-tmp
Archived
13
Fork 1
Code Issues 2.7k Pull requests 182 Projects Releases 65 Wiki Activity Actions

[styles] add icon for shenzhen metro

Browse source 
- added icon files
- adjusted bbox to fit the network

Signed-off-by: Jenny Em <ubahnverleih@gmail.com>
This commit is contained in:
Jenny Em 2024-12-05 20:52:50 +01:00 • committed by Viktor Havaka
parent b79bc732b5
commit 33e7aa2b33
11 changed files with 62 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
data/mapcss-mapping.csv
View file

@ -1732,3 +1732,5 @@ attraction|bumper_car;1616;
railway|station|subway|hongkong;[railway=station][transport=subway][city=hongkong],[railway=station][station=subway][city=hongkong];;name;int_name;1617;
railway|subway_entrance|hongkong;[railway=subway_entrance][city=hongkong];;name;int_name;1618;
railway|station|light_rail|berlin;[railway=station][station=light_rail][city=berlin],[railway=halt][station=light_rail][city=berlin];;name;int_name;1619;
railway|station|subway|shenzhen;[railway=station][transport=subway][city=shenzhen],[railway=station][station=subway][city=shenzhen];;name;int_name;1620;
railway|subway_entrance|shenzhen;[railway=subway_entrance][city=shenzhen];;name;int_name;1621;

Can't render this file because it contains an unexpected character in line 7 and column 16.

6
data/strings/types_strings.txt
View file

@ -23646,6 +23646,9 @@
[type.railway.station.subway.shanghai]
ref = type.railway.station.subway
[type.railway.station.subway.shenzhen]
ref = type.railway.station.subway
[type.railway.station.subway.shiraz]
ref = type.railway.station.subway
@ -24082,6 +24085,9 @@
[type.railway.subway_entrance.shanghai]
ref = type.railway.subway_entrance
[type.railway.subway_entrance.shenzhen]
ref = type.railway.subway_entrance
[type.railway.subway_entrance.shiraz]
ref = type.railway.subway_entrance

8
data/styles/default/dark/symbols/subway-shenzhen-m.svg Normal file
View file

@ -0,0 +1,8 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
<svg width="100%" height="100%" viewBox="0 0 18 18" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" xmlns:serif="http://www.serif.com/" style="fill-rule:evenodd;clip-rule:evenodd;stroke-linejoin:round;stroke-miterlimit:2;">
<ellipse cx="8.986" cy="8.992" rx="8.961" ry="8.968" style="fill:rgb(0,108,54);"/>
<g transform="matrix(1.3515,0,0,1.13791,-2.09203,-0.72571)">
<path d="M6.575,10.994C5.674,11.599 5.039,12.69 4.93,13.962L3.587,13.962C3.726,11.816 4.928,10.016 6.575,9.289L6.575,7.732C4.936,7 3.741,5.205 3.602,3.065L4.945,3.065C5.054,4.33 5.682,5.416 6.575,6.023L6.574,3.066L7.824,3.066L7.825,6.511C7.953,6.529 8.084,6.538 8.216,6.538C8.347,6.538 8.476,6.529 8.602,6.512L8.602,3.066L9.852,3.066L9.853,6.025C10.748,5.419 11.378,4.332 11.486,3.065L12.83,3.065C12.691,5.207 11.494,7.003 9.853,7.733L9.853,9.301C11.486,10.036 12.676,11.827 12.814,13.962L11.471,13.962C11.363,12.702 10.74,11.62 9.853,11.013L9.852,13.962L8.602,13.962L8.602,10.518C8.471,10.499 8.337,10.489 8.2,10.489C8.074,10.489 7.948,10.498 7.825,10.514L7.824,13.962L6.574,13.962L6.575,10.994ZM8.602,8.065C8.475,8.078 8.346,8.084 8.216,8.084C8.084,8.084 7.954,8.077 7.825,8.065L7.825,8.961C7.949,8.949 8.074,8.943 8.2,8.943C8.336,8.943 8.47,8.95 8.602,8.964L8.602,8.065Z" style="fill:rgb(183,183,183);"/>
</g>
</svg>
Side by side

After

Width:  |  Height:  |  Size: 1.5 KiB

10
data/styles/default/dark/symbols/subway-shenzhen-s.svg Normal file
View file

@ -0,0 +1,10 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
<svg width="100%" height="100%" viewBox="0 0 13 13" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" xmlns:serif="http://www.serif.com/" style="fill-rule:evenodd;clip-rule:evenodd;stroke-linejoin:round;stroke-miterlimit:2;">
<g transform="matrix(0.723622,0,0,0.723286,0.00691174,0.00653996)">
<ellipse cx="8.986" cy="8.992" rx="8.961" ry="8.968" style="fill:rgb(0,108,54);"/>
</g>
<g transform="matrix(0.591854,0,0,0.655991,0.929094,0.588599)">
<path d="M6.878,10.139L6.878,7.883C3.943,7.01 1.822,4.689 1.809,2.152L3.499,2.152C3.735,4.012 4.965,5.562 6.878,6.286L6.878,2.152L8.568,2.152L8.568,6.681C8.841,6.71 9.123,6.725 9.413,6.725C9.703,6.725 9.984,6.71 10.257,6.681L10.257,2.152L11.947,2.152L11.947,6.286C13.86,5.562 15.09,4.012 15.326,2.152L17.016,2.152C17.004,4.689 14.883,7.01 11.947,7.883L11.947,10.14C14.882,11.014 17.004,13.334 17.016,15.871L15.326,15.871C15.09,14.011 13.86,12.461 11.947,11.737L11.947,15.871L10.257,15.871L10.257,11.343C9.984,11.314 9.703,11.299 9.413,11.299C9.123,11.299 8.841,11.314 8.568,11.343L8.568,15.871L6.878,15.871L6.878,11.738C4.965,12.461 3.735,14.011 3.499,15.871L1.809,15.871C1.822,13.333 3.942,11.012 6.878,10.139ZM10.257,8.21C9.98,8.236 9.698,8.249 9.413,8.249C9.127,8.249 8.845,8.236 8.568,8.21L8.568,9.813C8.845,9.787 9.126,9.774 9.41,9.774C9.696,9.774 9.979,9.787 10.257,9.813L10.257,8.21Z" style="fill:rgb(183,183,183);"/>
</g>
</svg>
Side by side

After

Width:  |  Height:  |  Size: 1.6 KiB

5
data/styles/default/include/Subways.mapcss
View file

@ -649,6 +649,11 @@ node|z12-[railway=station][transport=subway][city=shanghai] {icon-image: subway-
node|z15-[railway=station][transport=subway][city=shanghai] {icon-image: subway-shanghai-m.svg;}
node|z16-[railway=subway_entrance][city=shanghai] {icon-image: subway-shanghai-s.svg;}
/* Shenzhen Subway Station */
node|z13-[railway=station][transport=subway][city=shenzhen] {icon-image: subway-shenzhen-s.svg;}
node|z15-[railway=station][transport=subway][city=shenzhen] {icon-image: subway-shenzhen-m.svg;}
node|z16-[railway=subway_entrance][city=shenzhen] {icon-image: subway-shenzhen-s.svg;}
/* Shiraz Subway Station */
node|z13-[railway=station][transport=subway][city=shiraz] {icon-image: subway-shiraz-s.svg;}
node|z15-[railway=station][transport=subway][city=shiraz] {icon-image: subway-shiraz-m.svg;}

4
data/styles/default/include/priorities_4_overlays.prio.txt
View file

@ -233,6 +233,7 @@ railway-station-subway-sapporo # icon z13- (also has captio
railway-station-subway-sendai # icon z13- (also has caption(optional) z14-)
railway-station-subway-sf # icon z12- (also has caption(optional) z14-)
railway-station-subway-shanghai # icon z12- (also has caption(optional) z14-)
railway-station-subway-shenzhen # icon z13- (also has caption(optional) z14-)
railway-station-subway-shiraz # icon z13- (also has caption(optional) z14-)
railway-station-subway-singapore # icon z13- (also has caption(optional) z14-)
railway-station-subway-sofia # icon z13- (also has caption(optional) z14-)
@ -512,6 +513,7 @@ railway-subway_entrance-sapporo # icon z16- (also has captio
railway-subway_entrance-sendai # icon z16- (also has caption(optional) z17-)
railway-subway_entrance-sf # icon z16- (also has caption(optional) z17-)
railway-subway_entrance-shanghai # icon z16- (also has caption(optional) z17-)
railway-subway_entrance-shenzhen # icon z16- (also has caption(optional) z17-)
railway-subway_entrance-shiraz # icon z16- (also has caption(optional) z17-)
railway-subway_entrance-singapore # icon z16- (also has caption(optional) z17-)
railway-subway_entrance-sofia # icon z16- (also has caption(optional) z17-)
@ -1397,6 +1399,7 @@ leisure-swimming_pool-private # icon z17- (also has captio
# railway-station-subway-sendai # caption(optional) z14- (also has icon z13-)
# railway-station-subway-sf # caption(optional) z14- (also has icon z12-)
# railway-station-subway-shanghai # caption(optional) z14- (also has icon z12-)
# railway-station-subway-shenzhen # caption(optional) z14- (also has icon z13-)
# railway-station-subway-shiraz # caption(optional) z14- (also has icon z13-)
# railway-station-subway-singapore # caption(optional) z14- (also has icon z13-)
# railway-station-subway-sofia # caption(optional) z14- (also has icon z13-)
@ -1633,6 +1636,7 @@ leisure-swimming_pool-private # icon z17- (also has captio
# railway-subway_entrance-sendai # caption(optional) z17- (also has icon z16-)
# railway-subway_entrance-sf # caption(optional) z17- (also has icon z16-)
# railway-subway_entrance-shanghai # caption(optional) z17- (also has icon z16-)
# railway-subway_entrance-shenzhen # caption(optional) z17- (also has icon z16-)
# railway-subway_entrance-shiraz # caption(optional) z17- (also has icon z16-)
# railway-subway_entrance-singapore # caption(optional) z17- (also has icon z16-)
# railway-subway_entrance-sofia # caption(optional) z17- (also has icon z16-)

8
data/styles/default/light/symbols/subway-shenzhen-m.svg Normal file
View file

@ -0,0 +1,8 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
<svg width="100%" height="100%" viewBox="0 0 18 18" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" xmlns:serif="http://www.serif.com/" style="fill-rule:evenodd;clip-rule:evenodd;stroke-linejoin:round;stroke-miterlimit:2;">
<ellipse cx="8.986" cy="8.992" rx="8.961" ry="8.968" style="fill:rgb(4,139,52);"/>
<g transform="matrix(1.3515,0,0,1.13791,-2.09203,-0.72571)">
<path d="M6.575,10.994C5.674,11.599 5.039,12.69 4.93,13.962L3.587,13.962C3.726,11.816 4.928,10.016 6.575,9.289L6.575,7.732C4.936,7 3.741,5.205 3.602,3.065L4.945,3.065C5.054,4.33 5.682,5.416 6.575,6.023L6.574,3.066L7.824,3.066L7.825,6.511C7.953,6.529 8.084,6.538 8.216,6.538C8.347,6.538 8.476,6.529 8.602,6.512L8.602,3.066L9.852,3.066L9.853,6.025C10.748,5.419 11.378,4.332 11.486,3.065L12.83,3.065C12.691,5.207 11.494,7.003 9.853,7.733L9.853,9.301C11.486,10.036 12.676,11.827 12.814,13.962L11.471,13.962C11.363,12.702 10.74,11.62 9.853,11.013L9.852,13.962L8.602,13.962L8.602,10.518C8.471,10.499 8.337,10.489 8.2,10.489C8.074,10.489 7.948,10.498 7.825,10.514L7.824,13.962L6.574,13.962L6.575,10.994ZM8.602,8.065C8.475,8.078 8.346,8.084 8.216,8.084C8.084,8.084 7.954,8.077 7.825,8.065L7.825,8.961C7.949,8.949 8.074,8.943 8.2,8.943C8.336,8.943 8.47,8.95 8.602,8.964L8.602,8.065Z" style="fill:white;"/>
</g>
</svg>
Side by side

After

Width:  |  Height:  |  Size: 1.5 KiB

10
data/styles/default/light/symbols/subway-shenzhen-s.svg Normal file
View file

@ -0,0 +1,10 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
<svg width="100%" height="100%" viewBox="0 0 13 13" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" xmlns:serif="http://www.serif.com/" style="fill-rule:evenodd;clip-rule:evenodd;stroke-linejoin:round;stroke-miterlimit:2;">
<g transform="matrix(0.723622,0,0,0.723286,0.00691174,0.00653996)">
<ellipse cx="8.986" cy="8.992" rx="8.961" ry="8.968" style="fill:rgb(4,139,52);"/>
</g>
<g transform="matrix(0.591854,0,0,0.655991,0.929094,0.588599)">
<path d="M6.878,10.139L6.878,7.883C3.943,7.01 1.822,4.689 1.809,2.152L3.499,2.152C3.735,4.012 4.965,5.562 6.878,6.286L6.878,2.152L8.568,2.152L8.568,6.681C8.841,6.71 9.123,6.725 9.413,6.725C9.703,6.725 9.984,6.71 10.257,6.681L10.257,2.152L11.947,2.152L11.947,6.286C13.86,5.562 15.09,4.012 15.326,2.152L17.016,2.152C17.004,4.689 14.883,7.01 11.947,7.883L11.947,10.14C14.882,11.014 17.004,13.334 17.016,15.871L15.326,15.871C15.09,14.011 13.86,12.461 11.947,11.737L11.947,15.871L10.257,15.871L10.257,11.343C9.984,11.314 9.703,11.299 9.413,11.299C9.123,11.299 8.841,11.314 8.568,11.343L8.568,15.871L6.878,15.871L6.878,11.738C4.965,12.461 3.735,14.011 3.499,15.871L1.809,15.871C1.822,13.333 3.942,11.012 6.878,10.139ZM10.257,8.21C9.98,8.236 9.698,8.249 9.413,8.249C9.127,8.249 8.845,8.236 8.568,8.21L8.568,9.813C8.845,9.787 9.126,9.774 9.41,9.774C9.696,9.774 9.979,9.787 10.257,9.813L10.257,8.21Z" style="fill:white;"/>
</g>
</svg>
Side by side

After

Width:  |  Height:  |  Size: 1.6 KiB

4
data/styles/outdoors/include/priorities_4_overlays.prio.txt
View file

@ -233,6 +233,7 @@ railway-station-subway-sapporo # icon z13- (also has captio
railway-station-subway-sendai # icon z13- (also has caption(optional) z14-)
railway-station-subway-sf # icon z12- (also has caption(optional) z14-)
railway-station-subway-shanghai # icon z12- (also has caption(optional) z14-)
railway-station-subway-shenzhen # icon z13- (also has caption(optional) z14-)
railway-station-subway-shiraz # icon z13- (also has caption(optional) z14-)
railway-station-subway-singapore # icon z13- (also has caption(optional) z14-)
railway-station-subway-sofia # icon z13- (also has caption(optional) z14-)
@ -512,6 +513,7 @@ railway-subway_entrance-sapporo # icon z16- (also has captio
railway-subway_entrance-sendai # icon z16- (also has caption(optional) z17-)
railway-subway_entrance-sf # icon z16- (also has caption(optional) z17-)
railway-subway_entrance-shanghai # icon z16- (also has caption(optional) z17-)
railway-subway_entrance-shenzhen # icon z16- (also has caption(optional) z17-)
railway-subway_entrance-shiraz # icon z16- (also has caption(optional) z17-)
railway-subway_entrance-singapore # icon z16- (also has caption(optional) z17-)
railway-subway_entrance-sofia # icon z16- (also has caption(optional) z17-)
@ -1397,6 +1399,7 @@ leisure-swimming_pool-private # icon z17- (also has captio
# railway-station-subway-sendai # caption(optional) z14- (also has icon z13-)
# railway-station-subway-sf # caption(optional) z14- (also has icon z12-)
# railway-station-subway-shanghai # caption(optional) z14- (also has icon z12-)
# railway-station-subway-shenzhen # caption(optional) z14- (also has icon z13-)
# railway-station-subway-shiraz # caption(optional) z14- (also has icon z13-)
# railway-station-subway-singapore # caption(optional) z14- (also has icon z13-)
# railway-station-subway-sofia # caption(optional) z14- (also has icon z13-)
@ -1633,6 +1636,7 @@ leisure-swimming_pool-private # icon z17- (also has captio
# railway-subway_entrance-sendai # caption(optional) z17- (also has icon z16-)
# railway-subway_entrance-sf # caption(optional) z17- (also has icon z16-)
# railway-subway_entrance-shanghai # caption(optional) z17- (also has icon z16-)
# railway-subway_entrance-shenzhen # caption(optional) z17- (also has icon z16-)
# railway-subway_entrance-shiraz # caption(optional) z17- (also has icon z16-)
# railway-subway_entrance-singapore # caption(optional) z17- (also has icon z16-)
# railway-subway_entrance-sofia # caption(optional) z17- (also has icon z16-)

4
data/styles/vehicle/include/priorities_4_overlays.prio.txt
View file

@ -404,6 +404,7 @@ railway-station-subway-sapporo # icon z13- (also has captio
railway-station-subway-sendai # icon z13- (also has caption(optional) z15-)
railway-station-subway-sf # icon z12- (also has caption(optional) z15-)
railway-station-subway-shanghai # icon z12- (also has caption(optional) z15-)
railway-station-subway-shenzhen # icon z13- (also has caption(optional) z15-)
railway-station-subway-shiraz # icon z13- (also has caption(optional) z15-)
railway-station-subway-singapore # icon z13- (also has caption(optional) z15-)
railway-station-subway-sofia # icon z13- (also has caption(optional) z15-)
@ -649,6 +650,7 @@ railway-subway_entrance-sapporo # icon z16- (also has captio
railway-subway_entrance-sendai # icon z16- (also has caption(optional) z17-)
railway-subway_entrance-sf # icon z16- (also has caption(optional) z17-)
railway-subway_entrance-shanghai # icon z16- (also has caption(optional) z17-)
railway-subway_entrance-shenzhen # icon z16- (also has caption(optional) z17-)
railway-subway_entrance-shiraz # icon z16- (also has caption(optional) z17-)
railway-subway_entrance-singapore # icon z16- (also has caption(optional) z17-)
railway-subway_entrance-sofia # icon z16- (also has caption(optional) z17-)
@ -932,6 +934,7 @@ entrance-main # icon z18- (also has captio
# railway-station-subway-sendai # caption(optional) z15- (also has icon z13-)
# railway-station-subway-sf # caption(optional) z15- (also has icon z12-)
# railway-station-subway-shanghai # caption(optional) z15- (also has icon z12-)
# railway-station-subway-shenzhen # caption(optional) z15- (also has icon z13-)
# railway-station-subway-shiraz # caption(optional) z15- (also has icon z13-)
# railway-station-subway-singapore # caption(optional) z15- (also has icon z13-)
# railway-station-subway-sofia # caption(optional) z15- (also has icon z13-)
@ -1131,6 +1134,7 @@ entrance-main # icon z18- (also has captio
# railway-subway_entrance-sendai # caption(optional) z17- (also has icon z16-)
# railway-subway_entrance-sf # caption(optional) z17- (also has icon z16-)
# railway-subway_entrance-shanghai # caption(optional) z17- (also has icon z16-)
# railway-subway_entrance-shenzhen # caption(optional) z17- (also has icon z16-)
# railway-subway_entrance-shiraz # caption(optional) z17- (also has icon z16-)
# railway-subway_entrance-singapore # caption(optional) z17- (also has icon z16-)
# railway-subway_entrance-sofia # caption(optional) z17- (also has icon z16-)

2
generator/osm2type.cpp
View file

@ -534,7 +534,7 @@ string MatchCity(ms::LatLon const & ll)
{"seoul", {126.540527344, 37.3352243593, 127.23815918, 37.6838203267}},
{"sf", {-122.72277832, 37.1690715771, -121.651611328, 38.0307856938}},
{"shanghai", {119.849853516, 30.5291450367, 122.102050781, 32.1523618947}},
{"shenzhen", {113.790893555, 22.459263801, 114.348449707, 22.9280416657}},
{"shenzhen", {113.747866,22.464779,114.477038,22.816068}},
{"shiraz", {52.382254,29.498738,52.667513,29.840346}},
{"singapore", {103.624420166, 1.21389843409, 104.019927979, 1.45278619819}},
{"sofia", {23.195085, 42.574041, 23.503569, 42.835375}},