organicmaps/organicmaps-tmp
Archived
13
Fork 1
Code Issues 2.7k Pull requests 182 Projects Releases 65 Wiki Activity Actions

[style] Change rendering of abandoned and disused railways #9758

Open
IdeallyGrey wants to merge 4 commits from IdeallyGrey/swap-abandoned-disused-rail-rendering into master
pull from: IdeallyGrey/swap-abandoned-disused-rail-rendering
merge into: organicmaps:master
Conversation 0 Commits 4 Files changed 25 +1203 -1205
25 changed files with 1203 additions and 1205 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
data/classificator.txt
View file

@ -889,13 +889,13 @@ world +
platform -
{}
railway +
abandoned +
abandoned -
construction -
crossing -
disused +
bridge -
tunnel -
{}
construction -
crossing -
disused -
funicular +
bridge -
tunnel -

BIN
data/drules_proto.bin
View file

Binary file not shown.

406
data/drules_proto.txt
View file

@ -73173,6 +73173,207 @@ cont {
}
cont {
name: "railway-abandoned"
element {
scale: 13
lines {
width: 1.0
color: 1301714310
dashdot {
dd: 1.8
dd: 5.4
}
priority: 160
}
}
element {
scale: 14
lines {
width: 1.0
color: 1301714310
dashdot {
dd: 1.8
dd: 5.4
}
priority: 160
}
}
element {
scale: 15
lines {
width: 1.0
color: 1301714310
dashdot {
dd: 1.8
dd: 5.4
}
priority: 160
}
}
element {
scale: 16
lines {
width: 1.0
color: 1301714310
dashdot {
dd: 1.8
dd: 5.4
}
priority: 160
}
}
element {
scale: 17
lines {
width: 1.0
color: 1301714310
dashdot {
dd: 1.8
dd: 5.4
}
priority: 160
}
}
element {
scale: 18
lines {
width: 1.0
color: 1301714310
dashdot {
dd: 1.8
dd: 5.4
}
priority: 160
}
}
element {
scale: 19
lines {
width: 1.0
color: 1301714310
dashdot {
dd: 1.8
dd: 5.4
}
priority: 160
}
}
element {
scale: 20
lines {
width: 1.0
color: 1301714310
dashdot {
dd: 1.8
dd: 5.4
}
priority: 160
}
}
}
cont {
name: "railway-construction"
element {
scale: 13
lines {
width: 1.0
color: 1301714310
dashdot {
dd: 1.8
dd: 5.4
}
priority: 160
cap: BUTTCAP
}
}
element {
scale: 14
lines {
width: 1.0
color: 1301714310
dashdot {
dd: 1.8
dd: 5.4
}
priority: 160
cap: BUTTCAP
}
}
element {
scale: 15
lines {
width: 1.0
color: 1301714310
dashdot {
dd: 1.8
dd: 5.4
}
priority: 160
cap: BUTTCAP
}
}
element {
scale: 16
lines {
width: 1.0
color: 1301714310
dashdot {
dd: 1.8
dd: 5.4
}
priority: 160
}
}
element {
scale: 17
lines {
width: 1.0
color: 1301714310
dashdot {
dd: 1.8
dd: 5.4
}
priority: 160
}
}
element {
scale: 18
lines {
width: 1.0
color: 1301714310
dashdot {
dd: 1.8
dd: 5.4
}
priority: 160
}
}
element {
scale: 19
lines {
width: 1.0
color: 1301714310
dashdot {
dd: 1.8
dd: 5.4
}
priority: 160
}
}
element {
scale: 20
lines {
width: 1.0
color: 1301714310
dashdot {
dd: 1.8
dd: 5.4
}
priority: 160
}
}
}
cont {
name: "railway-disused"
element {
scale: 13
lines {
@ -73271,7 +73472,7 @@ cont {
}
}
cont {
name: "railway-abandoned-bridge"
name: "railway-disused-bridge"
element {
scale: 13
lines {
@ -73466,7 +73667,7 @@ cont {
}
}
cont {
name: "railway-abandoned-tunnel"
name: "railway-disused-tunnel"
element {
scale: 13
lines {
@ -73564,207 +73765,6 @@ cont {
}
}
}
cont {
name: "railway-construction"
element {
scale: 13
lines {
width: 1.0
color: 1301714310
dashdot {
dd: 1.8
dd: 5.4
}
priority: 160
cap: BUTTCAP
}
}
element {
scale: 14
lines {
width: 1.0
color: 1301714310
dashdot {
dd: 1.8
dd: 5.4
}
priority: 160
cap: BUTTCAP
}
}
element {
scale: 15
lines {
width: 1.0
color: 1301714310
dashdot {
dd: 1.8
dd: 5.4
}
priority: 160
cap: BUTTCAP
}
}
element {
scale: 16
lines {
width: 1.0
color: 1301714310
dashdot {
dd: 1.8
dd: 5.4
}
priority: 160
}
}
element {
scale: 17
lines {
width: 1.0
color: 1301714310
dashdot {
dd: 1.8
dd: 5.4
}
priority: 160
}
}
element {
scale: 18
lines {
width: 1.0
color: 1301714310
dashdot {
dd: 1.8
dd: 5.4
}
priority: 160
}
}
element {
scale: 19
lines {
width: 1.0
color: 1301714310
dashdot {
dd: 1.8
dd: 5.4
}
priority: 160
}
}
element {
scale: 20
lines {
width: 1.0
color: 1301714310
dashdot {
dd: 1.8
dd: 5.4
}
priority: 160
}
}
}
cont {
name: "railway-disused"
element {
scale: 13
lines {
width: 1.0
color: 1301714310
dashdot {
dd: 1.8
dd: 5.4
}
priority: 160
}
}
element {
scale: 14
lines {
width: 1.0
color: 1301714310
dashdot {
dd: 1.8
dd: 5.4
}
priority: 160
}
}
element {
scale: 15
lines {
width: 1.0
color: 1301714310
dashdot {
dd: 1.8
dd: 5.4
}
priority: 160
}
}
element {
scale: 16
lines {
width: 1.0
color: 1301714310
dashdot {
dd: 1.8
dd: 5.4
}
priority: 160
}
}
element {
scale: 17
lines {
width: 1.0
color: 1301714310
dashdot {
dd: 1.8
dd: 5.4
}
priority: 160
}
}
element {
scale: 18
lines {
width: 1.0
color: 1301714310
dashdot {
dd: 1.8
dd: 5.4
}
priority: 160
}
}
element {
scale: 19
lines {
width: 1.0
color: 1301714310
dashdot {
dd: 1.8
dd: 5.4
}
priority: 160
}
}
element {
scale: 20
lines {
width: 1.0
color: 1301714310
dashdot {
dd: 1.8
dd: 5.4
}
priority: 160
}
}
}
cont {
name: "railway-funicular"
element {

BIN
data/drules_proto_default_dark.bin
View file

Binary file not shown.

282
data/drules_proto_default_dark.txt
View file

@ -69179,6 +69179,145 @@ cont {
}
cont {
name: "railway-abandoned"
element {
scale: 16
lines {
width: 1.0
color: 1296316234
dashdot {
dd: 1.8
dd: 5.4
}
priority: 160
}
}
element {
scale: 17
lines {
width: 1.0
color: 1296316234
dashdot {
dd: 1.8
dd: 5.4
}
priority: 160
}
}
element {
scale: 18
lines {
width: 1.0
color: 1296316234
dashdot {
dd: 1.8
dd: 5.4
}
priority: 160
}
}
element {
scale: 19
lines {
width: 1.0
color: 1296316234
dashdot {
dd: 1.8
dd: 5.4
}
priority: 160
}
}
element {
scale: 20
lines {
width: 1.0
color: 1296316234
dashdot {
dd: 1.8
dd: 5.4
}
priority: 160
}
}
}
cont {
name: "railway-construction"
element {
scale: 15
lines {
width: 1.0
color: 1296316234
dashdot {
dd: 1.8
dd: 5.4
}
priority: 160
cap: BUTTCAP
}
}
element {
scale: 16
lines {
width: 1.0
color: 1296316234
dashdot {
dd: 1.8
dd: 5.4
}
priority: 160
}
}
element {
scale: 17
lines {
width: 1.0
color: 1296316234
dashdot {
dd: 1.8
dd: 5.4
}
priority: 160
}
}
element {
scale: 18
lines {
width: 1.0
color: 1296316234
dashdot {
dd: 1.8
dd: 5.4
}
priority: 160
}
}
element {
scale: 19
lines {
width: 1.0
color: 1296316234
dashdot {
dd: 1.8
dd: 5.4
}
priority: 160
}
}
element {
scale: 20
lines {
width: 1.0
color: 1296316234
dashdot {
dd: 1.8
dd: 5.4
}
priority: 160
}
}
}
cont {
name: "railway-disused"
element {
scale: 16
lines {
@ -69241,7 +69380,7 @@ cont {
}
}
cont {
name: "railway-abandoned-bridge"
name: "railway-disused-bridge"
element {
scale: 16
lines {
@ -69364,7 +69503,7 @@ cont {
}
}
cont {
name: "railway-abandoned-tunnel"
name: "railway-disused-tunnel"
element {
scale: 16
lines {
@ -69426,145 +69565,6 @@ cont {
}
}
}
cont {
name: "railway-construction"
element {
scale: 15
lines {
width: 1.0
color: 1296316234
dashdot {
dd: 1.8
dd: 5.4
}
priority: 160
cap: BUTTCAP
}
}
element {
scale: 16
lines {
width: 1.0
color: 1296316234
dashdot {
dd: 1.8
dd: 5.4
}
priority: 160
}
}
element {
scale: 17
lines {
width: 1.0
color: 1296316234
dashdot {
dd: 1.8
dd: 5.4
}
priority: 160
}
}
element {
scale: 18
lines {
width: 1.0
color: 1296316234
dashdot {
dd: 1.8
dd: 5.4
}
priority: 160
}
}
element {
scale: 19
lines {
width: 1.0
color: 1296316234
dashdot {
dd: 1.8
dd: 5.4
}
priority: 160
}
}
element {
scale: 20
lines {
width: 1.0
color: 1296316234
dashdot {
dd: 1.8
dd: 5.4
}
priority: 160
}
}
}
cont {
name: "railway-disused"
element {
scale: 16
lines {
width: 1.0
color: 1296316234
dashdot {
dd: 1.8
dd: 5.4
}
priority: 160
}
}
element {
scale: 17
lines {
width: 1.0
color: 1296316234
dashdot {
dd: 1.8
dd: 5.4
}
priority: 160
}
}
element {
scale: 18
lines {
width: 1.0
color: 1296316234
dashdot {
dd: 1.8
dd: 5.4
}
priority: 160
}
}
element {
scale: 19
lines {
width: 1.0
color: 1296316234
dashdot {
dd: 1.8
dd: 5.4
}
priority: 160
}
}
element {
scale: 20
lines {
width: 1.0
color: 1296316234
dashdot {
dd: 1.8
dd: 5.4
}
priority: 160
}
}
}
cont {
name: "railway-funicular"
element {

BIN
data/drules_proto_default_light.bin
View file

Binary file not shown.

282
data/drules_proto_default_light.txt
View file

@ -68964,6 +68964,145 @@ cont {
}
cont {
name: "railway-abandoned"
element {
scale: 16
lines {
width: 1.0
color: 1301714310
dashdot {
dd: 1.8
dd: 5.4
}
priority: 160
}
}
element {
scale: 17
lines {
width: 1.0
color: 1301714310
dashdot {
dd: 1.8
dd: 5.4
}
priority: 160
}
}
element {
scale: 18
lines {
width: 1.0
color: 1301714310
dashdot {
dd: 1.8
dd: 5.4
}
priority: 160
}
}
element {
scale: 19
lines {
width: 1.0
color: 1301714310
dashdot {
dd: 1.8
dd: 5.4
}
priority: 160
}
}
element {
scale: 20
lines {
width: 1.0
color: 1301714310
dashdot {
dd: 1.8
dd: 5.4
}
priority: 160
}
}
}
cont {
name: "railway-construction"
element {
scale: 15
lines {
width: 1.0
color: 1301714310
dashdot {
dd: 1.8
dd: 5.4
}
priority: 160
cap: BUTTCAP
}
}
element {
scale: 16
lines {
width: 1.0
color: 1301714310
dashdot {
dd: 1.8
dd: 5.4
}
priority: 160
}
}
element {
scale: 17
lines {
width: 1.0
color: 1301714310
dashdot {
dd: 1.8
dd: 5.4
}
priority: 160
}
}
element {
scale: 18
lines {
width: 1.0
color: 1301714310
dashdot {
dd: 1.8
dd: 5.4
}
priority: 160
}
}
element {
scale: 19
lines {
width: 1.0
color: 1301714310
dashdot {
dd: 1.8
dd: 5.4
}
priority: 160
}
}
element {
scale: 20
lines {
width: 1.0
color: 1301714310
dashdot {
dd: 1.8
dd: 5.4
}
priority: 160
}
}
}
cont {
name: "railway-disused"
element {
scale: 16
lines {
@ -69026,7 +69165,7 @@ cont {
}
}
cont {
name: "railway-abandoned-bridge"
name: "railway-disused-bridge"
element {
scale: 16
lines {
@ -69149,7 +69288,7 @@ cont {
}
}
cont {
name: "railway-abandoned-tunnel"
name: "railway-disused-tunnel"
element {
scale: 16
lines {
@ -69211,145 +69350,6 @@ cont {
}
}
}
cont {
name: "railway-construction"
element {
scale: 15
lines {
width: 1.0
color: 1301714310
dashdot {
dd: 1.8
dd: 5.4
}
priority: 160
cap: BUTTCAP
}
}
element {
scale: 16
lines {
width: 1.0
color: 1301714310
dashdot {
dd: 1.8
dd: 5.4
}
priority: 160
}
}
element {
scale: 17
lines {
width: 1.0
color: 1301714310
dashdot {
dd: 1.8
dd: 5.4
}
priority: 160
}
}
element {
scale: 18
lines {
width: 1.0
color: 1301714310
dashdot {
dd: 1.8
dd: 5.4
}
priority: 160
}
}
element {
scale: 19
lines {
width: 1.0
color: 1301714310
dashdot {
dd: 1.8
dd: 5.4
}
priority: 160
}
}
element {
scale: 20
lines {
width: 1.0
color: 1301714310
dashdot {
dd: 1.8
dd: 5.4
}
priority: 160
}
}
}
cont {
name: "railway-disused"
element {
scale: 16
lines {
width: 1.0
color: 1301714310
dashdot {
dd: 1.8
dd: 5.4
}
priority: 160
}
}
element {
scale: 17
lines {
width: 1.0
color: 1301714310
dashdot {
dd: 1.8
dd: 5.4
}
priority: 160
}
}
element {
scale: 18
lines {
width: 1.0
color: 1301714310
dashdot {
dd: 1.8
dd: 5.4
}
priority: 160
}
}
element {
scale: 19
lines {
width: 1.0
color: 1301714310
dashdot {
dd: 1.8
dd: 5.4
}
priority: 160
}
}
element {
scale: 20
lines {
width: 1.0
color: 1301714310
dashdot {
dd: 1.8
dd: 5.4
}
priority: 160
}
}
}
cont {
name: "railway-funicular"
element {

BIN
data/drules_proto_outdoors_dark.bin
View file

Binary file not shown.

412
data/drules_proto_outdoors_dark.txt
View file

@ -73492,6 +73492,210 @@ cont {
}
cont {
name: "railway-abandoned"
element {
scale: 13
lines {
width: 1.0
color: 4470602
dashdot {
dd: 1.8
dd: 5.5
}
priority: 160
cap: BUTTCAP
}
}
element {
scale: 14
lines {
width: 1.0
color: 4470602
dashdot {
dd: 1.8
dd: 5.5
}
priority: 160
cap: BUTTCAP
}
}
element {
scale: 15
lines {
width: 1.0
color: 4470602
dashdot {
dd: 1.8
dd: 5.5
}
priority: 160
cap: BUTTCAP
}
}
element {
scale: 16
lines {
width: 1.7
color: 4470602
dashdot {
dd: 2.5
dd: 7.0
}
priority: 160
}
}
element {
scale: 17
lines {
width: 1.7
color: 4470602
dashdot {
dd: 2.5
dd: 7.0
}
priority: 160
}
}
element {
scale: 18
lines {
width: 1.7
color: 4470602
dashdot {
dd: 2.5
dd: 7.0
}
priority: 160
}
}
element {
scale: 19
lines {
width: 1.7
color: 4470602
dashdot {
dd: 2.5
dd: 7.0
}
priority: 160
}
}
element {
scale: 20
lines {
width: 1.7
color: 4470602
dashdot {
dd: 2.5
dd: 7.0
}
priority: 160
}
}
}
cont {
name: "railway-construction"
element {
scale: 13
lines {
width: 1.0
color: 4470602
dashdot {
dd: 1.8
dd: 5.5
}
priority: 160
cap: BUTTCAP
}
}
element {
scale: 14
lines {
width: 1.0
color: 4470602
dashdot {
dd: 1.8
dd: 5.5
}
priority: 160
cap: BUTTCAP
}
}
element {
scale: 15
lines {
width: 1.0
color: 4470602
dashdot {
dd: 1.8
dd: 5.5
}
priority: 160
cap: BUTTCAP
}
}
element {
scale: 16
lines {
width: 1.7
color: 4470602
dashdot {
dd: 2.5
dd: 7.0
}
priority: 160
}
}
element {
scale: 17
lines {
width: 1.7
color: 4470602
dashdot {
dd: 2.5
dd: 7.0
}
priority: 160
}
}
element {
scale: 18
lines {
width: 1.7
color: 4470602
dashdot {
dd: 2.5
dd: 7.0
}
priority: 160
}
}
element {
scale: 19
lines {
width: 1.7
color: 4470602
dashdot {
dd: 2.5
dd: 7.0
}
priority: 160
}
}
element {
scale: 20
lines {
width: 1.7
color: 4470602
dashdot {
dd: 2.5
dd: 7.0
}
priority: 160
}
}
}
cont {
name: "railway-disused"
element {
scale: 13
lines {
@ -73593,7 +73797,7 @@ cont {
}
}
cont {
name: "railway-abandoned-bridge"
name: "railway-disused-bridge"
element {
scale: 13
lines {
@ -73755,7 +73959,7 @@ cont {
}
}
cont {
name: "railway-abandoned-tunnel"
name: "railway-disused-tunnel"
element {
scale: 13
lines {
@ -73856,210 +74060,6 @@ cont {
}
}
}
cont {
name: "railway-construction"
element {
scale: 13
lines {
width: 1.0
color: 4470602
dashdot {
dd: 1.8
dd: 5.5
}
priority: 160
cap: BUTTCAP
}
}
element {
scale: 14
lines {
width: 1.0
color: 4470602
dashdot {
dd: 1.8
dd: 5.5
}
priority: 160
cap: BUTTCAP
}
}
element {
scale: 15
lines {
width: 1.0
color: 4470602
dashdot {
dd: 1.8
dd: 5.5
}
priority: 160
cap: BUTTCAP
}
}
element {
scale: 16
lines {
width: 1.7
color: 4470602
dashdot {
dd: 2.5
dd: 7.0
}
priority: 160
}
}
element {
scale: 17
lines {
width: 1.7
color: 4470602
dashdot {
dd: 2.5
dd: 7.0
}
priority: 160
}
}
element {
scale: 18
lines {
width: 1.7
color: 4470602
dashdot {
dd: 2.5
dd: 7.0
}
priority: 160
}
}
element {
scale: 19
lines {
width: 1.7
color: 4470602
dashdot {
dd: 2.5
dd: 7.0
}
priority: 160
}
}
element {
scale: 20
lines {
width: 1.7
color: 4470602
dashdot {
dd: 2.5
dd: 7.0
}
priority: 160
}
}
}
cont {
name: "railway-disused"
element {
scale: 13
lines {
width: 1.0
color: 4470602
dashdot {
dd: 1.8
dd: 5.5
}
priority: 160
cap: BUTTCAP
}
}
element {
scale: 14
lines {
width: 1.0
color: 4470602
dashdot {
dd: 1.8
dd: 5.5
}
priority: 160
cap: BUTTCAP
}
}
element {
scale: 15
lines {
width: 1.0
color: 4470602
dashdot {
dd: 1.8
dd: 5.5
}
priority: 160
cap: BUTTCAP
}
}
element {
scale: 16
lines {
width: 1.7
color: 4470602
dashdot {
dd: 2.5
dd: 7.0
}
priority: 160
}
}
element {
scale: 17
lines {
width: 1.7
color: 4470602
dashdot {
dd: 2.5
dd: 7.0
}
priority: 160
}
}
element {
scale: 18
lines {
width: 1.7
color: 4470602
dashdot {
dd: 2.5
dd: 7.0
}
priority: 160
}
}
element {
scale: 19
lines {
width: 1.7
color: 4470602
dashdot {
dd: 2.5
dd: 7.0
}
priority: 160
}
}
element {
scale: 20
lines {
width: 1.7
color: 4470602
dashdot {
dd: 2.5
dd: 7.0
}
priority: 160
}
}
}
cont {
name: "railway-funicular"
element {

BIN
data/drules_proto_outdoors_light.bin
View file

Binary file not shown.

412
data/drules_proto_outdoors_light.txt
View file

@ -73277,6 +73277,210 @@ cont {
}
cont {
name: "railway-abandoned"
element {
scale: 13
lines {
width: 1.0
color: 8487025
dashdot {
dd: 1.8
dd: 5.5
}
priority: 160
cap: BUTTCAP
}
}
element {
scale: 14
lines {
width: 1.0
color: 8487025
dashdot {
dd: 1.8
dd: 5.5
}
priority: 160
cap: BUTTCAP
}
}
element {
scale: 15
lines {
width: 1.0
color: 8487025
dashdot {
dd: 1.8
dd: 5.5
}
priority: 160
cap: BUTTCAP
}
}
element {
scale: 16
lines {
width: 1.7
color: 8487025
dashdot {
dd: 2.5
dd: 7.0
}
priority: 160
}
}
element {
scale: 17
lines {
width: 1.7
color: 8487025
dashdot {
dd: 2.5
dd: 7.0
}
priority: 160
}
}
element {
scale: 18
lines {
width: 1.7
color: 8487025
dashdot {
dd: 2.5
dd: 7.0
}
priority: 160
}
}
element {
scale: 19
lines {
width: 1.7
color: 8487025
dashdot {
dd: 2.5
dd: 7.0
}
priority: 160
}
}
element {
scale: 20
lines {
width: 1.7
color: 8487025
dashdot {
dd: 2.5
dd: 7.0
}
priority: 160
}
}
}
cont {
name: "railway-construction"
element {
scale: 13
lines {
width: 1.0
color: 8487025
dashdot {
dd: 1.8
dd: 5.5
}
priority: 160
cap: BUTTCAP
}
}
element {
scale: 14
lines {
width: 1.0
color: 8487025
dashdot {
dd: 1.8
dd: 5.5
}
priority: 160
cap: BUTTCAP
}
}
element {
scale: 15
lines {
width: 1.0
color: 8487025
dashdot {
dd: 1.8
dd: 5.5
}
priority: 160
cap: BUTTCAP
}
}
element {
scale: 16
lines {
width: 1.7
color: 8487025
dashdot {
dd: 2.5
dd: 7.0
}
priority: 160
}
}
element {
scale: 17
lines {
width: 1.7
color: 8487025
dashdot {
dd: 2.5
dd: 7.0
}
priority: 160
}
}
element {
scale: 18
lines {
width: 1.7
color: 8487025
dashdot {
dd: 2.5
dd: 7.0
}
priority: 160
}
}
element {
scale: 19
lines {
width: 1.7
color: 8487025
dashdot {
dd: 2.5
dd: 7.0
}
priority: 160
}
}
element {
scale: 20
lines {
width: 1.7
color: 8487025
dashdot {
dd: 2.5
dd: 7.0
}
priority: 160
}
}
}
cont {
name: "railway-disused"
element {
scale: 13
lines {
@ -73378,7 +73582,7 @@ cont {
}
}
cont {
name: "railway-abandoned-bridge"
name: "railway-disused-bridge"
element {
scale: 13
lines {
@ -73540,7 +73744,7 @@ cont {
}
}
cont {
name: "railway-abandoned-tunnel"
name: "railway-disused-tunnel"
element {
scale: 13
lines {
@ -73641,210 +73845,6 @@ cont {
}
}
}
cont {
name: "railway-construction"
element {
scale: 13
lines {
width: 1.0
color: 8487025
dashdot {
dd: 1.8
dd: 5.5
}
priority: 160
cap: BUTTCAP
}
}
element {
scale: 14
lines {
width: 1.0
color: 8487025
dashdot {
dd: 1.8
dd: 5.5
}
priority: 160
cap: BUTTCAP
}
}
element {
scale: 15
lines {
width: 1.0
color: 8487025
dashdot {
dd: 1.8
dd: 5.5
}
priority: 160
cap: BUTTCAP
}
}
element {
scale: 16
lines {
width: 1.7
color: 8487025
dashdot {
dd: 2.5
dd: 7.0
}
priority: 160
}
}
element {
scale: 17
lines {
width: 1.7
color: 8487025
dashdot {
dd: 2.5
dd: 7.0
}
priority: 160
}
}
element {
scale: 18
lines {
width: 1.7
color: 8487025
dashdot {
dd: 2.5
dd: 7.0
}
priority: 160
}
}
element {
scale: 19
lines {
width: 1.7
color: 8487025
dashdot {
dd: 2.5
dd: 7.0
}
priority: 160
}
}
element {
scale: 20
lines {
width: 1.7
color: 8487025
dashdot {
dd: 2.5
dd: 7.0
}
priority: 160
}
}
}
cont {
name: "railway-disused"
element {
scale: 13
lines {
width: 1.0
color: 8487025
dashdot {
dd: 1.8
dd: 5.5
}
priority: 160
cap: BUTTCAP
}
}
element {
scale: 14
lines {
width: 1.0
color: 8487025
dashdot {
dd: 1.8
dd: 5.5
}
priority: 160
cap: BUTTCAP
}
}
element {
scale: 15
lines {
width: 1.0
color: 8487025
dashdot {
dd: 1.8
dd: 5.5
}
priority: 160
cap: BUTTCAP
}
}
element {
scale: 16
lines {
width: 1.7
color: 8487025
dashdot {
dd: 2.5
dd: 7.0
}
priority: 160
}
}
element {
scale: 17
lines {
width: 1.7
color: 8487025
dashdot {
dd: 2.5
dd: 7.0
}
priority: 160
}
}
element {
scale: 18
lines {
width: 1.7
color: 8487025
dashdot {
dd: 2.5
dd: 7.0
}
priority: 160
}
}
element {
scale: 19
lines {
width: 1.7
color: 8487025
dashdot {
dd: 2.5
dd: 7.0
}
priority: 160
}
}
element {
scale: 20
lines {
width: 1.7
color: 8487025
dashdot {
dd: 2.5
dd: 7.0
}
priority: 160
}
}
}
cont {
name: "railway-funicular"
element {

BIN
data/drules_proto_vehicle_dark.bin
View file

Binary file not shown.

256
data/drules_proto_vehicle_dark.txt
View file

@ -42875,6 +42875,132 @@ cont {
}
cont {
name: "railway-abandoned"
element {
scale: 16
lines {
width: 1.0
color: 1715089216
dashdot {
dd: 1.8
dd: 5.4
}
priority: 120
}
}
element {
scale: 17
lines {
width: 1.0
color: 1715089216
dashdot {
dd: 1.8
dd: 5.4
}
priority: 120
}
}
element {
scale: 18
lines {
width: 1.0
color: 1715089216
dashdot {
dd: 1.8
dd: 5.4
}
priority: 120
}
}
element {
scale: 19
lines {
width: 1.0
color: 1715089216
dashdot {
dd: 1.8
dd: 5.4
}
priority: 120
}
}
element {
scale: 20
lines {
width: 1.0
color: 1715089216
dashdot {
dd: 1.8
dd: 5.4
}
priority: 120
}
}
}
cont {
name: "railway-construction"
element {
scale: 16
lines {
width: 1.0
color: 1715089216
dashdot {
dd: 1.8
dd: 5.4
}
priority: 120
}
}
element {
scale: 17
lines {
width: 1.0
color: 1715089216
dashdot {
dd: 1.8
dd: 5.4
}
priority: 120
}
}
element {
scale: 18
lines {
width: 1.0
color: 1715089216
dashdot {
dd: 1.8
dd: 5.4
}
priority: 120
}
}
element {
scale: 19
lines {
width: 1.0
color: 1715089216
dashdot {
dd: 1.8
dd: 5.4
}
priority: 120
}
}
element {
scale: 20
lines {
width: 1.0
color: 1715089216
dashdot {
dd: 1.8
dd: 5.4
}
priority: 120
}
}
}
cont {
name: "railway-disused"
element {
scale: 16
lines {
@ -42937,7 +43063,7 @@ cont {
}
}
cont {
name: "railway-abandoned-bridge"
name: "railway-disused-bridge"
element {
scale: 16
lines {
@ -43060,7 +43186,7 @@ cont {
}
}
cont {
name: "railway-abandoned-tunnel"
name: "railway-disused-tunnel"
element {
scale: 16
lines {
@ -43122,132 +43248,6 @@ cont {
}
}
}
cont {
name: "railway-construction"
element {
scale: 16
lines {
width: 1.0
color: 1715089216
dashdot {
dd: 1.8
dd: 5.4
}
priority: 120
}
}
element {
scale: 17
lines {
width: 1.0
color: 1715089216
dashdot {
dd: 1.8
dd: 5.4
}
priority: 120
}
}
element {
scale: 18
lines {
width: 1.0
color: 1715089216
dashdot {
dd: 1.8
dd: 5.4
}
priority: 120
}
}
element {
scale: 19
lines {
width: 1.0
color: 1715089216
dashdot {
dd: 1.8
dd: 5.4
}
priority: 120
}
}
element {
scale: 20
lines {
width: 1.0
color: 1715089216
dashdot {
dd: 1.8
dd: 5.4
}
priority: 120
}
}
}
cont {
name: "railway-disused"
element {
scale: 16
lines {
width: 1.0
color: 1715089216
dashdot {
dd: 1.8
dd: 5.4
}
priority: 120
}
}
element {
scale: 17
lines {
width: 1.0
color: 1715089216
dashdot {
dd: 1.8
dd: 5.4
}
priority: 120
}
}
element {
scale: 18
lines {
width: 1.0
color: 1715089216
dashdot {
dd: 1.8
dd: 5.4
}
priority: 120
}
}
element {
scale: 19
lines {
width: 1.0
color: 1715089216
dashdot {
dd: 1.8
dd: 5.4
}
priority: 120
}
}
element {
scale: 20
lines {
width: 1.0
color: 1715089216
dashdot {
dd: 1.8
dd: 5.4
}
priority: 120
}
}
}
cont {
name: "railway-halt"
element {

BIN
data/drules_proto_vehicle_light.bin
View file

Binary file not shown.

256
data/drules_proto_vehicle_light.txt
View file

@ -42335,6 +42335,132 @@ cont {
}
cont {
name: "railway-abandoned"
element {
scale: 16
lines {
width: 1.0
color: 1720486784
dashdot {
dd: 1.8
dd: 5.4
}
priority: 120
}
}
element {
scale: 17
lines {
width: 1.0
color: 1720486784
dashdot {
dd: 1.8
dd: 5.4
}
priority: 120
}
}
element {
scale: 18
lines {
width: 1.0
color: 1720486784
dashdot {
dd: 1.8
dd: 5.4
}
priority: 120
}
}
element {
scale: 19
lines {
width: 1.0
color: 1720486784
dashdot {
dd: 1.8
dd: 5.4
}
priority: 120
}
}
element {
scale: 20
lines {
width: 1.0
color: 1720486784
dashdot {
dd: 1.8
dd: 5.4
}
priority: 120
}
}
}
cont {
name: "railway-construction"
element {
scale: 16
lines {
width: 1.0
color: 1720486784
dashdot {
dd: 1.8
dd: 5.4
}
priority: 120
}
}
element {
scale: 17
lines {
width: 1.0
color: 1720486784
dashdot {
dd: 1.8
dd: 5.4
}
priority: 120
}
}
element {
scale: 18
lines {
width: 1.0
color: 1720486784
dashdot {
dd: 1.8
dd: 5.4
}
priority: 120
}
}
element {
scale: 19
lines {
width: 1.0
color: 1720486784
dashdot {
dd: 1.8
dd: 5.4
}
priority: 120
}
}
element {
scale: 20
lines {
width: 1.0
color: 1720486784
dashdot {
dd: 1.8
dd: 5.4
}
priority: 120
}
}
}
cont {
name: "railway-disused"
element {
scale: 16
lines {
@ -42397,7 +42523,7 @@ cont {
}
}
cont {
name: "railway-abandoned-bridge"
name: "railway-disused-bridge"
element {
scale: 16
lines {
@ -42520,7 +42646,7 @@ cont {
}
}
cont {
name: "railway-abandoned-tunnel"
name: "railway-disused-tunnel"
element {
scale: 16
lines {
@ -42582,132 +42708,6 @@ cont {
}
}
}
cont {
name: "railway-construction"
element {
scale: 16
lines {
width: 1.0
color: 1720486784
dashdot {
dd: 1.8
dd: 5.4
}
priority: 120
}
}
element {
scale: 17
lines {
width: 1.0
color: 1720486784
dashdot {
dd: 1.8
dd: 5.4
}
priority: 120
}
}
element {
scale: 18
lines {
width: 1.0
color: 1720486784
dashdot {
dd: 1.8
dd: 5.4
}
priority: 120
}
}
element {
scale: 19
lines {
width: 1.0
color: 1720486784
dashdot {
dd: 1.8
dd: 5.4
}
priority: 120
}
}
element {
scale: 20
lines {
width: 1.0
color: 1720486784
dashdot {
dd: 1.8
dd: 5.4
}
priority: 120
}
}
}
cont {
name: "railway-disused"
element {
scale: 16
lines {
width: 1.0
color: 1720486784
dashdot {
dd: 1.8
dd: 5.4
}
priority: 120
}
}
element {
scale: 17
lines {
width: 1.0
color: 1720486784
dashdot {
dd: 1.8
dd: 5.4
}
priority: 120
}
}
element {
scale: 18
lines {
width: 1.0
color: 1720486784
dashdot {
dd: 1.8
dd: 5.4
}
priority: 120
}
}
element {
scale: 19
lines {
width: 1.0
color: 1720486784
dashdot {
dd: 1.8
dd: 5.4
}
priority: 120
}
}
element {
scale: 20
lines {
width: 1.0
color: 1720486784
dashdot {
dd: 1.8
dd: 5.4
}
priority: 120
}
}
}
cont {
name: "railway-halt"
element {

6
data/mapcss-mapping.csv
View file

@ -395,8 +395,7 @@ place|farm;294;
deprecated:boundary|administrative|11:04.2024;[boundary=administrative][admin_level=11];x;name;int_name;295;
waterway|weir;296;
highway|secondary|tunnel;[highway=secondary][tunnel?];;name;int_name;297;
# TODO: its a mismapping likely, if there is a bridge structure still, then it should be railway=disused.
railway|abandoned|bridge;[railway=abandoned][bridge?];;name;int_name;298;
railway|disused|bridge;[railway=disused][bridge?];;name;int_name;298;
man_made|lighthouse;299;
deprecated:highway|path|demanding_mountain_hiking:04.2024;[highway=path][sac_scale=demanding_mountain_hiking];x;name;int_name;300;highway|path|difficult
pastk commented 2024-12-06 17:11:31 +00:00
Review
Copy link

actually a railway=abandoned bridge=yes is not a mismapping, its a legit situation, e.g. rails were removed but bridge is still there with some sleepers, posts and maybe other remnants left...
according to https://taginfo.openstreetmap.org/tags/railway=abandoned#combinations there are 37k abandoned railway bridges mapped (9% of all abandoned railways)

actually a `railway=abandoned bridge=yes` is not a mismapping, its a legit situation, e.g. rails were removed but bridge is still there with some sleepers, posts and maybe other remnants left... according to https://taginfo.openstreetmap.org/tags/railway=abandoned#combinations there are 37k abandoned railway bridges mapped (9% of all abandoned railways)
pastk commented 2024-12-06 17:15:46 +00:00
Review
Copy link

Ideally we'd have separate rendering styles for abandoned and disused bridges which would be similar to abandoned and disused lines respectively. Then we'll need to add translations into types_strings.txt also.

If you feel its too much to do then I think its fine to combine both of them into a single style, e.g.
railway|abandoned|bridge;[railway=abandoned][bridge?],[railway=disused][bridge?];;name;int_name;298;.
And they would use existing translations for railway|abandoned|bridge.

Ideally we'd have separate rendering styles for abandoned and disused bridges which would be similar to abandoned and disused lines respectively. Then we'll need to add translations into `types_strings.txt` also. If you feel its too much to do then I think its fine to combine both of them into a single style, e.g. `railway|abandoned|bridge;[railway=abandoned][bridge?],[railway=disused][bridge?];;name;int_name;298;`. And they would use existing translations for `railway|abandoned|bridge`.
pastk commented 2024-12-30 07:49:45 +00:00
Review
Copy link

Please change it to railway|disused|bridge;[railway=disused][bridge?],[railway=abandoned][bridge?];;name;int_name;298;

Please change it to `railway|disused|bridge;[railway=disused][bridge?],[railway=abandoned][bridge?];;name;int_name;298;`
man_made|storage_tank;301;
@ -502,8 +501,7 @@ railway|rail|spur|tunnel;[railway=rail][service=spur][!usage][tunnel?];;name;int
highway|secondary_link|bridge;[highway=secondary_link][bridge?];;name;int_name;397;
railway|tram|tunnel;[railway=tram][tunnel?];;name;int_name;398;
railway|rail|tourism;[railway=rail][usage=tourism][!service];;name;int_name;399;
# TODO: its a mismapping likely, if there is a tunnel structure still, then it should be railway=disused.
railway|abandoned|tunnel;[railway=abandoned][tunnel?];;name;int_name;400;
railway|disused|tunnel;[railway=disused][tunnel?];;name;int_name;400;
area:highway|living_street;401;
piste:type|sled;402;
leisure|beach_resort;403;

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

4
data/patterns.txt
View file

@ -71,8 +71,8 @@
4.0 6.0 8.0 1.5
5.0 7.0 10.0 1.9
1.0 80.0
6.3 6.3
1.8 5.4
6.3 6.3
4.5 4.5
8.1 8.1
10.0 10.0
@ -97,9 +97,9 @@
12.0 4.0
6.0 8.5 12.0 2.3
1.0 50.0
8.0 8.0
1.8 5.5
2.5 7.0
8.0 8.0
5.2 5.2
3.5 3.5
10.1 10.1

20
data/styles/default/include/Roads.mapcss
View file

@ -1126,13 +1126,13 @@ line|z13-[railway=rail][bridge?]::bridgewhite,
line|z13-[railway=subway][bridge?]::bridgewhite,
line|z13-[railway=light_rail][bridge?]::bridgewhite,
line|z15-[railway=preserved][bridge?]::bridgewhite,
line|z16-[railway=abandoned][bridge?]::bridgewhite,
line|z16-[railway=disused][bridge?]::bridgewhite,
{casing-linecap: butt;casing-color:@bridge_background;casing-opacity: 0.8;}
line|z16-[railway=rail][bridge?]::bridgeblack,
line|z16-[railway=subway][bridge?]::bridgeblack,
line|z16-[railway=light_rail][bridge?]::bridgeblack,
line|z16-[railway=preserved][bridge?]::bridgeblack,
line|z16-[railway=abandoned][bridge?]::bridgeblack,
line|z16-[railway=disused][bridge?]::bridgeblack,
{casing-linecap: butt;casing-color:@bridge_casing;casing-opacity: 0.7;}
/* 9.1 RAIL 11-22 ZOOM */
@ -1282,11 +1282,11 @@ line|z18-[railway=light_rail][!tunnel]::dash,
line|z15-[railway=preserved],
line|z16-[railway=abandoned],
line|z16-[railway=disused],
{width: 1.6;dashes: 6.3,6.3;}
line|z15-[railway=construction],
line|z16-[railway=disused],
line|z16-[railway=abandoned],
{width: 1;dashes: 1.8,5.4;}
/* 9.2 Rail tunnel 14-22 ZOOM */
@ -1326,38 +1326,38 @@ line|z16[railway=rail][bridge?]::bridgewhite,
line|z16[railway=subway][bridge?]::bridgewhite,
line|z16[railway=light_rail][bridge?]::bridgewhite,
line|z16[railway=preserved][bridge?]::bridgewhite,
line|z16[railway=abandoned][bridge?]::bridgewhite,
line|z16[railway=disused][bridge?]::bridgewhite,
{casing-width-add: 1.6;}
line|z17[railway=rail][bridge?]::bridgewhite,
line|z17[railway=subway][bridge?]::bridgewhite,
line|z17[railway=light_rail][bridge?]::bridgewhite,
line|z17[railway=preserved][bridge?]::bridgewhite,
line|z17[railway=abandoned][bridge?]::bridgewhite,
line|z17[railway=disused][bridge?]::bridgewhite,
{casing-width-add: 2.3;}
line|z18-[railway=rail][bridge?]::bridgewhite,
line|z18-[railway=subway][bridge?]::bridgewhite,
line|z18-[railway=light_rail][bridge?]::bridgewhite,
line|z18-[railway=preserved][bridge?]::bridgewhite,
line|z18-[railway=abandoned][bridge?]::bridgewhite,
line|z18-[railway=disused][bridge?]::bridgewhite,
{casing-width-add: 3.5;}
line|z16[railway=rail][bridge?]::bridgeblack,
line|z16[railway=subway][bridge?]::bridgeblack,
line|z16[railway=light_rail][bridge?]::bridgeblack,
line|z16[railway=preserved][bridge?]::bridgeblack,
line|z16[railway=abandoned][bridge?]::bridgeblack,
line|z16[railway=disused][bridge?]::bridgeblack,
{casing-width-add: 2.2;}
line|z17[railway=rail][bridge?]::bridgeblack,
line|z17[railway=subway][bridge?]::bridgeblack,
line|z17[railway=light_rail][bridge?]::bridgeblack,
line|z17[railway=preserved][bridge?]::bridgeblack,
line|z17[railway=abandoned][bridge?]::bridgeblack,
line|z17[railway=disused][bridge?]::bridgeblack,
{casing-width-add: 3;}
line|z18-[railway=rail][bridge?]::bridgeblack,
line|z18-[railway=subway][bridge?]::bridgeblack,
line|z18-[railway=light_rail][bridge?]::bridgeblack,
line|z18-[railway=preserved][bridge?]::bridgeblack,
line|z18-[railway=abandoned][bridge?]::bridgeblack,
line|z18-[railway=disused][bridge?]::bridgeblack,
{casing-width-add: 4.4;}
/* 9.4 Monorail 14-22 ZOOM */

8
data/styles/default/include/priorities_3_FG.prio.txt
View file

@ -289,10 +289,10 @@ highway-path-bicycle::cycleline # line::cycleline z14- (also
highway-construction # line z13- (also has pathtext z15-)
leisure-track # line z15- (also has caption z16-)
railway-abandoned # line z16-
railway-abandoned-bridge # line z16- (also has line::bridgeblack z16-, line::bridgewhite z16-)
railway-abandoned-tunnel # line z16-
railway-construction # line z15-
railway-disused # line z16-
railway-disused-bridge # line z16- (also has line::bridgeblack z16-, line::bridgewhite z16-)
railway-disused-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-
@ -327,7 +327,7 @@ highway-track-bridge::bridgewhite # line::bridgewhite z15- (al
highway-trunk-bridge::bridgewhite # line::bridgewhite z13- (also has line z6-, line::bridgeblack z13-, pathtext z10-, shield::shield z10-)
highway-trunk_link-bridge::bridgewhite # line::bridgewhite z14- (also has line z10-, line::bridgeblack z14-, pathtext z10-, shield::shield z10-)
highway-unclassified-bridge::bridgewhite # line::bridgewhite z14- (also has line z11-, line::bridgeblack z14-, pathtext z13-)
railway-abandoned-bridge::bridgewhite # line::bridgewhite z16- (also has line z16-, line::bridgeblack z16-)
railway-disused-bridge::bridgewhite # line::bridgewhite z16- (also has line z16-, line::bridgeblack z16-)
railway-preserved-bridge::bridgewhite # line::bridgewhite z15- (also has line z15-, line::bridgeblack z16-)
railway-rail-branch-bridge::bridgewhite # line::bridgewhite z13- (also has line z11-, line::bridgeblack z16-, line::dash z16-)
railway-rail-bridge::bridgewhite # line::bridgewhite z13- (also has line z11-, line::bridgeblack z16-, line::dash z16-)
@ -361,7 +361,7 @@ highway-track-bridge::bridgeblack # line::bridgeblack z17- (al
highway-trunk-bridge::bridgeblack # line::bridgeblack z13- (also has line z6-, line::bridgewhite z13-, pathtext z10-, shield::shield z10-)
highway-trunk_link-bridge::bridgeblack # line::bridgeblack z14- (also has line z10-, line::bridgewhite z14-, pathtext z10-, shield::shield z10-)
highway-unclassified-bridge::bridgeblack # line::bridgeblack z14- (also has line z11-, line::bridgewhite z14-, pathtext z13-)
railway-abandoned-bridge::bridgeblack # line::bridgeblack z16- (also has line z16-, line::bridgewhite z16-)
railway-disused-bridge::bridgeblack # line::bridgeblack z16- (also has line z16-, line::bridgewhite z16-)
railway-preserved-bridge::bridgeblack # line::bridgeblack z16- (also has line z15-, line::bridgewhite z15-)
railway-rail-branch-bridge::bridgeblack # line::bridgeblack z16- (also has line z11-, line::bridgewhite z13-, line::dash z16-)
railway-rail-bridge::bridgeblack # line::bridgeblack z16- (also has line z11-, line::bridgewhite z13-, line::dash z16-)

8
data/styles/outdoors/include/Roads.mapcss
View file

@ -518,17 +518,17 @@ line|z13-[railway=abandoned],
{color: @railway; opacity:1;}
line|z13-[railway=preserved],
line|z13-[railway=abandoned]
line|z13-[railway=disused]
{width: 1.6; dashes: 6.3,6.3;}
line|z16-[railway=preserved],
line|z16-[railway=abandoned]
line|z16-[railway=disused]
{width: 2.2; dashes: 8,8;}
line|z13-[railway=construction],
line|z13-[railway=disused]
line|z13-[railway=abandoned]
{width: 1; dashes: 1.8,5.5;}
line|z16-[railway=construction],
line|z16-[railway=disused]
line|z16-[railway=abandoned]
{width: 1.7; dashes: 2.5,7;}

8
data/styles/outdoors/include/priorities_3_FG.prio.txt
View file

@ -289,10 +289,10 @@ highway-path-bicycle::cycleline # line::cycleline z12- (also
highway-construction # line z11- (also has pathtext z15-)
leisure-track # line z15- (also has caption z16-)
railway-abandoned # line z13-
railway-abandoned-bridge # line z13- (also has line::bridgeblack z16-, line::bridgewhite z16-)
railway-abandoned-tunnel # line z13-
railway-construction # line z13-
railway-disused # line z13-
railway-disused-bridge # line z13- (also has line::bridgeblack z16-, line::bridgewhite z16-)
railway-disused-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-
@ -327,7 +327,7 @@ highway-track-bridge::bridgewhite # line::bridgewhite z15- (al
highway-trunk-bridge::bridgewhite # line::bridgewhite z13- (also has line z6-, line::bridgeblack z13-, pathtext z10-, shield::shield z10-)
highway-trunk_link-bridge::bridgewhite # line::bridgewhite z14- (also has line z10-, line::bridgeblack z14-, pathtext z10-, shield::shield z10-)
highway-unclassified-bridge::bridgewhite # line::bridgewhite z14- (also has line z11-, line::bridgeblack z14-, pathtext z13-)
railway-abandoned-bridge::bridgewhite # line::bridgewhite z16- (also has line z13-, line::bridgeblack z16-)
railway-disused-bridge::bridgewhite # line::bridgewhite z16- (also has line z13-, line::bridgeblack z16-)
railway-preserved-bridge::bridgewhite # line::bridgewhite z15- (also has line z13-, line::bridgeblack z16-)
railway-rail-branch-bridge::bridgewhite # line::bridgewhite z13- (also has line z10-, line::bridgeblack z16-, line::dash z15-)
railway-rail-bridge::bridgewhite # line::bridgewhite z13- (also has line z10-, line::bridgeblack z16-, line::dash z15-)
@ -361,7 +361,7 @@ highway-track-bridge::bridgeblack # line::bridgeblack z17- (al
highway-trunk-bridge::bridgeblack # line::bridgeblack z13- (also has line z6-, line::bridgewhite z13-, pathtext z10-, shield::shield z10-)
highway-trunk_link-bridge::bridgeblack # line::bridgeblack z14- (also has line z10-, line::bridgewhite z14-, pathtext z10-, shield::shield z10-)
highway-unclassified-bridge::bridgeblack # line::bridgeblack z14- (also has line z11-, line::bridgewhite z14-, pathtext z13-)
railway-abandoned-bridge::bridgeblack # line::bridgeblack z16- (also has line z13-, line::bridgewhite z16-)
railway-disused-bridge::bridgeblack # line::bridgeblack z16- (also has line z13-, line::bridgewhite z16-)
railway-preserved-bridge::bridgeblack # line::bridgeblack z16- (also has line z13-, line::bridgewhite z15-)
railway-rail-branch-bridge::bridgeblack # line::bridgeblack z16- (also has line z10-, line::bridgewhite z13-, line::dash z15-)
railway-rail-bridge::bridgeblack # line::bridgeblack z16- (also has line z10-, line::bridgewhite z13-, line::dash z15-)

20
data/styles/vehicle/include/Roads.mapcss
View file

@ -739,14 +739,14 @@ line|z14-[railway=rail][bridge?]::bridgewhite,
line|z14-[railway=subway][bridge?]::bridgewhite,
line|z14-[railway=light_rail][bridge?]::bridgewhite,
line|z16-[railway=preserved][bridge?]::bridgewhite,
line|z16-[railway=abandoned][bridge?]::bridgewhite,
line|z16-[railway=disused][bridge?]::bridgewhite,
line|z16-[railway=tram][bridge?]::bridgewhite,
{casing-linecap: butt;casing-color:@bridge_background; opacity: 0.8;}
line|z16-[railway=rail][bridge?]::bridgeblack,
line|z16-[railway=subway][bridge?]::bridgeblack,
line|z16-[railway=light_rail][bridge?]::bridgeblack,
line|z16-[railway=preserved][bridge?]::bridgeblack,
line|z16-[railway=abandoned][bridge?]::bridgeblack,
line|z16-[railway=disused][bridge?]::bridgeblack,
line|z16-[railway=tram][bridge?]::bridgeblack,
{casing-linecap: butt;casing-color:@bridge_casing; opacity: 0.6;}
@ -909,11 +909,11 @@ line|z19-[railway=light_rail][!tunnel]::dash,
line|z16-[railway=preserved],
line|z16-[railway=abandoned]
line|z16-[railway=disused]
{width: 1.6;dashes: 6.3,6.3;}
line|z16-[railway=construction],
line|z16-[railway=disused]
line|z16-[railway=abandoned]
{width: 1;dashes: 1.8,5.4;}
/* 9.2 Rail tunnel 14-22 ZOOM */
@ -944,38 +944,38 @@ line|z16[railway=rail][bridge?]::bridgewhite,
line|z16[railway=subway][bridge?]::bridgewhite,
line|z16[railway=light_rail][bridge?]::bridgewhite,
line|z16[railway=preserved][bridge?]::bridgewhite,
line|z16[railway=abandoned][bridge?]::bridgewhite,
line|z16[railway=disused][bridge?]::bridgewhite,
{casing-width-add: 1.6;}
line|z17[railway=rail][bridge?]::bridgewhite,
line|z17[railway=subway][bridge?]::bridgewhite,
line|z17[railway=light_rail][bridge?]::bridgewhite,
line|z17[railway=preserved][bridge?]::bridgewhite,
line|z17[railway=abandoned][bridge?]::bridgewhite,
line|z17[railway=disused][bridge?]::bridgewhite,
{casing-width-add: 2.3;}
line|z18-[railway=rail][bridge?]::bridgewhite,
line|z18-[railway=subway][bridge?]::bridgewhite,
line|z18-[railway=light_rail][bridge?]::bridgewhite,
line|z18-[railway=preserved][bridge?]::bridgewhite,
line|z18-[railway=abandoned][bridge?]::bridgewhite,
line|z18-[railway=disused][bridge?]::bridgewhite,
{casing-width-add: 3.5;}
line|z16[railway=rail][bridge?]::bridgeblack,
line|z16[railway=subway][bridge?]::bridgeblack,
line|z16[railway=light_rail][bridge?]::bridgeblack,
line|z16[railway=preserved][bridge?]::bridgeblack,
line|z16[railway=abandoned][bridge?]::bridgeblack,
line|z16[railway=disused][bridge?]::bridgeblack,
{casing-width-add: 2.2;}
line|z17[railway=rail][bridge?]::bridgeblack,
line|z17[railway=subway][bridge?]::bridgeblack,
line|z17[railway=light_rail][bridge?]::bridgeblack,
line|z17[railway=preserved][bridge?]::bridgeblack,
line|z17[railway=abandoned][bridge?]::bridgeblack,
line|z17[railway=disused][bridge?]::bridgeblack,
{casing-width-add: 3;}
line|z18-[railway=rail][bridge?]::bridgeblack,
line|z18-[railway=subway][bridge?]::bridgeblack,
line|z18-[railway=light_rail][bridge?]::bridgeblack,
line|z18-[railway=preserved][bridge?]::bridgeblack,
line|z18-[railway=abandoned][bridge?]::bridgeblack,
line|z18-[railway=disused][bridge?]::bridgeblack,
{casing-width-add: 4.4;}
/* 9.4 Monorail 14-22 ZOOM */

8
data/styles/vehicle/include/priorities_3_FG.prio.txt
View file

@ -268,10 +268,10 @@ highway-track-no-access # line z16-
highway-construction # line z13-
railway-abandoned # line z16-
railway-abandoned-bridge # line z16- (also has line::bridgeblack z16-, line::bridgewhite z16-)
railway-abandoned-tunnel # line z16-
railway-construction # line z16-
railway-disused # line z16-
railway-disused-bridge # line z16- (also has line::bridgeblack z16-, line::bridgewhite z16-)
railway-disused-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-
@ -289,7 +289,7 @@ highway-tertiary_link-bridge::bridgewhite # line::bridgewhite z14- (al
highway-trunk-bridge::bridgewhite # line::bridgewhite z13- (also has line z6-, line::bridgeblack z13-, line(casing) z14-, pathtext z10-, shield::shield z10-)
highway-trunk_link-bridge::bridgewhite # line::bridgewhite z14- (also has line z10-, line::bridgeblack z14-, line(casing) z14-, pathtext z10-, shield::shield z10-)
highway-unclassified-bridge::bridgewhite # line::bridgewhite z14- (also has line z11-, line::bridgeblack z14-, pathtext z14-)
railway-abandoned-bridge::bridgewhite # line::bridgewhite z16- (also has line z16-, line::bridgeblack z16-)
railway-disused-bridge::bridgewhite # line::bridgewhite z16- (also has line z16-, line::bridgeblack z16-)
railway-preserved-bridge::bridgewhite # line::bridgewhite z16- (also has line z16-, line::bridgeblack z16-)
railway-rail-branch-bridge::bridgewhite # line::bridgewhite z14- (also has line z11-, line::bridgeblack z16-, line::dash z16-)
railway-rail-bridge::bridgewhite # line::bridgewhite z14- (also has line z11-, line::bridgeblack z16-, line::dash z16-)
@ -314,7 +314,7 @@ highway-tertiary_link-bridge::bridgeblack # line::bridgeblack z14- (al
highway-trunk-bridge::bridgeblack # line::bridgeblack z13- (also has line z6-, line::bridgewhite z13-, line(casing) z14-, pathtext z10-, shield::shield z10-)
highway-trunk_link-bridge::bridgeblack # line::bridgeblack z14- (also has line z10-, line::bridgewhite z14-, line(casing) z14-, pathtext z10-, shield::shield z10-)
highway-unclassified-bridge::bridgeblack # line::bridgeblack z14- (also has line z11-, line::bridgewhite z14-, pathtext z14-)
railway-abandoned-bridge::bridgeblack # line::bridgeblack z16- (also has line z16-, line::bridgewhite z16-)
railway-disused-bridge::bridgeblack # line::bridgeblack z16- (also has line z16-, line::bridgewhite z16-)
railway-preserved-bridge::bridgeblack # line::bridgeblack z16- (also has line z16-, line::bridgewhite z16-)
railway-rail-branch-bridge::bridgeblack # line::bridgeblack z16- (also has line z11-, line::bridgewhite z14-, line::dash z16-)
railway-rail-bridge::bridgeblack # line::bridgeblack z16- (also has line z11-, line::bridgewhite z14-, line::dash z16-)

4
data/types.txt
View file

@ -295,7 +295,7 @@ mapswithme
mapswithme
*waterway|weir
*highway|secondary|tunnel
*railway|abandoned|bridge
*railway|disused|bridge
*man_made|lighthouse
highway|path|difficult
*man_made|storage_tank
@ -397,7 +397,7 @@ highway|path|expert
*highway|secondary_link|bridge
*railway|tram|tunnel
*railway|rail|tourism
*railway|abandoned|tunnel
*railway|disused|tunnel
*area:highway|living_street
*piste:type|sled
*leisure|beach_resort

8
data/visibility.txt
View file

@ -889,13 +889,13 @@ world 000000000000000000000 +
platform 000000000000000000000 -
{}
railway 000000000000000000000 +
abandoned 000000000000000011111 +
abandoned 000000000000000011111 -
construction 000000000000000011111 -
crossing 000000000000000000000 -
disused 000000000000000011111 +
bridge 000000000000000011111 -
tunnel 000000000000000011111 -
{}
construction 000000000000000011111 -
crossing 000000000000000000000 -
disused 000000000000000011111 -
funicular 000000000000000000000 +
bridge 000000000000000000000 -
tunnel 000000000000000000000 -