Name:
{{ aircraft.name }}
-
Call sign:
{{ aircraft.callsign }}
Latitude:
Last Update:
@@ -93,13 +87,10 @@ export class AircraftPopoverComponent {
@Input() canClose: boolean;
@Output() info: EventEmitter = new EventEmitter();
@Output() closed: EventEmitter = new EventEmitter();
-
_title: string;
timeLastUpdate: string;
timeAgo: string; // last update in minutes ago
-
constructor(public app: AppInfo) {}
-
ngOnInit() {
if (!this.aircraft) {
this.handleClose();
@@ -108,7 +99,6 @@ export class AircraftPopoverComponent {
this.title || this.aircraft.name || this.aircraft.mmsi || 'Aircraft:';
}
}
-
ngOnChanges() {
if (!this.aircraft) {
this.handleClose();
@@ -121,11 +111,9 @@ export class AircraftPopoverComponent {
(new Date().valueOf() - this.aircraft.lastUpdated.valueOf()) / 1000;
this.timeAgo = td < 60 ? '' : `(${Math.floor(td / 60)} min ago)`;
}
-
handleInfo() {
this.info.emit(this.aircraft.id);
}
-
handleClose() {
this.closed.emit();
}
diff --git a/src/app/modules/map/popovers/alarm-popover.component.ts b/src/app/modules/map/popovers/alarm-popover.component.ts
index 2e798f71..662bb3ff 100644
--- a/src/app/modules/map/popovers/alarm-popover.component.ts
+++ b/src/app/modules/map/popovers/alarm-popover.component.ts
@@ -5,20 +5,17 @@ import {
EventEmitter,
ChangeDetectionStrategy
} from '@angular/core';
-
import { MatButtonModule } from '@angular/material/button';
import { MatIconModule } from '@angular/material/icon';
import { MatTooltipModule } from '@angular/material/tooltip';
import { PipesModule } from 'src/app/lib/pipes';
import { PopoverComponent } from './popover.component';
-
import { AppInfo } from 'src/app/app.info';
import { SKNotification } from 'src/app/types';
-
/*********** Alarm Popover ***************
-title: string - title text,
-aton: SKNotification - alarm data
-*************************************************/
+ title: string - title text,
+ aton: SKNotification - alarm data
+ *************************************************/
@Component({
selector: 'alarm-popover',
changeDetection: ChangeDetectionStrategy.OnPush,
@@ -36,12 +33,10 @@ aton: SKNotification - alarm data
-
Message:
{{ alarm.message }}
Type:
{{ id }}
Latitude:
Latitude:
Last Update:
@@ -110,15 +105,12 @@ export class AtoNPopoverComponent {
@Input() canClose: boolean;
@Output() info: EventEmitter = new EventEmitter();
@Output() closed: EventEmitter = new EventEmitter();
-
_title: string;
timeLastUpdate: string;
timeAgo: string; // last update in minutes ago
protected convert = Convert;
isMeteo: boolean;
-
constructor(public app: AppInfo) {}
-
ngOnInit() {
if (!this.aton) {
this.handleClose();
@@ -126,7 +118,6 @@ export class AtoNPopoverComponent {
this.isMeteo = this.aton.id.includes('meteo');
}
}
-
ngOnChanges() {
if (!this.aton) {
this.handleClose();
@@ -139,11 +130,9 @@ export class AtoNPopoverComponent {
const td = (new Date().valueOf() - this.aton.lastUpdated.valueOf()) / 1000;
this.timeAgo = td < 60 ? '' : `(${Math.floor(td / 60)} min ago)`;
}
-
handleInfo() {
this.info.emit(this.aton.id);
}
-
handleClose() {
this.closed.emit();
}
diff --git a/src/app/modules/map/popovers/compass.component.ts b/src/app/modules/map/popovers/compass.component.ts
index 94da93db..b222cd1a 100644
--- a/src/app/modules/map/popovers/compass.component.ts
+++ b/src/app/modules/map/popovers/compass.component.ts
@@ -6,6 +6,7 @@ import {
ChangeDetectionStrategy,
Renderer2
} from '@angular/core';
+
import { CommonModule } from '@angular/common';
//** Base class **
diff --git a/src/app/modules/map/popovers/featurelist-popover.component.ts b/src/app/modules/map/popovers/featurelist-popover.component.ts
index 978b57e2..95b2b6d0 100644
--- a/src/app/modules/map/popovers/featurelist-popover.component.ts
+++ b/src/app/modules/map/popovers/featurelist-popover.component.ts
@@ -5,18 +5,16 @@ import {
EventEmitter,
ChangeDetectionStrategy
} from '@angular/core';
-
import { MatListModule } from '@angular/material/list';
import { MatButtonModule } from '@angular/material/button';
import { MatIconModule } from '@angular/material/icon';
import { MatTooltipModule } from '@angular/material/tooltip';
import { PipesModule } from 'src/app/lib/pipes';
import { PopoverComponent } from './popover.component';
-
/*********** feature List Popover ***************
-title: string - title text,
-features: Array - list of features
-*************************************************/
+ title: string - title text,
+ features: Array - list of features
+ *************************************************/
@Component({
selector: 'feature-list-popover',
changeDetection: ChangeDetectionStrategy.OnPush,
@@ -54,14 +52,11 @@ export class FeatureListPopoverComponent {
@Output() closed: EventEmitter = new EventEmitter();
// eslint-disable-next-line @typescript-eslint/no-explicit-any
@Output() selected: EventEmitter = new EventEmitter();
-
//constructor() {}
-
// eslint-disable-next-line @typescript-eslint/no-explicit-any
handleSelect(item: any) {
this.selected.emit(item);
}
-
handleClose() {
this.closed.emit();
}
diff --git a/src/app/modules/map/popovers/index.ts b/src/app/modules/map/popovers/index.ts
index 3db01d72..f0a18fa1 100644
--- a/src/app/modules/map/popovers/index.ts
+++ b/src/app/modules/map/popovers/index.ts
@@ -1,8 +1,8 @@
export * from './popover.component';
+export * from './resource-popover.component';
+export * from './compass.component';
+export * from './vessel-popover.component';
export * from './featurelist-popover.component';
export * from './aircraft-popover.component';
export * from './alarm-popover.component';
export * from './aton-popover.component';
-export * from './resource-popover.component';
-export * from './compass.component';
-export * from './vessel-popover.component';
diff --git a/src/app/modules/map/popovers/popover.component.ts b/src/app/modules/map/popovers/popover.component.ts
index 42f3363c..2e2f39dd 100644
--- a/src/app/modules/map/popovers/popover.component.ts
+++ b/src/app/modules/map/popovers/popover.component.ts
@@ -8,8 +8,8 @@ import {
EventEmitter,
ChangeDetectionStrategy
} from '@angular/core';
-import { CommonModule } from '@angular/common';
+import { CommonModule } from '@angular/common';
import { MatButtonModule } from '@angular/material/button';
import { MatIconModule } from '@angular/material/icon';
import { MatTooltipModule } from '@angular/material/tooltip';
diff --git a/src/app/modules/map/popovers/resource-popover.component.ts b/src/app/modules/map/popovers/resource-popover.component.ts
index e0f3559e..ec5191e7 100644
--- a/src/app/modules/map/popovers/resource-popover.component.ts
+++ b/src/app/modules/map/popovers/resource-popover.component.ts
@@ -10,7 +10,6 @@ import { MatButtonModule } from '@angular/material/button';
import { MatIconModule } from '@angular/material/icon';
import { MatTooltipModule } from '@angular/material/tooltip';
import { PipesModule } from 'src/app/lib/pipes';
-
import { PopoverComponent } from './popover.component';
import { AppInfo } from 'src/app/app.info';
@@ -25,6 +24,7 @@ id: string - resource id
*************************************************/
@Component({
selector: 'resource-popover',
+ changeDetection: ChangeDetectionStrategy.OnPush,
standalone: true,
imports: [
MatButtonModule,
@@ -33,7 +33,6 @@ id: string - resource id
PipesModule,
PopoverComponent
],
- changeDetection: ChangeDetectionStrategy.OnPush,
template: `
@for(p of properties; track p) {
diff --git a/src/app/modules/map/popovers/vessel-popover.component.ts b/src/app/modules/map/popovers/vessel-popover.component.ts
index 5f8fd970..59950c59 100644
--- a/src/app/modules/map/popovers/vessel-popover.component.ts
+++ b/src/app/modules/map/popovers/vessel-popover.component.ts
@@ -13,7 +13,6 @@ import { MatButtonModule } from '@angular/material/button';
import { MatIconModule } from '@angular/material/icon';
import { MatTooltipModule } from '@angular/material/tooltip';
import { PipesModule } from 'src/app/lib/pipes';
-
import { PopoverComponent } from './popover.component';
import { CompassComponent } from './compass.component';
diff --git a/src/app/modules/map/vessel-calcs.types.ts b/src/app/modules/map/vessel-calcs.types.ts
deleted file mode 100644
index 51b7b7b6..00000000
--- a/src/app/modules/map/vessel-calcs.types.ts
+++ /dev/null
@@ -1,23 +0,0 @@
-import { Position } from 'src/app/types';
-import { SKVessel } from '../skresources';
-
-export interface VesselLinesData {
- // eslint-disable-next-line @typescript-eslint/no-explicit-any
- vesselConfig: any; // app.config.vessel
- vesselSelf: SKVessel; // dfeat.self === app.data.vessels.self
- vesselActive: SKVessel; // app.data.vessels.active
- // eslint-disable-next-line @typescript-eslint/no-explicit-any
- navData: any; // dfeat.navData.position = app.data.navData.position;
- mapZoomLevel: number; // fbMap.zoomLevel
- zoomOffsetLevel: number; // this.zoomOffsetLevel
- units: { distance: string }; // app.config.units
-}
-
-export interface VesselLinesResult {
- laylines: { port: number[][][]; starboard: number[][][] };
- targetAngle: Array;
- cog: Array;
- heading: Array;
- twd: Array;
- awa: Array;
-}
diff --git a/src/app/modules/map/vessel-calcs.worker.ts b/src/app/modules/map/vessel-calcs.worker.ts
deleted file mode 100644
index b8f063a2..00000000
--- a/src/app/modules/map/vessel-calcs.worker.ts
+++ /dev/null
@@ -1,165 +0,0 @@
-///
import_export
Re-order
diff --git a/src/app/modules/skresources/resource-classes.ts b/src/app/modules/skresources/resource-classes.ts
index 53d044f3..f6fcf488 100644
--- a/src/app/modules/skresources/resource-classes.ts
+++ b/src/app/modules/skresources/resource-classes.ts
@@ -209,7 +209,8 @@ export class SKVessel {
previousPoint: {}
};
performance = {
- beatAngle: null
+ beatAngle: null,
+ gybeAngle: null
};
properties = {};
}
diff --git a/src/app/modules/skstream/skstream.worker.ts b/src/app/modules/skstream/skstream.worker.ts
index 56bbcc02..17101dc5 100644
--- a/src/app/modules/skstream/skstream.worker.ts
+++ b/src/app/modules/skstream/skstream.worker.ts
@@ -768,6 +768,8 @@ function processVessel(d: SKVessel, v, isSelf = false) {
}
} else if (v.path === 'performance.beatAngle') {
d.performance.beatAngle = v.value;
+ } else if (v.path === 'performance.gybeAngle') {
+ d.performance.gybeAngle = v.value;
} else if (v.path === 'communication.callsignVhf') {
d.callsign = v.value;
} else if (v.path === 'design.aisShipType') {
diff --git a/src/assets/help/img/ais_shiptypes.png b/src/assets/help/img/ais_shiptypes.png
index fccdf2ab..17d1fe5f 100644
Binary files a/src/assets/help/img/ais_shiptypes.png and b/src/assets/help/img/ais_shiptypes.png differ
diff --git a/src/assets/help/index.html b/src/assets/help/index.html
index 0ddb45a9..79848c80 100644
--- a/src/assets/help/index.html
+++ b/src/assets/help/index.html
@@ -1578,7 +1578,7 @@
Vessels
- 
+ 
+
Other (AIS type 90-99)