From 9b69971996c7eb5782373f66df9b26322ed24d75 Mon Sep 17 00:00:00 2001
From: David G <34038713+godind@users.noreply.github.com>
Date: Thu, 21 Dec 2023 23:49:51 -0500
Subject: [PATCH] Godind/issue257 (#265)

* feature requests. wind widget COG
Fixes #257

* feature requests. wind widget COG
Fixes #257
---
 .../widgets/svg-wind/svg-wind.component.html  | 78 +++++++++++--------
 ...inkscape.svg => svg-wind_v4-inkscape..svg} | 37 ++++++---
 2 files changed, 71 insertions(+), 44 deletions(-)
 rename src/svg-templates/{svg-wind_v3-inkscape.svg => svg-wind_v4-inkscape..svg} (97%)

diff --git a/src/app/widgets/svg-wind/svg-wind.component.html b/src/app/widgets/svg-wind/svg-wind.component.html
index 4961bbe9..73dab8b3 100644
--- a/src/app/widgets/svg-wind/svg-wind.component.html
+++ b/src/app/widgets/svg-wind/svg-wind.component.html
@@ -500,7 +500,6 @@
        class="laylines"
        style="display:inline;fill:none;stroke-width:3.06951;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:7.16218;stroke-opacity:1"
        id="StbdLayline" />
-
   </g>
 <!-- Compass -->
   <g
@@ -754,41 +753,56 @@
       y="143.99249"
       x="68.010208"
       id="tspan7125">330</tspan></text>
+  <!-- COG Indicator -->
+  <g id="COGIndicator">
+    <path
+      id="indicator"
+      style="fill:#ff6600;stroke-width:5.76507;stroke-linecap:square"
+      d="m 233.42911,73.408997 a 2.5,2.5 0 0 1 -2.5,2.5 2.5,2.5 0 0 1 -2.5,-2.5 2.5,2.5 0 0 1 2.5,-2.5 2.5,2.5 0 0 1 2.5,2.5 z m -11.72079,-40.278243 6.73667,-4.970565 c 1.41548,-1.044398 3.69456,-1.044398 5.11004,0 l 6.73666,4.97056 c 1.41549,1.044397 1.41549,2.725985 0,3.770382 l -6.73667,4.970566 c -1.41547,1.044391 -3.69456,1.044397 -5.11004,0 l -6.73666,-4.97056 c -1.41548,-1.044397 -1.41548,-2.725991 0,-3.770383 z m 6.73255,-4.677026 h 5 v 45.031639 h -5 z"
+    />
+    <animateTransform #waypointAnimate attributeName="transform"
+      type="rotate"
+      [attr.from]="waypoint.oldDegreeIndicator+' 231 231'"
+      [attr.to]="waypoint.newDegreeIndicator+' 231 231'"
+      begin="indefinite"
+      dur="0.5s"
+      additive="replace"
+      fill="freeze"
+      />
+  </g>
   <!-- Waypoint -->
   <g [style.display]="waypointActive ? 'inline' : 'none'"
     id="waypoint"
     style="display:inline">
-    <g
-    id="waypoint"
-    transform="translate(-0.00209063,3)">
-  <circle
-      style="fill:none;fill-opacity:1;stroke:#45ad36;stroke-width:5.7;stroke-dasharray:none;stroke-opacity:0.984314"
-      id="path6341"
-      cx="231"
-      cy="72.35717"
-      r="5.6431713" />
-  <g
-      id="g11647"
-      transform="matrix(1.0001219,0,0,0.99974754,-0.02606381,-20.276417)"
-      style="fill:#afafaf;fill-opacity:1;stroke:#afafaf;stroke-opacity:1">
-    <path
-        id="path10836"
-        style="fill:#afafaf;fill-opacity:1;stroke:#afafaf;stroke-width:2.3;stroke-dasharray:none;stroke-opacity:1"
-        d="m 240.4718,93.050621 c 2.54775,0.153686 5.11457,0.356643 7.70105,0.601581 h 0.34551" />
-    <path
-        id="path11640"
-        style="fill:#afafaf;fill-opacity:1;stroke:#afafaf;stroke-width:2.3;stroke-dasharray:none;stroke-opacity:1"
-        d="m 213.62158,93.652202 c 2.61223,-0.320275 5.24415,-0.552387 7.8965,-0.705521" />
-  </g>
-  </g>
-  <animateTransform #waypointAnimate attributeName="transform"
-    type="rotate"
-    [attr.from]="waypoint.oldDegreeIndicator+' 231 231'"
-    [attr.to]="waypoint.newDegreeIndicator+' 231 231'"
-    begin="indefinite"
-    dur="0.5s"
-    additive="replace"
-    fill="freeze"
+    <g id="waypoint" transform="translate(-0.00209063,3)">
+      <circle
+        style="fill:none;fill-opacity:1;stroke:#45ad36;stroke-width:5.7;stroke-dasharray:none;stroke-opacity:0.984314"
+        id="path6341"
+        cx="231"
+        cy="72.35717"
+        r="5.6431713" />
+      <g
+        id="g11647"
+        transform="matrix(1.0001219,0,0,0.99974754,-0.02606381,-20.276417)"
+        style="fill:#afafaf;fill-opacity:1;stroke:#afafaf;stroke-opacity:1">
+        <path
+          id="path10836"
+          style="fill:#afafaf;fill-opacity:1;stroke:#afafaf;stroke-width:2.3;stroke-dasharray:none;stroke-opacity:1"
+          d="m 240.4718,93.050621 c 2.54775,0.153686 5.11457,0.356643 7.70105,0.601581 h 0.34551" />
+        <path
+          id="path11640"
+          style="fill:#afafaf;fill-opacity:1;stroke:#afafaf;stroke-width:2.3;stroke-dasharray:none;stroke-opacity:1"
+          d="m 213.62158,93.652202 c 2.61223,-0.320275 5.24415,-0.552387 7.8965,-0.705521" />
+      </g>
+    </g>
+    <animateTransform #waypointAnimate attributeName="transform"
+      type="rotate"
+      [attr.from]="waypoint.oldDegreeIndicator+' 231 231'"
+      [attr.to]="waypoint.newDegreeIndicator+' 231 231'"
+      begin="indefinite"
+      dur="0.5s"
+      additive="replace"
+      fill="freeze"
     />
   </g>
   <animateTransform #compassAnimate attributeName="transform"
diff --git a/src/svg-templates/svg-wind_v3-inkscape.svg b/src/svg-templates/svg-wind_v4-inkscape..svg
similarity index 97%
rename from src/svg-templates/svg-wind_v3-inkscape.svg
rename to src/svg-templates/svg-wind_v4-inkscape..svg
index d4e4c746..d1aa6b4f 100644
--- a/src/svg-templates/svg-wind_v3-inkscape.svg
+++ b/src/svg-templates/svg-wind_v4-inkscape..svg
@@ -5,8 +5,8 @@
    viewBox="0 0 462 462"
    version="1.1"
    id="svg8"
-   sodipodi:docname="svg-wind_v3-inkscape.svg"
-   inkscape:version="1.2.1 (9c6d41e, 2022-07-14)"
+   sodipodi:docname="svg-wind_v4-inkscape..svg"
+   inkscape:version="1.3.2 (091e20e, 2023-11-25)"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:xlink="http://www.w3.org/1999/xlink"
@@ -27,13 +27,13 @@
      showgrid="true"
      borderlayer="true"
      shape-rendering="auto"
-     inkscape:zoom="2.026595"
-     inkscape:cx="143.5906"
-     inkscape:cy="157.16016"
-     inkscape:window-width="1223"
-     inkscape:window-height="773"
-     inkscape:window-x="217"
-     inkscape:window-y="25"
+     inkscape:zoom="1.6989666"
+     inkscape:cx="209.53914"
+     inkscape:cy="178.04941"
+     inkscape:window-width="1440"
+     inkscape:window-height="900"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
      inkscape:window-maximized="0"
      inkscape:current-layer="layerCompassHeading"
      showguides="true">
@@ -41,7 +41,11 @@
        type="xygrid"
        id="grid19666"
        originx="231"
-       originy="231" />
+       originy="231"
+       spacingy="1"
+       spacingx="1"
+       units="px"
+       visible="true" />
   </sodipodi:namedview>
   <defs
      id="defs2">
@@ -597,8 +601,7 @@
      id="layerCompassHeading"
      style="display:inline"
      inkscape:groupmode="layer"
-     inkscape:label="LayerCompassDial"
-     sodipodi:insensitive="true">
+     inkscape:label="LayerCompassDial">
     <ellipse
        ry="180.0916"
        rx="180.39105"
@@ -837,6 +840,16 @@
          y="143.99249"
          x="68.010208"
          id="tspan7125">330</tspan></text>
+    <g
+       inkscape:groupmode="layer"
+       id="layer3"
+       inkscape:label="LayerCOG">
+      <path
+         id="path2"
+         style="fill:#ff6600;stroke-width:5.76507;stroke-linecap:square"
+         d="m 233.42911,73.408997 a 2.5,2.5 0 0 1 -2.5,2.5 2.5,2.5 0 0 1 -2.5,-2.5 2.5,2.5 0 0 1 2.5,-2.5 2.5,2.5 0 0 1 2.5,2.5 z m -11.72079,-40.278243 6.73667,-4.970565 c 1.41548,-1.044398 3.69456,-1.044398 5.11004,0 l 6.73666,4.97056 c 1.41549,1.044397 1.41549,2.725985 0,3.770382 l -6.73667,4.970566 c -1.41547,1.044391 -3.69456,1.044397 -5.11004,0 l -6.73666,-4.97056 c -1.41548,-1.044397 -1.41548,-2.725991 0,-3.770383 z m 6.73255,-4.677026 h 5 v 45.031639 h -5 z"
+         inkscape:label="COGIndicator" />
+    </g>
     <g
        id="layer2"
        inkscape:label="LayerWaypoint"