From 8dc2477a77faeeb34cdaa0448d50afe7a82a0568 Mon Sep 17 00:00:00 2001 From: Hidde Wieringa Date: Sat, 30 Nov 2024 14:59:52 +0100 Subject: [PATCH] speed limits: sign / light --- features/speed_railway_signals.yaml | 40 ++++++++++++------- symbols/nl/282-40.svg | 9 +++++ symbols/nl/282.svg | 9 ----- symbols/nl/282a-40.svg | 8 ++++ symbols/nl/282a.svg | 8 ---- symbols/nl/313-80.svg | 5 +++ symbols/nl/313-empty.svg | 5 +++ symbols/nl/314-70.svg | 5 +++ symbols/nl/314-empty.svg | 5 +++ symbols/nl/316-130.svg | 6 +++ symbols/nl/316-empty.svg | 5 +++ symbols/nl/speed_limit_light-60.svg | 20 ++++++++++ symbols/nl/speed_limit_light-80.svg | 21 ++++++++++ symbols/nl/speed_limit_light-empty.svg | 14 +++++++ symbols/nl/speed_limit_light.svg | 53 -------------------------- 15 files changed, 129 insertions(+), 84 deletions(-) create mode 100644 symbols/nl/282-40.svg delete mode 100644 symbols/nl/282.svg create mode 100644 symbols/nl/282a-40.svg delete mode 100644 symbols/nl/282a.svg create mode 100644 symbols/nl/313-80.svg create mode 100644 symbols/nl/313-empty.svg create mode 100644 symbols/nl/314-70.svg create mode 100644 symbols/nl/314-empty.svg create mode 100644 symbols/nl/316-130.svg create mode 100644 symbols/nl/316-empty.svg create mode 100644 symbols/nl/speed_limit_light-60.svg create mode 100644 symbols/nl/speed_limit_light-80.svg create mode 100644 symbols/nl/speed_limit_light-empty.svg delete mode 100644 symbols/nl/speed_limit_light.svg diff --git a/features/speed_railway_signals.yaml b/features/speed_railway_signals.yaml index 1512fe58..954546ae 100644 --- 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 new file mode 100644 index 00000000..5bea1118 --- /dev/null +++ b/symbols/nl/282-40.svg @@ -0,0 +1,9 @@ + + + + + + + + + diff --git a/symbols/nl/282.svg b/symbols/nl/282.svg deleted file mode 100644 index 0e3958d7..00000000 --- a/symbols/nl/282.svg +++ /dev/null @@ -1,9 +0,0 @@ - - - - - - - - - diff --git a/symbols/nl/282a-40.svg b/symbols/nl/282a-40.svg new file mode 100644 index 00000000..f7598874 --- /dev/null +++ b/symbols/nl/282a-40.svg @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/symbols/nl/282a.svg b/symbols/nl/282a.svg deleted file mode 100644 index 14dc6030..00000000 --- a/symbols/nl/282a.svg +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - diff --git a/symbols/nl/313-80.svg b/symbols/nl/313-80.svg new file mode 100644 index 00000000..7b943b76 --- /dev/null +++ b/symbols/nl/313-80.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/symbols/nl/313-empty.svg b/symbols/nl/313-empty.svg new file mode 100644 index 00000000..98073d8f --- /dev/null +++ b/symbols/nl/313-empty.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/symbols/nl/314-70.svg b/symbols/nl/314-70.svg new file mode 100644 index 00000000..8442bd6d --- /dev/null +++ b/symbols/nl/314-70.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/symbols/nl/314-empty.svg b/symbols/nl/314-empty.svg new file mode 100644 index 00000000..52521f54 --- /dev/null +++ b/symbols/nl/314-empty.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/symbols/nl/316-130.svg b/symbols/nl/316-130.svg new file mode 100644 index 00000000..b38c28d7 --- /dev/null +++ b/symbols/nl/316-130.svg @@ -0,0 +1,6 @@ + + + + + + diff --git a/symbols/nl/316-empty.svg b/symbols/nl/316-empty.svg new file mode 100644 index 00000000..0f32853f --- /dev/null +++ b/symbols/nl/316-empty.svg @@ -0,0 +1,5 @@ + + + + + diff --git a/symbols/nl/speed_limit_light-60.svg b/symbols/nl/speed_limit_light-60.svg new file mode 100644 index 00000000..680ed152 --- /dev/null +++ b/symbols/nl/speed_limit_light-60.svg @@ -0,0 +1,20 @@ + + + + + + + + + + + + + + + + + + + + diff --git a/symbols/nl/speed_limit_light-80.svg b/symbols/nl/speed_limit_light-80.svg new file mode 100644 index 00000000..221dd8e3 --- /dev/null +++ b/symbols/nl/speed_limit_light-80.svg @@ -0,0 +1,21 @@ + + + + + + + + + + + + + + + + + + + + + diff --git a/symbols/nl/speed_limit_light-empty.svg b/symbols/nl/speed_limit_light-empty.svg new file mode 100644 index 00000000..67a8bbcd --- /dev/null +++ b/symbols/nl/speed_limit_light-empty.svg @@ -0,0 +1,14 @@ + + + + + + + + + + + + + + diff --git a/symbols/nl/speed_limit_light.svg b/symbols/nl/speed_limit_light.svg deleted file mode 100644 index cfdd6397..00000000 --- a/symbols/nl/speed_limit_light.svg +++ /dev/null @@ -1,53 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -