diff --git a/data/mapcss-mapping.csv b/data/mapcss-mapping.csv index e9c85a1749..2f6570aa2a 100644 --- a/data/mapcss-mapping.csv +++ b/data/mapcss-mapping.csv @@ -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; diff --git a/data/strings/types_strings.txt b/data/strings/types_strings.txt index 7e61b702a0..278fd861bf 100644 --- a/data/strings/types_strings.txt +++ b/data/strings/types_strings.txt @@ -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 diff --git a/data/styles/default/dark/symbols/subway-shenzhen-m.svg b/data/styles/default/dark/symbols/subway-shenzhen-m.svg new file mode 100644 index 0000000000..ead82284ca --- /dev/null +++ b/data/styles/default/dark/symbols/subway-shenzhen-m.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/data/styles/default/dark/symbols/subway-shenzhen-s.svg b/data/styles/default/dark/symbols/subway-shenzhen-s.svg new file mode 100644 index 0000000000..ce2a0449f1 --- /dev/null +++ b/data/styles/default/dark/symbols/subway-shenzhen-s.svg @@ -0,0 +1,10 @@ + + + + + + + + + + diff --git a/data/styles/default/include/Subways.mapcss b/data/styles/default/include/Subways.mapcss index f5cf147c1c..e0a82f8b3e 100644 --- a/data/styles/default/include/Subways.mapcss +++ b/data/styles/default/include/Subways.mapcss @@ -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;} diff --git a/data/styles/default/include/priorities_4_overlays.prio.txt b/data/styles/default/include/priorities_4_overlays.prio.txt index 7ce0b955bc..23f9159655 100644 --- a/data/styles/default/include/priorities_4_overlays.prio.txt +++ b/data/styles/default/include/priorities_4_overlays.prio.txt @@ -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-) diff --git a/data/styles/default/light/symbols/subway-shenzhen-m.svg b/data/styles/default/light/symbols/subway-shenzhen-m.svg new file mode 100644 index 0000000000..131bb3733e --- /dev/null +++ b/data/styles/default/light/symbols/subway-shenzhen-m.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/data/styles/default/light/symbols/subway-shenzhen-s.svg b/data/styles/default/light/symbols/subway-shenzhen-s.svg new file mode 100644 index 0000000000..fdbd4b3f48 --- /dev/null +++ b/data/styles/default/light/symbols/subway-shenzhen-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 20e8ee148b..7981c4dd40 100644 --- a/data/styles/outdoors/include/priorities_4_overlays.prio.txt +++ b/data/styles/outdoors/include/priorities_4_overlays.prio.txt @@ -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-) diff --git a/data/styles/vehicle/include/priorities_4_overlays.prio.txt b/data/styles/vehicle/include/priorities_4_overlays.prio.txt index e3660c919e..b6e11c1ad3 100644 --- a/data/styles/vehicle/include/priorities_4_overlays.prio.txt +++ b/data/styles/vehicle/include/priorities_4_overlays.prio.txt @@ -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-) diff --git a/generator/osm2type.cpp b/generator/osm2type.cpp index 00c5692850..806b2ca4c1 100644 --- a/generator/osm2type.cpp +++ b/generator/osm2type.cpp @@ -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}},