From 2a4522e813d2d8afa4ad813b98d6929e942554f4 Mon Sep 17 00:00:00 2001
From: saltywalrus-prkl <63785296+saltywalrus-prkl@users.noreply.github.com>
Date: Fri, 19 Jun 2026 15:09:04 +0100
Subject: [PATCH 1/2] Order of GB signals

In GB, shunt and distant signals are displayed below main signals.
(See: https://en.wikipedia.org/wiki/UK_railway_signalling#Position_light_signals and https://en.wikipedia.org/wiki/UK_railway_signalling#Semaphore_signals).

I've moved the shunt and distant signals before main signals in signals.railway.signals so that they are displayed below the main signal.
---
 features/signals_railway_signals.yaml | 68 +++++++++++++--------------
 1 file changed, 34 insertions(+), 34 deletions(-)

diff --git a/features/signals_railway_signals.yaml b/features/signals_railway_signals.yaml
index 4c0cc5767..7371179dc 100644
--- a/features/signals_railway_signals.yaml
+++ b/features/signals_railway_signals.yaml
@@ -6824,32 +6824,21 @@ features:
       - { tag: 'railway:signal:train_protection:form', value: 'sign' }
       - { tag: 'railway:signal:train_protection:type', value: 'block_marker' }
 
-  - description: Main (light)
-    country: GB
-    icon:
-      - match: 'railway:signal:main:design'
-        cases:
-          - { exact: 'combined', value: 'gb/main-combined-light' }
-        default: 'gb/main-individual-light'
-    tags:
-      - { tag: 'railway:signal:main', value: 'GB-NR:main' }
-      - { tag: 'railway:signal:main:form', value: 'light' }
-
-  - description: Main (semaphore)
+ - description: Shunting
     country: GB
-    icon: [ default: 'gb/main-semaphore' ]
+    icon: [ default: 'gb/shunting' ]
     tags:
-      - { tag: 'railway:signal:main', value: 'GB-NR:main' }
-      - { tag: 'railway:signal:main:form', value: 'semaphore' }
+      - { tag: 'railway:signal:shunting', value: 'GB-NR:shunting' }
+      - { tag: 'railway:signal:shunting:form', value: 'light' }
 
-  - description: SPAD
+  - description: Shunting limit
     country: GB
-    icon: [ default: 'gb/SPAD' ]
+    icon: [ default: 'gb/limit-shunt' ]
     tags:
-      - { tag: 'railway:signal:main', value: 'GB-NR:SPAD' }
-      - { tag: 'railway:signal:main:form', value: 'light' }
+      - { tag: 'railway:signal:shunting', value: 'GB-NR:limit' }
+      - { tag: 'railway:signal:shunting:form', value: 'light' }
 
-  - description: Distant
+    - description: Distant
     country: GB
     icon: [ default: 'gb/distant-light' ]
     tags:
@@ -6870,6 +6859,31 @@ features:
       - { tag: 'railway:signal:distant', value: 'GB-NR:distant' }
       - { tag: 'railway:signal:distant:form', value: 'sign' }
 
+  - description: Main (light)
+    country: GB
+    icon:
+      - match: 'railway:signal:main:design'
+        cases:
+          - { exact: 'combined', value: 'gb/main-combined-light' }
+        default: 'gb/main-individual-light'
+    tags:
+      - { tag: 'railway:signal:main', value: 'GB-NR:main' }
+      - { tag: 'railway:signal:main:form', value: 'light' }
+
+  - description: Main (semaphore)
+    country: GB
+    icon: [ default: 'gb/main-semaphore' ]
+    tags:
+      - { tag: 'railway:signal:main', value: 'GB-NR:main' }
+      - { tag: 'railway:signal:main:form', value: 'semaphore' }
+
+  - description: SPAD
+    country: GB
+    icon: [ default: 'gb/SPAD' ]
+    tags:
+      - { tag: 'railway:signal:main', value: 'GB-NR:SPAD' }
+      - { tag: 'railway:signal:main:form', value: 'light' }
+
   - description: Repeated (banner)
     country: GB
     icon: [ default: 'gb/repeated-banner' ]
@@ -6891,20 +6905,6 @@ features:
       - { tag: 'railway:signal:route_distant', value: 'GB-NR:PRI' }
       - { tag: 'railway:signal:route_distant:form', value: 'light' }
 
-  - description: Shunting
-    country: GB
-    icon: [ default: 'gb/shunting' ]
-    tags:
-      - { tag: 'railway:signal:shunting', value: 'GB-NR:shunting' }
-      - { tag: 'railway:signal:shunting:form', value: 'light' }
-
-  - description: Shunting limit
-    country: GB
-    icon: [ default: 'gb/limit-shunt' ]
-    tags:
-      - { tag: 'railway:signal:shunting', value: 'GB-NR:limit' }
-      - { tag: 'railway:signal:shunting:form', value: 'light' }
-
   - description: Junction signals (feather & theatre)
     country: GB
     icon:

From ff803c1285a5aae7f4d43a5f026d3ff7d164859b Mon Sep 17 00:00:00 2001
From: saltywalrus-prkl <63785296+saltywalrus-prkl@users.noreply.github.com>
Date: Fri, 19 Jun 2026 15:15:21 +0100
Subject: [PATCH 2/2] Update signals_railway_signals.yaml

---
 features/signals_railway_signals.yaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/features/signals_railway_signals.yaml b/features/signals_railway_signals.yaml
index 7371179dc..4f5b25212 100644
--- a/features/signals_railway_signals.yaml
+++ b/features/signals_railway_signals.yaml
@@ -6824,7 +6824,7 @@ features:
       - { tag: 'railway:signal:train_protection:form', value: 'sign' }
       - { tag: 'railway:signal:train_protection:type', value: 'block_marker' }
 
- - description: Shunting
+  - description: Shunting
     country: GB
     icon: [ default: 'gb/shunting' ]
     tags:
@@ -6838,7 +6838,7 @@ features:
       - { tag: 'railway:signal:shunting', value: 'GB-NR:limit' }
       - { tag: 'railway:signal:shunting:form', value: 'light' }
 
-    - description: Distant
+  - description: Distant
     country: GB
     icon: [ default: 'gb/distant-light' ]
     tags: