[classif] Deprecate obsolete or non-existent railway types, cleanup styles

Signed-off-by: Konstantin Pastbin <konstantin.pastbin@gmail.com>
This commit is contained in:
Konstantin Pastbin 2023-06-24 01:03:40 +03:00 committed by Viktor Govako
parent 31af26f4af
commit 73e0d0eacf
6 changed files with 22 additions and 206 deletions

View file

@ -269,7 +269,8 @@ sport|basketball;242;
amenity|cinema;243;
amenity|theatre;244;
sport|chess;245;
railway|spur;246;
# Was railway|spur -- June 2023
deprecated|deprecated;246;x
aerialway|station;247;
landuse|brownfield;248;
aeroway|apron;249;
@ -452,7 +453,8 @@ healthcare|podiatrist;425;
healthcare|psychotherapist;426;
highway|ford;427;
area:highway|path;428;
railway|siding;429;
# Was railway|siding -- June 2023
deprecated|deprecated;429;x
highway|track|area;[highway=track][area?];;name;int_name;430;
amenity|sanitary_dump_station;431;
railway|funicular;432;
@ -470,11 +472,13 @@ deprecated|deprecated;443;x
highway|path|difficult_alpine_hiking;[highway=path][sac_scale=difficult_alpine_hiking];;name;int_name;444;
earthquake:damage|spontaneous_camp;445;
deprecated|deprecated;446;x
railway|yard;447;
# Was railway|yard -- June 2023
deprecated|deprecated;447;x
deprecated|deprecated;448;x
natural|meadow;449;landuse|meadow
deprecated|deprecated;450;x
railway|razed;451;
# Was railway|razed -- June 2023
deprecated|deprecated;451;x
highway|footway|demanding_mountain_hiking;[highway=footway][sac_scale=demanding_mountain_hiking];;name;int_name;452;
deprecated|deprecated;453;x
deprecated|deprecated;454;x
@ -532,7 +536,8 @@ deprecated|deprecated;505;x
deprecated|deprecated;506;x
deprecated|deprecated;507;x
deprecated|deprecated;508;x
railway|spur|bridge;[railway=spur][bridge?];;name;int_name;509;
# Was railway|spur|bridge -- June 2023
deprecated|deprecated;509;x
deprecated|deprecated;510;x
deprecated|deprecated;511;x
deprecated|deprecated;512;x
@ -649,7 +654,8 @@ deprecated|deprecated;622;x
deprecated|deprecated;623;x
deprecated|deprecated;624;x
deprecated|deprecated;625;x
railway|siding|bridge;[railway=siding][bridge?];;name;int_name;626;
# Was railway|siding|bridge -- June 2023
deprecated|deprecated;626;x
highway|footway|difficult_alpine_hiking;[highway=footway][sac_scale=difficult_alpine_hiking];;name;int_name;627;
deprecated|deprecated;628;x
deprecated|deprecated;629;x
@ -674,7 +680,8 @@ deprecated|deprecated;647;x
deprecated|deprecated;648;x
deprecated|deprecated;649;x
deprecated|deprecated;650;x
railway|spur|tunnel;[railway=spur][tunnel?];;name;int_name;651;
# Was railway|spur|tunnel -- June 2023
deprecated|deprecated;651;x
deprecated|deprecated;652;x
deprecated|deprecated;653;x
deprecated|deprecated;654;x
@ -688,7 +695,8 @@ deprecated|deprecated;661;x
deprecated|deprecated;662;x
deprecated|deprecated;663;x
deprecated|deprecated;664;x
railway|yard|bridge;[railway=yard][bridge?];;name;int_name;665;
# Was railway|yard|bridge -- June 2023
deprecated|deprecated;665;x
deprecated|deprecated;666;x
deprecated|deprecated;667;x
deprecated|deprecated;668;x
@ -887,8 +895,10 @@ highway|busway|tunnel;[highway=busway][tunnel?];;name;int_name;860;
natural|salt_pond;861;landuse|salt_pond
amenity|conference_centre;862;
amenity|exhibition_centre;863;
railway|siding|tunnel;[railway=siding][tunnel?];;name;int_name;864;
railway|yard|tunnel;[railway=yard][tunnel?];;name;int_name;865;
# Was railway|siding|tunnel -- June 2023
deprecated|deprecated;864;x
# Was railway|yard|tunnel -- June 2023
deprecated|deprecated;865;x
area:highway|footway;866;
deprecated|deprecated;867;x
area:highway|residential;868;

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

View file

@ -18923,55 +18923,8 @@
zh-Hans = 铁路轨道
zh-Hant = 鐵路軌道
[type.railway.razed]
en = Razed Rail
de = Stillgelegte Eisenbahnstrecke
et = Eemaldatud raudtee
ja = 撤去済の鉄道
nl = Verwijderde spoorbaan
pt = Ferrovia removida
pt-BR = Ferrovia removida
ru = Заброшенная Ж/Д
tr = Yıkılmış Ray
uk = Закинута залізниця
[type.railway.siding]
en = Siding Rail
de = Ausweich-/Überholgleis
et = Raudtee haru
ja = 側線
nl = Nevenspoor
pt = Desvio de ferrovia
pt-BR = Desvio de ferrovia
ru = Ветка Ж/Д
tr = Demiryolu Hattı
uk = Гілка залізниці
[type.railway.siding.bridge]
en = Siding Rail Bridge
de = Ausweich-/Überholgleis
et = Raudtee haru sild
ja = 側線(橋)
nl = Nevenspoor-brug
pt = Desvio de ferrovia
pt-BR = Desvio de ferrovia
ru = Ветка Ж/Д
tr = Demiryolu Hattı
uk = Гілка залізниці
[type.railway.siding.tunnel]
en = Siding Rail Tunnel
de = Ausweich-/Überholgleis
et = Raudtee haru tunnel
ja = 側線(トンネル)
nl = Nevenspoor-tunnel
pt = Desvio de ferrovia
pt-BR = Desvio de ferrovia
ru = Ветка Ж/Д
tr = Demiryolu Hattı
uk = Гілка залізниці
[type.railway.spur]
comment = TODO: reuse for railway-rail-spur
en = Spur Rail
de = Anschlussgleis
et = Rööbastee
@ -19920,48 +19873,6 @@
zh-Hans = 电车站
zh-Hant = 電車站
[type.railway.yard]
en = Railway Yard
de = Abstellgleis
et = Raudtee hoov
ja = ヤード
mr = रेल्वे आवार
nl = Rangeerterrein
pt = Pátio de manobras ferroviárias
pt-BR = Pátio de manobras ferroviárias
ru = Ж/Д площадка
tr = Demiryolu Avlusu
uk = Залізнична ділянка
zh-Hans = 铁路货场
[type.railway.yard.bridge]
en = Railway Yard Bridge
de = Abstellgleis
et = Raudtee hoovi sild
ja = ヤード(橋)
mr = रेल्वे आवार
nl = Rangeerterrein brug
pt = Pátio de manobras ferroviárias
pt-BR = Pátio de manobras ferroviárias
ru = Ж/Д площадка
tr = Demiryolu Avlusu
uk = Залізнична ділянка
zh-Hans = 铁路货场
[type.railway.yard.tunnel]
en = Railway Yard Tunnel
de = Abstellgleis
et = Raudtee hoovi tunnel
ja = ヤード(トンネル)
mr = रेल्वे आवार
nl = Rangeerterrein tunnel
pt = Pátio de manobras ferroviárias
pt-BR = Pátio de manobras ferroviárias
ru = Ж/Д площадка
tr = Demiryolu Avlusu
uk = Залізнична ділянка
zh-Hans = 铁路货场
[type.route]
en = Route
de = Route

View file

@ -75,19 +75,13 @@ line[railway=rail][tunnel?],
line[highway=footway][tunnel?]::tunnelCasing,
line[highway=path][tunnel?]::tunnelCasing,
line[highway=steps][tunnel?]::tunnelCasing,
line[railway=rail][bridge?]::bridgeblack,
line[railway=subway][bridge?]::bridgeblack,
line[railway=light_rail][bridge?]::bridgeblack,
line[railway=yard][bridge?]::bridgeblack
{z-index: 25;}
line[highway=footway][tunnel?]::tunnelBackground,
line[highway=path][tunnel?]::tunnelBackground,
line[highway=steps][tunnel?]::tunnelBackground,
line[railway=rail][bridge?]::bridgewhite,
line[railway=subway][bridge?]::bridgewhite,
line[railway=light_rail][bridge?]::bridgewhite,
line[railway=yard][bridge?]::bridgewhite
{z-index: 30;}
line[aeroway=runway],
@ -184,13 +178,11 @@ line[highway=ford]
line[railway=rail],
line[railway=subway][!tunnel],
line[railway=light_rail][!tunnel],
line[railway=yard]
{z-index: 680;}
line[railway=rail]::dash,
line[railway=subway][!tunnel]::dash,
line[railway=light_rail][!tunnel]::dash,
line[railway=yard]::dash
{z-index: 690;}
line[highway=residential],
@ -1093,7 +1085,6 @@ line|z15-[aeroway=taxiway]
/* 9.RAIL 11-22 ZOOM */
line|z11-[railway=rail],
line|z11-[railway=yard],
line|z12-[railway=funicular],
line|z13-[railway=light_rail][!tunnel],
line|z13-[railway=subway][!tunnel],
@ -1109,64 +1100,52 @@ line|z13-[railway=tram]
line|z16-[railway=rail]::dash,
line|z16-[railway=subway][!tunnel]::dash,
line|z16-[railway=light_rail][!tunnel]::dash,
line|z16-[railway=yard]::dash
{color: @railway_dash;opacity:1;}
line|z14-[railway=rail][bridge?]::bridgewhite,
line|z14-[railway=subway][bridge?]::bridgewhite,
line|z14-[railway=light_rail][bridge?]::bridgewhite,
line|z14-[railway=yard][bridge?]::bridgewhite
{casing-linecap: butt;casing-color:@bridge_background;}
line|z14-[railway=rail][bridge?]::bridgeblack,
line|z14-[railway=subway][bridge?]::bridgeblack,
line|z14-[railway=light_rail][bridge?]::bridgeblack,
line|z14-[railway=yard][bridge?]::bridgeblack
{casing-linecap: butt;casing-color:@bridge_casing;}
/* 9.1 RAIL 11-22 ZOOM */
line|z11-12[railway=rail],
line|z11-12[railway=yard]
{color: @railway_light;width: 0.6;}
line|z13-[railway=rail],
line|z13-[railway=subway][!tunnel],
line|z13-[railway=light_rail][!tunnel],
line|z13-[railway=yard]
{color: @railway_light;width: 0.8;}
line|z14[railway=rail],
line|z14[railway=subway][!tunnel],
line|z14[railway=light_rail][!tunnel],
line|z14[railway=yard]
{width: 1;}
line|z15[railway=rail],
line|z15[railway=subway][!tunnel],
line|z15[railway=light_rail][!tunnel],
line|z15[railway=yard],
{width: 1.2;}
line|z16[railway=rail],
line|z16[railway=subway][!tunnel],
line|z16[railway=light_rail][!tunnel],
line|z16[railway=yard]
{width: 2.6;}
line|z17-[railway=rail],
line|z17-[railway=subway][!tunnel],
line|z17-[railway=light_rail][!tunnel],
line|z17-[railway=yard]
{width: 3;}
line|z16[railway=rail]::dash,
line|z16[railway=subway][!tunnel]::dash,
line|z16[railway=light_rail][!tunnel]::dash,
line|z16[railway=yard]::dash,
{width: 1.3;dashes: 4.5,4.5;}
line|z17[railway=rail]::dash,
line|z17[railway=subway][!tunnel]::dash,
line|z17[railway=light_rail][!tunnel]::dash,
line|z17[railway=yard]::dash
{width: 2;dashes: 6.3,6.3;}
line|z18-[railway=rail]::dash,
line|z18-[railway=subway][!tunnel]::dash,
line|z18-[railway=light_rail][!tunnel]::dash,
line|z18-[railway=yard]::dash
{width: 2;dashes: 8.1,8.1;}
line|z16-[railway=preserved],
@ -1180,7 +1159,6 @@ line|z16-[railway=disused]
/* 9.2 Rail tunnel 14-22 ZOOM */
line|z14-[railway=rail][tunnel?],
line|z14-[railway=yard][tunnel?]
{casing-width: 1;casing-linecap: butt;casing-color: @railway_tunnel;casing-dashes: 5,5;}
/* 9.3 Rail bridge 14-22 ZOOM */
@ -1215,23 +1193,19 @@ line|z17-[railway][bridge?]::bridgewhite,
line|z18-[railway=rail][bridge?]::bridgewhite,
line|z18-[railway=subway][bridge?]::bridgewhite,
line|z18-[railway=light_rail][bridge?]::bridgewhite,
line|z18-[railway=yard][bridge?]::bridgewhite
{casing-width-add: 2;}
line|z16[railway=rail][bridge?]::bridgeblack,
line|z16[railway=subway][bridge?]::bridgeblack,
line|z16[railway=light_rail][bridge?]::bridgeblack,
line|z16[railway=yard][bridge?]::bridgeblack
{casing-width-add: 1.4;}
line|z17-[railway=rail][bridge?]::bridgeblack,
line|z17-[railway=subway][bridge?]::bridgeblack,
line|z17-[railway=light_rail][bridge?]::bridgeblack,
line|z17-[railway=yard][bridge?]::bridgeblack
{casing-width-add: 1.6;}
line|z18-[railway=rail][bridge?]::bridgeblack,
line|z18-[railway=subway][bridge?]::bridgeblack,
line|z18-[railway=light_rail][bridge?]::bridgeblack,
line|z18-[railway=yard][bridge?]::bridgeblack
{casing-width-add: 2.2;}
/* 9.4 Monorail 14-22 ZOOM */

View file

@ -76,18 +76,6 @@ line[highway=pedestrian],
line[highway=ford]
{z-index: 660;}
line[railway=rail],
line[railway=light_rail][!tunnel],
line[railway=subway][!tunnel],
line[railway=yard]
{z-index: 680;}
line[railway=rail]::dash,
line[railway=light_rail][!tunnel]::dash,
line[railway=subway][!tunnel]::dash,
line[railway=yard]::dash
{z-index: 690;}
line[highway=unclassified],
line[highway=road],
line[highway=living_street]
@ -440,19 +428,6 @@ line|z18-[highway=bridleway],
line|z18-[highway=footway],
{font-size: 10;}
/* 9.RAIL 15-22 ZOOM */
/*
line[railway=rail],
line[railway=light_rail],
line[railway=yard],
line[railway=construction],
line[railway=disused],
line[railway=preserved],
line[railway=abandoned],
line[railway=monorail],
line[railway=narrow_gauge],
line[railway=funicular]
*/
/* 10.PISTE 15-22 ZOOM */
line|z15-[aerialway=cable_car],

View file

@ -72,19 +72,13 @@ line[railway=rail][tunnel?],
line[highway=footway][tunnel?]::tunnelCasing,
line[highway=path][tunnel?]::tunnelCasing,
line[highway=steps][tunnel?]::tunnelCasing,
line[railway=rail][bridge?]::bridgeblack,
line[railway=subway][bridge?]::bridgeblack,
line[railway=light_rail][bridge?]::bridgeblack,
line[railway=yard][bridge?]::bridgeblack
{z-index: 25;}
line[highway=footway][tunnel?]::tunnelBackground,
line[highway=path][tunnel?]::tunnelBackground,
line[highway=steps][tunnel?]::tunnelBackground,
line[railway=rail][bridge?]::bridgewhite,
line[railway=subway][bridge?]::bridgewhite,
line[railway=light_rail][bridge?]::bridgewhite,
line[railway=yard][bridge?]::bridgewhite
{z-index: 30;}
line[aeroway=runway],
@ -179,13 +173,11 @@ line[highway=ford]
line[railway=rail],
line[railway=subway][!tunnel],
line[railway=light_rail][!tunnel],
line[railway=yard]
{z-index: 680;}
line[railway=rail]::dash,
line[railway=subway][!tunnel]::dash,
line[railway=light_rail][!tunnel]::dash,
line[railway=yard]::dash
{z-index: 690;}
line[highway=residential],
@ -1009,7 +1001,6 @@ line|z15-[aeroway=taxiway]
/* 9.RAIL 11-22 ZOOM */
line|z11-[railway=rail],
line|z11-[railway=yard],
line|z12-[railway=funicular],
line|z13-[railway=light_rail][!tunnel],
line|z13-[railway=subway][!tunnel],
@ -1027,81 +1018,66 @@ line|z16-[railway=tram]
line|z16-[railway=rail]::dash,
line|z16-[railway=subway][!tunnel]::dash,
line|z16-[railway=light_rail][!tunnel]::dash,
line|z16-[railway=yard]::dash
{color: @railway_dash;opacity:1;}
line|z14-[railway=rail][bridge?]::bridgewhite,
line|z14-[railway=subway][bridge?]::bridgewhite,
line|z14-[railway=light_rail][bridge?]::bridgewhite,
line|z14-[railway=yard][bridge?]::bridgewhite,
line|z16-[railway=tram][bridge?]::bridgewhite,
{casing-linecap: butt;casing-color:@bridge_background;}
line|z14-[railway=rail][bridge?]::bridgeblack,
line|z14-[railway=subway][bridge?]::bridgeblack,
line|z14-[railway=light_rail][bridge?]::bridgeblack,
line|z14-[railway=yard][bridge?]::bridgeblack,
line|z16-[railway=tram][bridge?]::bridgeblack
{casing-linecap: butt;casing-color:@bridge_casing;}
/* 9.1 RAIL 11-22 ZOOM */
line|z11-12[railway=rail],
line|z11-12[railway=yard]
{color: @railway_light;width: 0.7;}
line|z13-[railway=rail],
line|z13-[railway=subway][!tunnel],
line|z13-[railway=light_rail][!tunnel],
line|z13-[railway=yard]
{color: @railway_light;width: 0.9;}
line|z14[railway=rail],
line|z14[railway=subway][!tunnel],
line|z14[railway=light_rail][!tunnel],
line|z14[railway=yard]
{width: 1.15;}
line|z15[railway=rail],
line|z15[railway=subway][!tunnel],
line|z15[railway=light_rail][!tunnel],
line|z15[railway=yard],
{width: 1.8;}
line|z16[railway=rail],
line|z16[railway=subway][!tunnel],
line|z16[railway=light_rail][!tunnel],
line|z16[railway=yard]
{width: 2.8;}
line|z17[railway=rail],
line|z17[railway=subway][!tunnel],
line|z17[railway=light_rail][!tunnel],
line|z17[railway=yard]
{width: 3.2;}
line|z18[railway=rail],
line|z18[railway=subway][!tunnel],
line|z18[railway=light_rail][!tunnel],
line|z18[railway=yard]
{width: 4.2;}
line|z19[railway=rail],
line|z19[railway=subway][!tunnel],
line|z19[railway=light_rail][!tunnel],
line|z19[railway=yard]
{width: 5.8;}
line|z16[railway=rail]::dash,
line|z16[railway=subway][!tunnel]::dash,
line|z16[railway=light_rail][!tunnel]::dash,
line|z16[railway=yard]::dash,
{width: 1.5;dashes: 4.5,4.5;}
line|z17[railway=rail]::dash,
line|z17[railway=subway][!tunnel]::dash,
line|z17[railway=light_rail][!tunnel]::dash,
line|z17[railway=yard]::dash
{width: 2.4;dashes: 6.3,6.3;}
line|z18[railway=rail]::dash,
line|z18[railway=subway][!tunnel]::dash,
line|z18[railway=light_rail][!tunnel]::dash,
line|z18[railway=yard]::dash
{width: 3.3;dashes: 8.1,8.1;}
line|z19[railway=rail]::dash,
line|z19[railway=subway][!tunnel]::dash,
line|z19[railway=light_rail][!tunnel]::dash,
line|z19[railway=yard]::dash
{width: 5;dashes: 10.1,10.1;}
line|z16-[railway=preserved],
@ -1115,7 +1091,6 @@ line|z16-[railway=disused]
/* 9.2 Rail tunnel 14-22 ZOOM */
line|z14-[railway=rail][tunnel?],
line|z14-[railway=yard][tunnel?]
{casing-width: 1;casing-linecap: butt;casing-color: @railway_tunnel;casing-dashes: 5,5;}
/* 9.3 Rail bridge 14-22 ZOOM */
@ -1142,23 +1117,19 @@ line|z17-[railway][bridge?]::bridgewhite,
line|z18-[railway=rail][bridge?]::bridgewhite,
line|z18-[railway=subway][bridge?]::bridgewhite,
line|z18-[railway=light_rail][bridge?]::bridgewhite,
line|z18-[railway=yard][bridge?]::bridgewhite
{casing-width-add: 2;}
line|z16[railway=rail][bridge?]::bridgeblack,
line|z16[railway=subway][bridge?]::bridgeblack,
line|z16[railway=light_rail][bridge?]::bridgeblack ,
line|z16[railway=yard][bridge?]::bridgeblack ,
line|z16[railway=light_rail][bridge?]::bridgeblack,
{casing-width-add: 1.4;}
line|z17-[railway=rail][bridge?]::bridgeblack,
line|z17-[railway=subway][bridge?]::bridgeblack,
line|z17-[railway=light_rail][bridge?]::bridgeblack,
line|z17-[railway=yard][bridge?]::bridgeblack
{casing-width-add: 1.6;}
line|z18-[railway=rail][bridge?]::bridgeblack,
line|z18-[railway=subway][bridge?]::bridgeblack,
line|z18-[railway=light_rail][bridge?]::bridgeblack,
line|z18-[railway=yard][bridge?]::bridgeblack
{casing-width-add: 2.2;}
/* 9.4 Monorail 14-22 ZOOM */

View file

@ -74,18 +74,6 @@ line[highway=pedestrian],
line[highway=ford]
{z-index: 660;}
line[railway=rail],
line[railway=light_rail][!tunnel],
line[railway=subway][!tunnel],
line[railway=yard]
{z-index: 680;}
line[railway=rail]::dash,
line[railway=light_rail][!tunnel]::dash,
line[railway=subway][!tunnel]::dash,
line[railway=yard]::dash
{z-index: 690;}
line[highway=unclassified],
line[highway=road],
line[highway=living_street]
@ -464,19 +452,6 @@ line|z18-[highway=bridleway],
line|z18-[highway=footway],
{font-size: 10;}*/
/* 9.RAIL 15-22 ZOOM */
/*
line[railway=rail],
line[railway=light_rail],
line[railway=yard],
line[railway=construction],
line[railway=disused],
line[railway=preserved],
line[railway=abandoned],
line[railway=monorail],
line[railway=narrow_gauge],
line[railway=funicular]
*/
/* 10.PISTE 15-22 ZOOM */
/*
line[power=line],