From 77bd1a8770cdbe8c8ba607e1d6b403f41a359b2b Mon Sep 17 00:00:00 2001
From: izawartka <59137928+izawartka@users.noreply.github.com>
Date: Thu, 24 Jul 2025 23:56:51 +0200
Subject: [PATCH] Fixed W9, W14 and W15 signs

+Added a definition and an icon for sign_w9_v2 sign
*Fixed some one-sided W9 signs being incorrectly parsed as double-sided
*Fixed some one-sided W14 signs being incorrectly parsed as double-sided
*Fixed W15 signs sometimes having the arrow pointing in the wrong direction
---
 public/assets/signs/w9_both.svg | 12 ++++++++++++
 src/model/defs/defined-signs.js | 33 +++++++++++++++++++++++++++------
 2 files changed, 39 insertions(+), 6 deletions(-)
 create mode 100644 public/assets/signs/w9_both.svg

diff --git a/public/assets/signs/w9_both.svg b/public/assets/signs/w9_both.svg
new file mode 100644
index 0000000..a229974
--- /dev/null
+++ b/public/assets/signs/w9_both.svg
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="100mm" height="296mm" version="1.1" viewBox="0 0 100 296" xmlns="http://www.w3.org/2000/svg">
+ <path d="m38 68c-6.5788 0-12 5.4212-12 12v44c0 6.5788 5.4212 12 12 12h24c6.5788 0 12-5.4212 12-12v-44c0-6.5788-5.4212-12-12-12zm0 8h24c2.2852 0 4 1.7148 4 4v44c0 2.2852-1.7148 4-4 4h-24c-2.2852 0-4-1.7148-4-4v-44c0-2.2852 1.7148-4 4-4z" stop-color="#000000"/>
+ <path d="m38 160c-6.5788 0-12 5.4212-12 12v44c0 6.5788 5.4212 12 12 12h24c6.5788 0 12-5.4212 12-12v-44c0-6.5788-5.4212-12-12-12zm0 8h24c2.2852 0 4 1.7148 4 4v44c0 2.2852-1.7148 4-4 4h-24c-2.2852 0-4-1.7148-4-4v-44c0-2.2852 1.7148-4 4-4z" stop-color="#000000"/>
+ <path d="m64.803 132.24a3 3 0 0 1-3.6934-2.0859l-11.131-40.029-11.092 39.338a3 3 0 0 1-3.7012 2.0742 3 3 0 0 1-2.0723-3.7012l14-49.65a3.0003 3.0003 0 0 1 5.7773 0.0117l14 50.35a3 3 0 0 1-2.0879 3.6934z" stop-color="#000000"/>
+ <path d="m64.803 163.76a3 3 0 0 0-3.6934 2.0859l-11.131 40.029-11.092-39.338a3 3 0 0 0-3.7012-2.0742 3 3 0 0 0-2.0723 3.7031l14 49.648a3.0003 3.0003 0 0 0 5.7773-0.0117l14-50.35a3 3 0 0 0-2.0879-3.6934z" stop-color="#000000"/>
+ <path d="m50 130c-2.2091 0-4 1.7909-4 4v28c0 2.2091 1.7909 4 4 4s4-1.7909 4-4v-28c0-2.2091-1.7909-4-4-4z" color="#000000"/>
+ <path d="m38 8c-6.5788 0-12 5.4212-12 12v44c0 6.5788 5.4212 12 12 12h24c6.5788 0 12-5.4212 12-12v-44c0-6.5788-5.4212-12-12-12zm0 8h24c2.2852 0 4 1.7148 4 4v44c0 2.2852-1.7148 4-4 4h-24c-2.2852 0-4-1.7148-4-4v-44c0-2.2852 1.7148-4 4-4z" stop-color="#000000"/>
+ <path d="m64.803 11.76a3 3 0 0 0-3.6934 2.0859l-11.131 40.029-11.092-39.338a3 3 0 0 0-3.7012-2.0742 3 3 0 0 0-2.0723 3.7012l14 49.65a3.0003 3.0003 0 0 0 5.7773-0.0117l14-50.35a3 3 0 0 0-2.0879-3.6934z" stop-color="#000000"/>
+ <path d="m38 220c-6.5788 0-12 5.4212-12 12v44c0 6.5788 5.4212 12 12 12h24c6.5788 0 12-5.4212 12-12v-44c0-6.5788-5.4212-12-12-12zm0 8h24c2.2852 0 4 1.7148 4 4v44c0 2.2852-1.7148 4-4 4h-24c-2.2852 0-4-1.7148-4-4v-44c0-2.2852 1.7148-4 4-4z" stop-color="#000000"/>
+ <path d="m64.803 284.24a3 3 0 0 1-3.6934-2.0859l-11.131-40.029-11.092 39.338a3 3 0 0 1-3.7012 2.0742 3 3 0 0 1-2.0723-3.7031l14-49.648a3.0003 3.0003 0 0 1 5.7773 0.0117l14 50.35a3 3 0 0 1-2.0879 3.6934z" stop-color="#000000"/>
+</svg>
diff --git a/src/model/defs/defined-signs.js b/src/model/defs/defined-signs.js
index d0b2687..1b60307 100644
--- a/src/model/defs/defined-signs.js
+++ b/src/model/defs/defined-signs.js
@@ -169,15 +169,26 @@ const DefinedSigns = {
         "offsetY": -2.01096,
         "height": 1.4
     },
-    "w14a_oneside": { alias: "w9_oneside" },
-    "w14b_oneside": { alias: "w9b_oneside" },
-    "w14": { alias: "w9" },
-    "w15_p": {
+    "w14a_oneside": { 
+        "pattern": /^(?:w14(?:_niski)?_(?:v1|v2)(?:_.*)?|sign_w14a_oneside)$/,
+        "alias": "w9a_oneside"
+    },
+    "w14b_oneside": {
+        "pattern": /^(?:w14(?:_niski)?_(?:v3|v4)(?:_.*)?|sign_w14b_oneside)$/,
+        "alias": "w9b_oneside"
+    },
+    "w14": {
+        "pattern": /^sign_w14$/,
+        "alias": "w9"
+    },
+    "w15_r": {
+        "pattern": /^(?:w15_l(?:_.*)?|sign_w15_p)$/,
         "name": "W15 Right",
         "icon": "w15_r.svg",
         "offsetY": -1.4364,
     },
     "w15_l": {
+        "pattern": /^(?:w15_p(?:_.*)?|sign_w15_l)$/,
         "name": "W15 Left",
         "icon": "w15_l.svg",
         "offsetY": -1.4364
@@ -270,17 +281,27 @@ const DefinedSigns = {
         "textOffsetX": 1.89,
         "textOffsetY": 0.9
     },
-    "w9a_oneside": {
+    "w9_both": {
+        "pattern": /^sign_w9_v2$/,
         "name": "W9",
+        "icon": "w9_both.svg",
+        "offsetY": -3.7044,
+        "height": 2.96
+    },
+    "w9a_oneside": {
+        "pattern": /^(?:w9(?:_niski)?_(?:v1|v2)(?:_.*)?|sign_w9a_oneside)$/,
+        "name": "W9a",
         "icon": "w9a.svg",
         "offsetY": -1.4364
     },
     "w9b_oneside": {
-        "name": "W9",
+        "pattern": /^(?:w9(?:_niski)?_(?:v3|v4)(?:_.*)?|sign_w9b_oneside)$/,
+        "name": "W9b",
         "icon": "w9b.svg",
         "offsetY": -1.4364
     },
     "w9": {
+        "pattern": /^sign_w9$/,
         "name": "W9",
         "icon": "w9.svg",
         "offsetY": -2.528064,