use the new icon composition system for AU

k-yle · k-yle · commit eabc5b03f359 · 2025-12-06T01:25:12.000+11:00
diff --git a/features/signals_railway_signals.yaml b/features/signals_railway_signals.yaml
@@ -1030,6 +1030,102 @@ features:
       - { tag: 'railway:signal:main', value: 'AU:LightRail:NSW:PI' }
       - { tag: 'railway:signal:main:form', value: 'light' }
 
+  - description: Points Indicator
+    country: AU
+    exampleIcon: au/LightRail/signals/PI/straight
+    icon:
+      - match: 'railway:signal:minor:states'
+        cases:
+          - { exact: 'stop', value: 'au/LightRail/signals/PI/stop' }
+        position: bottom
+
+      - match: 'railway:signal:minor:states'
+        cases:
+          - { exact: 'stop_red', value: 'au/LightRail/signals/PI/stop_red' }
+        position: bottom
+
+      - match: 'railway:signal:minor:states'
+        cases:
+          - { exact: 'straight', value: 'au/LightRail/signals/PI/straight' }
+        position: bottom
+
+      - match: 'railway:signal:minor:states'
+        cases:
+          - { exact: 'right', value: 'au/LightRail/signals/PI/right' }
+        position: bottom
+
+      - match: 'railway:signal:minor:states'
+        cases:
+          - { exact: 'left', value: 'au/LightRail/signals/PI/left' }
+        position: bottom
+    tags:
+      - { tag: 'railway:signal:minor', value: 'AU:LightRail:PI' }
+      - { tag: 'railway:signal:minor:form', value: 'light' }
+
+  - description: Signal Operated Points Indicator
+    country: AU
+    exampleIcon: au/LightRail/signals/SPI/straight
+    icon:
+      - match: 'railway:signal:minor:states'
+        cases:
+          - { exact: 'locked', value: 'au/LightRail/signals/SPI/locked' }
+        position: bottom
+
+      - match: 'railway:signal:minor:states'
+        cases:
+          - { exact: 'straight', value: 'au/LightRail/signals/SPI/straight' }
+        position: bottom
+
+      - match: 'railway:signal:minor:states'
+        cases:
+          - { exact: 'right', value: 'au/LightRail/signals/SPI/right' }
+        position: bottom
+
+      - match: 'railway:signal:minor:states'
+        cases:
+          - { exact: 'left', value: 'au/LightRail/signals/SPI/left' }
+        position: bottom
+    tags:
+      - { tag: 'railway:signal:minor', value: 'AU:LightRail:SPI' }
+      - { tag: 'railway:signal:minor:form', value: 'light' }
+
+  - description: Signal System Lanterns
+    country: AU
+    exampleIcon: au/LightRail/signals/SI/straight
+    icon:
+      - match: 'railway:signal:main:states'
+        cases:
+          - { exact: 'stop', value: 'au/LightRail/signals/SI/stop' }
+        position: bottom
+
+      - match: 'railway:signal:main:states'
+        cases:
+          - { exact: 'straight', value: 'au/LightRail/signals/SI/straight' }
+        position: bottom
+
+      - match: 'railway:signal:main:states'
+        cases:
+          - { exact: 'right', value: 'au/LightRail/signals/SI/right' }
+        position: bottom
+
+      - match: 'railway:signal:main:states'
+        cases:
+          - { exact: 'left', value: 'au/LightRail/signals/SI/left' }
+        position: bottom
+
+      - match: 'railway:signal:main:states'
+        cases:
+          - { exact: 'error', value: 'au/LightRail/signals/SI/error' }
+        position: bottom
+
+      - match: 'railway:signal:main:states'
+        cases:
+          - { exact: 'warning', value: 'au/LightRail/signals/SI/warning' }
+        position: bottom
+    tags:
+      - { tag: 'railway:signal:main', value: 'AU:LightRail:SI' }
+      - { tag: 'railway:signal:main:form', value: 'light' }
+
   # --- AU-NSW-signs --- #
 
   - description: Alert
@@ -1173,20 +1269,56 @@ features:
 
   - description: Stop Position
     country: AU
+    exampleIcon: 'au/nsw/signs/stop_position/unknown'
     icon:
       - match: 'railway:signal:stop:states'
         cases:
           - { any: [ 'X', 'XPT', 'XPL' ], value: 'au/nsw/signs/stop_position/X' }
+        position: bottom
+      - match: 'railway:signal:stop:states'
+        cases:
           - { exact: '10', value: 'au/nsw/signs/stop_position/10' }
+        position: bottom
+      - match: 'railway:signal:stop:states'
+        cases:
           - { exact: '8', value: 'au/nsw/signs/stop_position/8' }
+        position: bottom
+      - match: 'railway:signal:stop:states'
+        cases:
           - { exact: '8H', value: 'au/nsw/signs/stop_position/8H' }
+        position: bottom
+      - match: 'railway:signal:stop:states'
+        cases:
           - { exact: '8V', value: 'au/nsw/signs/stop_position/8V' }
+        position: bottom
+      - match: 'railway:signal:stop:states'
+        cases:
           - { exact: '6', value: 'au/nsw/signs/stop_position/6' }
+        position: bottom
+      - match: 'railway:signal:stop:states'
+        cases:
           - { exact: '6V', value: 'au/nsw/signs/stop_position/6V' }
+        position: bottom
+      - match: 'railway:signal:stop:states'
+        cases:
           - { exact: '4', value: 'au/nsw/signs/stop_position/4' }
+        position: bottom
+      - match: 'railway:signal:stop:states'
+        cases:
+          - { any: ['4H', 'H4'], value: 'au/nsw/signs/stop_position/4H' }
+        position: bottom
+      - match: 'railway:signal:stop:states'
+        cases:
           - { exact: '4V', value: 'au/nsw/signs/stop_position/4V' }
+        position: bottom
+      - match: 'railway:signal:stop:states'
+        cases:
           - { exact: '2', value: 'au/nsw/signs/stop_position/2' }
-        default: 'au/nsw/signs/stop_position/unknown'
+        position: bottom
+      - match: 'railway:signal:stop:states'
+        cases:
+          - { any: ['2C', 'C2'], value: 'au/nsw/signs/stop_position/2C' }
+        position: bottom
     tags:
       - { tag: 'railway:signal:stop', value: 'AU:NSW:stop_position' }
       - { tag: 'railway:signal:stop:form', value: 'sign' }
diff --git a/proxy/js/features.mjs b/proxy/js/features.mjs
@@ -18,6 +18,7 @@ const electrification_signals = all_signals.features.filter(feature => feature.t
 
 const requireUniqueEntries = array => {
   const count = Object.groupBy(array, it => it[0]);
+  delete count['']; // icons with no name are used for icon composition
   if (Object.values(count).some(it => it.length > 1)) {
     const offendingEntries = Object.entries(count).filter(it => it[1].length > 1).map(it => it[0]).join(', ');
     throw new Error(`entries must be unique, offending entries: ${offendingEntries}`);
diff --git a/symbols/au/LightRail/signals/PI/left.svg b/symbols/au/LightRail/signals/PI/left.svg
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 10 10" width="10" height="10">
+  <rect width="10" height="10" fill="#888" fill-opacity="1"/>
+  <circle fill="#000" cx="5" cy="5" r="4.8"/>
+  <path stroke="#fff" d="M 2.2 2.2 7.8 7.8" stroke-width="1.87" />
+</svg>
diff --git a/symbols/au/LightRail/signals/PI/right.svg b/symbols/au/LightRail/signals/PI/right.svg
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 10 10" width="10" height="10">
+  <rect width="10" height="10" fill="#888" fill-opacity="1"/>
+  <circle fill="#000" cx="5" cy="5" r="4.8"/>
+  <path stroke="#fff" d="M 7.8 2.2 2.2 7.8" stroke-width="1.87" />
+</svg>
diff --git a/symbols/au/LightRail/signals/PI/stop.svg b/symbols/au/LightRail/signals/PI/stop.svg
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 10 10" width="10" height="10">
+  <rect width="10" height="10" fill="#888" fill-opacity="1"/>
+  <circle fill="#000" cx="5" cy="5" r="4.8"/>
+  <rect fill="#fff" width="7.86" height="1.87" x="1.07" y="4.06"/>
+</svg>
diff --git a/symbols/au/LightRail/signals/PI/stop_red.svg b/symbols/au/LightRail/signals/PI/stop_red.svg
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 10 10" width="10" height="10">
+  <rect width="10" height="10" fill="#888" fill-opacity="1"/>
+  <circle fill="#000" cx="5" cy="5" r="4.8"/>
+  <rect fill="#f00" width="7.86" height="1.87" x="1.07" y="4.06"/>
+</svg>
diff --git a/symbols/au/LightRail/signals/PI/straight.svg b/symbols/au/LightRail/signals/PI/straight.svg
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 10 10" width="10" height="10">
+  <rect width="10" height="10" fill="#888" fill-opacity="1"/>
+  <circle fill="#000" cx="5" cy="5" r="4.8"/>
+  <rect fill="#fff" width="1.87" height="7.86" x="4.06" y="1.07"/>
+</svg>
diff --git a/symbols/au/LightRail/signals/SI/error.svg b/symbols/au/LightRail/signals/SI/error.svg
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 10 10" width="10" height="10">
+  <rect width="10" height="10" fill="#888" fill-opacity="1"/>
+  <circle fill="#000" cx="5" cy="5" r="4.8"/>
+  <circle fill="#fff" stroke-width=".4" r="2.5" cy="5" cx="5" />
+</svg>
diff --git a/symbols/au/LightRail/signals/SI/left.svg b/symbols/au/LightRail/signals/SI/left.svg
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 10 10" width="10" height="10">
+  <rect width="10" height="10" fill="#888" fill-opacity="1"/>
+  <circle fill="#000" cx="5" cy="5" r="4.8"/>
+  <path stroke="#fff" stroke-width="1.5" d="M3.5858 1.4645 8.5355 6.4142M1.4645 3.5858 6.4142 8.5355" />
+</svg>
diff --git a/symbols/au/LightRail/signals/SI/right.svg b/symbols/au/LightRail/signals/SI/right.svg
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 10 10" width="10" height="10">
+  <rect width="10" height="10" fill="#888" fill-opacity="1"/>
+  <circle fill="#000" cx="5" cy="5" r="4.8"/>
+  <path stroke="#fff" stroke-width="1.5" d="M1.4645 6.4142 6.4142 1.4645M3.5858 8.5355 8.5355 3.5858" />
+</svg>
diff --git a/symbols/au/LightRail/signals/SI/stop.svg b/symbols/au/LightRail/signals/SI/stop.svg
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 10 10" width="10" height="10">
+  <rect width="10" height="10" fill="#888" fill-opacity="1"/>
+  <circle fill="#000" cx="5" cy="5" r="4.8"/>
+  <path stroke="#fff" stroke-width="1.5" d="M 1.5 3.5 L 8.5 3.5 M 1.5 6.5 L 8.5 6.5" />
+  <path stroke="#09f" stroke-width="1" d="M 4.25 5 L 5.75 5" />
+</svg>
diff --git a/symbols/au/LightRail/signals/SI/straight.svg b/symbols/au/LightRail/signals/SI/straight.svg
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 10 10" width="10" height="10">
+  <rect width="10" height="10" fill="#888" fill-opacity="1"/>
+  <circle fill="#000" cx="5" cy="5" r="4.8"/>
+  <path stroke="#fff" stroke-width="1.5" d="M6.5 1.5 6.5 8.5M3.5 1.5 3.5 8.5" />
+</svg>
diff --git a/symbols/au/LightRail/signals/SI/warning.svg b/symbols/au/LightRail/signals/SI/warning.svg
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 10 10" width="10" height="10">
+  <rect width="10" height="10" fill="#888" fill-opacity="1"/>
+  <circle fill="#000" cx="5" cy="5" r="4.8"/>
+  <circle fill="#fa0" stroke-width=".4" r="2.5" cy="5" cx="5" />
+</svg>
diff --git a/symbols/au/LightRail/signals/SPI/left.svg b/symbols/au/LightRail/signals/SPI/left.svg
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 10 10" width="10" height="10">
+  <rect width="10" height="10" fill="#888" fill-opacity="1"/>
+  <circle fill="#000" cx="5" cy="5" r="4.8"/>
+  <path stroke="#fff" stroke-width="1.3" d="M7.4 8 2.5 5 7.4 2" />
+</svg>
diff --git a/symbols/au/LightRail/signals/SPI/locked.svg b/symbols/au/LightRail/signals/SPI/locked.svg
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 10 10" width="10" height="10">
+  <rect width="10" height="10" fill="#888" fill-opacity="1"/>
+  <circle fill="#000" cx="5" cy="5" r="4.8"/>
+  <path stroke="#fff" stroke-width="1" d="M 5 8 L 8 5 L 5 2 L 2 5 Z" />
+  <path stroke="#09f" stroke-width="1" d="M 4.25 5 L 5.75 5" />
+</svg>
diff --git a/symbols/au/LightRail/signals/SPI/right.svg b/symbols/au/LightRail/signals/SPI/right.svg
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 10 10" width="10" height="10">
+  <rect width="10" height="10" fill="#888" fill-opacity="1"/>
+  <circle fill="#000" cx="5" cy="5" r="4.8"/>
+  <path stroke="#fff" stroke-width="1.3" d="M2.5 8 7.5 5 2.5 2" />
+</svg>
diff --git a/symbols/au/LightRail/signals/SPI/straight.svg b/symbols/au/LightRail/signals/SPI/straight.svg
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 10 10" width="10" height="10">
+  <rect width="10" height="10" fill="#888" fill-opacity="1"/>
+  <circle fill="#000" cx="5" cy="5" r="4.8"/>
+  <path stroke="#fff" stroke-width="1.3" d="M2 7.4 5 2.5 8 7.4" />
+</svg>
diff --git a/symbols/au/nsw/signs/stop_position/2C.svg b/symbols/au/nsw/signs/stop_position/2C.svg
@@ -0,0 +1,4 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="10" height="15" viewBox="0 0 10 15">
+  <rect fill="#00f" stroke="#fff" stroke-width=".4" width="9.6" height="14.6" ry="1" x=".2" y=".2"/>
+  <path fill="#fff" d="M3.0232 6.6536V5.8752l1.932-2.0748a10.136 10.136 90 00.0616-.07q.0924-.1008.1708-.1932a5.7316 5.7316 90 00.1484-.1848 4.8692 4.8692 90 00.042-.056q.1288-.168.2128-.3136a2.0496 2.0496 90 00.0112-.0196q.042-.0756.0728-.1428a1.232 1.232 90 00.0532-.1456 1.1004 1.1004 90 00.0196-.07A.9324.9324 90 005.77 2.3976a1.218 1.218 90 00-.0112-.168A.9072.9072 90 005.714 2.0392a.9072.9072 90 00-.0252-.0616.7644.7644 90 00-.1344-.2044.7308.7308 90 00-.252-.1652.7896.7896 90 00-.1232-.0364A.9408.9408 90 004.9804 1.552a1.008 1.008 90 00-.0056 0q-.1036 0-.1988.014a1.0136 1.0136 90 00-.2016.0504.8568.8568 90 00-.0616.0252.7084.7084 90 00-.2268.1596A.7532.7532 90 004.1908 1.93a.9184.9184 90 00-.084.1876 1.2012 1.2012 90 00-.0476.21 1.6268 1.6268 90 00-.014.2212H2.9a1.8928 1.8928 90 01.1512-.7532 1.8676 1.8676 90 01.4312-.6216 1.8368 1.8368 90 01.2044-.1708 2.0916 2.0916 90 01.462-.2492 2.1308 2.1308 90 01.3388-.1008A2.5536 2.5536 90 015.0168.6a2.7972 2.7972 90 01.392.0252 2.0608 2.0608 90 01.4144.1008 1.9124 1.9124 90 01.1876.0812 1.554 1.554 90 01.4004.2772 1.526 1.526 90 01.3556.5516 1.7864 1.7864 90 01.0812.2744 2.142 2.142 90 01.042.4368q0 .2968-.0924.5628a2.254 2.254 90 01-.056.1512 2.5788 2.5788 90 01-.2044.3808 4.368 4.368 90 01-.1512.2156 5.4068 5.4068 90 01-.2576.3192 12.9332 12.9332 90 01-.252.28 16.0328 16.0328 90 01-.2772.294L4.4764 5.738H7.0972v.9156H3.0232ZM7.371 11.988 6.138 11.988Q6.123 12.234 6.063 12.42A1.185 1.185 90 016.039 12.483 1.044 1.044 90 015.946 12.672.825.825 90 015.826 12.822.819.819 90 015.526 13.005.96.96 90 015.496 13.014 1.281 1.281 90 015.256 13.065 1.677 1.677 90 015.061 13.077Q4.881 13.077 4.731 13.035A.816.816 90 014.467 12.906.849.849 90 014.299 12.744.975.975 90 014.272 12.708 1.194 1.194 90 014.167 12.531 1.446 1.446 90 014.125 12.435 1.935 1.935 90 014.05 12.195Q4.02 12.078 3.999 11.949A3.21 3.21 90 013.993 11.91Q3.951 11.61 3.951 11.226L3.951 10.356A5.298 5.298 90 013.963 10.023 4.314 4.314 90 013.978 9.831 3.009 3.009 90 014.017 9.57 2.382 2.382 90 014.062 9.384 1.908 1.908 90 014.161 9.114 1.524 1.524 90 014.263 8.931Q4.389 8.736 4.569 8.628A.864.864 90 014.794 8.538.996.996 90 014.797 8.538Q4.923 8.505 5.07 8.505 5.301 8.505 5.478 8.559A.966.966 90 015.538 8.58.879.879 90 015.772 8.706.795.795 90 015.865 8.793.909.909 90 016.003 9.006 1.173 1.173 90 016.06 9.153Q6.123 9.354 6.144 9.618A2.922 2.922 90 016.144 9.654L7.377 9.654A3.336 3.336 90 007.29 9.129 2.667 2.667 90 007.164 8.751Q6.999 8.352 6.708 8.076A1.935 1.935 90 006.135 7.701 2.286 2.286 90 006.006 7.65 2.418 2.418 90 005.508 7.53 3.231 3.231 90 005.07 7.5 2.49 2.49 90 004.602 7.542 2.163 2.163 90 004.404 7.59Q4.092 7.68 3.834 7.848 3.543 8.046 3.315 8.331A2.412 2.412 90 002.973 8.913 2.73 2.73 90 002.946 8.982 3.009 3.009 90 002.796 9.459 3.486 3.486 90 002.763 9.63 4.131 4.131 90 002.703 10.209 4.722 4.722 90 002.7 10.365L2.7 11.226A4.485 4.485 90 002.736 11.799 3.897 3.897 90 002.769 12.009 3.594 3.594 90 002.877 12.447 3.006 3.006 90 002.964 12.687Q3.096 12.993 3.288 13.248 3.477 13.503 3.723 13.683A2.043 2.043 90 004.287 13.965 2.31 2.31 90 004.329 13.98 2.352 2.352 90 004.83 14.073 2.838 2.838 90 005.061 14.082 2.967 2.967 90 005.595 14.037 2.43 2.43 90 005.973 13.935 2.157 2.157 90 006.498 13.668 1.941 1.941 90 006.687 13.515Q6.984 13.245 7.164 12.858A2.289 2.289 90 007.338 12.279 2.826 2.826 90 007.371 11.988Z" />
+</svg>
diff --git a/symbols/au/nsw/signs/stop_position/4H.svg b/symbols/au/nsw/signs/stop_position/4H.svg
@@ -0,0 +1,4 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="10" height="15" viewBox="0 0 10 15">
+  <rect fill="#00f" stroke="#fff" stroke-width=".4" width="9.6" height="14.6" ry="1" x=".2" y=".2"/>
+  <path fill="#fff" d="M5.306 4.52V2.144l-.117.21L3.8 4.52H5.306Zm1.965 0v.99H6.53V6.899H5.306V5.51H2.648L2.6 4.745 5.288.5H6.53V4.52h.741ZM5.936 13.899H7.157V7.5H5.936v2.625H4.127V7.5H2.9v6.399H4.127V11.124H5.936v2.775Z" />
+</svg>
