speed limits: sign / light

hiddewie · Nov 30, 2024 · 8dc2477 · 8dc2477
1 parent 3cca2aa
commit 8dc2477
Show file tree

Hide file tree

Showing 15 changed files with 129 additions and 84 deletions.
diff --git a/features/speed_railway_signals.yaml b/features/speed_railway_signals.yaml
@@ -690,43 +690,55 @@ speed_railway_signals:
       icon:
         match: 'railway:signal:speed_limit_distant:speed'
         cases:
-          - { regex: '^[1-9]0|1[0-9]0$', value: 'nl/speed_limit_distant_sign-{}', example: 'nl/speed_limit_distant_sign-70' }
-        default: 'nl/speed_limit_distant_sign-empty'
+          - { regex: '^[1-9]0|1[0-9]0$', value: 'nl/313-{}', example: 'nl/313-80' }
+        default: 'nl/313-empty'
       tags:
-        - { tag: 'railway:signal:speed_limit_distant', value: 'NL' }
+        - { tag: 'railway:signal:speed_limit_distant', value: 'NL:313' }
         - { tag: 'railway:signal:speed_limit_distant:form', value: 'sign' }
 
-    - description: distant speed limit (light)
+    - description: speed limit (sign)
       country: NL
       type: line
       icon:
-        match: 'railway:signal:speed_limit_distant:speed'
+        match: 'railway:signal:speed_limit:speed'
         cases:
-          - { regex: '^[1-9]0|1[0-9]0$', value: 'nl/speed_limit_distant_light-{}', example: 'nl/speed_limit_distant_light-70' }
-        default: 'nl/speed_limit_distant_light-empty'
+          - { regex: '^[1-9]0|1[0-9]0$', value: 'nl/314-{}', example: 'nl/314-70' }
+        default: 'nl/314-empty'
       tags:
-        - { tag: 'railway:signal:speed_limit_distant', value: 'NL' }
-        - { tag: 'railway:signal:speed_limit_distant:form', value: 'light' }
+        - { tag: 'railway:signal:speed_limit', value: 'NL:314' }
+        - { tag: 'railway:signal:speed_limit:form', value: 'sign' }
 
-    - description: speed limit (sign)
+    - description: speed limit increase (sign)
       country: NL
       type: line
       icon:
         match: 'railway:signal:speed_limit:speed'
         cases:
-          - { regex: '^[1-9]0|1[0-9]0$', value: 'nl/speed_limit_sign-{}', example: 'nl/speed_limit_sign-70' }
-        default: 'nl/speed_limit_sign-empty'
+          - { regex: '^[1-9]0|1[0-9]0$', value: 'nl/316-{}', example: 'nl/316-130' }
+        default: 'nl/316-empty'
       tags:
-        - { tag: 'railway:signal:speed_limit', value: 'NL' }
+        - { tag: 'railway:signal:speed_limit', value: 'NL:316' }
         - { tag: 'railway:signal:speed_limit:form', value: 'sign' }
 
+    - description: distant speed limit (light)
+      country: NL
+      type: line
+      icon:
+        match: 'railway:signal:speed_limit_distant:speed'
+        cases:
+          - { regex: '^[1-9]0|1[0-9]0$', value: 'nl/speed_limit_light-{}', example: 'nl/speed_limit_light-60' }
+        default: 'nl/speed_limit_light-empty'
+      tags:
+        - { tag: 'railway:signal:speed_limit_distant', value: 'NL:313' }
+        - { tag: 'railway:signal:speed_limit_distant:form', value: 'light' }
+
     - description: speed limit (light)
       country: NL
       type: line
       icon:
         match: 'railway:signal:speed_limit:speed'
         cases:
-          - { regex: '^[1-9]0|1[0-9]0$', value: 'nl/speed_limit_light-{}', example: 'nl/speed_limit_light-70' }
+          - { regex: '^[1-9]0|1[0-9]0$', value: 'nl/speed_limit_light-{}', example: 'nl/speed_limit_light-60' }
         default: 'nl/speed_limit_light-empty'
       tags:
         - { tag: 'railway:signal:speed_limit', value: 'NL' }

diff --git a/symbols/nl/282-40.svg b/symbols/nl/282-40.svg
diff --git a/symbols/nl/282.svg b/symbols/nl/282.svg
diff --git a/symbols/nl/282a-40.svg b/symbols/nl/282a-40.svg
diff --git a/symbols/nl/282a.svg b/symbols/nl/282a.svg
diff --git a/symbols/nl/313-80.svg b/symbols/nl/313-80.svg
diff --git a/symbols/nl/313-empty.svg b/symbols/nl/313-empty.svg
diff --git a/symbols/nl/314-70.svg b/symbols/nl/314-70.svg