diff --git a/standard.mml b/standard.mml index fadbb6522..515c94243 100644 --- a/standard.mml +++ b/standard.mml @@ -335,7 +335,7 @@ Layer: <<: *osm2pgsql table: |- (SELECT - way, railway, station, + way, railway, station, monorail, CASE WHEN railway = 'station' AND station = 'light_rail' THEN 450 WHEN railway = 'station' AND station = 'subway' THEN 400 WHEN railway = 'station' THEN 800 @@ -357,6 +357,7 @@ Layer: railway, route_count, tags->'station' AS station, + tags->'monorail' AS monorail, tags->'railway:ref' AS label FROM stations_with_route_counts WHERE railway IN ('station', 'halt', 'service_station', 'yard', 'junction', 'spur_junction', 'crossover', 'site') @@ -374,7 +375,7 @@ Layer: <<: *osm2pgsql table: |- (SELECT - way, railway, station, + way, railway, station, monorail, CASE WHEN railway = 'station' AND station = 'light_rail' THEN 450 WHEN railway = 'station' AND station = 'subway' THEN 400 WHEN railway = 'station' THEN 800 @@ -401,6 +402,7 @@ Layer: ELSE route_count::int END AS route_count, tags->'station' AS station, + tags->'monorail' AS monorail, COALESCE(tags->'short_name', name) AS label FROM stations_with_route_counts WHERE railway IN ('station', 'halt', 'service_station', 'yard', 'junction', 'spur_junction', 'crossover', 'site', 'tram_stop') diff --git a/standard_labels.mss b/standard_labels.mss index c620f5623..38dfa6610 100644 --- a/standard_labels.mss +++ b/standard_labels.mss @@ -40,11 +40,11 @@ #railway_text_stations_med[zoom>=6][zoom<=10], #railway_text_stations_high[zoom>=11] { - [railway = 'station'][station != 'light_rail'][station != 'subway'][station != 'funicular'][zoom <= 9], + [railway = 'station'][station != 'light_rail'][station != 'subway'][station != 'funicular'][station != 'monorail'][monorail != 'yes'][zoom <= 9], [railway = 'tram_stop'][zoom >= 14], - [railway = 'station'][station != 'funicular'][zoom >= 10], - [railway = 'halt'][station != 'funicular'][zoom >= 10], - [railway != 'tram_stop'][station != 'funicular'][zoom >= 11] { + [railway = 'station'][station != 'funicular'][station != 'monorail'][monorail != 'yes'][zoom >= 10], + [railway = 'halt'][station != 'funicular'][station != 'monorail'][zoom >= 10], + [railway != 'tram_stop'][station != 'funicular'][station != 'monorail'][monorail != 'yes'][zoom >= 11] { text-name: '[label]'; text-face-name: @bold-fonts; text-size: @text-station-size;