Merge branch 'master' of github.com:hiddewie/OpenRailwayMap-vector in…

…to signal-popups
hiddewie · Dec 8, 2024 · 7be00ad · 7be00ad
2 parents 7866cd2 + 280ba5f
commit 7be00ad
Show file tree

Hide file tree

Showing 172 changed files with 2,171 additions and 1,352 deletions.
diff --git a/SETUP.md b/SETUP.md
@@ -14,7 +14,7 @@ The import process will filter the file before importing it. The filtered file w
 
 Start the tile server:
 ```shell
-docker compose up --build martin
+docker compose up --build --watch martin
 ```
 
 Prepare and start the API:
@@ -25,15 +25,12 @@ docker compose up api
 
 Start the web server:
 ```shell
-docker compose up --build martin-proxy
+docker compose up --build --watch martin-proxy
 ```
 
 The OpenRailwayMap is now available on http://localhost:8000.
 
-To ease development, Docker Compose can automatically rebuild containers when dependent files change. Enable *watch mode* with:
-```shell
-docker compose watch
-```
+Docker Compose will automatically rebuild and restart the `martin` and `martin-proxy` containers if relevant files are modified.
 
 ## Deployment
 

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -88,15 +88,19 @@ services:
     depends_on:
       db:
         condition: service_healthy
-    volumes:
-      - ./martin:/config
     environment:
       - DATABASE_URL=postgresql://postgres@db:5432/gis
     ulimits:
       nproc: 65535
       nofile:
         soft: 26677
         hard: 46677
+    develop:
+      watch:
+        - action: rebuild
+          path: martin
+        - action: rebuild
+          path: symbols
 
   martin-static:
     build:

diff --git a/features/electrification_signals.yaml b/features/electrification_signals.yaml
@@ -750,7 +750,12 @@ electrification_signals:
 
     - description: Wskaźnik uprzedzający o opuszczeniu pantografu (we1)
       country: PL
-      icon: { default: 'pl/we1' }
+      icon:
+        match: 'railway:signal:electricity:turn_direction'
+        cases:
+          - { regex: '^right$', value: 'pl/we1b' }
+          - { regex: '^left$', value: 'pl/we1c' }
+        default: 'pl/we1a'
       tags:
         - { tag: 'railway:signal:electricity', value: 'PL-PKP:we1' }
         - { tag: 'railway:signal:electricity:form', value: 'sign' }
@@ -777,7 +782,7 @@ electrification_signals:
           - { regex: '^locomotive$', value: 'pl/we3b' }
         default: 'pl/we3a'
       tags:
-        - { tag: 'railway:signal:electricity', values: ['PL-PKP:we3a', 'PL-PKP:we3b'] }
+        - { tag: 'railway:signal:electricity', values: ['PL-PKP:we3a', 'PL-PKP:we3b', 'PL-PKP:we3c'] }
         - { tag: 'railway:signal:electricity:form', value: 'sign' }
         - { tag: 'railway:signal:electricity:type', value: 'pantograph_up' }
 
@@ -815,10 +820,58 @@ electrification_signals:
           - { regex: '^locomotive$', value: 'pl/we9b' }
         default: 'pl/we9a'
       tags:
-        - { tag: 'railway:signal:electricity', values: ['PL-PKP:we9a', 'PL-PKP:we9b'] }
+        - { tag: 'railway:signal:electricity', values: ['PL-PKP:we9a', 'PL-PKP:we9b', 'PL-PKP:we9c'] }
         - { tag: 'railway:signal:electricity:form', value: 'sign' }
         - { tag: 'railway:signal:electricity:type', value: 'power_on' }
 
+    - description: Wskaźniki zmiany systemu zasilania 25 kV
+      country: PL
+      icon: { default: 'pl/we10a' }
+      tags:
+        - { tag: 'railway:signal:electricity', value: 'PL-PKP:we10a' }
+        - { tag: 'railway:signal:electricity:form', value: 'sign' }
+        - { tag: 'railway:signal:electricity:type', value: 'power_change' }
+
+    - description: Wskaźniki zmiany systemu zasilania 25 kV
+      country: PL
+      icon: { default: 'pl/we10b' }
+      tags:
+        - { tag: 'railway:signal:electricity', value: 'PL-PKP:we10b' }
+        - { tag: 'railway:signal:electricity:form', value: 'sign' }
+        - { tag: 'railway:signal:electricity:type', value: 'power_change' }
+
+    - description: Wskaźniki zmiany systemu zasilania 15 kV
+      country: PL
+      icon: { default: 'pl/we10c' }
+      tags:
+        - { tag: 'railway:signal:electricity', value: 'PL-PKP:we10c' }
+        - { tag: 'railway:signal:electricity:form', value: 'sign' }
+        - { tag: 'railway:signal:electricity:type', value: 'power_change' }
+
+    - description: Wskaźniki zmiany systemu zasilania 15 kV
+      country: PL
+      icon: { default: 'pl/we10d' }
+      tags:
+        - { tag: 'railway:signal:electricity', value: 'PL-PKP:we10d' }
+        - { tag: 'railway:signal:electricity:form', value: 'sign' }
+        - { tag: 'railway:signal:electricity:type', value: 'power_change' }
+
+    - description: Wskaźniki zmiany systemu zasilania 3 kV
+      country: PL
+      icon: { default: 'pl/we10e' }
+      tags:
+        - { tag: 'railway:signal:electricity', value: 'PL-PKP:we10e' }
+        - { tag: 'railway:signal:electricity:form', value: 'sign' }
+        - { tag: 'railway:signal:electricity:type', value: 'power_change' }
+
+    - description: Wskaźniki zmiany systemu zasilania 3 kV
+      country: PL
+      icon: { default: 'pl/we10f' }
+      tags:
+        - { tag: 'railway:signal:electricity', value: 'PL-PKP:we10f' }
+        - { tag: 'railway:signal:electricity:form', value: 'sign' }
+        - { tag: 'railway:signal:electricity:type', value: 'power_change' }
+
     - description: Tram isolation (ct-1)
       country: PL
       icon: { default: 'pl/ct-1' }