Skip to content

Commit

Permalink
2.12-patch1
Browse files Browse the repository at this point in the history
  • Loading branch information
panaaj committed Nov 8, 2024
1 parent 3b6ef31 commit 48db318
Show file tree
Hide file tree
Showing 15 changed files with 408 additions and 19 deletions.
9 changes: 8 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,10 +1,17 @@
# CHANGELOG: Freeboard

### v2.12.1
- **Added**: WMS sources to the types of chart sources that can be defined.
- **Fixed**: Date / time formating in weather forecast. (#193)
- **Fixed**: Fix issue where anchor watch controls are not visible on small screens. (#198)
- **Fixed**: Vessel Call sign not displayed correctly in AIS Properties screen. (#199)


### v2.12.0

- **Added**: Define chart sources from within the Charts List including: WMTS, Mapbox Style and TileJSON.
- **Updated**: Measure distances < 1km are displayed in meters and < 0.5NM uses depth units (#194).
- **Updated**: Ensure weather forecast times use 24 hr format. (#193).
- **Updated**: Ensure weather forecast times use 24 hr format. (#193)
- **Updated**: OpenSea Map min / max zoom levels.
- **Updated**: OpenLayers v10.
- **Fixed**: gybeAngle null value handling.
Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@signalk/freeboard-sk",
"version": "2.12.0",
"version": "2.12.1",
"description": "Openlayers chart plotter implementation for Signal K",
"keywords": [
"signalk-webapp",
Expand Down
2 changes: 1 addition & 1 deletion src/app/app.info.ts
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,7 @@ export class AppInfo extends Info {
this.name = 'Freeboard-SK';
this.shortName = 'Freeboard';
this.description = `Signal K Chart Plotter.`;
this.version = '2.12.0';
this.version = '2.12.1';
this.url = 'https://github.com/signalk/freeboard-sk';
this.logo = './assets/img/app_logo.png';

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
min-width: 150px;
position: relative;
height: 100%;
overflow-y: scroll;
}

.anchorwatch .title-block {
Expand Down
8 changes: 3 additions & 5 deletions src/app/modules/alarms/components/anchor-watch.component.html
Original file line number Diff line number Diff line change
Expand Up @@ -34,16 +34,14 @@
>
<b
style="
position: fixed;
top: 105px;
left: 69px;
position: relative;
top: 30px;
left: 80px;
width: 35px;
text-align: right;
"
>
{{ radius === -1 ? '--' : feet ? mToFt(radius) : radius.toFixed(0) }}
</b>
<b style="position: fixed; top: 105px; left: 109px; text-align: left">
{{ feet ? 'ft' : 'm' }}
</b>
</div>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -221,10 +221,10 @@ export class AISPropertiesModal implements OnInit {
}
if (typeof v['communication'] !== 'undefined') {
if (typeof v['communication']['callsignVhf'] !== 'undefined') {
this.vInfo.callsignVhf = v['communication']['callsignVhf'];
this.vInfo.callsignVhf = v['communication']['callsignVhf']['value'];
}
if (typeof v['communication']['callsignHf'] !== 'undefined') {
this.vInfo.callsignHf = v['communication']['callsignHf'];
this.vInfo.callsignHf = v['communication']['callsignHf']['value'];
}
}
if (typeof v['navigation'] !== 'undefined') {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
<div class="resourcelist" style="width: 320px">
<mat-menu #addchartmenu="matMenu">
<button mat-menu-item (click)="addChartSource('wmts')">WMTS</button>
<button mat-menu-item (click)="addChartSource('wms')">WMS</button>
<button mat-menu-item (click)="addChartSource('json')">
JSON Map Source
</button>
Expand Down
11 changes: 9 additions & 2 deletions src/app/modules/skresources/components/charts/chartlist.ts
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ import { FBCharts, FBChart, FBResourceSelect } from 'src/app/types';
import { forkJoin, of } from 'rxjs';
import { catchError } from 'rxjs/operators';
import { WMTSDialog } from './wmts-dialog';
import { WMSDialog } from './wms-dialog';
import { JsonMapSourceDialog } from './jsonmapsource-dialog';
import { SignalKClient } from 'signalk-client-angular';

Expand Down Expand Up @@ -310,15 +311,21 @@ export class ChartListComponent {
this.delete.emit({ id: id });
}

public addChartSource(type: 'wmts' | 'json') {
let dref: MatDialogRef<WMTSDialog | JsonMapSourceDialog>;
public addChartSource(type: 'wms' | 'wmts' | 'json') {
let dref: MatDialogRef<WMTSDialog | WMSDialog | JsonMapSourceDialog>;

if (type === 'wmts') {
dref = this.dialog.open(WMTSDialog, {
disableClose: true,
data: {}
});
}
if (type === 'wms') {
dref = this.dialog.open(WMSDialog, {
disableClose: true,
data: {}
});
}
if (type === 'json') {
dref = this.dialog.open(JsonMapSourceDialog, {
disableClose: true,
Expand Down
Loading

0 comments on commit 48db318

Please sign in to comment.