From 01b0707bbaaee2fb4aae49833e890c19c7db9a97 Mon Sep 17 00:00:00 2001
From: Hidde Wieringa <hidde@hiddewieringa.nl>
Date: Sat, 30 Nov 2024 16:23:53 +0100
Subject: [PATCH] directions for ETCS block markers (and arrows)

---
 features/signals_railway_signals.yaml             | 15 +++++++++++++--
 symbols/general/etcs-stop-marker-arrow-down.svg   |  6 ++++++
 symbols/general/etcs-stop-marker-arrow-right.svg  |  6 ++++++
 .../general/etcs-stop-marker-triangle-down.svg    |  6 ++++++
 .../general/etcs-stop-marker-triangle-right.svg   |  6 ++++++
 5 files changed, 37 insertions(+), 2 deletions(-)
 create mode 100644 symbols/general/etcs-stop-marker-arrow-down.svg
 create mode 100644 symbols/general/etcs-stop-marker-arrow-right.svg
 create mode 100644 symbols/general/etcs-stop-marker-triangle-down.svg
 create mode 100644 symbols/general/etcs-stop-marker-triangle-right.svg

diff --git a/features/signals_railway_signals.yaml b/features/signals_railway_signals.yaml
index cd5214ba..e5b75b0b 100644
--- a/features/signals_railway_signals.yaml
+++ b/features/signals_railway_signals.yaml
@@ -84,6 +84,7 @@ signals_railway_signals:
     - 'railway:signal:wrong_road'
     - 'railway:signal:wrong_road:form'
     - 'railway:vacancy_detection'
+    - 'railway:signal:position'
 
   features:
 
@@ -1261,7 +1262,12 @@ signals_railway_signals:
 
     - description: train protection block markers (arrow)
       country: NL
-      icon: { default: 'general/etcs-stop-marker-arrow-left' }
+      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: 'NL:227b' }
         - { tag: 'railway:signal:train_protection:form', value: 'sign' }
@@ -1270,7 +1276,12 @@ signals_railway_signals:
 
     - description: train protection block markers (triangle)
       country: NL
-      icon: { default: 'general/etcs-stop-marker-triangle-left' }
+      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', values: ['NL:227b', 'DE-ESO:ne14'] }
         - { tag: 'railway:signal:train_protection:form', value: 'sign' }
diff --git a/symbols/general/etcs-stop-marker-arrow-down.svg b/symbols/general/etcs-stop-marker-arrow-down.svg
new file mode 100644
index 00000000..a4796610
--- /dev/null
+++ b/symbols/general/etcs-stop-marker-arrow-down.svg
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="16" height="16" viewBox="0 0 16 16">
+<rect x="-1.6" y="-1.6" width="19.2" height="19.2" fill="rgb(0.392157%, 25.098039%, 69.803922%)" fill-opacity="1"/>
+<path fill-rule="evenodd" fill="rgb(100%, 100%, 100%)" fill-opacity="1" d="M 5.808594 2 L 5.808594 8 L 2 8 L 8 14.667969 L 14 8 L 10.191406 8 L 10.191406 2 Z M 5.808594 2 "/>
+<path fill-rule="evenodd" fill="rgb(98.039216%, 98.039216%, 9.019608%)" fill-opacity="1" d="M 6.476562 2 L 6.476562 8.667969 L 3.496094 8.667969 L 8 13.671875 L 12.5 8.667969 L 9.523438 8.667969 L 9.523438 2 Z M 6.476562 2 "/>
+</svg>
diff --git a/symbols/general/etcs-stop-marker-arrow-right.svg b/symbols/general/etcs-stop-marker-arrow-right.svg
new file mode 100644
index 00000000..dbcba329
--- /dev/null
+++ b/symbols/general/etcs-stop-marker-arrow-right.svg
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="16" height="16" viewBox="0 0 16 16">
+<rect x="-1.6" y="-1.6" width="19.2" height="19.2" fill="rgb(0.392157%, 25.098039%, 69.803922%)" fill-opacity="1"/>
+<path fill-rule="evenodd" fill="rgb(100%, 100%, 100%)" fill-opacity="1" d="M 2 10.191406 L 8 10.191406 L 8 14 L 14.667969 8 L 8 2 L 8 5.808594 L 2 5.808594 Z M 2 10.191406 "/>
+<path fill-rule="evenodd" fill="rgb(98.039216%, 98.039216%, 9.019608%)" fill-opacity="1" d="M 2 9.523438 L 8.667969 9.523438 L 8.667969 12.503906 L 13.671875 8 L 8.667969 3.5 L 8.667969 6.476562 L 2 6.476562 Z M 2 9.523438 "/>
+</svg>
diff --git a/symbols/general/etcs-stop-marker-triangle-down.svg b/symbols/general/etcs-stop-marker-triangle-down.svg
new file mode 100644
index 00000000..62b6556d
--- /dev/null
+++ b/symbols/general/etcs-stop-marker-triangle-down.svg
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="16" height="16" viewBox="0 0 16 16">
+<rect x="-1.6" y="-1.6" width="19.2" height="19.2" fill="rgb(0.392157%, 25.098039%, 69.803922%)" fill-opacity="1"/>
+<path fill-rule="evenodd" fill="rgb(100%, 100%, 100%)" fill-opacity="1" d="M 14.667969 2 L 1.332031 2 L 8.082031 14.667969 Z M 14.667969 2 "/>
+<path fill-rule="evenodd" fill="rgb(98.039216%, 98.039216%, 9.019608%)" fill-opacity="1" d="M 13.75 2 L 2.246094 2 L 8.085938 12.835938 Z M 13.75 2 "/>
+</svg>
diff --git a/symbols/general/etcs-stop-marker-triangle-right.svg b/symbols/general/etcs-stop-marker-triangle-right.svg
new file mode 100644
index 00000000..191ffffe
--- /dev/null
+++ b/symbols/general/etcs-stop-marker-triangle-right.svg
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="16" height="16" viewBox="0 0 16 16">
+<rect x="-1.6" y="-1.6" width="19.2" height="19.2" fill="rgb(0.392157%, 25.098039%, 69.803922%)" fill-opacity="1"/>
+<path fill-rule="evenodd" fill="rgb(100%, 100%, 100%)" fill-opacity="1" d="M 2 1.332031 L 2 14.667969 L 14.667969 7.917969 Z M 2 1.332031 "/>
+<path fill-rule="evenodd" fill="rgb(98.039216%, 98.039216%, 9.019608%)" fill-opacity="1" d="M 2 2.25 L 2 13.753906 L 12.835938 7.914062 Z M 2 2.25 "/>
+</svg>