From cfb25810db62b272588b1fc283840ee533114470 Mon Sep 17 00:00:00 2001 From: humppafreak <75011426+humppafreak@users.noreply.github.com> Date: Wed, 26 Apr 2023 15:13:02 +0200 Subject: [PATCH 1/4] add vessels..distanceToSelf --- calcs/cpa_tcpa.js | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) diff --git a/calcs/cpa_tcpa.js b/calcs/cpa_tcpa.js index 4f0529b..9518407 100755 --- a/calcs/cpa_tcpa.js +++ b/calcs/cpa_tcpa.js @@ -23,6 +23,12 @@ module.exports = function (app, plugin) { 'Calculate for all vessels within this range (m), negative to disable filter', default: 1852 }, + distanceToSelf: { + type: 'boolean', + title: + 'Calculate distance to self for all vessels', + default: true + }, timelimit: { type: 'number', title: @@ -121,6 +127,27 @@ module.exports = function (app, plugin) { }, { latitude: vesselPos.latitude, longitude: vesselPos.longitude } ) + + if ( + typeof plugin.properties.traffic.distanceToSelf === 'undefined' || + plugin.properties.traffic.distanceToSelf + ) { + app.debug('distance of ' + vessel + ' to self: ' + distance) + app.handleMessage(plugin.id, { + context: 'vessels.' + app.selfId, + updates: [ + { + values: [ + { + path: 'vessels.' + vessel + '.distanceToSelf', + value: distance + } + ] + } + ] + }) + } + if ( distance >= plugin.properties.traffic.range && plugin.properties.traffic.range >= 0 From ff8de8d5c7a80e2e9454f125cc4e91b650ea94f4 Mon Sep 17 00:00:00 2001 From: humppafreak <75011426+humppafreak@users.noreply.github.com> Date: Wed, 26 Apr 2023 15:36:46 +0200 Subject: [PATCH 2/4] added metadata to distanceToSelf update --- calcs/cpa_tcpa.js | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/calcs/cpa_tcpa.js b/calcs/cpa_tcpa.js index 9518407..e4b11a3 100755 --- a/calcs/cpa_tcpa.js +++ b/calcs/cpa_tcpa.js @@ -142,6 +142,17 @@ module.exports = function (app, plugin) { path: 'vessels.' + vessel + '.distanceToSelf', value: distance } + ], + meta: [ + { + path: 'vessels.' + vessel + '.distanceToSelf', + value: { + units: "m", + description: "distance to own vessel", + displayName: "Distance to self", + shortName: "Distance" + } + } ] } ] From 4f2dc77f39dd7c12ec9c08c6a42ced0bf7ae2365 Mon Sep 17 00:00:00 2001 From: humppafreak <75011426+humppafreak@users.noreply.github.com> Date: Fri, 28 Apr 2023 08:48:18 +0200 Subject: [PATCH 3/4] corrected context and path for distanceToSelf --- calcs/cpa_tcpa.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/calcs/cpa_tcpa.js b/calcs/cpa_tcpa.js index e4b11a3..3211968 100755 --- a/calcs/cpa_tcpa.js +++ b/calcs/cpa_tcpa.js @@ -134,18 +134,18 @@ module.exports = function (app, plugin) { ) { app.debug('distance of ' + vessel + ' to self: ' + distance) app.handleMessage(plugin.id, { - context: 'vessels.' + app.selfId, + context: 'vessels.' + vessel, updates: [ { values: [ { - path: 'vessels.' + vessel + '.distanceToSelf', + path: 'distanceToSelf', value: distance } ], meta: [ { - path: 'vessels.' + vessel + '.distanceToSelf', + path: 'distanceToSelf', value: { units: "m", description: "distance to own vessel", From 1c83d3005306d805f9de483794e56bb330fc36f1 Mon Sep 17 00:00:00 2001 From: humppafreak <75011426+humppafreak@users.noreply.github.com> Date: Sun, 7 Jan 2024 15:46:45 +0100 Subject: [PATCH 4/4] change path and disable "enabled by default" --- calcs/cpa_tcpa.js | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) diff --git a/calcs/cpa_tcpa.js b/calcs/cpa_tcpa.js index 3211968..f96a8fb 100755 --- a/calcs/cpa_tcpa.js +++ b/calcs/cpa_tcpa.js @@ -129,7 +129,6 @@ module.exports = function (app, plugin) { ) if ( - typeof plugin.properties.traffic.distanceToSelf === 'undefined' || plugin.properties.traffic.distanceToSelf ) { app.debug('distance of ' + vessel + ' to self: ' + distance) @@ -139,20 +138,9 @@ module.exports = function (app, plugin) { { values: [ { - path: 'distanceToSelf', + path: 'navigation.distanceToSelf', value: distance } - ], - meta: [ - { - path: 'distanceToSelf', - value: { - units: "m", - description: "distance to own vessel", - displayName: "Distance to self", - shortName: "Distance" - } - } ] } ]