From 78ca1e7f249656ddf7d4eeb3dce7cfdcf20a9c3d Mon Sep 17 00:00:00 2001 From: Hidde Wieringa Date: Mon, 30 Sep 2024 21:02:46 +0200 Subject: [PATCH] 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) --- docker-compose.yml | 5 ++ features/signals_railway_signals.yaml | 96 +++++++++++++++++++++++++++ features/speed_railway_signals.yaml | 9 +-- symbols/ch/fdv-232.svg | 9 +++ symbols/ch/fdv-559.svg | 5 ++ symbols/ch/fdv-l-522.1.svg | 7 ++ symbols/ch/fdv-l-524.svg | 10 +++ symbols/ch/fdv-l-525.svg | 15 +++++ symbols/ch/fdv-l-528.svg | 9 +++ symbols/ch/fdv-l-529.svg | 9 +++ symbols/ch/fdv-l-530.svg | 10 +++ symbols/ch/fdv-l-531.svg | 15 +++++ symbols/ch/fdv-l-534.svg | 9 +++ symbols/ch/fdv-l-535.svg | 15 +++++ symbols/ch/fdv-l-536.svg | 9 +++ symbols/ch/fdv-l-537.svg | 15 +++++ symbols/ch/fdv-l-538.svg | 10 +++ symbols/ch/fdv-l-539.svg | 15 +++++ symbols/ch/fdv-l-542.svg | 10 +++ symbols/ch/fdv-l-543.svg | 15 +++++ symbols/ch/fdv-l-545.svg | 10 +++ symbols/ch/fdv-l-546.svg | 15 +++++ symbols/ch/fdv-l-547.svg | 10 +++ symbols/ch/fdv-l-548.svg | 16 +++++ symbols/ch/fdv-l-550.svg | 10 +++ symbols/ch/fdv-l-551.svg | 15 +++++ symbols/ch/fdv-n-521.svg | 7 ++ symbols/ch/fdv-n-522.svg | 8 +++ symbols/ch/fdv-n-523.svg | 10 +++ symbols/ch/fdv-n-526.svg | 8 +++ symbols/ch/fdv-n-532.svg | 8 +++ symbols/ch/fdv-n-533.svg | 7 ++ symbols/ch/fdv-n-552.svg | 10 +++ symbols/ch/fdv-n-554.svg | 10 +++ 34 files changed, 437 insertions(+), 4 deletions(-) create mode 100644 symbols/ch/fdv-232.svg create mode 100644 symbols/ch/fdv-559.svg create mode 100644 symbols/ch/fdv-l-522.1.svg create mode 100644 symbols/ch/fdv-l-524.svg create mode 100644 symbols/ch/fdv-l-525.svg create mode 100644 symbols/ch/fdv-l-528.svg create mode 100644 symbols/ch/fdv-l-529.svg create mode 100644 symbols/ch/fdv-l-530.svg create mode 100644 symbols/ch/fdv-l-531.svg create mode 100644 symbols/ch/fdv-l-534.svg create mode 100644 symbols/ch/fdv-l-535.svg create mode 100644 symbols/ch/fdv-l-536.svg create mode 100644 symbols/ch/fdv-l-537.svg create mode 100644 symbols/ch/fdv-l-538.svg create mode 100644 symbols/ch/fdv-l-539.svg create mode 100644 symbols/ch/fdv-l-542.svg create mode 100644 symbols/ch/fdv-l-543.svg create mode 100644 symbols/ch/fdv-l-545.svg create mode 100644 symbols/ch/fdv-l-546.svg create mode 100644 symbols/ch/fdv-l-547.svg create mode 100644 symbols/ch/fdv-l-548.svg create mode 100644 symbols/ch/fdv-l-550.svg create mode 100644 symbols/ch/fdv-l-551.svg create mode 100644 symbols/ch/fdv-n-521.svg create mode 100644 symbols/ch/fdv-n-522.svg create mode 100644 symbols/ch/fdv-n-523.svg create mode 100644 symbols/ch/fdv-n-526.svg create mode 100644 symbols/ch/fdv-n-532.svg create mode 100644 symbols/ch/fdv-n-533.svg create mode 100644 symbols/ch/fdv-n-552.svg create mode 100644 symbols/ch/fdv-n-554.svg diff --git a/docker-compose.yml b/docker-compose.yml index 783b9851..045005f2 100644 --- 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 index 49b91379..9df9001a 100644 --- 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 index 2700bc3f..2342bbc9 100644 --- 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 new file mode 100644 index 00000000..09124a6e --- /dev/null +++ b/symbols/ch/fdv-232.svg @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/symbols/ch/fdv-559.svg b/symbols/ch/fdv-559.svg new file mode 100644 index 00000000..8dd20dfc --- /dev/null +++ b/symbols/ch/fdv-559.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/symbols/ch/fdv-l-522.1.svg b/symbols/ch/fdv-l-522.1.svg new file mode 100644 index 00000000..31a6cb1e --- /dev/null +++ b/symbols/ch/fdv-l-522.1.svg @@ -0,0 +1,7 @@ + + + + + + + diff --git a/symbols/ch/fdv-l-524.svg b/symbols/ch/fdv-l-524.svg new file mode 100644 index 00000000..f0d86b6e --- /dev/null +++ b/symbols/ch/fdv-l-524.svg @@ -0,0 +1,10 @@ + + + + + + + + + + diff --git a/symbols/ch/fdv-l-525.svg b/symbols/ch/fdv-l-525.svg new file mode 100644 index 00000000..bb64e556 --- /dev/null +++ b/symbols/ch/fdv-l-525.svg @@ -0,0 +1,15 @@ + + + + + + + + + + + + + + + diff --git a/symbols/ch/fdv-l-528.svg b/symbols/ch/fdv-l-528.svg new file mode 100644 index 00000000..96c6f3b9 --- /dev/null +++ b/symbols/ch/fdv-l-528.svg @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/symbols/ch/fdv-l-529.svg b/symbols/ch/fdv-l-529.svg new file mode 100644 index 00000000..79fd3241 --- /dev/null +++ b/symbols/ch/fdv-l-529.svg @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/symbols/ch/fdv-l-530.svg b/symbols/ch/fdv-l-530.svg new file mode 100644 index 00000000..bbea1cf8 --- /dev/null +++ b/symbols/ch/fdv-l-530.svg @@ -0,0 +1,10 @@ + + + + + + + + + + diff --git a/symbols/ch/fdv-l-531.svg b/symbols/ch/fdv-l-531.svg new file mode 100644 index 00000000..59b10491 --- /dev/null +++ b/symbols/ch/fdv-l-531.svg @@ -0,0 +1,15 @@ + + + + + + + + + + + + + + + diff --git a/symbols/ch/fdv-l-534.svg b/symbols/ch/fdv-l-534.svg new file mode 100644 index 00000000..1d33cfeb --- /dev/null +++ b/symbols/ch/fdv-l-534.svg @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/symbols/ch/fdv-l-535.svg b/symbols/ch/fdv-l-535.svg new file mode 100644 index 00000000..eba2a7a8 --- /dev/null +++ b/symbols/ch/fdv-l-535.svg @@ -0,0 +1,15 @@ + + + + + + + + + + + + + + + diff --git a/symbols/ch/fdv-l-536.svg b/symbols/ch/fdv-l-536.svg new file mode 100644 index 00000000..23b2797e --- /dev/null +++ b/symbols/ch/fdv-l-536.svg @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/symbols/ch/fdv-l-537.svg b/symbols/ch/fdv-l-537.svg new file mode 100644 index 00000000..47b4cce5 --- /dev/null +++ b/symbols/ch/fdv-l-537.svg @@ -0,0 +1,15 @@ + + + + + + + + + + + + + + + diff --git a/symbols/ch/fdv-l-538.svg b/symbols/ch/fdv-l-538.svg new file mode 100644 index 00000000..b7a2b748 --- /dev/null +++ b/symbols/ch/fdv-l-538.svg @@ -0,0 +1,10 @@ + + + + + + + + + + diff --git a/symbols/ch/fdv-l-539.svg b/symbols/ch/fdv-l-539.svg new file mode 100644 index 00000000..c004d057 --- /dev/null +++ b/symbols/ch/fdv-l-539.svg @@ -0,0 +1,15 @@ + + + + + + + + + + + + + + + diff --git a/symbols/ch/fdv-l-542.svg b/symbols/ch/fdv-l-542.svg new file mode 100644 index 00000000..2bcca2fe --- /dev/null +++ b/symbols/ch/fdv-l-542.svg @@ -0,0 +1,10 @@ + + + + + + + + + + diff --git a/symbols/ch/fdv-l-543.svg b/symbols/ch/fdv-l-543.svg new file mode 100644 index 00000000..319bd1db --- /dev/null +++ b/symbols/ch/fdv-l-543.svg @@ -0,0 +1,15 @@ + + + + + + + + + + + + + + + diff --git a/symbols/ch/fdv-l-545.svg b/symbols/ch/fdv-l-545.svg new file mode 100644 index 00000000..21e7862c --- /dev/null +++ b/symbols/ch/fdv-l-545.svg @@ -0,0 +1,10 @@ + + + + + + + + + + diff --git a/symbols/ch/fdv-l-546.svg b/symbols/ch/fdv-l-546.svg new file mode 100644 index 00000000..47ffe782 --- /dev/null +++ b/symbols/ch/fdv-l-546.svg @@ -0,0 +1,15 @@ + + + + + + + + + + + + + + + diff --git a/symbols/ch/fdv-l-547.svg b/symbols/ch/fdv-l-547.svg new file mode 100644 index 00000000..2bcca2fe --- /dev/null +++ b/symbols/ch/fdv-l-547.svg @@ -0,0 +1,10 @@ + + + + + + + + + + diff --git a/symbols/ch/fdv-l-548.svg b/symbols/ch/fdv-l-548.svg new file mode 100644 index 00000000..edd88328 --- /dev/null +++ b/symbols/ch/fdv-l-548.svg @@ -0,0 +1,16 @@ + + + + + + + + + + + + + + + + diff --git a/symbols/ch/fdv-l-550.svg b/symbols/ch/fdv-l-550.svg new file mode 100644 index 00000000..656b6528 --- /dev/null +++ b/symbols/ch/fdv-l-550.svg @@ -0,0 +1,10 @@ + + + + + + + + + + diff --git a/symbols/ch/fdv-l-551.svg b/symbols/ch/fdv-l-551.svg new file mode 100644 index 00000000..3a645f84 --- /dev/null +++ b/symbols/ch/fdv-l-551.svg @@ -0,0 +1,15 @@ + + + + + + + + + + + + + + + diff --git a/symbols/ch/fdv-n-521.svg b/symbols/ch/fdv-n-521.svg new file mode 100644 index 00000000..05179b56 --- /dev/null +++ b/symbols/ch/fdv-n-521.svg @@ -0,0 +1,7 @@ + + + + + + + diff --git a/symbols/ch/fdv-n-522.svg b/symbols/ch/fdv-n-522.svg new file mode 100644 index 00000000..ec2a7019 --- /dev/null +++ b/symbols/ch/fdv-n-522.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/symbols/ch/fdv-n-523.svg b/symbols/ch/fdv-n-523.svg new file mode 100644 index 00000000..3c00de40 --- /dev/null +++ b/symbols/ch/fdv-n-523.svg @@ -0,0 +1,10 @@ + + + + + + + + + + diff --git a/symbols/ch/fdv-n-526.svg b/symbols/ch/fdv-n-526.svg new file mode 100644 index 00000000..425e1eb8 --- /dev/null +++ b/symbols/ch/fdv-n-526.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/symbols/ch/fdv-n-532.svg b/symbols/ch/fdv-n-532.svg new file mode 100644 index 00000000..1ab8f06e --- /dev/null +++ b/symbols/ch/fdv-n-532.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/symbols/ch/fdv-n-533.svg b/symbols/ch/fdv-n-533.svg new file mode 100644 index 00000000..2c5257ad --- /dev/null +++ b/symbols/ch/fdv-n-533.svg @@ -0,0 +1,7 @@ + + + + + + + diff --git a/symbols/ch/fdv-n-552.svg b/symbols/ch/fdv-n-552.svg new file mode 100644 index 00000000..a6aef5ae --- /dev/null +++ b/symbols/ch/fdv-n-552.svg @@ -0,0 +1,10 @@ + + + + + + + + + + diff --git a/symbols/ch/fdv-n-554.svg b/symbols/ch/fdv-n-554.svg new file mode 100644 index 00000000..a6aef5ae --- /dev/null +++ b/symbols/ch/fdv-n-554.svg @@ -0,0 +1,10 @@ + + + + + + + + + +