From 2dcd2ecf4f57993699a5321d9416965c3c692f2f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bernhard=20K=C3=B6lbl?= Date: Sun, 22 Dec 2024 15:39:25 +0100 Subject: [PATCH 1/2] Draw H/V distant signals with lower priority than main signals. --- features/signals_railway_signals.yaml | 104 +++++++++++++------------- 1 file changed, 52 insertions(+), 52 deletions(-) diff --git a/features/signals_railway_signals.yaml b/features/signals_railway_signals.yaml index 9b54f8c6..183e0618 100644 --- a/features/signals_railway_signals.yaml +++ b/features/signals_railway_signals.yaml @@ -778,58 +778,6 @@ features: - { tag: 'railway:signal:main', value: 'DE-ESO:ne1' } - { tag: 'railway:signal:main:form', value: 'sign' } - - description: distant light signals type Vr (repeated) - country: DE - icon: - match: 'railway:signal:distant:states' - cases: - - { regex: '^(.*;)?DE-ESO:vr2(;.*)?$', value: 'de/vr2-light-repeated', description: 'shortened' } - - { regex: '^(.*;)?DE-ESO:vr1(;.*)?$', value: 'de/vr1-light-repeated' } - default: 'de/vr0-light-repeated' - tags: - - { tag: 'railway:signal:distant', value: 'DE-ESO:vr' } - - { tag: 'railway:signal:distant:form', value: 'light' } - - { tag: 'railway:signal:distant:repeated', value: 'yes' } - - - description: distant light signals type Vr (shortened) - country: DE - # TODO make distinct icon - # Shown with the same icon as shortened - icon: - match: 'railway:signal:distant:states' - cases: - - { regex: '^(.*;)?DE-ESO:vr2(;.*)?$', value: 'de/vr2-light-repeated' } - - { regex: '^(.*;)?DE-ESO:vr1(;.*)?$', value: 'de/vr1-light-repeated' } - default: 'de/vr0-light-repeated' - tags: - - { tag: 'railway:signal:distant', value: 'DE-ESO:vr' } - - { tag: 'railway:signal:distant:form', value: 'light' } - - { tag: 'railway:signal:distant:shortened', value: 'yes' } - - - description: distant light signals type Vr - country: DE - icon: - match: 'railway:signal:distant:states' - cases: - - { regex: '^(.*;)?DE-ESO:vr2(;.*)?$', value: 'de/vr2-light' } - - { regex: '^(.*;)?DE-ESO:vr1(;.*)?$', value: 'de/vr1-light' } - default: 'de/vr0-light' - tags: - - { tag: 'railway:signal:distant', value: 'DE-ESO:vr' } - - { tag: 'railway:signal:distant:form', value: 'light' } - - - description: distant semaphore signals type Vr - country: DE - icon: - match: 'railway:signal:distant:states' - cases: - - { regex: '^(.*;)?DE-ESO:vr2(;.*)?$', value: 'de/vr2-semaphore' } - - { regex: '^(.*;)?DE-ESO:vr1(;.*)?$', value: 'de/vr1-semaphore' } - default: 'de/vr0-semaphore' - tags: - - { tag: 'railway:signal:distant', value: 'DE-ESO:vr' } - - { tag: 'railway:signal:distant:form', value: 'semaphore' } - - description: Hamburger Hochbahn distant signal country: DE icon: { default: 'de/hha/v1' } @@ -903,6 +851,58 @@ features: - { tag: 'railway:signal:main', value: 'DE-ESO:hp' } - { tag: 'railway:signal:main:form', value: 'light' } + - description: distant light signals type Vr (repeated) + country: DE + icon: + match: 'railway:signal:distant:states' + cases: + - { regex: '^(.*;)?DE-ESO:vr2(;.*)?$', value: 'de/vr2-light-repeated', description: 'shortened' } + - { regex: '^(.*;)?DE-ESO:vr1(;.*)?$', value: 'de/vr1-light-repeated' } + default: 'de/vr0-light-repeated' + tags: + - { tag: 'railway:signal:distant', value: 'DE-ESO:vr' } + - { tag: 'railway:signal:distant:form', value: 'light' } + - { tag: 'railway:signal:distant:repeated', value: 'yes' } + + - description: distant light signals type Vr (shortened) + country: DE + # TODO make distinct icon + # Shown with the same icon as shortened + icon: + match: 'railway:signal:distant:states' + cases: + - { regex: '^(.*;)?DE-ESO:vr2(;.*)?$', value: 'de/vr2-light-repeated' } + - { regex: '^(.*;)?DE-ESO:vr1(;.*)?$', value: 'de/vr1-light-repeated' } + default: 'de/vr0-light-repeated' + tags: + - { tag: 'railway:signal:distant', value: 'DE-ESO:vr' } + - { tag: 'railway:signal:distant:form', value: 'light' } + - { tag: 'railway:signal:distant:shortened', value: 'yes' } + + - description: distant light signals type Vr + country: DE + icon: + match: 'railway:signal:distant:states' + cases: + - { regex: '^(.*;)?DE-ESO:vr2(;.*)?$', value: 'de/vr2-light' } + - { regex: '^(.*;)?DE-ESO:vr1(;.*)?$', value: 'de/vr1-light' } + default: 'de/vr0-light' + tags: + - { tag: 'railway:signal:distant', value: 'DE-ESO:vr' } + - { tag: 'railway:signal:distant:form', value: 'light' } + + - description: distant semaphore signals type Vr + country: DE + icon: + match: 'railway:signal:distant:states' + cases: + - { regex: '^(.*;)?DE-ESO:vr2(;.*)?$', value: 'de/vr2-semaphore' } + - { regex: '^(.*;)?DE-ESO:vr1(;.*)?$', value: 'de/vr1-semaphore' } + default: 'de/vr0-semaphore' + tags: + - { tag: 'railway:signal:distant', value: 'DE-ESO:vr' } + - { tag: 'railway:signal:distant:form', value: 'semaphore' } + - description: distant light signals type Hl country: DE icon: { default: 'de/hl1-distant' } From 8967a17c4ec7d36829d2dcebd6c53a0c09c24a8c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bernhard=20K=C3=B6lbl?= Date: Sun, 22 Dec 2024 15:40:55 +0100 Subject: [PATCH 2/2] Draw Ne2 with lower priority than H/V main signals. --- features/signals_railway_signals.yaml | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/features/signals_railway_signals.yaml b/features/signals_railway_signals.yaml index 183e0618..58e6802e 100644 --- a/features/signals_railway_signals.yaml +++ b/features/signals_railway_signals.yaml @@ -816,17 +816,6 @@ features: - { tag: 'railway:signal:crossing_distant', value: 'DE-ESO:so14' } - { tag: 'railway:signal:crossing_distant:form', value: 'sign' } - - description: distant signal replacement by sign Ne 2 - country: DE - icon: - match: 'railway:signal:distant:shortened' - cases: - - { regex: '^yes$', value: 'de/ne2-reduced-distance' } - default: 'de/ne2' - tags: - - { tag: 'railway:signal:distant', value: 'DE-ESO:db:ne2' } - - { tag: 'railway:signal:distant:form', value: 'sign' } - - description: main semaphore signals type Hp country: DE icon: @@ -903,6 +892,17 @@ features: - { tag: 'railway:signal:distant', value: 'DE-ESO:vr' } - { tag: 'railway:signal:distant:form', value: 'semaphore' } + - description: distant signal replacement by sign Ne 2 + country: DE + icon: + match: 'railway:signal:distant:shortened' + cases: + - { regex: '^yes$', value: 'de/ne2-reduced-distance' } + default: 'de/ne2' + tags: + - { tag: 'railway:signal:distant', value: 'DE-ESO:db:ne2' } + - { tag: 'railway:signal:distant:form', value: 'sign' } + - description: distant light signals type Hl country: DE icon: { default: 'de/hl1-distant' }