ng 18

SignalK · Jul 6, 2024 · 0ca0ce7 · 0ca0ce7
1 parent a815c99
commit 0ca0ce7
Show file tree

Hide file tree

Showing 120 changed files with 4,032 additions and 3,057 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,15 @@
 # CHANGELOG: Freeboard
 
+### v2.9.0
+
+- **Added**: Ability to filter vessels by `AIS Ship Type` (#163).
+- **Added**: Display `performance.beatAngle` vectors on the map.
+- **Fixed**: Meteo properties `environment.water.waves` display formatting.
+- **Fixed**: Anchor watch not available when plugin is installed and enabled.
+- **Fixed**: Laylines not displayed if performance paths do not contain values.
+- **Updated**: Don't show internet map service dialog in kiosk mode. (#166)
+- **Updated**: Angular framework to v18
+
 ### v2.8.4
 
 - **Fixed**: shore.basestation popover & properties not displayed.

diff --git a/angular.json b/angular.json
@@ -15,12 +15,16 @@
       "prefix": "app",
       "architect": {
         "build": {
-          "builder": "@angular-devkit/build-angular:browser",
+          "builder": "@angular-devkit/build-angular:application",
           "options": {
-            "outputPath": "public",
+            "outputPath": {
+              "base": "public",
+              "browser": ""
+            },
             "index": "src/index.html",
-            "main": "src/main.ts",
-            "polyfills": "src/polyfills.ts",
+            "polyfills": [
+              "src/polyfills.ts"
+            ],
             "tsConfig": "tsconfig.app.json",
             "assets": [
               "src/favicon.ico",
@@ -33,17 +37,16 @@
               "src/styles.scss"
             ],
             "scripts": [],
-            "vendorChunk": true,
             "extractLicenses": false,
-            "buildOptimizer": false,
             "sourceMap": true,
             "optimization": false,
             "namedChunks": true,
             "webWorkerTsConfig": "tsconfig.worker.json",
             "allowedCommonJsDependencies": [
               "geolib",
               "simplify-ts"
-           ]
+          ],
+          "browser": "src/main.ts"
           },
           "configurations": {
             "production": {
@@ -58,8 +61,6 @@
               "sourceMap": false,
               "namedChunks": false,
               "extractLicenses": true,
-              "vendorChunk": false,
-              "buildOptimizer": true,
               "budgets": [
                 {
                   "type": "initial",

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@signalk/freeboard-sk",
-  "version": "2.8.4",
+  "version": "2.9.0",
   "description": "Openlayers chart plotter implementation for Signal K",
   "keywords": [
     "signalk-webapp",
@@ -43,19 +43,19 @@
     "tslib": "^2.0.0"
   },
   "devDependencies": {
-    "@angular-devkit/build-angular": "^17.3.0",
-    "@angular/animations": "^17.3.0",
-    "@angular/cdk": "^17.3.0",
-    "@angular/cli": "^17.3.0",
-    "@angular/common": "^17.3.0",
-    "@angular/compiler": "^17.3.0",
-    "@angular/compiler-cli": "^17.3.0",
-    "@angular/core": "^17.3.0",
-    "@angular/forms": "^17.3.0",
-    "@angular/language-service": "^17.3.0",
-    "@angular/material": "^17.3.0",
-    "@angular/platform-browser": "^17.3.0",
-    "@angular/platform-browser-dynamic": "^17.3.0",
+    "@angular-devkit/build-angular": "^18.0.5",
+    "@angular/animations": "^18.0.4",
+    "@angular/cdk": "^18.0.4",
+    "@angular/cli": "^18.0.5",
+    "@angular/common": "^18.0.4",
+    "@angular/compiler": "^18.0.4",
+    "@angular/compiler-cli": "^18.0.4",
+    "@angular/core": "^18.0.4",
+    "@angular/forms": "^18.0.4",
+    "@angular/language-service": "^18.0.4",
+    "@angular/material": "^18.0.4",
+    "@angular/platform-browser": "^18.0.4",
+    "@angular/platform-browser-dynamic": "^18.0.4",
     "@kolkov/angular-editor": "^2.1.0",
     "@types/arcgis-rest-api": "^10.4.5",
     "@types/express": "^4.17.17",
@@ -77,7 +77,7 @@
     "karma-coverage-istanbul-reporter": "~3.0.2",
     "karma-jasmine": "~4.0.0",
     "karma-jasmine-html-reporter": "^1.5.0",
-    "ng-packagr": "^17.3.0",
+    "ng-packagr": "^18.0.0",
     "ngeohash": "^0.6.3",
     "ol": "^9.0.0",
     "ol-mapbox-style": "^12.2.1",
@@ -98,4 +98,4 @@
     "xml2js": "^0.6.2",
     "zone.js": "~0.14.4"
   }
-}
+}
diff --git a/src/app-theme.scss b/src/app-theme.scss
@@ -4,45 +4,45 @@
 @include mat.core();
 
 // Define a theme.
-$my-primary: mat.define-palette(mat.$indigo-palette, 500,700,200);
-$my-accent:  mat.define-palette(mat.$amber-palette, 500,700,200);
+$my-primary: mat.m2-define-palette(mat.$m2-indigo-palette, 500,700,200);
+$my-accent:  mat.m2-define-palette(mat.$m2-amber-palette, 500,700,200);
 // The "warn" palette is optional and defaults to red if not specified.
-$my-warn:    mat.define-palette(mat.$red-palette, 500,700,200);
+$my-warn:    mat.m2-define-palette(mat.$m2-red-palette, 500,700,200);
 
-$my-theme: mat.define-light-theme((
+$my-theme: mat.m2-define-light-theme((
  color: (
    primary: $my-primary,
    accent: $my-accent,
    warn: $my-warn,
  ),
- typography: mat.define-typography-config(),
+ typography: mat.m2-define-typography-config(),
  density: 0,
 ));
 
 // Define a dark theme.
-$my-dark-primary: mat.define-palette(mat.$light-blue-palette, 200,300,400);
-$my-dark-accent:  mat.define-palette(mat.$amber-palette, A400, A100, A700);
-$my-dark-warn:    mat.define-palette(mat.$deep-orange-palette, A400);
+$my-dark-primary: mat.m2-define-palette(mat.$m2-light-blue-palette, 200,300,400);
+$my-dark-accent:  mat.m2-define-palette(mat.$m2-amber-palette, A400, A100, A700);
+$my-dark-warn:    mat.m2-define-palette(mat.$m2-deep-orange-palette, A400);
 
-$my-dark-theme: mat.define-dark-theme((
+$my-dark-theme: mat.m2-define-dark-theme((
  color: (
    primary: $my-dark-primary,
    accent: $my-dark-accent,
    warn: $my-dark-warn,
  ),
- typography: mat.define-typography-config(),
+ typography: mat.m2-define-typography-config(),
  density: 0,
 ));
 
 .dark-theme {
     @include mat.all-component-colors($my-dark-theme);
 
     .about-row .item a {
-        color: mat.get-color-from-palette($my-dark-accent);
+        color: mat.m2-get-color-from-palette($my-dark-accent);
     }
 
     .welcome a {
-        color: mat.get-color-from-palette($my-dark-accent);
+        color: mat.m2-get-color-from-palette($my-dark-accent);
     }  
 
     .popover > .arrow:after {
@@ -55,12 +55,12 @@ $my-dark-theme: mat.define-dark-theme((
         border-top-color: mat.get-theme-color($my-dark-theme, background, background);
     }
 
-    /* Track */
+
     ::-webkit-scrollbar-track {
         background: rgba(0,0,0,.5);
     }
 
-    /* Handle on hover */
+
     ::-webkit-scrollbar-thumb:hover {
         background: #999;
     }
@@ -82,26 +82,26 @@ $my-dark-theme: mat.define-dark-theme((
 
 // std elements
 .about-row .item a  {
-    color: mat.get-color-from-palette($my-primary);
+    color: mat.m2-get-color-from-palette($my-primary);
 }
 
-/* width */
+
 ::-webkit-scrollbar {
     width: 6px;
     height: 6px;
 }
 
-/* Track */
+
 ::-webkit-scrollbar-track {
     background: #f1f1f1;
 }
 
-/* Handle */
+
 ::-webkit-scrollbar-thumb {
     background: #888;
 }
 
-/* Handle on hover */
+
 ::-webkit-scrollbar-thumb:hover {
     background: #555;
 }
@@ -110,4 +110,3 @@ $my-dark-theme: mat.define-dark-theme((
 // Include all theme styles for the components.
 @include mat.all-component-themes($my-theme);
 
-
diff --git a/src/app/app.component.css b/src/app/app.component.css
@@ -39,6 +39,7 @@ mat-nav-list {
     padding-left: 0px;
     z-index: 5000; 
     background-color: rgba(200,200,200,.4);
+    width: 315px;
 }
 
 .buttonPanel {