diff --git a/data/mapcss-mapping.csv b/data/mapcss-mapping.csv index 55e38bf6f0..f8764a3539 100644 --- a/data/mapcss-mapping.csv +++ b/data/mapcss-mapping.csv @@ -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; diff --git a/data/strings/types_strings.txt b/data/strings/types_strings.txt index f7787c6d4d..7e45af1332 100644 --- a/data/strings/types_strings.txt +++ b/data/strings/types_strings.txt @@ -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 diff --git a/data/styles/default/dark/symbols/subway-hongkong-m.svg b/data/styles/default/dark/symbols/subway-hongkong-m.svg new file mode 100644 index 0000000000..57fe6e9b3c --- /dev/null +++ b/data/styles/default/dark/symbols/subway-hongkong-m.svg @@ -0,0 +1,10 @@ + + + + + + + + + + diff --git a/data/styles/default/dark/symbols/subway-hongkong-s.svg b/data/styles/default/dark/symbols/subway-hongkong-s.svg new file mode 100644 index 0000000000..9f9cb39579 --- /dev/null +++ b/data/styles/default/dark/symbols/subway-hongkong-s.svg @@ -0,0 +1,10 @@ + + + + + + + + + + diff --git a/data/styles/default/include/Subways.mapcss b/data/styles/default/include/Subways.mapcss index b2bb2124d4..da7fd4e405 100644 --- a/data/styles/default/include/Subways.mapcss +++ b/data/styles/default/include/Subways.mapcss @@ -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;} diff --git a/data/styles/default/include/priorities_4_overlays.prio.txt b/data/styles/default/include/priorities_4_overlays.prio.txt index a0db03b9b3..8b1e54970f 100644 --- a/data/styles/default/include/priorities_4_overlays.prio.txt +++ b/data/styles/default/include/priorities_4_overlays.prio.txt @@ -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-) diff --git a/data/styles/default/light/symbols/subway-hongkong-m.svg b/data/styles/default/light/symbols/subway-hongkong-m.svg new file mode 100644 index 0000000000..9cc6896ae6 --- /dev/null +++ b/data/styles/default/light/symbols/subway-hongkong-m.svg @@ -0,0 +1,10 @@ + + + + + + + + + + diff --git a/data/styles/default/light/symbols/subway-hongkong-s.svg b/data/styles/default/light/symbols/subway-hongkong-s.svg new file mode 100644 index 0000000000..686a8ec386 --- /dev/null +++ b/data/styles/default/light/symbols/subway-hongkong-s.svg @@ -0,0 +1,10 @@ + + + + + + + + + + diff --git a/data/styles/outdoors/include/priorities_4_overlays.prio.txt b/data/styles/outdoors/include/priorities_4_overlays.prio.txt index 0ead3d3e6d..1cf18eddf4 100644 --- a/data/styles/outdoors/include/priorities_4_overlays.prio.txt +++ b/data/styles/outdoors/include/priorities_4_overlays.prio.txt @@ -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-) diff --git a/data/styles/vehicle/include/priorities_4_overlays.prio.txt b/data/styles/vehicle/include/priorities_4_overlays.prio.txt index b9de8edd78..6e5bfeb03b 100644 --- a/data/styles/vehicle/include/priorities_4_overlays.prio.txt +++ b/data/styles/vehicle/include/priorities_4_overlays.prio.txt @@ -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-) diff --git a/generator/osm2type.cpp b/generator/osm2type.cpp index 84fb9992ec..1044492549 100644 --- a/generator/osm2type.cpp +++ b/generator/osm2type.cpp @@ -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}},