diff --git a/data/classificator.txt b/data/classificator.txt index 72d3f78eee..3263de0589 100644 --- a/data/classificator.txt +++ b/data/classificator.txt @@ -889,13 +889,13 @@ world + platform - {} railway + - abandoned + + abandoned - + construction - + crossing - + disused + bridge - tunnel - {} - construction - - crossing - - disused - funicular + bridge - tunnel - diff --git a/data/drules_proto.bin b/data/drules_proto.bin index 50d6114c66..0a21221fcd 100644 Binary files a/data/drules_proto.bin and b/data/drules_proto.bin differ diff --git a/data/drules_proto.txt b/data/drules_proto.txt index 0e6cc82f4f..b3431cba67 100644 --- a/data/drules_proto.txt +++ b/data/drules_proto.txt @@ -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 { diff --git a/data/drules_proto_default_dark.bin b/data/drules_proto_default_dark.bin index 3fb2ec4eb4..a0e316cc27 100644 Binary files a/data/drules_proto_default_dark.bin and b/data/drules_proto_default_dark.bin differ diff --git a/data/drules_proto_default_dark.txt b/data/drules_proto_default_dark.txt index 67524425e2..196650f843 100644 --- a/data/drules_proto_default_dark.txt +++ b/data/drules_proto_default_dark.txt @@ -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 { diff --git a/data/drules_proto_default_light.bin b/data/drules_proto_default_light.bin index e4bfe3a669..884339eedc 100644 Binary files a/data/drules_proto_default_light.bin and b/data/drules_proto_default_light.bin differ diff --git a/data/drules_proto_default_light.txt b/data/drules_proto_default_light.txt index 638090a6c7..e323f704d7 100644 --- a/data/drules_proto_default_light.txt +++ b/data/drules_proto_default_light.txt @@ -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 { diff --git a/data/drules_proto_outdoors_dark.bin b/data/drules_proto_outdoors_dark.bin index de9a456cc1..a173adae98 100644 Binary files a/data/drules_proto_outdoors_dark.bin and b/data/drules_proto_outdoors_dark.bin differ diff --git a/data/drules_proto_outdoors_dark.txt b/data/drules_proto_outdoors_dark.txt index 1220f8ce08..c8a6cbb652 100644 --- a/data/drules_proto_outdoors_dark.txt +++ b/data/drules_proto_outdoors_dark.txt @@ -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 { diff --git a/data/drules_proto_outdoors_light.bin b/data/drules_proto_outdoors_light.bin index 4d2a9e9c4d..305a953aae 100644 Binary files a/data/drules_proto_outdoors_light.bin and b/data/drules_proto_outdoors_light.bin differ diff --git a/data/drules_proto_outdoors_light.txt b/data/drules_proto_outdoors_light.txt index 0b6fe151cf..c4daecedb6 100644 --- a/data/drules_proto_outdoors_light.txt +++ b/data/drules_proto_outdoors_light.txt @@ -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 { diff --git a/data/drules_proto_vehicle_dark.bin b/data/drules_proto_vehicle_dark.bin index 52f57b6cf1..4cb0938505 100644 Binary files a/data/drules_proto_vehicle_dark.bin and b/data/drules_proto_vehicle_dark.bin differ diff --git a/data/drules_proto_vehicle_dark.txt b/data/drules_proto_vehicle_dark.txt index f1b465e21f..2a4baa8a0e 100644 --- a/data/drules_proto_vehicle_dark.txt +++ b/data/drules_proto_vehicle_dark.txt @@ -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 { diff --git a/data/drules_proto_vehicle_light.bin b/data/drules_proto_vehicle_light.bin index c067235fd0..fa4c5ea08a 100644 Binary files a/data/drules_proto_vehicle_light.bin and b/data/drules_proto_vehicle_light.bin differ diff --git a/data/drules_proto_vehicle_light.txt b/data/drules_proto_vehicle_light.txt index 07ace761b8..523d8533c0 100644 --- a/data/drules_proto_vehicle_light.txt +++ b/data/drules_proto_vehicle_light.txt @@ -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 { diff --git a/data/mapcss-mapping.csv b/data/mapcss-mapping.csv index 55e38bf6f0..2101eb29ba 100644 --- a/data/mapcss-mapping.csv +++ b/data/mapcss-mapping.csv @@ -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 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; diff --git a/data/patterns.txt b/data/patterns.txt index 83ab80f6ec..e5d0cce1e7 100644 --- a/data/patterns.txt +++ b/data/patterns.txt @@ -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 diff --git a/data/styles/default/include/Roads.mapcss b/data/styles/default/include/Roads.mapcss index 6fd441ae82..3284df12a1 100644 --- a/data/styles/default/include/Roads.mapcss +++ b/data/styles/default/include/Roads.mapcss @@ -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 */ diff --git a/data/styles/default/include/priorities_3_FG.prio.txt b/data/styles/default/include/priorities_3_FG.prio.txt index c61f4fce1b..0b1b2e1cbe 100644 --- a/data/styles/default/include/priorities_3_FG.prio.txt +++ b/data/styles/default/include/priorities_3_FG.prio.txt @@ -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-) diff --git a/data/styles/outdoors/include/Roads.mapcss b/data/styles/outdoors/include/Roads.mapcss index 58c84c91a0..c8d885b034 100644 --- a/data/styles/outdoors/include/Roads.mapcss +++ b/data/styles/outdoors/include/Roads.mapcss @@ -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;} diff --git a/data/styles/outdoors/include/priorities_3_FG.prio.txt b/data/styles/outdoors/include/priorities_3_FG.prio.txt index 24ee35f0ca..ee0e765746 100644 --- a/data/styles/outdoors/include/priorities_3_FG.prio.txt +++ b/data/styles/outdoors/include/priorities_3_FG.prio.txt @@ -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-) diff --git a/data/styles/vehicle/include/Roads.mapcss b/data/styles/vehicle/include/Roads.mapcss index 2abb8253ea..c69db56e2c 100644 --- a/data/styles/vehicle/include/Roads.mapcss +++ b/data/styles/vehicle/include/Roads.mapcss @@ -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 */ diff --git a/data/styles/vehicle/include/priorities_3_FG.prio.txt b/data/styles/vehicle/include/priorities_3_FG.prio.txt index 5f8a41ba47..111185f23d 100644 --- a/data/styles/vehicle/include/priorities_3_FG.prio.txt +++ b/data/styles/vehicle/include/priorities_3_FG.prio.txt @@ -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-) diff --git a/data/types.txt b/data/types.txt index 79a722cf4e..208130db8b 100644 --- a/data/types.txt +++ b/data/types.txt @@ -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 diff --git a/data/visibility.txt b/data/visibility.txt index 41623e448a..ae746523e9 100644 --- a/data/visibility.txt +++ b/data/visibility.txt @@ -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 -