add Australian signals (NSW, part 1) (#642)

This PR adds all light signals for New South Wales (Australia), except
`main` and `distant`, because those two are more complicated, like [the
italian
system](#639).

See [the osmwiki
page](https://osm.wiki/Australian_Tagging_Guidelines/Railway_Signals#NSW)
for details.

In Australia, there can be up to 6 `train_protection` signals on a
single pole
([example](https://wiki.openstreetmap.org/wiki/File:NSW_Railway_Signal_full_example.jpg)),
so we need to increase the limit from 5 to 6.

<img width="112" height="136" alt="image"
src="https://github.com/user-attachments/assets/1d6fdfe7-2852-4a07-a5ee-ab20996aaa16"
/>
<img width="71" height="97" alt="image"
src="https://github.com/user-attachments/assets/90b04dff-5b99-41ca-98eb-c2cb33a7532a"
/>
<img width="78" height="102" alt="image"
src="https://github.com/user-attachments/assets/cf86a095-2a3d-420a-9691-89ef66151066"
/>
<img width="204" height="169" alt="image"
src="https://github.com/user-attachments/assets/4bd2fffa-1cf4-4075-9387-627f353ccb78"
/>
<img width="92" height="125" alt="image"
src="https://github.com/user-attachments/assets/347fca1c-96c6-43e8-972d-41cd280ab506"
/>
<img width="172" height="212" alt="image"
src="https://github.com/user-attachments/assets/53ab6a1f-48c1-4fc3-8d4a-ce744e3b7df7"
/>
<img width="47" height="82" alt="image"
src="https://github.com/user-attachments/assets/d59126bd-0170-46e8-9686-b5158bbae3cb"
/>
<img width="101" height="98" alt="image"
src="https://github.com/user-attachments/assets/5a82cbfe-bb11-4fdd-8823-eba239b25a98"
/>
<img width="134" height="154" alt="image"
src="https://github.com/user-attachments/assets/8492f134-302c-4d73-9376-77fd261130ac"
/>
<img width="80" height="60" alt="image"
src="https://github.com/user-attachments/assets/27e5cbc3-a8d7-43e0-bc41-97247db5ae83"
/>
<img width="94" height="116" alt="image"
src="https://github.com/user-attachments/assets/f1859e73-bf34-4bf7-87d4-b2ad1cb03086"
/>
<img width="103" height="181" alt="image"
src="https://github.com/user-attachments/assets/eb3b1009-6d85-440d-b860-9710f0f8791f"
/>
<img width="94" height="100" alt="image"
src="https://github.com/user-attachments/assets/3322407b-a0aa-4963-8edb-4d2c89efa6aa"
/>
<img width="80" height="93" alt="image"
src="https://github.com/user-attachments/assets/f5bff291-08b6-4690-b8c6-2583956d9014"
/>
<img width="82" height="114" alt="image"
src="https://github.com/user-attachments/assets/177f9185-21b4-4462-8aec-70e35deaf0b4"
/>

Co-authored-by: Hidde Wieringa <[email protected]>

Author: k-yle

features/signals_railway_signals.yaml

@@ -113,16 +113,23 @@ tags:
   - { tag: 'railway:signal:route:deactivated', title: 'Route deactivated', type: boolean }
   - { tag: 'railway:signal:route_distant', title: 'Route distant' }
   - { tag: 'railway:signal:route_distant:form', title: 'Route distant form' }
+  - { tag: 'railway:signal:route_distant:shape', title: 'Route distant shape' }
   - { tag: 'railway:signal:route_distant:states', title: 'Route distant states', type: array }
   - { tag: 'railway:signal:route_distant:deactivated', title: 'Route distant deactivated', type: boolean }
   - { tag: 'railway:signal:short_route', title: 'Short route' }
   - { tag: 'railway:signal:short_route:form', title: 'Short route form' }
+  - { tag: 'railway:signal:short_route:shape', title: 'Short route shape' }
   - { tag: 'railway:signal:short_route:deactivated', title: 'Short route deactivated', type: boolean }
   - { tag: 'railway:signal:shunting', title: 'Shunting' }
   - { tag: 'railway:signal:shunting:form', title: 'Shunting form' }
   - { tag: 'railway:signal:shunting:states', title: 'Shunting states', type: array }
+  - { tag: 'railway:signal:shunting:shape', title: 'Shunting shape' }
   - { tag: 'railway:signal:shunting:height', title: 'Shunting height' }
   - { tag: 'railway:signal:shunting:deactivated', title: 'Shunting deactivated', type: boolean }
+  - { tag: 'railway:signal:shunting_route', title: 'Shunting Route' }
+  - { tag: 'railway:signal:shunting_route:form', title: 'Shunting Route form' }
+  - { tag: 'railway:signal:shunting_route:states', title: 'Shunting Route states', type: array }
+  - { tag: 'railway:signal:shunting_route:deactivated', title: 'Shunting Route deactivated', type: boolean }
   - { tag: 'railway:signal:snowplow', title: 'Snowplow' }
   - { tag: 'railway:signal:snowplow:form', title: 'Snowplow form' }
   - { tag: 'railway:signal:snowplow:type', title: 'Snowplow type' }
@@ -196,6 +203,7 @@ types:
   - { type: minor_distant, layer: signals }
   - { type: passing, layer: signals }
   - { type: shunting, layer: signals }
+  - { type: shunting_route, layer: signals }
   - { type: radio, layer: signals }
   - { type: stop, layer: signals }
   - { type: stop_distant, layer: signals }
@@ -1218,6 +1226,202 @@ features:
       - { tag: 'railway:signal:station_distant', value: 'AU:NSW:YL' }
       - { tag: 'railway:signal:station_distant:form', value: 'sign' }
 
+  # --- AU-NSW-signals --- #
+
+  # shunt
+  - description: Shunt Signal
+    country: AU
+    icon:
+      match: 'railway:signal:shunting:shape'
+      cases:
+        - { exact: 'vertical', value: 'au/nsw/signals/shunt_vertical' }
+      default: 'au/nsw/signals/shunt_box'
+    tags:
+      - { tag: 'railway:signal:shunting', value: 'AU:NSW:shunt' }
+      - { tag: 'railway:signal:shunting:form', value: 'light' }
+
+  - description: Intermediate Shunt Signal Signal
+    country: AU
+    icon:
+      match: 'railway:signal:shunting:shape'
+      cases:
+        - { exact: 'vertical', value: 'au/nsw/signals/shunt_vertical_int' }
+      default: 'au/nsw/signals/shunt_box_int'
+    tags:
+      - { tag: 'railway:signal:shunting', value: 'AU:NSW:intermediate' }
+      - { tag: 'railway:signal:shunting:form', value: 'light' }
+
+  - description: Facing Points Indicator
+    country: AU
+    icon: { default: 'au/nsw/signals/points_indicator_facing' }
+    tags:
+      - { tag: 'railway:signal:switch', value: 'AU:NSW:facing_points' }
+      - { tag: 'railway:signal:switch:form', value: 'light' }
+
+  - description: Trailing Points Indicator
+    country: AU
+    icon: { default: 'au/nsw/signals/points_indicator_trailing' }
+    tags:
+      - { tag: 'railway:signal:switch', value: 'AU:NSW:trailing_points' }
+      - { tag: 'railway:signal:switch:form', value: 'light' }
+
+  # repeaters
+  - description: LED Repeater
+    country: AU
+    icon: { default: 'au/nsw/signals/LED_repeater' }
+    tags:
+      - { tag: 'railway:signal:main_repeated', value: 'AU:NSW:LED_repeater' }
+      - { tag: 'railway:signal:main_repeated:form', value: 'light' }
+
+  # other
+  - description: End of Track
+    country: AU
+    icon: { default: 'au/nsw/signals/end_of_track_R' }
+    tags:
+      - { tag: 'railway:signal:stop', value: 'AU:NSW:end_of_track' }
+      - { tag: 'railway:signal:stop:form', value: 'light' }
+      - { tag: 'railway:signal:stop:states', value: 'R' }
+
+  - description: End of Track
+    country: AU
+    icon: { default: 'au/nsw/signals/end_of_track_WR' }
+    tags:
+      - { tag: 'railway:signal:stop', value: 'AU:NSW:end_of_track' }
+      - { tag: 'railway:signal:stop:form', value: 'light' }
+      - { tag: 'railway:signal:stop:states', value: 'WR' }
+
+  - description: Guards Indicator
+    country: AU
+    icon: { default: 'au/nsw/signals/guards_indicator' }
+    tags:
+      - { tag: 'railway:signal:main_repeated', value: 'AU:NSW:guards_indicator' }
+      - { tag: 'railway:signal:main_repeated:form', value: 'light' }
+
+  - description: Warning Light
+    country: AU
+    icon: { default: 'au/nsw/signals/warning_light_bulb' }
+    tags:
+      - { tag: 'railway:signal:train_protection', value: 'AU:NSW:warning_light' }
+      - { tag: 'railway:signal:train_protection:form', value: 'light' }
+      - { tag: 'railway:signal:train_protection:shape', value: 'bulb' }
+
+  - description: Warning Light
+    country: AU
+    icon: { default: 'au/nsw/signals/warning_light_array' }
+    tags:
+      - { tag: 'railway:signal:train_protection', value: 'AU:NSW:warning_light' }
+      - { tag: 'railway:signal:train_protection:form', value: 'light' }
+      - { tag: 'railway:signal:train_protection:shape', value: 'array' }
+
+  # main/distant + subsidiaries
+  - description: Tonnage Light
+    country: AU
+    icon: { default: 'au/nsw/signals/tonnage' }
+    tags:
+      - { tag: 'railway:signal:helper_engine', value: 'AU:NSW:tonnage' }
+      - { tag: 'railway:signal:helper_engine:form', value: 'light' }
+
+  - description: Automatic Light
+    country: AU
+    icon: { default: 'au/nsw/signals/automatic' }
+    tags:
+      - { tag: 'railway:signal:train_protection', value: 'AU:NSW:A' }
+      - { tag: 'railway:signal:train_protection:form', value: 'light' }
+
+  - description: Dead End Siding (Right)
+    country: AU
+    icon: { default: 'au/nsw/signals/dead_end_right' }
+    tags:
+      - { tag: 'railway:signal:short_route', value: 'AU:NSW:dead_end' }
+      - { tag: 'railway:signal:short_route:form', value: 'light' }
+      - { tag: 'railway:signal:short_route:shape', value: 'right' }
+
+  - description: Dead End Siding (Left)
+    country: AU
+    icon: { default: 'au/nsw/signals/dead_end_left' }
+    tags:
+      - { tag: 'railway:signal:short_route', value: 'AU:NSW:dead_end' }
+      - { tag: 'railway:signal:short_route:form', value: 'light' }
+      - { tag: 'railway:signal:short_route:shape', value: 'left' }
+
+  - description: Calling-On / Shunt Ahead
+    country: AU
+    icon: { default: 'au/nsw/signals/subsidiary' }
+    tags:
+      - { tag: 'railway:signal:shunting', value: 'AU:NSW:subsidiary' }
+      - { tag: 'railway:signal:shunting:form', value: 'light' }
+
+
+  - description: Shunt Route Indicator
+    country: AU
+    icon: { default: 'au/nsw/signals/stencil' }
+    tags:
+      - { tag: 'railway:signal:shunting_route', value: 'AU:NSW:stencil' }
+      - { tag: 'railway:signal:shunting_route:form', value: 'light' }
+
+  - description: Close Up
+    country: AU
+    icon: { default: 'au/nsw/signals/close_up' }
+    tags:
+      - { tag: 'railway:signal:minor', value: 'AU:NSW:close_up' }
+      - { tag: 'railway:signal:minor:form', value: 'light' }
+
+  - description: Low Speed
+    country: AU
+    icon: { default: 'au/nsw/signals/low_speed' }
+    tags:
+      - { tag: 'railway:signal:minor', value: 'AU:NSW:low_speed' }
+      - { tag: 'railway:signal:minor:form', value: 'light' }
+
+  - description: Turnout Route
+    country: AU
+    icon:
+      match: 'railway:signal:switch:states'
+      cases:
+        - { all: ['right', 'left'], value: 'au/nsw/signals/turnout_both' }
+        - { exact: 'right', value: 'au/nsw/signals/turnout_right', description: 'right' }
+        - { exact: 'left', value: 'au/nsw/signals/turnout_left', description: 'left' }
+      default: 'au/nsw/signals/turnout_off'
+    tags:
+      - { tag: 'railway:signal:switch', value: 'AU:NSW:turnout_route' }
+      - { tag: 'railway:signal:switch:form', value: 'light' }
+
+  - description: Mainline Indicator – Turnout
+    country: AU
+    icon:
+      match: 'railway:signal:switch:states'
+      cases:
+        - { all: ['right', 'left'], value: 'au/nsw/signals/MLI/turnout_both' }
+        - { exact: 'right', value: 'au/nsw/signals/MLI/turnout_right', description: 'right' }
+        - { exact: 'left', value: 'au/nsw/signals/MLI/turnout_left', description: 'left' }
+      default: 'au/nsw/signals/MLI/turnout_off'
+    tags:
+      - { tag: 'railway:signal:switch', value: 'AU:NSW:MLI_turnout' }
+      - { tag: 'railway:signal:switch:form', value: 'light' }
+
+  - description: Mainline Route Indicator
+    country: AU
+    icon: { default: 'au/nsw/signals/route_indicator' }
+    tags:
+      - { tag: 'railway:signal:route', value: 'AU:NSW:theatre_box' }
+      - { tag: 'railway:signal:route:form', value: 'light' }
+
+  - description: Turnout Repeater
+    country: AU
+    icon: { default: 'au/nsw/signals/route_distant_theatre_box' }
+    tags:
+      - { tag: 'railway:signal:route_distant', value: 'AU:NSW:turnout_repeater' }
+      - { tag: 'railway:signal:route_distant:form', value: 'light' }
+      - { tag: 'railway:signal:route_distant:shape', value: 'theatre_box' }
+
+  - description: Turnout Repeater (feather-style)
+    country: AU
+    icon: { default: 'au/nsw/signals/route_distant_feather' }
+    tags:
+      - { tag: 'railway:signal:route_distant', value: 'AU:NSW:turnout_repeater' }
+      - { tag: 'railway:signal:route_distant:form', value: 'light' }
+      - { tag: 'railway:signal:route_distant:shape', value: 'feather' }
+
   # --- BE --- #
 
   - description: Speed limit light (part of main signal)

import/sql/signal_features.sql.js

@@ -375,15 +375,18 @@ CREATE OR REPLACE FUNCTION signals_railway_signals(z integer, x integer, y integ
         features[3] as feature2,
         features[4] as feature3,
         features[5] as feature4,
+        features[6] as feature5,
         deactivated[1] as deactivated0,
         deactivated[2] as deactivated1,
         deactivated[3] as deactivated2,
         deactivated[4] as deactivated3,
         deactivated[5] as deactivated4,
+        deactivated[6] as deactivated5,
         CEIL(icon_height[1] / 2 + icon_height[2] / 2) as offset1,
         CEIL(icon_height[1] / 2 + icon_height[2] + icon_height[3] / 2) as offset2,
         CEIL(icon_height[1] / 2 + icon_height[2] + icon_height[3] + icon_height[4] / 2) as offset3,
         CEIL(icon_height[1] / 2 + icon_height[2] + icon_height[3] + icon_height[4] + icon_height[5] / 2) as offset4,
+        CEIL(icon_height[1] / 2 + icon_height[2] + icon_height[3] + icon_height[4] + icon_height[5] + icon_height[6] / 2) as offset5,
         type
       FROM signals s
       JOIN signal_features sf
@@ -426,15 +429,18 @@ DO $do$ BEGIN
           "feature2": "string",
           "feature3": "string",
           "feature4": "string",
+          "feature5": "string",
           "deactivated0": "boolean",
           "deactivated1": "boolean",
           "deactivated2": "boolean",
           "deactivated3": "boolean",
           "deactivated4": "boolean",
+          "deactivated5": "boolean",
           "offset1": "number",
           "offset2": "number",
           "offset3": "number",
           "offset4": "number",
+          "offset5": "number",
           "type": "string"
         }
       }

proxy/js/features.mjs

@@ -846,6 +846,12 @@ const features = {
           lookup: 'signals_railway_signals',
         },
       },
+      feature5: {
+        name: 'Senary signal',
+        format: {
+          lookup: 'signals_railway_signals',
+        },
+      },
       ref: {
         name: 'Reference',
       },