From 2e38241fb315bfb71831c3303132141d140b7bfc Mon Sep 17 00:00:00 2001
From: izawartka <59137928+izawartka@users.noreply.github.com>
Date: Wed, 11 Jun 2025 10:55:07 +0200
Subject: [PATCH] Added W6 signs defs

+Added definitions and icons for signs: W6, W6a, W6b
+Added an option to use non-square sign icons
*Imrpoved W5 sign icon
---
 public/assets/signs/w5.svg                    |   6 +-
 public/assets/signs/w6.svg                    | 152 ++++++++++++++++++
 public/assets/signs/w6a.svg                   |  10 ++
 public/assets/signs/w6b.svg                   |  14 ++
 .../map/object-renderers/SignRenderer.js      |   6 +-
 src/model/defined-signs.js                    |  18 ++-
 6 files changed, 199 insertions(+), 7 deletions(-)
 create mode 100644 public/assets/signs/w6.svg
 create mode 100644 public/assets/signs/w6a.svg
 create mode 100644 public/assets/signs/w6b.svg

diff --git a/public/assets/signs/w5.svg b/public/assets/signs/w5.svg
index 8955e2e..77a5a07 100644
--- a/public/assets/signs/w5.svg
+++ b/public/assets/signs/w5.svg
@@ -1,7 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <svg width="100mm" height="100mm" version="1.1" viewBox="0 0 100 100" xmlns="http://www.w3.org/2000/svg">
- <g>
-  <path d="m50 8c-18.73 0-34 15.27-34 34v4h68v-4c0-18.73-15.27-34-34-34zm0 8c13.036 0 23.675 9.5208 25.6 22h-51.199c1.9247-12.479 12.564-22 25.6-22z" color="#000000" fill-rule="evenodd" style="-inkscape-stroke:none"/>
-  <path d="m50 39a4 4 0 0 0-4 4v45a4 4 0 0 0 4 4 4 4 0 0 0 4-4v-45a4 4 0 0 0-4-4z" color="#000000"/>
- </g>
+ <path d="m50 39a4 4 0 0 0-4 4v45a4 4 0 0 0 4 4 4 4 0 0 0 4-4v-45a4 4 0 0 0-4-4z" color="#000000"/>
+ <path d="m50 6c-17.905 0-32.653 13.932-33.912 31.545-0.25157 3.5195 2.7195 6.4551 6.084 6.4551h55.963c3.1937 0 6.0048-2.7781 5.8008-6.1074-1.089-17.774-15.913-31.893-33.936-31.893zm0 8c12.498 0 22.768 8.7764 25.294 20.486 0.17933 0.83142-0.40907 1.5143-1.2597 1.5143h-47.991c-0.89546 0-1.515-0.71892-1.3235-1.5935 2.5553-11.668 12.811-20.406 25.28-20.406z" stop-color="#000000"/>
 </svg>
diff --git a/public/assets/signs/w6.svg b/public/assets/signs/w6.svg
new file mode 100644
index 0000000..8dd35da
--- /dev/null
+++ b/public/assets/signs/w6.svg
@@ -0,0 +1,152 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   width="100mm"
+   height="100mm"
+   version="1.1"
+   viewBox="0 0 100 100"
+   id="svg2"
+   sodipodi:docname="w6.svg"
+   inkscape:version="1.4.2 (f4327f4, 2025-05-13)"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg">
+  <defs
+     id="defs2">
+    <inkscape:path-effect
+       effect="fillet_chamfer"
+       id="path-effect9"
+       is_visible="true"
+       lpeversion="1"
+       nodesatellites_param="F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 | F,0,0,1,0,1.6732528,0,1 @ F,0,0,1,0,1.562184,0,1 @ F,0,0,1,0,1.6501666,0,1"
+       radius="0"
+       unit="px"
+       method="auto"
+       mode="F"
+       chamfer_steps="1"
+       flexible="false"
+       use_knot_distance="true"
+       apply_no_radius="true"
+       apply_with_radius="true"
+       only_selected="false"
+       hide_knots="false" />
+    <inkscape:path-effect
+       effect="fillet_chamfer"
+       id="path-effect8"
+       is_visible="true"
+       lpeversion="1"
+       nodesatellites_param="F,0,0,1,0,3.314746,0,1 @ F,0,0,1,0,3.3331526,0,1 @ F,0,0,1,0,3.0335304,0,1"
+       radius="0"
+       unit="px"
+       method="auto"
+       mode="F"
+       chamfer_steps="1"
+       flexible="false"
+       use_knot_distance="true"
+       apply_no_radius="true"
+       apply_with_radius="true"
+       only_selected="false"
+       hide_knots="false" />
+    <inkscape:path-effect
+       effect="fillet_chamfer"
+       id="path-effect6"
+       is_visible="true"
+       lpeversion="1"
+       nodesatellites_param="F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1"
+       radius="0"
+       unit="px"
+       method="auto"
+       mode="F"
+       chamfer_steps="1"
+       flexible="false"
+       use_knot_distance="true"
+       apply_no_radius="true"
+       apply_with_radius="true"
+       only_selected="false"
+       hide_knots="false" />
+    <inkscape:path-effect
+       effect="fillet_chamfer"
+       id="path-effect5"
+       is_visible="true"
+       lpeversion="1"
+       nodesatellites_param="F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,1,1,0,4.0046584,0,1 @ F,0,0,1,0,4,0,1 @ F,0,0,1,0,0,0,1 | F,0,0,1,0,0,0,1 @ F,0,0,1,0,4.0046584,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1"
+       radius="0"
+       unit="px"
+       method="auto"
+       mode="F"
+       chamfer_steps="1"
+       flexible="false"
+       use_knot_distance="true"
+       apply_no_radius="true"
+       apply_with_radius="true"
+       only_selected="false"
+       hide_knots="false" />
+    <inkscape:path-effect
+       effect="fillet_chamfer"
+       id="path-effect4"
+       is_visible="true"
+       lpeversion="1"
+       nodesatellites_param="F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 | F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1"
+       radius="0"
+       unit="px"
+       method="auto"
+       mode="F"
+       chamfer_steps="1"
+       flexible="false"
+       use_knot_distance="true"
+       apply_no_radius="true"
+       apply_with_radius="true"
+       only_selected="false"
+       hide_knots="false" />
+    <inkscape:path-effect
+       effect="fillet_chamfer"
+       id="path-effect3"
+       is_visible="true"
+       lpeversion="1"
+       nodesatellites_param="F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 | F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1 @ F,0,0,1,0,0,0,1"
+       radius="0"
+       unit="px"
+       method="auto"
+       mode="F"
+       chamfer_steps="1"
+       flexible="false"
+       use_knot_distance="true"
+       apply_no_radius="true"
+       apply_with_radius="true"
+       only_selected="false"
+       hide_knots="false" />
+  </defs>
+  <sodipodi:namedview
+     id="namedview2"
+     pagecolor="#ffffff"
+     bordercolor="#000000"
+     borderopacity="0.25"
+     inkscape:showpageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     inkscape:deskcolor="#d1d1d1"
+     inkscape:document-units="mm"
+     inkscape:zoom="1.887257"
+     inkscape:cx="256.98673"
+     inkscape:cy="160.28554"
+     inkscape:window-width="1920"
+     inkscape:window-height="1009"
+     inkscape:window-x="-8"
+     inkscape:window-y="-8"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg2" />
+  <g
+     id="g2">
+    <path
+       d="m 50,43 c -2.209139,0 -4,1.790861 -4,4 v 41 c 0,2.209139 1.790861,4 4,4 2.209139,0 4,-1.790861 4,-4 V 47 c 0,-2.209139 -1.790861,-4 -4,-4 z"
+       color="#000000"
+       id="path2"
+       sodipodi:nodetypes="sssssss" />
+  </g>
+  <path
+     style="baseline-shift:baseline;display:inline;overflow:visible;opacity:1;vector-effect:none;enable-background:accumulate;stop-color:#000000;stop-opacity:1"
+     d="m 50,7.6347656 c -1.911691,0 -3.822822,0.8351534 -5.017578,2.5078124 L 23.681641,39.962891 C 21.118752,43.550934 23.924625,49 28.333984,49 h 43.351563 c 4.401655,0 7.200988,-5.43971 4.642578,-9.021484 L 55.017578,10.142578 C 53.822822,8.469919 51.911691,7.6347656 50,7.6347656 Z M 50.972631,18.244342 66.320447,39.728847 A 0.80387487,0.80387487 117.22962 0 1 65.666332,41 H 34.421651 A 0.8491493,0.8491493 62.770375 0 1 33.730696,39.657256 L 49.027369,18.244342 a 1.1953161,1.1953161 0 0 1 1.945262,0 z"
+     id="path5"
+     inkscape:path-effect="#path-effect9"
+     inkscape:original-d="m 50,7.6347656 c -1.911691,0 -3.822822,0.8351534 -5.017578,2.5078124 L 23.681641,39.962891 C 21.118752,43.550934 23.924625,49 28.333984,49 h 43.351563 c 4.401655,0 7.200988,-5.43971 4.642578,-9.021484 L 55.017578,10.142578 C 53.822822,8.469919 51.911691,7.6347656 50,7.6347656 Z M 50,16.882812 67.228516,41 H 32.771484 Z" />
+</svg>
diff --git a/public/assets/signs/w6a.svg b/public/assets/signs/w6a.svg
new file mode 100644
index 0000000..36ecca5
--- /dev/null
+++ b/public/assets/signs/w6a.svg
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="100mm" height="100mm" version="1.1" viewBox="0 0 100 100" xmlns="http://www.w3.org/2000/svg">
+ <path d="m50 43c-2.2091 0-4 1.7909-4 4v41c0 2.2091 1.7909 4 4 4s4-1.7909 4-4v-41c0-2.2091-1.7909-4-4-4z" color="#000000"/>
+ <path d="m50 7.635c-1.9117 0-3.8228 0.83515-5.0176 2.5078l-21.301 29.82c-2.5629 3.588 0.24298 9.0371 4.6523 9.0371h43.352c4.4017 0 7.201-5.4397 4.6426-9.0215l-21.311-29.836c-1.1948-1.6727-3.1059-2.5078-5.0176-2.5078zm0.97263 10.61 15.348 21.484a0.80387 0.80387 0 0 1-0.65412 1.2712h-31.245a0.84915 0.84915 0 0 1-0.69096-1.3427l15.297-21.413a1.1953 1.1953 0 0 1 1.9453 0z" stop-color="#000000"/>
+ <g stroke-linecap="round" stroke-linejoin="round">
+  <path d="m46 28.818a1.5002 1.5002 0 0 0-1.5 1.5v2.5273a1.5002 1.5002 0 0 0 1.5 1.5h8a1.5002 1.5002 0 0 0 1.5-1.5v-0.52734a1.5002 1.5002 0 0 0-1.5-1.5h-2.0723l-0.58594-1.1719a1.5002 1.5002 0 0 0-1.3418-0.82812z" stop-color="#000000"/>
+  <path d="m48.5 35.694a1.5 1.5 0 0 1-1.5 1.5 1.5 1.5 0 0 1-1.5-1.5 1.5 1.5 0 0 1 1.5-1.5 1.5 1.5 0 0 1 1.5 1.5z" stroke-width="4"/>
+  <path d="m54.5 35.694a1.5 1.5 0 0 1-1.5 1.5 1.5 1.5 0 0 1-1.5-1.5 1.5 1.5 0 0 1 1.5-1.5 1.5 1.5 0 0 1 1.5 1.5z" stroke-width="4"/>
+ </g>
+</svg>
diff --git a/public/assets/signs/w6b.svg b/public/assets/signs/w6b.svg
new file mode 100644
index 0000000..5020eb4
--- /dev/null
+++ b/public/assets/signs/w6b.svg
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg width="100mm" height="150mm" version="1.1" viewBox="0 0 100 150" xmlns="http://www.w3.org/2000/svg">
+ <path transform="matrix(1 0 0 1 0 50)" d="m50 43c-2.2091 0-4 1.7909-4 4v41c0 2.2091 1.7909 4 4 4s4-1.7909 4-4v-41c0-2.2091-1.7909-4-4-4z" color="#000000"/>
+ <path transform="matrix(1 0 0 1 0 50)" d="m50 7.6348c-1.9117 0-3.8228 0.83515-5.0176 2.5078l-21.301 29.82c-2.5629 3.588 0.24298 9.0371 4.6523 9.0371h43.352c4.4017 0 7.201-5.4397 4.6426-9.0215l-21.311-29.836c-1.1948-1.6727-3.1059-2.5078-5.0176-2.5078zm0.97263 10.61 15.348 21.485a0.80387 0.80387 117.23 0 1-0.65412 1.2712h-31.245a0.84915 0.84915 62.77 0 1-0.69096-1.3427l15.297-21.413a1.1953 1.1953 0 0 1 1.9453 0z" stop-color="#000000"/>
+ <path transform="matrix(1 0 0 1 0 16.493)" d="m50 7.6348c-1.9117 0-3.8228 0.83515-5.0176 2.5078l-21.301 29.82c-2.5629 3.588 0.24298 9.0371 4.6523 9.0371h43.352c4.4017 0 7.201-5.4397 4.6426-9.0215l-21.311-29.836c-1.1948-1.6727-3.1059-2.5078-5.0176-2.5078zm0.97263 10.61 15.348 21.485a0.80387 0.80387 117.23 0 1-0.65412 1.2712h-31.245a0.84915 0.84915 62.77 0 1-0.69096-1.3427l15.297-21.413a1.1953 1.1953 0 0 1 1.9453 0z" stop-color="#000000"/>
+ <g stroke-linecap="round" stroke-linejoin="round">
+  <path d="m46 78.818a1.5002 1.5002 0 0 0-1.5 1.5v2.5273a1.5002 1.5002 0 0 0 1.5 1.5h8a1.5002 1.5002 0 0 0 1.5-1.5v-0.52734a1.5002 1.5002 0 0 0-1.5-1.5h-2.0723l-0.58594-1.1719a1.5002 1.5002 0 0 0-1.3418-0.82812z" stop-color="#000000"/>
+  <path d="m48.5 85.694a1.5 1.5 0 0 1-1.5 1.5 1.5 1.5 0 0 1-1.5-1.5 1.5 1.5 0 0 1 1.5-1.5 1.5 1.5 0 0 1 1.5 1.5z" stroke-width="4"/>
+  <path d="m54.5 85.694a1.5 1.5 0 0 1-1.5 1.5 1.5 1.5 0 0 1-1.5-1.5 1.5 1.5 0 0 1 1.5-1.5 1.5 1.5 0 0 1 1.5 1.5z" stroke-width="4"/>
+  <path d="m46 45.311a1.5002 1.5002 0 0 0-1.5 1.5v2.5273a1.5002 1.5002 0 0 0 1.5 1.5h8a1.5002 1.5002 0 0 0 1.5-1.5v-0.52734a1.5002 1.5002 0 0 0-1.5-1.5h-2.0723l-0.58594-1.1699a1.5002 1.5002 0 0 0-1.3418-0.83008z" stop-color="#000000"/>
+  <path d="m48.5 52.187a1.5 1.5 0 0 1-1.5 1.5 1.5 1.5 0 0 1-1.5-1.5 1.5 1.5 0 0 1 1.5-1.5 1.5 1.5 0 0 1 1.5 1.5z" stroke-width="4"/>
+  <path d="m54.5 52.187a1.5 1.5 0 0 1-1.5 1.5 1.5 1.5 0 0 1-1.5-1.5 1.5 1.5 0 0 1 1.5-1.5 1.5 1.5 0 0 1 1.5 1.5z" stroke-width="4"/>
+ </g>
+</svg>
diff --git a/src/components/map/object-renderers/SignRenderer.js b/src/components/map/object-renderers/SignRenderer.js
index d6df35e..0e7df66 100644
--- a/src/components/map/object-renderers/SignRenderer.js
+++ b/src/components/map/object-renderers/SignRenderer.js
@@ -8,6 +8,8 @@ export default function SignRenderer(props) {
 
     const offX = -1.89 + (object.def.offsetX || 0);
     const offY = -1.89 + (object.def.offsetY || 0);
+    const width = object.def.width || 1;
+    const height = object.def.height || 1;
 
     return (
         <g className="sign" transform={`translate(${x}, ${y}) rotate(${object.rot.y}) translate(${offX}, ${offY})`}>
@@ -16,8 +18,8 @@ export default function SignRenderer(props) {
                 wrapper='svg'
 
                 beforeInjection={(svg) => {
-                    svg.setAttribute('width', '1mm');
-                    svg.setAttribute('height', '1mm');
+                    svg.setAttribute('width', `${width}mm`);
+                    svg.setAttribute('height', `${height}mm`);
                 }}
             />
         </g>
diff --git a/src/model/defined-signs.js b/src/model/defined-signs.js
index 71184e3..bf49f2a 100644
--- a/src/model/defined-signs.js
+++ b/src/model/defined-signs.js
@@ -5,7 +5,23 @@ const DefinedSigns = {
         "name": "W5",
         "icon": "w5.svg",
         "offsetY": -1.4364
-    }
+    },
+    "sign_w6b": {
+        "name": "W6b",
+        "icon": "w6b.svg",
+        "offsetY": -3.3264,
+        "height": 1.5
+    },
+    "sign_w6a": {
+        "name": "W6a",
+        "icon": "w6a.svg",
+        "offsetY": -1.4364
+    },
+    "sign_w6": {
+        "name": "W6",
+        "icon": "w6.svg",
+        "offsetY": -1.4364
+    },
 };
 
 export default DefinedSigns;
\ No newline at end of file