missing signals CH (#112)

Part of #35 ![image](https://github.com/user-attachments/assets/db50f623-4096-48d6-9771-cb9b0deb318a) ![image](https://github.com/user-attachments/assets/ef62dcc0-107e-48a3-be63-bc289fd74abb)
hiddewie · Sep 30, 2024 · 78ca1e7 · 78ca1e7
1 parent 2b3cf5e
commit 78ca1e7
Show file tree

Hide file tree

Showing 34 changed files with 437 additions and 4 deletions.
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -92,6 +92,11 @@ services:
       - ./martin:/config
     environment:
       - DATABASE_URL=postgresql://postgres@db:5432/gis
+    ulimits:
+      nproc: 65535
+      nofile:
+        soft: 26677
+        hard: 46677
 
   martin-static:
     build:

diff --git a/features/signals_railway_signals.yaml b/features/signals_railway_signals.yaml
@@ -6,6 +6,7 @@ signals_railway_signals:
     - 'railway:signal:combined:states'
     - 'railway:signal:combined:shortened'
     - 'railway:signal:combined:substitute_signal'
+    - 'railway:signal:combined:height'
     - 'railway:signal:crossing'
     - 'railway:signal:crossing:form'
     - 'railway:signal:crossing:repeated'
@@ -381,6 +382,101 @@ signals_railway_signals:
       tags:
         - { tag: 'railway:signal:main', value: 'BE-SME:simplified_stop_signal' }
 
+    # --- CH --- #
+
+    - description: Vorsignal System L
+      country: CH
+      icon:
+        match: 'railway:signal:distant:states'
+        cases:
+          - { regex: '^(.*;)?CH-FDV:538(;.*)?$', value: 'ch/fdv-l-538' }
+          - { regex: '^(.*;)?CH-FDV:536(;.*)?$', value: 'ch/fdv-l-536' }
+          - { regex: '^(.*;)?CH-FDV:529(;.*)?$', value: 'ch/fdv-l-529' }
+          - { regex: '^(.*;)?CH-FDV:534(;.*)?$', value: 'ch/fdv-l-534' }
+        default: 'ch/fdv-l-528'
+      tags:
+        - { tag: 'railway:signal:distant', value: 'CH-FDV:l' }
+        - { tag: 'railway:signal:distant:form', value: 'light' }
+
+    - description: Mini-Hauptsignal System L
+      country: CH
+      icon: { default: 'ch/fdv-l-522.1' }
+      tags:
+        - { tag: 'railway:signal:combined', value: 'CH-FDV:512' }
+        - { tag: 'railway:signal:combined:form', value: 'light' }
+        - { tag: 'railway:signal:combined:height', value: 'dwarf' }
+
+    - description: Hauptsignal System L
+      country: CH
+      icon:
+        match: 'railway:signal:main:states'
+        cases:
+          - { regex: '^(.*;)?CH-FDV:550(;.*)?$', value: 'ch/fdv-l-550' }
+          - { regex: '^(.*;)?CH-FDV:547(;.*)?$', value: 'ch/fdv-l-547' }
+          - { regex: '^(.*;)?CH-FDV:542(;.*)?$', value: 'ch/fdv-l-542' }
+          - { regex: '^(.*;)?CH-FDV:545(;.*)?$', value: 'ch/fdv-l-545' }
+          - { regex: '^(.*;)?CH-FDV:530(;.*)?$', value: 'ch/fdv-l-530' }
+        default: 'ch/fdv-l-524'
+      tags:
+        - { tag: 'railway:signal:main', value: 'CH-FDV:l' }
+        - { tag: 'railway:signal:main:form', value: 'light' }
+
+    - description: Hauptsignal System L (combined)
+      country: CH
+      icon:
+        match: 'railway:signal:combined:states'
+        cases:
+          - { regex: '^(.*;)?CH-FDV:548(;.*)?$', value: 'ch/fdv-l-548' }
+          - { regex: '^(.*;)?CH-FDV:551(;.*)?$', value: 'ch/fdv-l-551' }
+          - { regex: '^(.*;)?CH-FDV:546(;.*)?$', value: 'ch/fdv-l-546' }
+          - { regex: '^(.*;)?CH-FDV:543(;.*)?$', value: 'ch/fdv-l-543' }
+          - { regex: '^(.*;)?CH-FDV:539(;.*)?$', value: 'ch/fdv-l-539' }
+          - { regex: '^(.*;)?CH-FDV:537(;.*)?$', value: 'ch/fdv-l-537' }
+          - { regex: '^(.*;)?CH-FDV:535(;.*)?$', value: 'ch/fdv-l-535' }
+          - { regex: '^(.*;)?CH-FDV:531(;.*)?$', value: 'ch/fdv-l-531' }
+        default: 'ch/fdv-l-525'
+      tags:
+        - { tag: 'railway:signal:combined', value: 'CH-FDV:l' }
+        - { tag: 'railway:signal:combined:form', value: 'light' }
+
+    - description: Vorsignal System N
+      country: CH
+      icon:
+        match: 'railway:signal:distant:states'
+        cases:
+          - { regex: '^(.*;)?CH-FDV:(522|521)(;.*)?$', value: 'ch/fdv-n-521' }
+        default: 'ch/fdv-n-533'
+      tags:
+        - { tag: 'railway:signal:distant', value: 'CH-FDV:n' }
+        - { tag: 'railway:signal:distant:form', value: 'light' }
+
+    - description: Hauptsignal System N
+      country: CH
+      icon:
+        match: 'railway:signal:combined:states'
+        cases:
+          - { regex: '^(.*;)?CH-FDV:523(;.*)?$', value: 'ch/fdv-n-523' }
+          - { regex: '^(.*;)?CH-FDV:552(;.*)?$', value: 'ch/fdv-n-552' }
+          - { regex: '^(.*;)?CH-FDV:(532|533)(;.*)?$', value: 'ch/fdv-n-532' }
+        default: 'ch/fdv-n-526'
+      tags:
+        - { tag: 'railway:signal:combined', value: 'CH-FDV:n' }
+        - { tag: 'railway:signal:combined:form', value: 'light' }
+
+    - description: Minor signal
+      country: CH
+      icon: { default: 'ch/fdv-232' }
+      tags:
+        - { tag: 'railway:signal:minor', value: 'CH-FDV:232' }
+        - { tag: 'railway:signal:minor:form', value: 'light' }
+
+    - description: Fahrtstellungsmelder
+      country: CH
+      icon: { default: 'ch/fdv-559' }
+      tags:
+        - { tag: 'railway:signal:main_repeated', value: 'CH-FDV:559' }
+        - { tag: 'railway:signal:main_repeated:form', value: 'light' }
+
     # --- DE --- #
 
     - description: Bü 4 Whistle Sign

diff --git a/features/speed_railway_signals.yaml b/features/speed_railway_signals.yaml
@@ -154,8 +154,9 @@ speed_railway_signals:
           - { regex: '^([6-9][05]|1[0-1][05])$', value: 'ch/fdv-209-{}', example: 'ch/fdv-209-90' }
         default: 'ch/fdv-209-empty'
       tags:
-        - { tag: 'railway:signal:speed_limit_distant', value: 'CH-FDV:209' }
-        - { tag: 'railway:signal:speed_limit_distant:form', value: 'light' }
+        # TODO support CH-FDV:210, with railway:signal:speed_limit_distant:speed:trainclass_low
+        - { tag: 'railway:signal:speed_limit_distant', values: ['CH-FDV:209', 'CH-FDV:210'] }
+        - { tag: 'railway:signal:speed_limit_distant:form', value: 'sign' }
 
     - description: Anfangssignal verminderte Geschwindigkeit
       country: CH
@@ -211,7 +212,7 @@ speed_railway_signals:
           - { regex: '^([4-9]|1[0-2])0$', value: 'ch/fdv-540-{}', example: 'ch/fdv-540-40' }
         default: 'ch/fdv-540-empty'
       tags:
-        - { tag: 'railway:signal:speed_limit_distant', value: 'CH-FDV:540' }
+        - { tag: 'railway:signal:speed_limit_distant', values: ['CH-FDV:540', 'CH-FDV:541'] }
         - { tag: 'railway:signal:speed_limit_distant:form', value: 'light' }
 
     - description: Geschwindigkeits-Ausführung
@@ -223,7 +224,7 @@ speed_railway_signals:
           - { regex: '^([4-9]|1[0-2])0$', value: 'ch/fdv-540-{}', example: 'ch/fdv-540-100' }
         default: 'ch/fdv-540-empty'
       tags:
-        - { tag: 'railway:signal:speed_limit', value: 'CH-FDV:540' }
+        - { tag: 'railway:signal:speed_limit', value: 'CH-FDV:549' }
         - { tag: 'railway:signal:speed_limit:form', value: 'light' }
 
     - description: Merktafel für Streckengeschwindigkeit beim Signalsystem N

diff --git a/symbols/ch/fdv-232.svg b/symbols/ch/fdv-232.svg
diff --git a/symbols/ch/fdv-559.svg b/symbols/ch/fdv-559.svg
diff --git a/symbols/ch/fdv-l-522.1.svg b/symbols/ch/fdv-l-522.1.svg
diff --git a/symbols/ch/fdv-l-524.svg b/symbols/ch/fdv-l-524.svg
diff --git a/symbols/ch/fdv-l-525.svg b/symbols/ch/fdv-l-525.svg
diff --git a/symbols/ch/fdv-l-528.svg b/symbols/ch/fdv-l-528.svg