@signalk/freeboard-sk 2.19.6 → 2.19.8

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@signalk/freeboard-sk",
-  "version": "2.19.6",
+  "version": "2.19.8",
   "description": "Openlayers chart plotter implementation for Signal K",
   "keywords": [
     "signalk-webapp",
@@ -42,6 +42,7 @@
   "dependencies": {
     "@signalk/server-api": "^2.9.0",
     "geolib": "^3.3.3",
+    "google-protobuf": "^4.0.1",
     "tslib": "^2.0.0",
     "uuid": "^11.1.0"
   },
@@ -69,6 +70,7 @@
     "@types/xml2js": "^0.4.14",
     "@typescript-eslint/eslint-plugin": "^8.46.3",
     "@typescript-eslint/parser": "^8.46.3",
+    "baseline-browser-mapping": "^2.9.18",
     "buffer": "^6.0.3",
     "eslint": "^9.17.0",
     "events": "^3.3.0",
@@ -80,7 +82,7 @@
     "karma-jasmine-html-reporter": "~2.1.0",
     "ng-packagr": "^21.0.0",
     "ngeohash": "^0.6.3",
-    "ol": "^10.2.1",
+    "ol": "^10.7.0",
     "ol-mapbox-style": "^12.3.5",
     "pmtiles": "^2.7.0",
     "prettier": "^3.6.2",

package/plugin/alarms/alarms.js

@@ -196,7 +196,7 @@ const handleDeltaMessage = (delta) => {
         });
     });
 };
-const initAlarmEndpoints = () => {
+const initAlarmEndpoints = async () => {
     server.debug(`** Registering Alarm Action API endpoint(s) **`);
     // list area alarms
     server.get(`${ALARM_API_PATH}/area`, async (req, res, next) => {
@@ -348,96 +348,100 @@ const initAlarmEndpoints = () => {
             });
         }
     });
-    // standard alarms
-    server.post(`${ALARM_API_PATH}/:alarmType`, (req, res, next) => {
-        server.debug(`** ${req.method} ${ALARM_API_PATH}/${req.params.alarmType}`);
-        if (!STANDARD_ALARMS.includes(req.params.alarmType)) {
-            next();
-            return;
-        }
-        try {
-            const id = uuid.v4();
-            const msg = req.body.message
-                ? req.body.message
-                : req.params.alarmType;
-            const r = handleAlarm('vessels.self', `notifications.${req.params.alarmType}.${id}`, Object.assign({
-                message: msg,
-                method: [server_api_1.ALARM_METHOD.sound, server_api_1.ALARM_METHOD.visual],
-                state: server_api_1.ALARM_STATE.emergency
-            }, buildAlarmData()));
-            res.status(r.statusCode).json(Object.assign(r, { id: id }));
-        }
-        catch (e) {
-            res.status(400).json({
-                state: 'FAILED',
-                statusCode: 400,
-                message: e.message
-            });
-        }
-    });
-    server.post(`${ALARM_API_PATH}/:alarmType/:id/silence`, (req, res) => {
-        server.debug(`** ${req.method} ${req.path}`);
-        if (!STANDARD_ALARMS.includes(req.params.alarmType)) {
-            res.status(200).json({
-                state: 'COMPLETED',
-                statusCode: 200,
-                message: `Unsupported Alarm (${req.params.alarmType}).`
-            });
-            return;
-        }
-        try {
-            const al = server.getSelfPath(`notifications.${req.params.alarmType}.${req.params.id}`);
-            if (al && al.value) {
-                server.debug('Alarm value....');
-                if (al.value.method && al.value.method.includes('sound')) {
-                    server.debug('Alarm has sound... silence!!!');
-                    al.value.method = al.value.method.filter((i) => i !== 'sound');
-                    const r = handleAlarm('vessels.self', `notifications.${req.params.alarmType}.${req.params.id}`, al.value);
-                    res.status(r.statusCode).json(r);
+    const f = await server.getFeatures();
+    // test for notifications API
+    if (!f.apis.includes('notifications')) {
+        // standard alarms
+        server.post(`${ALARM_API_PATH}/:alarmType`, (req, res, next) => {
+            server.debug(`** ${req.method} ${ALARM_API_PATH}/${req.params.alarmType}`);
+            if (!STANDARD_ALARMS.includes(req.params.alarmType)) {
+                next();
+                return;
+            }
+            try {
+                const id = uuid.v4();
+                const msg = req.body.message
+                    ? req.body.message
+                    : req.params.alarmType;
+                const r = handleAlarm('vessels.self', `notifications.${req.params.alarmType}.${id}`, Object.assign({
+                    message: msg,
+                    method: [server_api_1.ALARM_METHOD.sound, server_api_1.ALARM_METHOD.visual],
+                    state: server_api_1.ALARM_STATE.emergency
+                }, buildAlarmData()));
+                res.status(r.statusCode).json(Object.assign(r, { id: id }));
+            }
+            catch (e) {
+                res.status(400).json({
+                    state: 'FAILED',
+                    statusCode: 400,
+                    message: e.message
+                });
+            }
+        });
+        server.post(`${ALARM_API_PATH}/:alarmType/:id/silence`, (req, res) => {
+            server.debug(`** ${req.method} ${req.path}`);
+            if (!STANDARD_ALARMS.includes(req.params.alarmType)) {
+                res.status(200).json({
+                    state: 'COMPLETED',
+                    statusCode: 200,
+                    message: `Unsupported Alarm (${req.params.alarmType}).`
+                });
+                return;
+            }
+            try {
+                const al = server.getSelfPath(`notifications.${req.params.alarmType}.${req.params.id}`);
+                if (al && al.value) {
+                    server.debug('Alarm value....');
+                    if (al.value.method && al.value.method.includes('sound')) {
+                        server.debug('Alarm has sound... silence!!!');
+                        al.value.method = al.value.method.filter((i) => i !== 'sound');
+                        const r = handleAlarm('vessels.self', `notifications.${req.params.alarmType}.${req.params.id}`, al.value);
+                        res.status(r.statusCode).json(r);
+                    }
+                    else {
+                        server.debug('Alarm has no sound... no action required.');
+                        res.status(200).json({
+                            state: 'COMPLETED',
+                            statusCode: 200,
+                            message: `Alarm (${req.params.alarmType}) is already silent.`
+                        });
+                    }
                 }
                 else {
-                    server.debug('Alarm has no sound... no action required.');
-                    res.status(200).json({
-                        state: 'COMPLETED',
-                        statusCode: 200,
-                        message: `Alarm (${req.params.alarmType}) is already silent.`
-                    });
+                    throw new Error(`Alarm (${req.params.alarmType}.${req.params.id}) has no value or was not found!`);
                 }
             }
-            else {
-                throw new Error(`Alarm (${req.params.alarmType}.${req.params.id}) has no value or was not found!`);
+            catch (e) {
+                res.status(400).json({
+                    state: 'FAILED',
+                    statusCode: 400,
+                    message: e.message
+                });
             }
-        }
-        catch (e) {
-            res.status(400).json({
-                state: 'FAILED',
-                statusCode: 400,
-                message: e.message
-            });
-        }
-    });
-    server.delete(`${ALARM_API_PATH}/:alarmType/:id`, (req, res, next) => {
-        server.debug(`** ${req.method} ${ALARM_API_PATH}/${req.params.alarmType}`);
-        if (!STANDARD_ALARMS.includes(req.params.alarmType)) {
-            next();
-            return;
-        }
-        try {
-            const r = handleAlarm('vessels.self', `notifications.${req.params.alarmType}.${req.params.id}`, {
-                message: '',
-                method: [],
-                state: server_api_1.ALARM_STATE.normal
-            });
-            res.status(r.statusCode).json(r);
-        }
-        catch (e) {
-            res.status(400).json({
-                state: 'FAILED',
-                statusCode: 400,
-                message: e.message
-            });
-        }
-    });
+        });
+        server.delete(`${ALARM_API_PATH}/:alarmType/:id`, (req, res, next) => {
+            server.debug(`** ${req.method} ${ALARM_API_PATH}/${req.params.alarmType}`);
+            if (!STANDARD_ALARMS.includes(req.params.alarmType)) {
+                next();
+                return;
+            }
+            try {
+                const r = handleAlarm('vessels.self', `notifications.${req.params.alarmType}.${req.params.id}`, {
+                    message: '',
+                    method: [],
+                    state: server_api_1.ALARM_STATE.normal
+                });
+                res.status(r.statusCode).json(r);
+            }
+            catch (e) {
+                res.status(400).json({
+                    state: 'FAILED',
+                    statusCode: 400,
+                    message: e.message
+                });
+            }
+        });
+    }
 };
 const handleV1PutRequest = (context, path, value, cb) => {
     cb(handleAlarm(context, path, value));
@@ -552,7 +556,8 @@ const validateAreaBody = (body) => {
  * @returns true if valid
  */
 const isValidPosition = (position) => {
-    return 'latitude' in position &&
+    return position &&
+        'latitude' in position &&
         'longitude' in position &&
         typeof position.latitude === 'number' &&
         position.latitude >= -90 &&

package/plugin/index.js

@@ -49,7 +49,8 @@ module.exports = (server) => {
             settings.alarms = options.alarms ?? {
                 enable: true
             };
-            settings.alarms.enable = true;
+            // const f = await server.getFeatures();
+            settings.alarms.enable = true; //!f.apis.includes('notifications' as any);
             server.debug(`Applied config: ${JSON.stringify(settings)}`);
             if (settings.alarms.enable) {
                 (0, alarms_1.initAlarms)(server, plugin.id);

package/public/3rdpartylicenses.txt

@@ -1470,6 +1470,40 @@ The above copyright notice and this permission notice shall be included in all c
 
 THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
+--------------------------------------------------------------------------------
+Package: google-protobuf
+License: "(BSD-3-Clause AND Apache-2.0)"
+
+BSD 3-Clause License
+
+Copyright (c) 2022, Google Inc.
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+1. Redistributions of source code must retain the above copyright notice, this
+   list of conditions and the following disclaimer.
+
+2. Redistributions in binary form must reproduce the above copyright notice,
+   this list of conditions and the following disclaimer in the documentation
+   and/or other materials provided with the distribution.
+
+3. Neither the name of the copyright holder nor the names of its
+   contributors may be used to endorse or promote products derived from
+   this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
 --------------------------------------------------------------------------------
 Package: zone.js
 License: "MIT"

package/public/assets/help/index.html

@@ -569,7 +569,7 @@
           can set a destination in the following ways:
           <ol>
             <li>
-              <b>Activate a Route:</b> Once activaed select a point along the
+              <b>Activate a Route:</b> Once activated, select a point along the
               route.
             </li>
             <li><b>Go To Waypoint:</b> Select a waypoint as a destination.</li>
@@ -879,9 +879,18 @@
               <div style="padding-left: 20px">
                 <ul>
                   <li>
-                    <b>Set the destination point:</b> If displayed route is the
-                    <i>Active Route</i>, click a point to set it as the current
-                    destination along the route.
+                    <i class="material-icons">near_me</i
+                    ><b>Nearest:</b> Activate the route starting at the point
+                    nearest the vessel.
+                  </li>
+                  <li>
+                    <i class="material-icons">clear_all</i
+                    ><b>Clear:</b> De-activate the route.
+                  </li>
+                  <li>
+                    <b>Start at / Set the selected point:</b>
+                    Click <i class="material-icons">near_me</i> next to the
+                    point to set as the current destination along the route.
                   </li>
                   <li>
                     <b>Re-order points:</b> Use the handle to drag points to a
@@ -902,7 +911,7 @@
                   can add, edit or delete notes.
                 </li>
                 <li>
-                  <b>Activate: </b> Clicking
+                  <b>Start: </b> Clicking
                   <i class="material-icons">near_me</i> sends a message to the
                   server to set this route as the <i>Active Route</i>.<br />
                   The start of the route is set as the current destination.

package/public/assets/img/ob/chart-radar-overlay-iec.svg

@@ -0,0 +1,4 @@
+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path d="M10.278 7.84254C10.824 7.6164 11.4091 7.5 12.0001 7.5C12.591 7.5 13.1762 7.6164 13.7222 7.84254C14.5196 8.17284 15 8.5 15.7123 9.34826L13.4491 11.6115C13.5827 12.1119 13.4533 12.668 13.0607 13.0606C12.4749 13.6464 11.5251 13.6464 10.9393 13.0606C10.3536 12.4749 10.3536 11.5251 10.9393 10.9393C11.3319 10.5468 11.8879 10.4173 12.3883 10.5509L13.5236 9.41563C13.4032 9.34468 13.2778 9.28206 13.1481 9.22836C12.7842 9.0776 12.3941 9 12.0001 9C11.6061 9 11.216 9.0776 10.852 9.22836C10.4881 9.37913 10.1574 9.6001 9.87878 9.87868L8.81812 8.81802C9.23598 8.40016 9.73206 8.06869 10.278 7.84254Z" fill="#1F1F1F"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M8.5 2L2.10608 4.74025C1.7384 4.89783 1.5 5.25937 1.5 5.6594V20.4835C1.5 21.2014 2.23405 21.6854 2.89392 21.4026L8.5 19L15.5 22L21.8939 19.2597C22.2616 19.1022 22.5 18.7406 22.5 18.3406V3.32573C22.5 2.66135 21.8641 2.18169 21.2253 2.36421L15.5 4L8.5 2ZM7.75 3.95338L3 5.98909V19.7252L7.33037 17.8693C5.60552 16.4952 4.5 14.3767 4.5 12C4.5 9.43576 5.78686 7.17209 7.75 5.81955V3.95338ZM9.25 6.66591C8.6936 6.95334 8.18794 7.32527 7.75 7.76473C6.66854 8.84993 6 10.3469 6 12C6 13.6531 6.66854 15.1501 7.75 16.2353C8.18794 16.6747 8.6936 17.0467 9.25 17.3341C10.0738 17.7597 11.0088 18 12 18C12.9912 18 13.9262 17.7597 14.75 17.3341C15.3064 17.0467 15.8121 16.6747 16.25 16.2353C17.3315 15.1501 18 13.6531 18 12C18 10.3469 17.3315 8.84993 16.25 7.76473C15.8121 7.32527 15.3064 6.95334 14.75 6.66591C13.9262 6.24033 12.9912 6 12 6C11.0088 6 10.0738 6.24033 9.25 6.66591ZM11.7991 4.50264C10.9012 4.52624 10.0426 4.70767 9.25 5.0202V3.77431L11.7991 4.50264ZM16.25 5.81955C18.2131 7.17209 19.5 9.43576 19.5 12C19.5 14.5642 18.2131 16.8279 16.25 18.1804V20.0466L21 18.0109V3.98859L16.25 5.34574V5.81955ZM14.75 18.9798C14.2682 19.1698 13.762 19.3113 13.2375 19.3984L14.75 20.0466V18.9798Z" fill="#1F1F1F"/>
+</svg>

package/public/assets/img/ob/radar-iec.svg

@@ -0,0 +1,3 @@
+<svg width="24" height="24" viewBox="0 0 24 24" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M23 12C23 18.0751 18.0751 23 12 23C5.92487 23 1 18.0751 1 12C1 5.92487 5.92487 1 12 1C18.0751 1 23 5.92487 23 12ZM21.5 12C21.5 17.2467 17.2467 21.5 12 21.5C6.75329 21.5 2.5 17.2467 2.5 12C2.5 6.75329 6.75329 2.5 12 2.5C14.3534 2.5 16.5069 3.35575 18.1664 4.77305L17.1017 5.83773C16.4879 5.32954 15.8004 4.915 15.0616 4.60896C14.091 4.20693 13.0507 4 12.0001 4C10.9495 4 9.90925 4.20693 8.93865 4.60896C7.96804 5.011 7.08613 5.60028 6.34326 6.34315L7.40392 7.40381C8.0075 6.80023 8.72406 6.32144 9.51267 5.99478C10.3013 5.66813 11.1465 5.5 12.0001 5.5C12.8537 5.5 13.6989 5.66813 14.4876 5.99478C15.0442 6.22533 15.5649 6.53167 16.0353 6.90417L14.9652 7.97423C14.6406 7.73512 14.2875 7.5356 13.9133 7.3806C13.3067 7.12933 12.6565 7 11.9999 7C11.3433 7 10.6931 7.12933 10.0865 7.3806C9.47984 7.63188 8.92865 8.00017 8.46436 8.46447L9.52502 9.52513C9.85002 9.20012 10.2359 8.94231 10.6605 8.76642C11.0851 8.59053 11.5403 8.5 11.9999 8.5C12.4595 8.5 12.9146 8.59053 13.3393 8.76642C13.5304 8.84559 13.7137 8.94135 13.8871 9.05237L12.7812 10.1583C12.5412 10.0564 12.2772 10 12 10C10.8954 10 10 10.8954 10 12C10 13.1046 10.8954 14 12 14C13.1046 14 14 13.1046 14 12C14 11.7229 13.9436 11.459 13.8418 11.219L19.2271 5.83372C20.6443 7.49317 21.5 9.64666 21.5 12Z" fill="#1F1F1F"/>
+</svg>

package/public/index.html

@@ -10,11 +10,6 @@
     <meta name="description" content="Freeboard for Signal K">
     <meta name="keywords" content="signal k, signalk, freeboard, signalk webapp">
 
-    <!-- ******************* Cache control ********************** -->
-    <meta http-equiv="Cache-control" content="no-cache, no-store, must-revalidate">
-    <meta http-equiv="Pragma" content="no-cache">
-    <meta http-equiv="Expires" content="0">
-
     <!-- ******************* PWA ********************** -->
     <meta name="theme-color" content="#333333">
     <link rel="manifest" href="./manifest.json">
@@ -59,5 +54,5 @@
         </div>
       </div>
     </app-root>
-  <link rel="modulepreload" href="chunk-FDERIQAA.js"><script src="polyfills-5CFQRCPP.js" type="module"></script><script src="main-HJRTSPY2.js" type="module"></script></body>
+  <link rel="modulepreload" href="chunk-FDERIQAA.js"><script src="polyfills-5CFQRCPP.js" type="module"></script><script src="main-3CX2DAQ4.js" type="module"></script></body>
 </html>