kirylkaveryn/organicmaps
1
Fork 0
forked from organicmaps/organicmaps-tmp
Code Pull requests Activity

Add Hong Kong metro type/icon

Browse source 
also adjusted Hong Kong bbox so it covers nearly all stations without conflicting shenzhen (only one border station in the north is not covered by the bbox)

Signed-off-by: Jenny Em <ubahnverleih@gmail.com>
This commit is contained in:
Jenny Em 2024-12-02 20:39:15 +01:00 • committed by Viktor Havaka
parent 0351898147
commit 2a84957d7f
11 changed files with 66 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

@ -1729,3 +1729,5 @@ attraction|maze;1613;
attraction|historic;1614;
attraction|big_wheel;1615;
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;

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

@ -23475,6 +23475,9 @@
[type.railway.station.subway.hiroshima]
ref = type.railway.station.subway
[type.railway.station.subway.hongkong]
ref = type.railway.station.subway
[type.railway.station.subway.isfahan]
ref = type.railway.station.subway
@ -23908,6 +23911,9 @@
[type.railway.subway_entrance.hiroshima]
ref = type.railway.subway_entrance
[type.railway.subway_entrance.hongkong]
ref = type.railway.subway_entrance
[type.railway.subway_entrance.isfahan]
ref = type.railway.subway_entrance

10
data/styles/default/dark/symbols/subway-hongkong-m.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 18 16" 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(1.0659,0,0,1.43107,-0.0381795,-0.805606)">
<ellipse cx="8.486" cy="5.88" rx="8.41" ry="5.267" style="fill:rgb(173,35,59);"/>
</g>
<g transform="matrix(0.971591,0,0,0.906989,-0.707122,-0.12468)">
<path d="M9.127,9.245L9.127,7.772C6.975,7.36 5.346,5.476 5.34,3.216L7.037,3.216C7.037,3.222 7.037,3.227 7.037,3.233C7.037,4.589 7.916,5.739 9.127,6.127L9.127,2.877L10.88,2.877L10.88,6.143C12.118,5.771 13.022,4.608 13.022,3.233C13.022,3.227 13.022,3.222 13.022,3.216L14.687,3.216C14.681,5.483 13.042,7.371 10.88,7.776L10.88,9.247C13.035,9.657 14.666,11.542 14.672,13.804L13.008,13.804C13.008,13.799 13.008,13.793 13.008,13.787C13.008,12.417 12.111,11.258 10.88,10.881L10.88,14.035L9.127,14.035L9.127,10.888C7.908,11.272 7.022,12.426 7.022,13.787C7.022,13.793 7.022,13.799 7.022,13.804L5.325,13.804C5.332,11.539 6.968,9.651 9.127,9.245Z" style="fill:rgb(183,183,183);"/>
</g>
</svg>
Side by side

After

Width:  |  Height:  |  Size: 1.3 KiB

10
data/styles/default/dark/symbols/subway-hongkong-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 12 11" 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.712786,0,0,0.954179,-0.0480684,-0.573992)">
<ellipse cx="8.486" cy="5.88" rx="8.41" ry="5.267" style="fill:rgb(173,35,59);"/>
</g>
<g transform="matrix(0.649719,0,0,0.604743,-0.502948,-0.120485)">
<path d="M9.127,9.245L9.127,7.772C6.975,7.36 5.346,5.476 5.34,3.216L7.037,3.216C7.037,3.222 7.037,3.227 7.037,3.233C7.037,4.589 7.916,5.739 9.127,6.127L9.127,2.877L10.88,2.877L10.88,6.143C12.118,5.771 13.022,4.608 13.022,3.233C13.022,3.227 13.022,3.222 13.022,3.216L14.687,3.216C14.681,5.483 13.042,7.371 10.88,7.776L10.88,9.247C13.035,9.657 14.666,11.542 14.672,13.804L13.008,13.804C13.008,13.799 13.008,13.793 13.008,13.787C13.008,12.417 12.111,11.258 10.88,10.881L10.88,14.035L9.127,14.035L9.127,10.888C7.908,11.272 7.022,12.426 7.022,13.787C7.022,13.793 7.022,13.799 7.022,13.804L5.325,13.804C5.332,11.539 6.968,9.651 9.127,9.245Z" style="fill:rgb(183,183,183);"/>
</g>
</svg>
Side by side

After

Width:  |  Height:  |  Size: 1.3 KiB

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

@ -299,6 +299,11 @@ node|z15-[railway=station][transport=subway][city=hiroshima] {icon-image: subway
node|z16-[railway=subway_entrance][city=hiroshima] {icon-image: subway-hirosima-s.svg;}
node|z18-[railway=subway_entrance][city=hiroshima] {icon-image: subway-hirosima-m.svg;}
/* Hong Kong Subway Station */
node|z13-[railway=station][transport=subway][city=hongkong] {icon-image: subway-hongkong-s.svg;}
node|z15-[railway=station][transport=subway][city=hongkong] {icon-image: subway-hongkong-m.svg;}
node|z16-[railway=subway_entrance][city=hongkong] {icon-image: subway-hongkong-s.svg;}
/* Isfahan Subway Station */
node|z13-[railway=station][transport=subway][city=isfahan] {icon-image: subway-isfahan-s.svg;}
node|z15-[railway=station][transport=subway][city=isfahan] {icon-image: subway-isfahan-m.svg;}

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

@ -179,6 +179,7 @@ railway-station-subway-guangzhou # icon z13- (also has captio
railway-station-subway-hamburg # icon z13- (also has caption(optional) z14-)
railway-station-subway-helsinki # icon z13- (also has caption(optional) z14-)
railway-station-subway-hiroshima # icon z13- (also has caption(optional) z14-)
railway-station-subway-hongkong # icon z13- (also has caption(optional) z14-)
railway-station-subway-isfahan # icon z13- (also has caption(optional) z14-)
railway-station-subway-istanbul # icon z12- (also has caption(optional) z14-)
railway-station-subway-izmir # icon z13- (also has caption(optional) z14-)
@ -457,6 +458,7 @@ railway-subway_entrance-guangzhou # icon z16- (also has captio
railway-subway_entrance-hamburg # icon z16- (also has caption(optional) z17-)
railway-subway_entrance-helsinki # icon z16- (also has caption(optional) z17-)
railway-subway_entrance-hiroshima # icon z16- (also has caption(optional) z17-)
railway-subway_entrance-hongkong # icon z16- (also has caption(optional) z17-)
railway-subway_entrance-isfahan # icon z16- (also has caption(optional) z17-)
railway-subway_entrance-istanbul # icon z16- (also has caption(optional) z17-)
railway-subway_entrance-izmir # icon z16- (also has caption(optional) z17-)
@ -1340,6 +1342,7 @@ leisure-swimming_pool-private # icon z17- (also has captio
# railway-station-subway-hamburg # caption(optional) z14- (also has icon z13-)
# railway-station-subway-helsinki # caption(optional) z14- (also has icon z13-)
# railway-station-subway-hiroshima # caption(optional) z14- (also has icon z13-)
# railway-station-subway-hongkong # caption(optional) z14- (also has icon z13-)
# railway-station-subway-isfahan # caption(optional) z14- (also has icon z13-)
# railway-station-subway-istanbul # caption(optional) z14- (also has icon z12-)
# railway-station-subway-izmir # caption(optional) z14- (also has icon z13-)
@ -1575,6 +1578,7 @@ leisure-swimming_pool-private # icon z17- (also has captio
# railway-subway_entrance-hamburg # caption(optional) z17- (also has icon z16-)
# railway-subway_entrance-helsinki # caption(optional) z17- (also has icon z16-)
# railway-subway_entrance-hiroshima # caption(optional) z17- (also has icon z16-)
# railway-subway_entrance-hongkong # caption(optional) z17- (also has icon z16-)
# railway-subway_entrance-isfahan # caption(optional) z17- (also has icon z16-)
# railway-subway_entrance-istanbul # caption(optional) z17- (also has icon z16-)
# railway-subway_entrance-izmir # caption(optional) z17- (also has icon z16-)

10
data/styles/default/light/symbols/subway-hongkong-m.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 18 16" 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(1.0659,0,0,1.43107,-0.0381795,-0.805606)">
<ellipse cx="8.486" cy="5.88" rx="8.41" ry="5.267" style="fill:rgb(173,35,59);"/>
</g>
<g transform="matrix(0.971591,0,0,0.906989,-0.707122,-0.12468)">
<path d="M9.127,9.245L9.127,7.772C6.975,7.36 5.346,5.476 5.34,3.216L7.037,3.216C7.037,3.222 7.037,3.227 7.037,3.233C7.037,4.589 7.916,5.739 9.127,6.127L9.127,2.877L10.88,2.877L10.88,6.143C12.118,5.771 13.022,4.608 13.022,3.233C13.022,3.227 13.022,3.222 13.022,3.216L14.687,3.216C14.681,5.483 13.042,7.371 10.88,7.776L10.88,9.247C13.035,9.657 14.666,11.542 14.672,13.804L13.008,13.804C13.008,13.799 13.008,13.793 13.008,13.787C13.008,12.417 12.111,11.258 10.88,10.881L10.88,14.035L9.127,14.035L9.127,10.888C7.908,11.272 7.022,12.426 7.022,13.787C7.022,13.793 7.022,13.799 7.022,13.804L5.325,13.804C5.332,11.539 6.968,9.651 9.127,9.245Z" style="fill:white;"/>
</g>
</svg>
Side by side

After

Width:  |  Height:  |  Size: 1.3 KiB

10
data/styles/default/light/symbols/subway-hongkong-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 12 11" 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.712786,0,0,0.954179,-0.0480684,-0.573992)">
<ellipse cx="8.486" cy="5.88" rx="8.41" ry="5.267" style="fill:rgb(173,35,59);"/>
</g>
<g transform="matrix(0.649719,0,0,0.604743,-0.502948,-0.120485)">
<path d="M9.127,9.245L9.127,7.772C6.975,7.36 5.346,5.476 5.34,3.216L7.037,3.216C7.037,3.222 7.037,3.227 7.037,3.233C7.037,4.589 7.916,5.739 9.127,6.127L9.127,2.877L10.88,2.877L10.88,6.143C12.118,5.771 13.022,4.608 13.022,3.233C13.022,3.227 13.022,3.222 13.022,3.216L14.687,3.216C14.681,5.483 13.042,7.371 10.88,7.776L10.88,9.247C13.035,9.657 14.666,11.542 14.672,13.804L13.008,13.804C13.008,13.799 13.008,13.793 13.008,13.787C13.008,12.417 12.111,11.258 10.88,10.881L10.88,14.035L9.127,14.035L9.127,10.888C7.908,11.272 7.022,12.426 7.022,13.787C7.022,13.793 7.022,13.799 7.022,13.804L5.325,13.804C5.332,11.539 6.968,9.651 9.127,9.245Z" style="fill:white;"/>
</g>
</svg>
Side by side

After

Width:  |  Height:  |  Size: 1.3 KiB

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

@ -179,6 +179,7 @@ railway-station-subway-guangzhou # icon z13- (also has captio
railway-station-subway-hamburg # icon z13- (also has caption(optional) z14-)
railway-station-subway-helsinki # icon z13- (also has caption(optional) z14-)
railway-station-subway-hiroshima # icon z13- (also has caption(optional) z14-)
railway-station-subway-hongkong # icon z13- (also has caption(optional) z14-)
railway-station-subway-isfahan # icon z13- (also has caption(optional) z14-)
railway-station-subway-istanbul # icon z12- (also has caption(optional) z14-)
railway-station-subway-izmir # icon z13- (also has caption(optional) z14-)
@ -457,6 +458,7 @@ railway-subway_entrance-guangzhou # icon z16- (also has captio
railway-subway_entrance-hamburg # icon z16- (also has caption(optional) z17-)
railway-subway_entrance-helsinki # icon z16- (also has caption(optional) z17-)
railway-subway_entrance-hiroshima # icon z16- (also has caption(optional) z17-)
railway-subway_entrance-hongkong # icon z16- (also has caption(optional) z17-)
railway-subway_entrance-isfahan # icon z16- (also has caption(optional) z17-)
railway-subway_entrance-istanbul # icon z16- (also has caption(optional) z17-)
railway-subway_entrance-izmir # icon z16- (also has caption(optional) z17-)
@ -1340,6 +1342,7 @@ leisure-swimming_pool-private # icon z17- (also has captio
# railway-station-subway-hamburg # caption(optional) z14- (also has icon z13-)
# railway-station-subway-helsinki # caption(optional) z14- (also has icon z13-)
# railway-station-subway-hiroshima # caption(optional) z14- (also has icon z13-)
# railway-station-subway-hongkong # caption(optional) z14- (also has icon z13-)
# railway-station-subway-isfahan # caption(optional) z14- (also has icon z13-)
# railway-station-subway-istanbul # caption(optional) z14- (also has icon z12-)
# railway-station-subway-izmir # caption(optional) z14- (also has icon z13-)
@ -1575,6 +1578,7 @@ leisure-swimming_pool-private # icon z17- (also has captio
# railway-subway_entrance-hamburg # caption(optional) z17- (also has icon z16-)
# railway-subway_entrance-helsinki # caption(optional) z17- (also has icon z16-)
# railway-subway_entrance-hiroshima # caption(optional) z17- (also has icon z16-)
# railway-subway_entrance-hongkong # caption(optional) z17- (also has icon z16-)
# railway-subway_entrance-isfahan # caption(optional) z17- (also has icon z16-)
# railway-subway_entrance-istanbul # caption(optional) z17- (also has icon z16-)
# railway-subway_entrance-izmir # caption(optional) z17- (also has icon z16-)

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

@ -350,6 +350,7 @@ railway-station-subway-guangzhou # icon z13- (also has captio
railway-station-subway-hamburg # icon z13- (also has caption(optional) z15-)
railway-station-subway-helsinki # icon z13- (also has caption(optional) z15-)
railway-station-subway-hiroshima # icon z13- (also has caption(optional) z15-)
railway-station-subway-hongkong # icon z13- (also has caption(optional) z15-)
railway-station-subway-isfahan # icon z13- (also has caption(optional) z15-)
railway-station-subway-istanbul # icon z12- (also has caption(optional) z15-)
railway-station-subway-izmir # icon z13- (also has caption(optional) z15-)
@ -593,6 +594,7 @@ railway-subway_entrance-guangzhou # icon z16- (also has captio
railway-subway_entrance-hamburg # icon z16- (also has caption(optional) z17-)
railway-subway_entrance-helsinki # icon z16- (also has caption(optional) z17-)
railway-subway_entrance-hiroshima # icon z16- (also has caption(optional) z17-)
railway-subway_entrance-hongkong # icon z16- (also has caption(optional) z17-)
railway-subway_entrance-isfahan # icon z16- (also has caption(optional) z17-)
railway-subway_entrance-istanbul # icon z16- (also has caption(optional) z17-)
railway-subway_entrance-izmir # icon z16- (also has caption(optional) z17-)
@ -875,6 +877,7 @@ entrance-main # icon z18- (also has captio
# railway-station-subway-hamburg # caption(optional) z15- (also has icon z13-)
# railway-station-subway-helsinki # caption(optional) z15- (also has icon z13-)
# railway-station-subway-hiroshima # caption(optional) z15- (also has icon z13-)
# railway-station-subway-hongkong # caption(optional) z15- (also has icon z13-)
# railway-station-subway-isfahan # caption(optional) z15- (also has icon z13-)
# railway-station-subway-istanbul # caption(optional) z15- (also has icon z12-)
# railway-station-subway-izmir # caption(optional) z15- (also has icon z13-)
@ -1072,6 +1075,7 @@ entrance-main # icon z18- (also has captio
# railway-subway_entrance-hamburg # caption(optional) z17- (also has icon z16-)
# railway-subway_entrance-helsinki # caption(optional) z17- (also has icon z16-)
# railway-subway_entrance-hiroshima # caption(optional) z17- (also has icon z16-)
# railway-subway_entrance-hongkong # caption(optional) z17- (also has icon z16-)
# railway-subway_entrance-isfahan # caption(optional) z17- (also has icon z16-)
# railway-subway_entrance-istanbul # caption(optional) z17- (also has icon z16-)
# railway-subway_entrance-izmir # caption(optional) z17- (also has icon z16-)

2
generator/osm2type.cpp
View file

@ -476,7 +476,7 @@ string MatchCity(ms::LatLon const & ll)
{"hamburg", {9.75860595703, 53.39151869, 10.2584838867, 53.6820686709}},
{"helsinki", {24.3237304688, 59.9989861206, 25.48828125, 60.44638186}},
{"hiroshima", {132.256736,34.312824,132.621345,34.55182}},
{"hongkong", {114.039459229, 22.1848617608, 114.305877686, 22.3983322415}},
{"hongkong", {113.934086,22.150767,114.424924,22.515215}},
{"isfahan", {51.472344,32.504644,51.865369,32.820396}},
{"istanbul", {28.4155, 40.7172, 29.7304, 41.4335}},
{"izmir", {26.953591,38.262044,27.318199,38.543469}},