AndrewShkrob/organicmaps
1
Fork 0
forked from organicmaps/organicmaps
Code Pull requests Activity

[styles] add Berlin light rail station icons

Browse source 
- adjusted berlin bbox to include all stations
- used exiting icon

Signed-off-by: Jenny Em <ubahnverleih@gmail.com>
This commit is contained in:
Jenny Em 2024-12-04 16:59:15 +01:00 • committed by Konstantin Pastbin
parent 20aa24a74b
commit 660f427cc2
7 changed files with 17 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
data/mapcss-mapping.csv
View file

@ -1731,3 +1731,4 @@ 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;
railway|station|light_rail|berlin;[railway=station][station=light_rail][city=berlin],[railway=halt][station=light_rail][city=berlin];;name;int_name;1619;

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

5
data/strings/types_strings.txt
View file

@ -23308,6 +23308,11 @@
zh-Hans = 轻轨车站
zh-Hant = 輕軌車站
[type.railway.station.light_rail.berlin]
ref = type.railway.station.light_rail
en = S-Bahn Station
de = S-Bahnhof
[type.railway.station.light_rail.london]
ref = type.railway.station.light_rail
en = DLR Station

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

@ -809,3 +809,7 @@ node|z15-[railway=station][station=light_rail][city=london] {icon-image: light_r
/* Porto Light Rail Station */
node|z13-[railway=station][station=light_rail][city=porto] {icon-image: light_rail-porto-s.svg;}
node|z15-[railway=station][station=light_rail][city=porto] {icon-image: light_rail-porto-m.svg;}
/* Berlin Light Rail Station (S-Bahn Berlin) */
node|z13-[railway=station][station=light_rail][city=berlin] {icon-image: lightrail-berlin-s.svg;}
node|z15-[railway=station][station=light_rail][city=berlin] {icon-image: lightrail-berlin-m.svg;}

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

@ -136,6 +136,7 @@ amenity-bus_station # icon z13- (also has captio
railway-station-funicular # icon z12- (also has caption(optional) z12-)
railway-station-light_rail # icon z13- (also has caption(optional) z14-)
railway-station-light_rail-berlin # icon z13- (also has caption(optional) z14-)
railway-station-light_rail-london # icon z13- (also has caption(optional) z14-)
railway-station-light_rail-porto # icon z13- (also has caption(optional) z14-)
railway-station-monorail # icon z12- (also has caption(optional) z12-)
@ -1299,6 +1300,7 @@ leisure-swimming_pool-private # icon z17- (also has captio
# railway-station-funicular # caption(optional) z12- (also has icon z12-)
# railway-station-light_rail # caption(optional) z14- (also has icon z13-)
# railway-station-light_rail-berlin # caption(optional) z14- (also has icon z13-)
# railway-station-light_rail-london # caption(optional) z14- (also has icon z13-)
# railway-station-light_rail-porto # caption(optional) z14- (also has icon z13-)
# railway-station-monorail # caption(optional) z12- (also has icon z12-)

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

@ -136,6 +136,7 @@ amenity-bus_station # icon z13- (also has captio
railway-station-funicular # icon z12- (also has caption(optional) z12-)
railway-station-light_rail # icon z13- (also has caption(optional) z14-)
railway-station-light_rail-berlin # icon z13- (also has caption(optional) z14-)
railway-station-light_rail-london # icon z13- (also has caption(optional) z14-)
railway-station-light_rail-porto # icon z13- (also has caption(optional) z14-)
railway-station-monorail # icon z12- (also has caption(optional) z12-)
@ -1299,6 +1300,7 @@ leisure-swimming_pool-private # icon z17- (also has captio
# railway-station-funicular # caption(optional) z12- (also has icon z12-)
# railway-station-light_rail # caption(optional) z14- (also has icon z13-)
# railway-station-light_rail-berlin # caption(optional) z14- (also has icon z13-)
# railway-station-light_rail-london # caption(optional) z14- (also has icon z13-)
# railway-station-light_rail-porto # caption(optional) z14- (also has icon z13-)
# railway-station-monorail # caption(optional) z12- (also has icon z12-)

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

@ -196,6 +196,7 @@ natural-water-reservoir # caption z10- (also has are
railway-station-funicular # icon z12- (also has caption(optional) z13-)
railway-station-light_rail # icon z13- (also has caption(optional) z15-)
railway-station-light_rail-berlin # icon z13- (also has caption(optional) z15-)
railway-station-light_rail-london # icon z13- (also has caption(optional) z15-)
railway-station-light_rail-porto # icon z13- (also has caption(optional) z15-)
railway-station-monorail # icon z12- (also has caption(optional) z13-)
@ -769,6 +770,7 @@ entrance-main # icon z18- (also has captio
# railway-station-funicular # caption(optional) z13- (also has icon z12-)
# railway-station-light_rail # caption(optional) z15- (also has icon z13-)
# railway-station-light_rail-berlin # caption(optional) z15- (also has icon z13-)
# railway-station-light_rail-london # caption(optional) z15- (also has icon z13-)
# railway-station-light_rail-porto # caption(optional) z15- (also has icon z13-)
# railway-station-monorail # caption(optional) z13- (also has icon z12-)

2
generator/osm2type.cpp
View file

@ -446,7 +446,7 @@ string MatchCity(ms::LatLon const & ll)
{"bangkok", {100.159606934, 13.4363737155, 100.909423828, 14.3069694978}},
{"barcelona", {1.94458007812, 41.2489025224, 2.29614257812, 41.5414776668}},
{"beijing", {115.894775391, 39.588757277, 117.026367187, 40.2795256688}},
{"berlin", {13.0352783203, 52.3051199211, 13.7933349609, 52.6963610783}},
{"berlin", {13.061007, 52.290099, 13.91399, 52.760803}},
{"boston", {-71.2676239014, 42.2117365893, -70.8879089355, 42.521711682}},
{"bengalore", {77.393079,12.807501,77.806439,13.17014}},
{"bilbao", {-3.129730,43.202673,-2.859879,43.420011}},