From 427ebc51a00fcef7d34317d27e817b91e9e6b3a8 Mon Sep 17 00:00:00 2001 From: Hidde Wieringa Date: Thu, 13 Feb 2025 23:13:16 +0100 Subject: [PATCH] BE ETCS and speed signals (#230) http://localhost:8000/#view=16/50.619329/5.576643&style=speed ![image](https://github.com/user-attachments/assets/62a49c5b-acc9-4ccb-8341-922a5db78a34) --- features/signals_railway_signals.yaml | 82 +++++++++++++++++++++++++++ symbols/be/PVA-empty.svg | 5 ++ symbols/be/PVA-{90}.svg | 5 ++ symbols/be/PVJ-empty.svg | 6 ++ symbols/be/PVJ-{100}.svg | 7 +++ symbols/be/PVJ-{40}.svg | 6 ++ symbols/be/PVJ-{60}.svg | 6 ++ symbols/be/PVJ-{90}.svg | 6 ++ symbols/be/PVO-empty.svg | 5 ++ symbols/be/PVO-{100}.svg | 6 ++ symbols/be/PVO-{140}.svg | 6 ++ symbols/be/PVO-{90}.svg | 5 ++ symbols/be/PVR-empty.svg | 5 ++ symbols/be/PVR-{120}.svg | 6 ++ symbols/be/PVR-{160}.svg | 6 ++ symbols/be/PVV-empty.svg | 6 ++ symbols/be/PVV-{60}.svg | 6 ++ 17 files changed, 174 insertions(+) create mode 100644 symbols/be/PVA-empty.svg create mode 100644 symbols/be/PVA-{90}.svg create mode 100644 symbols/be/PVJ-empty.svg create mode 100644 symbols/be/PVJ-{100}.svg create mode 100644 symbols/be/PVJ-{40}.svg create mode 100644 symbols/be/PVJ-{60}.svg create mode 100644 symbols/be/PVJ-{90}.svg create mode 100644 symbols/be/PVO-empty.svg create mode 100644 symbols/be/PVO-{100}.svg create mode 100644 symbols/be/PVO-{140}.svg create mode 100644 symbols/be/PVO-{90}.svg create mode 100644 symbols/be/PVR-empty.svg create mode 100644 symbols/be/PVR-{120}.svg create mode 100644 symbols/be/PVR-{160}.svg create mode 100644 symbols/be/PVV-empty.svg create mode 100644 symbols/be/PVV-{60}.svg diff --git a/features/signals_railway_signals.yaml b/features/signals_railway_signals.yaml index 8cadad1e..7a1a116b 100644 --- a/features/signals_railway_signals.yaml +++ b/features/signals_railway_signals.yaml @@ -648,6 +648,61 @@ features: - { tag: 'railway:signal:speed_limit', value: 'BE:VIS' } - { tag: 'railway:signal:speed_limit:form', value: 'light' } + - description: Reference speed + country: BE + icon: + match: 'railway:signal:speed_limit:speed' + cases: + - { regex: '^(12|16)0$', value: 'be/PVR-{}', example: 'be/PVR-{120}' } + default: 'be/PVR-empty' + tags: + - { tag: 'railway:signal:speed_limit', value: 'BE:PVR' } + - { tag: 'railway:signal:speed_limit:form', value: 'sign' } + + - description: Announcement of a speed limit + country: BE + icon: + match: 'railway:signal:speed_limit_distant:speed' + cases: + - { regex: '^90$', value: 'be/PVA-{}', example: 'be/PVA-{90}' } + default: 'be/PVA-empty' + tags: + - { tag: 'railway:signal:speed_limit_distant', value: 'BE:PVA' } + - { tag: 'railway:signal:speed_limit_distant:form', value: 'sign' } + + - description: Beginning of a speed limit + country: BE + icon: + match: 'railway:signal:speed_limit:speed' + cases: + - { regex: '^(9|10|14)0$', value: 'be/PVO-{}', example: 'be/PVO-{100}' } + default: 'be/PVO-empty' + tags: + - { tag: 'railway:signal:speed_limit', value: 'BE:PVO' } + - { tag: 'railway:signal:speed_limit:form', value: 'sign' } + + - description: Higher speed limit below reference speed + country: BE + icon: + match: 'railway:signal:speed_limit:speed' + cases: + - { regex: '^(4|6|9|10)0$', value: 'be/PVJ-{}', example: 'be/PVJ-{60}' } + default: 'be/PVJ-empty' + tags: + - { tag: 'railway:signal:speed_limit', value: 'BE:PVJ' } + - { tag: 'railway:signal:speed_limit:form', value: 'sign' } + + - description: Higher speed limit for some traffic + country: BE + icon: + match: 'railway:signal:speed_limit:speed' + cases: + - { regex: '^60$', value: 'be/PVV-{}', example: 'be/PVV-{60}' } + default: 'be/PVV-empty' + tags: + - { tag: 'railway:signal:speed_limit', value: 'BE:PVV' } + - { tag: 'railway:signal:speed_limit:form', value: 'sign' } + - description: Panto distant country: BE icon: { default: 'be/PBA' } @@ -672,6 +727,33 @@ features: - { tag: 'railway:signal:electricity:form', value: 'sign' } - { tag: 'railway:signal:electricity:type', value: 'pantograph_up' } + - description: train protection block markers (arrow) + country: BE + icon: + match: 'railway:signal:position' + cases: + - { regex: '^left$', value: 'general/etcs-stop-marker-arrow-right' } + - { regex: '^overhead$', value: 'general/etcs-stop-marker-arrow-down' } + default: 'general/etcs-stop-marker-arrow-left' + tags: + - { tag: 'railway:signal:train_protection', value: 'BE:PRA' } + - { tag: 'railway:signal:train_protection:form', value: 'sign' } + - { tag: 'railway:signal:train_protection:type', value: 'block_marker' } + - { tag: 'railway:signal:train_protection:shape', value: 'triangle' } + + - description: train protection block markers (triangle) + country: BE + icon: + match: 'railway:signal:position' + cases: + - { regex: '^left$', value: 'general/etcs-stop-marker-triangle-right' } + - { regex: '^overhead$', value: 'general/etcs-stop-marker-triangle-down' } + default: 'general/etcs-stop-marker-triangle-left' + tags: + - { tag: 'railway:signal:train_protection', value: 'BE:PRA' } + - { tag: 'railway:signal:train_protection:form', value: 'sign' } + - { tag: 'railway:signal:train_protection:type', value: 'block_marker' } + # --- CH --- # - description: Vorsignal System L diff --git a/symbols/be/PVA-empty.svg b/symbols/be/PVA-empty.svg new file mode 100644 index 00000000..bb5c0eb9 --- /dev/null +++ b/symbols/be/PVA-empty.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/symbols/be/PVA-{90}.svg b/symbols/be/PVA-{90}.svg new file mode 100644 index 00000000..1e61e0cf --- /dev/null +++ b/symbols/be/PVA-{90}.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/symbols/be/PVJ-empty.svg b/symbols/be/PVJ-empty.svg new file mode 100644 index 00000000..aef39d73 --- /dev/null +++ b/symbols/be/PVJ-empty.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/symbols/be/PVJ-{100}.svg b/symbols/be/PVJ-{100}.svg new file mode 100644 index 00000000..d1bf4d78 --- /dev/null +++ b/symbols/be/PVJ-{100}.svg @@ -0,0 +1,7 @@ + + + + + + + diff --git a/symbols/be/PVJ-{40}.svg b/symbols/be/PVJ-{40}.svg new file mode 100644 index 00000000..a4285c13 --- /dev/null +++ b/symbols/be/PVJ-{40}.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/symbols/be/PVJ-{60}.svg b/symbols/be/PVJ-{60}.svg new file mode 100644 index 00000000..a09b9e0c --- /dev/null +++ b/symbols/be/PVJ-{60}.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/symbols/be/PVJ-{90}.svg b/symbols/be/PVJ-{90}.svg new file mode 100644 index 00000000..fb6e69a2 --- /dev/null +++ b/symbols/be/PVJ-{90}.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/symbols/be/PVO-empty.svg b/symbols/be/PVO-empty.svg new file mode 100644 index 00000000..f521e815 --- /dev/null +++ b/symbols/be/PVO-empty.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/symbols/be/PVO-{100}.svg b/symbols/be/PVO-{100}.svg new file mode 100644 index 00000000..2436575f --- /dev/null +++ b/symbols/be/PVO-{100}.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/symbols/be/PVO-{140}.svg b/symbols/be/PVO-{140}.svg new file mode 100644 index 00000000..6b54b4c2 --- /dev/null +++ b/symbols/be/PVO-{140}.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/symbols/be/PVO-{90}.svg b/symbols/be/PVO-{90}.svg new file mode 100644 index 00000000..1a7e2351 --- /dev/null +++ b/symbols/be/PVO-{90}.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/symbols/be/PVR-empty.svg b/symbols/be/PVR-empty.svg new file mode 100644 index 00000000..ca7b6b92 --- /dev/null +++ b/symbols/be/PVR-empty.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/symbols/be/PVR-{120}.svg b/symbols/be/PVR-{120}.svg new file mode 100644 index 00000000..a6225b9a --- /dev/null +++ b/symbols/be/PVR-{120}.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/symbols/be/PVR-{160}.svg b/symbols/be/PVR-{160}.svg new file mode 100644 index 00000000..4f65db39 --- /dev/null +++ b/symbols/be/PVR-{160}.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/symbols/be/PVV-empty.svg b/symbols/be/PVV-empty.svg new file mode 100644 index 00000000..6987a18f --- /dev/null +++ b/symbols/be/PVV-empty.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/symbols/be/PVV-{60}.svg b/symbols/be/PVV-{60}.svg new file mode 100644 index 00000000..86ecd610 --- /dev/null +++ b/symbols/be/PVV-{60}.svg @@ -0,0 +1,6 @@ + + + + + +