use the new icon composition system for AU

k-yle · k-yle · commit ef29fb913368 · 2025-11-28T23:35:30.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
@@ -1177,16 +1273,44 @@ features:
       - 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:
           - { 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
+    exampleIcon: 'au/nsw/signs/stop_position/unknown'
     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
@@ -20,7 +20,9 @@ const requireUniqueEntries = array => {
   const count = Object.groupBy(array, it => it[0]);
   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}`);
+    if (offendingEntries) {
+      throw new Error(`entries must be unique, offending entries: ${offendingEntries}`);
+    }
   }
   return Object.fromEntries(array);
 }
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>

Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,9 @@ const requireUniqueEntries = array => {`
`20`	`20`	`const count = Object.groupBy(array, it => it[0]);`
`21`	`21`	`if (Object.values(count).some(it => it.length > 1)) {`
`22`	`22`	`const offendingEntries = Object.entries(count).filter(it => it[1].length > 1).map(it => it[0]).join(', ');`
`23`		- throw new Error(`entries must be unique, offending entries: ${offendingEntries}`);
	`23`	`+ if (offendingEntries) {`
	`24`	+ throw new Error(`entries must be unique, offending entries: ${offendingEntries}`);
	`25`	`+ }`
`24`	`26`	`}`
`25`	`27`	`return Object.fromEntries(array);`
`26`	`28`	`}`