From 970def18e37a55158d078347b3a461213c055eaa Mon Sep 17 00:00:00 2001 From: vng Date: Thu, 11 Feb 2016 16:08:42 +0300 Subject: [PATCH] [styles] Added new type building=train_station. --- data/mapcss-mapping.csv | 1 + data/styles/clear/include/buildings.mapcss | 15 +++-- data/styles/clear/include/transport.mapcss | 74 ++++++++++++++-------- 3 files changed, 59 insertions(+), 31 deletions(-) diff --git a/data/mapcss-mapping.csv b/data/mapcss-mapping.csv index 69597959d5..f9445f8baa 100644 --- a/data/mapcss-mapping.csv +++ b/data/mapcss-mapping.csv @@ -1051,3 +1051,4 @@ amenity|place_of_worship|taoist;[amenity=place_of_worship][religion=taoist];;nam man_made|water_tower;[man_made=water_tower];;name;int_name;1051; highway|world_level;[highway=world_level];;name;int_name;1052; highway|world_towns_level;[highway=world_towns_level];;name;int_name;1053; +building|train_station;[building=train_station];;name;int_name;1054; diff --git a/data/styles/clear/include/buildings.mapcss b/data/styles/clear/include/buildings.mapcss index 08862daee1..015e263799 100644 --- a/data/styles/clear/include/buildings.mapcss +++ b/data/styles/clear/include/buildings.mapcss @@ -1,12 +1,14 @@ area|z14[building], -area|z14[landuse=garages] +area|z14[landuse=garages], +area|z14[building=train_station], { fill-color: @building; fill-opacity: 0.5; z-index: 150; } area|z15[building], -area|z15[landuse=garages] +area|z15[landuse=garages], +area|z15[building=train_station], { fill-color: @building; fill-opacity: 0.6; @@ -15,7 +17,8 @@ area|z15[landuse=garages] area|z16[building], area|z16[building:part], -area|z16[landuse=garages] +area|z16[landuse=garages], +area|z16[building=train_station], { fill-color: @building; fill-opacity: 0.8; @@ -24,7 +27,8 @@ area|z16[landuse=garages] area|z17[building], area|z17[building:part], -area|z17[landuse=garages] +area|z17[landuse=garages], +area|z17[building=train_station], { fill-color: @building_dark; opacity: 0.9; @@ -33,7 +37,8 @@ area|z17[landuse=garages] area|z18-[building], area|z18-[building:part], -area|z18-[landuse=garages] +area|z18-[landuse=garages], +area|z18-[building=train_station], { fill-color: @building_dark; opacity: 1; diff --git a/data/styles/clear/include/transport.mapcss b/data/styles/clear/include/transport.mapcss index 802d66ec79..6319dbdfe0 100644 --- a/data/styles/clear/include/transport.mapcss +++ b/data/styles/clear/include/transport.mapcss @@ -321,10 +321,11 @@ node|z17-[highway=motorway_junction] /* TRAIN STATIONS */ -node|z12[railway=halt] { - icon-image: train-s.svg; +node|z12[railway=halt], +{ + icon-image: train-s.svg; text-offset: 6; - z-index: 2800; + z-index: 2800; font-size: 9; text: name; text-color: @label_dark; @@ -333,9 +334,10 @@ node|z12[railway=halt] { text-halo-color: @label_halo_light; } -node|z12[railway=halt]::int_name { +node|z12[railway=halt]::int_name, +{ text-offset: 6; - z-index: 2800; + z-index: 2800; font-size: 8; text: int_name; text-color: @label_dark; @@ -345,10 +347,12 @@ node|z12[railway=halt]::int_name { } node|z13[railway=station], -node|z13[railway=halt] { - icon-image: train-s.svg; +node|z13[railway=halt], +area|z13[building=train_station], +{ + icon-image: train-s.svg; text-offset: 6; - z-index: 2800; + z-index: 2800; font-size: 10; text: name; text-color: @label_dark; @@ -357,9 +361,11 @@ node|z13[railway=halt] { text-halo-color: @label_halo_light; } node|z13[railway=station]::int_name, -node|z13[railway=halt]::int_name { +node|z13[railway=halt]::int_name, +area|z13[building=train_station]::int_name, +{ text-offset: 6; - z-index: 2800; + z-index: 2800; font-size: 9; text: int_name; text-color: @label_dark; @@ -368,10 +374,12 @@ node|z13[railway=halt]::int_name { text-halo-color: @label_halo_light; } node|z14[railway=station], -node|z14[railway=halt] { - icon-image: train-s.svg; +node|z14[railway=halt], +area|z14[building=train_station], +{ + icon-image: train-s.svg; text-offset: 6; - z-index: 2800; + z-index: 2800; font-size: 11; text: name; text-color: @label_dark; @@ -380,9 +388,11 @@ node|z14[railway=halt] { text-halo-color: @label_halo_light; } node|z14[railway=station]::int_name, -node|z14[railway=halt]::int_name { +node|z14[railway=halt]::int_name, +area|z14[building=train_station]::int_name, +{ text-offset: 6; - z-index: 2800; + z-index: 2800; font-size: 10; text: int_name; text-color: @label_dark; @@ -391,10 +401,12 @@ node|z14[railway=halt]::int_name { text-halo-color: @label_halo_light; } node|z15[railway=station], -node|z15[railway=halt] { - icon-image: train-m.svg; +node|z15[railway=halt], +area|z15[building=train_station], +{ + icon-image: train-m.svg; text-offset: 8; - z-index: 2800; + z-index: 2800; font-size: 12; text: name; text-color: @label_dark; @@ -403,9 +415,11 @@ node|z15[railway=halt] { text-halo-color: @label_halo_light; } node|z15[railway=station]::int_name, -node|z15[railway=halt]::int_name { +node|z15[railway=halt]::int_name, +area|z15[building=train_station]::int_name, +{ text-offset: 8; - z-index: 2800; + z-index: 2800; font-size: 10; text: int_name; text-color: @label_dark; @@ -415,8 +429,10 @@ node|z15[railway=halt]::int_name { } node|z16[railway=station], -node|z16[railway=halt] { - icon-image: train-m.svg; +node|z16[railway=halt], +area|z16[building=train_station], +{ + icon-image: train-m.svg; text-offset: 8; font-size: 13; z-index: 2800; @@ -427,7 +443,9 @@ node|z16[railway=halt] { text-halo-color: @label_halo_light; } node|z16[railway=station]::int_name, -node|z16[railway=halt]::int_name { +node|z16[railway=halt]::int_name, +area|z16[building=train_station]::int_name, +{ text-offset: 8; font-size: 11; z-index: 2800; @@ -438,8 +456,10 @@ node|z16[railway=halt]::int_name { text-halo-color: @label_halo_light; } node|z17-[railway=station], -node|z17-[railway=halt] { - icon-image: train-l.svg; +node|z17-[railway=halt], +area|z17-[building=train_station], +{ + icon-image: train-l.svg; text-offset: 8; font-size: 13; z-index: 2800; @@ -450,7 +470,9 @@ node|z17-[railway=halt] { text-halo-color: @label_halo_light; } node|z17-[railway=station]::int_name, -node|z17-[railway=halt]::int_name { +node|z17-[railway=halt]::int_name, +area|z17-[building=train_station]::int_name, +{ text-offset: 18; font-size: 12; z-index: 2800;