diff --git a/features/signals_railway_signals.yaml b/features/signals_railway_signals.yaml index 92b9af17..3c16e46d 100644 --- a/features/signals_railway_signals.yaml +++ b/features/signals_railway_signals.yaml @@ -72,6 +72,7 @@ signals_railway_signals: - 'railway:signal:steam_locomotive' - 'railway:signal:steam_locomotive:form' - 'railway:signal:stop:form' + - 'railway:signal:stop:carriages' - 'railway:signal:stop_demand' - 'railway:signal:stop_demand:form' - 'railway:signal:train_protection' @@ -1298,8 +1299,28 @@ signals_railway_signals: - description: treinlengtebord country: NL - # TODO implement train length values - icon: { default: 'nl/304-empty' } + # TODO implement partial platform train length values (railway:signal:stop:carriages_partial_platform=*) + icon: + match: 'railway:signal:stop:carriages' + cases: + # Free match to allow matching multiple values on a single sign, separated by ; + - { regex: '18', value: 'nl/304-18' } + - { regex: '16', value: 'nl/304-16' } + - { regex: '15', value: 'nl/304-15' } + - { regex: '14', value: 'nl/304-14' } + - { regex: '13', value: 'nl/304-13' } + - { regex: '12', value: 'nl/304-12' } + - { regex: '11', value: 'nl/304-11' } + - { regex: '10', value: 'nl/304-10' } + - { regex: '9', value: 'nl/304-9' } + - { regex: '8', value: 'nl/304-8' } + - { regex: '7', value: 'nl/304-7' } + - { regex: '6', value: 'nl/304-6' } + - { regex: '5', value: 'nl/304-5' } + - { regex: '4', value: 'nl/304-4' } + - { regex: '3', value: 'nl/304-3' } + - { regex: '2', value: 'nl/304-2' } + default: 'nl/304-empty' tags: - { tag: 'railway:signal:stop', value: 'NL:304' } - { tag: 'railway:signal:stop:form', value: 'sign' } diff --git a/features/speed_railway_signals.yaml b/features/speed_railway_signals.yaml index e1351189..05f92c35 100644 --- a/features/speed_railway_signals.yaml +++ b/features/speed_railway_signals.yaml @@ -690,7 +690,7 @@ speed_railway_signals: icon: match: 'railway:signal:speed_limit_distant:speed' cases: - - { regex: '^[1-9]0|1[0-9]0$', value: 'nl/313-{}', example: 'nl/313-80' } + - { regex: '^[1-9]0|1[0-4]0|125$', value: 'nl/313-{}', example: 'nl/313-80' } default: 'nl/313-empty' tags: - { tag: 'railway:signal:speed_limit_distant', value: 'NL:313' } @@ -702,7 +702,7 @@ speed_railway_signals: icon: match: 'railway:signal:speed_limit:speed' cases: - - { regex: '^[1-9]0|1[0-9]0$', value: 'nl/314-{}', example: 'nl/314-70' } + - { regex: '^[1-9]0|1[0-46]0|[12]5|125$', value: 'nl/314-{}', example: 'nl/314-70' } default: 'nl/314-empty' tags: - { tag: 'railway:signal:speed_limit', value: 'NL:314' } @@ -714,7 +714,7 @@ speed_railway_signals: icon: match: 'railway:signal:speed_limit:speed' cases: - - { regex: '^[1-9]0|1[0-9]0$', value: 'nl/316-{}', example: 'nl/316-130' } + - { regex: '^[3-9]0|1[0-46]0|125$', value: 'nl/316-{}', example: 'nl/316-130' } default: 'nl/316-empty' tags: - { tag: 'railway:signal:speed_limit', value: 'NL:316' } diff --git a/symbols/nl/304-10.svg b/symbols/nl/304-10.svg new file mode 100644 index 00000000..a61a1752 --- /dev/null +++ b/symbols/nl/304-10.svg @@ -0,0 +1,7 @@ + + + + + + + diff --git a/symbols/nl/304-11.svg b/symbols/nl/304-11.svg new file mode 100644 index 00000000..f8625533 --- /dev/null +++ b/symbols/nl/304-11.svg @@ -0,0 +1,7 @@ + + + + + + + diff --git a/symbols/nl/304-12.svg b/symbols/nl/304-12.svg new file mode 100644 index 00000000..f85bb0be --- /dev/null +++ b/symbols/nl/304-12.svg @@ -0,0 +1,7 @@ + + + + + + + diff --git a/symbols/nl/304-13.svg b/symbols/nl/304-13.svg new file mode 100644 index 00000000..2ad00452 --- /dev/null +++ b/symbols/nl/304-13.svg @@ -0,0 +1,7 @@ + + + + + + + diff --git a/symbols/nl/304-14.svg b/symbols/nl/304-14.svg new file mode 100644 index 00000000..998f6c33 --- /dev/null +++ b/symbols/nl/304-14.svg @@ -0,0 +1,7 @@ + + + + + + + diff --git a/symbols/nl/304-15.svg b/symbols/nl/304-15.svg new file mode 100644 index 00000000..d2df6427 --- /dev/null +++ b/symbols/nl/304-15.svg @@ -0,0 +1,7 @@ + + + + + + + diff --git a/symbols/nl/304-16.svg b/symbols/nl/304-16.svg new file mode 100644 index 00000000..0b1540cb --- /dev/null +++ b/symbols/nl/304-16.svg @@ -0,0 +1,7 @@ + + + + + + + diff --git a/symbols/nl/304-18.svg b/symbols/nl/304-18.svg new file mode 100644 index 00000000..9f4a233a --- /dev/null +++ b/symbols/nl/304-18.svg @@ -0,0 +1,7 @@ + + + + + + + diff --git a/symbols/nl/304-2.svg b/symbols/nl/304-2.svg new file mode 100644 index 00000000..f3759070 --- /dev/null +++ b/symbols/nl/304-2.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/symbols/nl/304-3.svg b/symbols/nl/304-3.svg new file mode 100644 index 00000000..a5d272ba --- /dev/null +++ b/symbols/nl/304-3.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/symbols/nl/304-4.svg b/symbols/nl/304-4.svg new file mode 100644 index 00000000..604d4bd8 --- /dev/null +++ b/symbols/nl/304-4.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/symbols/nl/304-5.svg b/symbols/nl/304-5.svg new file mode 100644 index 00000000..b3f5846c --- /dev/null +++ b/symbols/nl/304-5.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/symbols/nl/304-6.svg b/symbols/nl/304-6.svg new file mode 100644 index 00000000..6cb39157 --- /dev/null +++ b/symbols/nl/304-6.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/symbols/nl/304-7.svg b/symbols/nl/304-7.svg new file mode 100644 index 00000000..d46939ec --- /dev/null +++ b/symbols/nl/304-7.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/symbols/nl/304-8.svg b/symbols/nl/304-8.svg new file mode 100644 index 00000000..e46426dd --- /dev/null +++ b/symbols/nl/304-8.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/symbols/nl/304-9.svg b/symbols/nl/304-9.svg new file mode 100644 index 00000000..ab716bc2 --- /dev/null +++ b/symbols/nl/304-9.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/symbols/nl/304-empty.svg b/symbols/nl/304-empty.svg index bf93f2c7..296050a8 100644 --- a/symbols/nl/304-empty.svg +++ b/symbols/nl/304-empty.svg @@ -1,5 +1,5 @@ - - - + + + diff --git a/symbols/nl/313-10.svg b/symbols/nl/313-10.svg new file mode 100644 index 00000000..bc2cfed5 --- /dev/null +++ b/symbols/nl/313-10.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/symbols/nl/313-100.svg b/symbols/nl/313-100.svg new file mode 100644 index 00000000..40724b59 --- /dev/null +++ b/symbols/nl/313-100.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/symbols/nl/313-110.svg b/symbols/nl/313-110.svg new file mode 100644 index 00000000..a4c644ac --- /dev/null +++ b/symbols/nl/313-110.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/symbols/nl/313-120.svg b/symbols/nl/313-120.svg new file mode 100644 index 00000000..e0ca0ae3 --- /dev/null +++ b/symbols/nl/313-120.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/symbols/nl/313-125.svg b/symbols/nl/313-125.svg new file mode 100644 index 00000000..fded7d9b --- /dev/null +++ b/symbols/nl/313-125.svg @@ -0,0 +1,7 @@ + + + + + + + diff --git a/symbols/nl/313-130.svg b/symbols/nl/313-130.svg new file mode 100644 index 00000000..5e488333 --- /dev/null +++ b/symbols/nl/313-130.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/symbols/nl/313-140.svg b/symbols/nl/313-140.svg new file mode 100644 index 00000000..dd43dbeb --- /dev/null +++ b/symbols/nl/313-140.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/symbols/nl/313-20.svg b/symbols/nl/313-20.svg new file mode 100644 index 00000000..3b421789 --- /dev/null +++ b/symbols/nl/313-20.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/symbols/nl/313-30.svg b/symbols/nl/313-30.svg new file mode 100644 index 00000000..6f2808f1 --- /dev/null +++ b/symbols/nl/313-30.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/symbols/nl/313-40.svg b/symbols/nl/313-40.svg new file mode 100644 index 00000000..c4dd7e7b --- /dev/null +++ b/symbols/nl/313-40.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/symbols/nl/313-50.svg b/symbols/nl/313-50.svg new file mode 100644 index 00000000..d0378669 --- /dev/null +++ b/symbols/nl/313-50.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/symbols/nl/313-60.svg b/symbols/nl/313-60.svg new file mode 100644 index 00000000..6f92bd7f --- /dev/null +++ b/symbols/nl/313-60.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/symbols/nl/313-70.svg b/symbols/nl/313-70.svg new file mode 100644 index 00000000..84622ff9 --- /dev/null +++ b/symbols/nl/313-70.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/symbols/nl/313-90.svg b/symbols/nl/313-90.svg new file mode 100644 index 00000000..01a2af0e --- /dev/null +++ b/symbols/nl/313-90.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/symbols/nl/314-10.svg b/symbols/nl/314-10.svg new file mode 100644 index 00000000..e428d7c3 --- /dev/null +++ b/symbols/nl/314-10.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/symbols/nl/314-100.svg b/symbols/nl/314-100.svg new file mode 100644 index 00000000..e5d9a72a --- /dev/null +++ b/symbols/nl/314-100.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/symbols/nl/314-110.svg b/symbols/nl/314-110.svg new file mode 100644 index 00000000..263dc333 --- /dev/null +++ b/symbols/nl/314-110.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/symbols/nl/314-120.svg b/symbols/nl/314-120.svg new file mode 100644 index 00000000..cd0291ef --- /dev/null +++ b/symbols/nl/314-120.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/symbols/nl/314-125.svg b/symbols/nl/314-125.svg new file mode 100644 index 00000000..3f045b03 --- /dev/null +++ b/symbols/nl/314-125.svg @@ -0,0 +1,7 @@ + + + + + + + diff --git a/symbols/nl/314-130.svg b/symbols/nl/314-130.svg new file mode 100644 index 00000000..a8770bf9 --- /dev/null +++ b/symbols/nl/314-130.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/symbols/nl/314-140.svg b/symbols/nl/314-140.svg new file mode 100644 index 00000000..2bccf071 --- /dev/null +++ b/symbols/nl/314-140.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/symbols/nl/314-15.svg b/symbols/nl/314-15.svg new file mode 100644 index 00000000..5c7d12ef --- /dev/null +++ b/symbols/nl/314-15.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/symbols/nl/314-160.svg b/symbols/nl/314-160.svg new file mode 100644 index 00000000..889910b8 --- /dev/null +++ b/symbols/nl/314-160.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/symbols/nl/314-20.svg b/symbols/nl/314-20.svg new file mode 100644 index 00000000..ae2c9ddc --- /dev/null +++ b/symbols/nl/314-20.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/symbols/nl/314-25.svg b/symbols/nl/314-25.svg new file mode 100644 index 00000000..b37c9e35 --- /dev/null +++ b/symbols/nl/314-25.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/symbols/nl/314-30.svg b/symbols/nl/314-30.svg new file mode 100644 index 00000000..282a87db --- /dev/null +++ b/symbols/nl/314-30.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/symbols/nl/314-40.svg b/symbols/nl/314-40.svg new file mode 100644 index 00000000..1ce30696 --- /dev/null +++ b/symbols/nl/314-40.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/symbols/nl/314-50.svg b/symbols/nl/314-50.svg new file mode 100644 index 00000000..f4293bf4 --- /dev/null +++ b/symbols/nl/314-50.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/symbols/nl/314-60.svg b/symbols/nl/314-60.svg new file mode 100644 index 00000000..21f4899d --- /dev/null +++ b/symbols/nl/314-60.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/symbols/nl/314-70.svg b/symbols/nl/314-70.svg index 8442bd6d..6846140e 100644 --- a/symbols/nl/314-70.svg +++ b/symbols/nl/314-70.svg @@ -1,5 +1,5 @@ - - - + + + diff --git a/symbols/nl/314-80.svg b/symbols/nl/314-80.svg new file mode 100644 index 00000000..0e8d1c11 --- /dev/null +++ b/symbols/nl/314-80.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/symbols/nl/314-90.svg b/symbols/nl/314-90.svg new file mode 100644 index 00000000..480ca21e --- /dev/null +++ b/symbols/nl/314-90.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/symbols/nl/314-empty.svg b/symbols/nl/314-empty.svg index 52521f54..9a5d47e9 100644 --- a/symbols/nl/314-empty.svg +++ b/symbols/nl/314-empty.svg @@ -1,5 +1,5 @@ - - + + diff --git a/symbols/nl/316-100.svg b/symbols/nl/316-100.svg new file mode 100644 index 00000000..04f72fa3 --- /dev/null +++ b/symbols/nl/316-100.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/symbols/nl/316-110.svg b/symbols/nl/316-110.svg new file mode 100644 index 00000000..1f5cd144 --- /dev/null +++ b/symbols/nl/316-110.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/symbols/nl/316-120.svg b/symbols/nl/316-120.svg new file mode 100644 index 00000000..93c582c9 --- /dev/null +++ b/symbols/nl/316-120.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/symbols/nl/316-125.svg b/symbols/nl/316-125.svg new file mode 100644 index 00000000..ac87c9a8 --- /dev/null +++ b/symbols/nl/316-125.svg @@ -0,0 +1,7 @@ + + + + + + + diff --git a/symbols/nl/316-130.svg b/symbols/nl/316-130.svg index b38c28d7..cb25a703 100644 --- a/symbols/nl/316-130.svg +++ b/symbols/nl/316-130.svg @@ -1,6 +1,6 @@ - - - + + + diff --git a/symbols/nl/316-140.svg b/symbols/nl/316-140.svg new file mode 100644 index 00000000..4807a682 --- /dev/null +++ b/symbols/nl/316-140.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/symbols/nl/316-160.svg b/symbols/nl/316-160.svg new file mode 100644 index 00000000..06e8d235 --- /dev/null +++ b/symbols/nl/316-160.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/symbols/nl/316-30.svg b/symbols/nl/316-30.svg new file mode 100644 index 00000000..f0145e9c --- /dev/null +++ b/symbols/nl/316-30.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/symbols/nl/316-40.svg b/symbols/nl/316-40.svg new file mode 100644 index 00000000..68b20d06 --- /dev/null +++ b/symbols/nl/316-40.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/symbols/nl/316-50.svg b/symbols/nl/316-50.svg new file mode 100644 index 00000000..d4bc672b --- /dev/null +++ b/symbols/nl/316-50.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/symbols/nl/316-60.svg b/symbols/nl/316-60.svg new file mode 100644 index 00000000..7e30fcde --- /dev/null +++ b/symbols/nl/316-60.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/symbols/nl/316-70.svg b/symbols/nl/316-70.svg new file mode 100644 index 00000000..c83b718c --- /dev/null +++ b/symbols/nl/316-70.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/symbols/nl/316-80.svg b/symbols/nl/316-80.svg new file mode 100644 index 00000000..3c75ec8f --- /dev/null +++ b/symbols/nl/316-80.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/symbols/nl/316-90.svg b/symbols/nl/316-90.svg new file mode 100644 index 00000000..1d9c7d0b --- /dev/null +++ b/symbols/nl/316-90.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/symbols/nl/316-empty.svg b/symbols/nl/316-empty.svg index 0f32853f..64269189 100644 --- a/symbols/nl/316-empty.svg +++ b/symbols/nl/316-empty.svg @@ -1,5 +1,5 @@ - - - + + +