diff --git a/android/sdk/src/main/res/values/types_strings.xml b/android/sdk/src/main/res/values/types_strings.xml index af5cf9f2c..ecdbd45db 100644 --- a/android/sdk/src/main/res/values/types_strings.xml +++ b/android/sdk/src/main/res/values/types_strings.xml @@ -961,6 +961,7 @@ High-Speed Railway Touristic Railway Railway + Railway Turntable Railway Branch diff --git a/data/mapcss-mapping.csv b/data/mapcss-mapping.csv index 7bf79ffdb..b69205f71 100644 --- a/data/mapcss-mapping.csv +++ b/data/mapcss-mapping.csv @@ -351,7 +351,7 @@ sport|basketball;242; amenity|cinema;243; amenity|theatre;244; sport|chess;245; -deprecated:railway|spur:06.2023;246;x +railway|turntable;246; aerialway|station;247; landuse|brownfield;248; aeroway|apron;249; diff --git a/data/styles/default/include/Roads.mapcss b/data/styles/default/include/Roads.mapcss index 9e291eca5..959470626 100644 --- a/data/styles/default/include/Roads.mapcss +++ b/data/styles/default/include/Roads.mapcss @@ -1198,6 +1198,7 @@ line|z15-[railway=preserved], line|z16-[railway=miniature], line|z16-[railway=disused], line|z16-[railway=abandoned], +line|z17-[railway=turntable], {color: @railway; opacity: 0.7;} line|z13-[railway=light_rail][!tunnel], @@ -1381,6 +1382,9 @@ line|z15-[railway=construction], line|z16-[railway=disused], {width: 1;dashes: 1.8,5.4;} +line|z17-[railway=turntable], +{width: 1.6;} + /* 9.2 Rail tunnel 14-22 ZOOM */ line|z12[railway=rail][tunnel?], diff --git a/data/styles/default/include/priorities_3_FG.prio.txt b/data/styles/default/include/priorities_3_FG.prio.txt index 8f33da9df..7aa501027 100644 --- a/data/styles/default/include/priorities_3_FG.prio.txt +++ b/data/styles/default/include/priorities_3_FG.prio.txt @@ -305,6 +305,7 @@ railway-miniature-tunnel # line z16- railway-preserved # line z15- railway-preserved-bridge # line z15- (also has line::bridgeblack z16-, line::bridgewhite z15-) railway-preserved-tunnel # line z15- +railway-turntable # line z17- === 160 highway-footway-bridge # line z15- (also has line::bridgeblack z17-, line::bridgewhite z15-, pathtext z15-) diff --git a/data/styles/outdoors/include/priorities_3_FG.prio.txt b/data/styles/outdoors/include/priorities_3_FG.prio.txt index fb19beb09..d062e939f 100644 --- a/data/styles/outdoors/include/priorities_3_FG.prio.txt +++ b/data/styles/outdoors/include/priorities_3_FG.prio.txt @@ -307,6 +307,7 @@ railway-miniature-tunnel # line z13- railway-preserved # line z13- railway-preserved-bridge # line z13- (also has line::bridgeblack z16-, line::bridgewhite z15-) railway-preserved-tunnel # line z13- +railway-turntable # line z17- === 160 highway-footway-bridge # line z11- (also has line::bridgeblack z17-, line::bridgewhite z15-, pathtext z13-) diff --git a/data/styles/vehicle/include/Roads.mapcss b/data/styles/vehicle/include/Roads.mapcss index e7d37c4dd..b8ac808ce 100644 --- a/data/styles/vehicle/include/Roads.mapcss +++ b/data/styles/vehicle/include/Roads.mapcss @@ -722,6 +722,7 @@ line|z16-[railway=disused], line|z16-[railway=preserved], line|z16-[railway=miniature], line|z16-[railway=abandoned], +line|z17-[railway=turntable], {color: @railway; opacity: 0.6;} line|z13-[railway=light_rail][!tunnel], @@ -921,6 +922,9 @@ line|z16-[railway=construction], line|z16-[railway=disused] {width: 1;dashes: 1.8,5.4;} +line|z17-[railway=turntable], +{width: 1.6;} + /* 9.2 Rail tunnel 14-22 ZOOM */ line|z14-[railway=rail][tunnel?], diff --git a/data/styles/vehicle/include/priorities_3_FG.prio.txt b/data/styles/vehicle/include/priorities_3_FG.prio.txt index 1fa840256..a469d8bd6 100644 --- a/data/styles/vehicle/include/priorities_3_FG.prio.txt +++ b/data/styles/vehicle/include/priorities_3_FG.prio.txt @@ -282,6 +282,7 @@ railway-miniature-tunnel # line z16- railway-preserved # line z16- railway-preserved-bridge # line z16- (also has line::bridgeblack z16-, line::bridgewhite z16-) railway-preserved-tunnel # line z16- +railway-turntable # line z17- === 120 highway-motorway-bridge::bridgewhite # line::bridgewhite z13- (also has line z6-, line::bridgeblack z13-, line(casing) z14-, pathtext z10-, shield::shield z10-) diff --git a/iphone/Maps/LocalizedStrings/en.lproj/LocalizableTypes.strings b/iphone/Maps/LocalizedStrings/en.lproj/LocalizableTypes.strings index bd9a17600..546197ebf 100644 --- a/iphone/Maps/LocalizedStrings/en.lproj/LocalizableTypes.strings +++ b/iphone/Maps/LocalizedStrings/en.lproj/LocalizableTypes.strings @@ -1054,6 +1054,7 @@ "type.railway.rail.highspeed" = "High-Speed Railway"; "type.railway.rail.tourism" = "Touristic Railway"; "type.railway.rail.main" = "Railway"; +"type.railway.turntable" = "Railway Turntable"; /* Includes ordinary railway=rail w/o more specific usage= and service= tags. */ "type.railway.rail.branch" = "Railway Branch";