From 30c57b462eab3a24a2def33f08fe7df19ea65f14 Mon Sep 17 00:00:00 2001 From: Hidde Wieringa Date: Tue, 5 Nov 2024 18:23:14 +0100 Subject: [PATCH] Missing electricity signals (part 2) (#140) Part of #36 Support for: - DE Streckentrennung - AT light electricity signals - NL electricity signals --- features/electrification_signals.yaml | 110 ++++++++++++++++++++++++- symbols/de/el1-el2.svg | 11 +++ symbols/de/ice-schaltmerkhilfe.svg | 8 ++ symbols/de/streckentrennung-anfang.svg | 8 ++ symbols/de/streckentrennung-ende.svg | 10 +++ symbols/nl/306a.svg | 8 ++ symbols/nl/307a.svg | 6 ++ symbols/nl/308a.svg | 7 ++ symbols/nl/309a.svg | 6 ++ symbols/nl/310a.svg | 6 ++ symbols/nl/311-left.svg | 9 ++ symbols/nl/311-right.svg | 9 ++ symbols/nl/311.svg | 7 ++ symbols/nl/320-1500.svg | 9 ++ symbols/nl/320-25000.svg | 6 ++ symbols/nl/320-unknown.svg | 7 ++ 16 files changed, 224 insertions(+), 3 deletions(-) create mode 100644 symbols/de/el1-el2.svg create mode 100644 symbols/de/ice-schaltmerkhilfe.svg create mode 100644 symbols/de/streckentrennung-anfang.svg create mode 100644 symbols/de/streckentrennung-ende.svg create mode 100644 symbols/nl/306a.svg create mode 100644 symbols/nl/307a.svg create mode 100644 symbols/nl/308a.svg create mode 100644 symbols/nl/309a.svg create mode 100644 symbols/nl/310a.svg create mode 100644 symbols/nl/311-left.svg create mode 100644 symbols/nl/311-right.svg create mode 100644 symbols/nl/311.svg create mode 100644 symbols/nl/320-1500.svg create mode 100644 symbols/nl/320-25000.svg create mode 100644 symbols/nl/320-unknown.svg diff --git a/features/electrification_signals.yaml b/features/electrification_signals.yaml index e4e2b20e..eb3b86b4 100644 --- a/features/electrification_signals.yaml +++ b/features/electrification_signals.yaml @@ -6,6 +6,7 @@ electrification_signals: - 'railway:signal:electricity:form' - 'railway:signal:electricity:for' - 'railway:signal:electricity:turn_direction' + - 'railway:signal:electricity:voltage' features: @@ -25,7 +26,7 @@ electrification_signals: tags: - { tag: 'railway:signal:electricity', value: 'AT-V2:ankündigung_hauptschalter_aus' } - { tag: 'railway:signal:electricity:type', value: 'power_off_advance' } - - { tag: 'railway:signal:electricity:form', value: 'sign' } + - { tag: 'railway:signal:electricity:form', values: ['sign', 'light'] } - description: Halt für Fahrzeuge mit angehobenem Stromabnehmer country: AT @@ -39,7 +40,7 @@ electrification_signals: tags: - { tag: 'railway:signal:electricity', value: 'AT-V2:halt_fuer_fahrzeuge_mit_angehobenem_stromabnehmer' } - { tag: 'railway:signal:electricity:type', value: 'end_of_catenary' } - - { tag: 'railway:signal:electricity:form', value: 'sign' } + - { tag: 'railway:signal:electricity:form', values: ['sign', 'light'] } - description: Hauptschalter ein country: AT @@ -63,7 +64,7 @@ electrification_signals: tags: - { tag: 'railway:signal:electricity', value: 'AT-V2:hauptschalter_aus' } - { tag: 'railway:signal:electricity:type', value: 'power_off' } - - { tag: 'railway:signal:electricity:form', value: 'sign' } + - { tag: 'railway:signal:electricity:form', values: ['sign', 'light'] } - description: Stromabnehmer tief country: AT @@ -169,6 +170,38 @@ electrification_signals: - { tag: 'railway:signal:electricity:form', value: 'sign' } - { tag: 'railway:signal:electricity', values: ['DE-BOStrab:st7', 'DE-AVG:st7'] } + - description: power off shortly + country: DE + icon: { default: 'de/el1-el2' } + tags: + - { tag: 'railway:signal:electricity:type', value: 'power_off_shortly' } + - { tag: 'railway:signal:electricity:form', value: 'sign' } + - { tag: 'railway:signal:electricity', values: ['DE-ESO:el1;DE-ESO:el2', 'DE-ESO:el2:DE-ESO:el1'] } + + - description: Streckentrennung (anfang) + country: DE + icon: { default: 'de/streckentrennung-anfang' } + tags: + - { tag: 'railway:signal:electricity', value: 'DE-ESO:streckentrennung' } + - { tag: 'railway:signal:electricity:type', value: 'begin_of_isolated_overlap' } + - { tag: 'railway:signal:electricity:form', value: 'sign' } + + - description: Streckentrennung (ende) + country: DE + icon: { default: 'de/streckentrennung-ende' } + tags: + - { tag: 'railway:signal:electricity', value: 'DE-ESO:streckentrennung' } + - { tag: 'railway:signal:electricity:type', value: 'end_of_isolated_overlap' } + - { tag: 'railway:signal:electricity:form', value: 'sign' } + + - description: ICE-Schaltmerkhilfe + country: DE + icon: { default: 'de/ice-schaltmerkhilfe' } + tags: + - { tag: 'railway:signal:electricity', value: 'DE-ESO:ice-schaltmerkhilfe' } + - { tag: 'railway:signal:electricity:type', value: 'power_on_for_long_trains' } + - { tag: 'railway:signal:electricity:form', value: 'sign' } + # --- FI --- # - description: Erotusjakson etumerkki @@ -220,6 +253,77 @@ electrification_signals: - { tag: 'railway:signal:electricity', value: 'FI:T-125' } - { tag: 'railway:signal:electricity:form', value: 'sign' } + # --- NL --- # + + - description: power off + country: NL + icon: { default: 'nl/306a' } + tags: + - { tag: 'railway:signal:electricity', value: 'NL:306a' } + - { tag: 'railway:signal:electricity:form', value: 'sign' } + - { tag: 'railway:signal:electricity:type', value: 'power_off' } + + # TODO support carriages + - description: power on + country: NL + icon: { default: 'nl/307a' } + tags: + - { tag: 'railway:signal:electricity', value: 'NL:307a' } + - { tag: 'railway:signal:electricity:form', value: 'sign' } + - { tag: 'railway:signal:electricity:type', value: 'power_on' } + + - description: announcement pantograph down + country: NL + icon: { default: 'nl/307a' } + tags: + - { tag: 'railway:signal:electricity', value: 'NL:308a' } + - { tag: 'railway:signal:electricity:form', value: 'sign' } + - { tag: 'railway:signal:electricity:type', value: 'pantograph_down_advance' } + + # TODO support wash + - description: pantograph down + country: NL + icon: { default: 'nl/309a' } + tags: + - { tag: 'railway:signal:electricity', value: 'NL:309a' } + - { tag: 'railway:signal:electricity:form', value: 'sign' } + - { tag: 'railway:signal:electricity:type', value: 'pantograph_down' } + + # TODO support carriages + - description: pantograph up + country: NL + icon: { default: 'nl/310a' } + tags: + - { tag: 'railway:signal:electricity', value: 'NL:310a' } + - { tag: 'railway:signal:electricity:form', value: 'sign' } + - { tag: 'railway:signal:electricity:type', value: 'pantograph_up' } + + - description: end of catenary + country: NL + icon: + match: 'railway:signal:electricity:turn_direction' + cases: + - { regex: '^right$', value: 'nl/311-right' } + - { regex: '^left$', value: 'nl/311-left' } + default: 'nl/311' + tags: + - { tag: 'railway:signal:electricity', value: 'NL:311' } + - { tag: 'railway:signal:electricity:form', value: 'sign' } + - { tag: 'railway:signal:electricity:type', value: 'end_of_catenary' } + + - description: voltage change + country: NL + icon: + match: 'railway:signal:electricity:voltage' + cases: + - { regex: '^1500$', value: 'nl/320-1500' } + - { regex: '^25000$', value: 'nl/320-25000' } + default: 'nl/320-unknown' + tags: + - { tag: 'railway:signal:electricity', value: 'NL:320' } + - { tag: 'railway:signal:electricity:form', value: 'sign' } + - { tag: 'railway:signal:electricity:type', value: 'voltage_change' } + # --- PL --- # - description: Wskaźnik uprzedzający o opuszczeniu pantografu (we1) diff --git a/symbols/de/el1-el2.svg b/symbols/de/el1-el2.svg new file mode 100644 index 00000000..80072067 --- /dev/null +++ b/symbols/de/el1-el2.svg @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git a/symbols/de/ice-schaltmerkhilfe.svg b/symbols/de/ice-schaltmerkhilfe.svg new file mode 100644 index 00000000..a0a4d601 --- /dev/null +++ b/symbols/de/ice-schaltmerkhilfe.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/symbols/de/streckentrennung-anfang.svg b/symbols/de/streckentrennung-anfang.svg new file mode 100644 index 00000000..e5a37be7 --- /dev/null +++ b/symbols/de/streckentrennung-anfang.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/symbols/de/streckentrennung-ende.svg b/symbols/de/streckentrennung-ende.svg new file mode 100644 index 00000000..7b8e6871 --- /dev/null +++ b/symbols/de/streckentrennung-ende.svg @@ -0,0 +1,10 @@ + + + + + + + + + + diff --git a/symbols/nl/306a.svg b/symbols/nl/306a.svg new file mode 100644 index 00000000..650afa5f --- /dev/null +++ b/symbols/nl/306a.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/symbols/nl/307a.svg b/symbols/nl/307a.svg new file mode 100644 index 00000000..cc0523b1 --- /dev/null +++ b/symbols/nl/307a.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/symbols/nl/308a.svg b/symbols/nl/308a.svg new file mode 100644 index 00000000..f8dbcbcd --- /dev/null +++ b/symbols/nl/308a.svg @@ -0,0 +1,7 @@ + + + + + + + diff --git a/symbols/nl/309a.svg b/symbols/nl/309a.svg new file mode 100644 index 00000000..13eb918a --- /dev/null +++ b/symbols/nl/309a.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/symbols/nl/310a.svg b/symbols/nl/310a.svg new file mode 100644 index 00000000..47e698a7 --- /dev/null +++ b/symbols/nl/310a.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/symbols/nl/311-left.svg b/symbols/nl/311-left.svg new file mode 100644 index 00000000..5c3c02cf --- /dev/null +++ b/symbols/nl/311-left.svg @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/symbols/nl/311-right.svg b/symbols/nl/311-right.svg new file mode 100644 index 00000000..72fad99e --- /dev/null +++ b/symbols/nl/311-right.svg @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/symbols/nl/311.svg b/symbols/nl/311.svg new file mode 100644 index 00000000..98baa95a --- /dev/null +++ b/symbols/nl/311.svg @@ -0,0 +1,7 @@ + + + + + + + diff --git a/symbols/nl/320-1500.svg b/symbols/nl/320-1500.svg new file mode 100644 index 00000000..96ba625c --- /dev/null +++ b/symbols/nl/320-1500.svg @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/symbols/nl/320-25000.svg b/symbols/nl/320-25000.svg new file mode 100644 index 00000000..79de7c70 --- /dev/null +++ b/symbols/nl/320-25000.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/symbols/nl/320-unknown.svg b/symbols/nl/320-unknown.svg new file mode 100644 index 00000000..6614ec41 --- /dev/null +++ b/symbols/nl/320-unknown.svg @@ -0,0 +1,7 @@ + + + + + + +