+
@@ -272,37 +266,27 @@ export class ConfirmDialog implements OnInit {
Visit Website
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
`,
@@ -253,7 +247,7 @@ export class ConfirmDialog implements OnInit {
template: `
About:
-
+
![]()
-
-
+
+ -
-
+
-
+
+
Invalid GeoJSON Data:
Selected file does not contain valid GeoJSON data or
does not define a valid FeatureCollection.
- Selected file does not contain valid GeoJSON data or
does not define a valid FeatureCollection.
+
-
+
@@ -59,7 +45,7 @@
arrow_forward
@@ -67,7 +53,7 @@
place
Waypoints:
- ({{geoData?.waypoints.length}})
+ ({{geoData?.waypoints.length}})
@@ -79,7 +65,7 @@
arrow_forward
@@ -87,7 +73,7 @@
directions
Routes:
- ({{geoData?.routes.length}})
+ ({{geoData?.routes.length}})
@@ -102,7 +88,7 @@
arrow_forward
@@ -110,7 +96,7 @@
show_chart
Tracks:
- ({{geoData?.tracks.length}})
+ ({{geoData?.tracks.length}})
@@ -122,7 +108,7 @@
arrow_forward
@@ -130,10 +116,23 @@
tab_unselected
Regions:
- ({{geoData?.regions.length}})
+ ({{geoData?.regions.length}})
+
+
diff --git a/src/app/modules/geojson/geojson-dialog.ts b/src/app/lib/components/dialogs/geojson-dialog.ts
similarity index 64%
rename from src/app/modules/geojson/geojson-dialog.ts
rename to src/app/lib/components/dialogs/geojson-dialog.ts
index 4ef314a8..a6da21bc 100644
--- a/src/app/modules/geojson/geojson-dialog.ts
+++ b/src/app/lib/components/dialogs/geojson-dialog.ts
@@ -1,14 +1,44 @@
import { Component, OnInit, Inject } from '@angular/core';
-import { MatDialogRef, MAT_DIALOG_DATA } from '@angular/material/dialog';
+import {
+ MatDialogModule,
+ MatDialogRef,
+ MAT_DIALOG_DATA
+} from '@angular/material/dialog';
+import { CommonModule } from '@angular/common';
+import { FormsModule } from '@angular/forms';
+import { MatButtonModule } from '@angular/material/button';
+import { MatCardModule } from '@angular/material/card';
+import { MatCheckboxModule } from '@angular/material/checkbox';
+import { MatExpansionModule } from '@angular/material/expansion';
+import { MatFormFieldModule } from '@angular/material/form-field';
+import { MatIconModule } from '@angular/material/icon';
+import { MatInputModule } from '@angular/material/input';
+import { MatToolbarModule } from '@angular/material/toolbar';
+import { MatTooltipModule } from '@angular/material/tooltip';
-import { GeoJSONLoadFacade } from './geojson.facade';
+import { GeoJSONLoadFacade } from './geojson-dialog.facade';
import { AppInfo } from 'src/app/app.info';
//** GeoJSON import dialog **
@Component({
+ standalone: true,
selector: 'geojson-dialog',
+ imports: [
+ CommonModule,
+ FormsModule,
+ MatDialogModule,
+ MatIconModule,
+ MatButtonModule,
+ MatCardModule,
+ MatExpansionModule,
+ MatCheckboxModule,
+ MatTooltipModule,
+ MatToolbarModule,
+ MatFormFieldModule,
+ MatInputModule
+ ],
templateUrl: './geojson-dialog.html',
- styleUrls: ['./geojson.css']
+ styleUrls: ['./geojson-dialog.css']
})
export class GeoJSONImportDialog implements OnInit {
public geoData = {
diff --git a/src/app/modules/gpx/gpx.module.ts b/src/app/lib/components/dialogs/gpx/gpx.module.ts
similarity index 86%
rename from src/app/modules/gpx/gpx.module.ts
rename to src/app/lib/components/dialogs/gpx/gpx.module.ts
index ec5a69f5..0d7bb2d9 100644
--- a/src/app/modules/gpx/gpx.module.ts
+++ b/src/app/lib/components/dialogs/gpx/gpx.module.ts
@@ -18,8 +18,8 @@ import { MatTooltipModule } from '@angular/material/tooltip';
// ** components **
-import { GPXImportDialog } from './gpxload/import-dialog';
-import { GPXExportDialog } from './gpxsave/export-dialog';
+import { GPXImportDialog } from './gpxload/gpxload-dialog';
+import { GPXExportDialog } from './gpxsave/gpxsave-dialog';
@NgModule({
imports: [
@@ -42,5 +42,5 @@ import { GPXExportDialog } from './gpxsave/export-dialog';
})
export class GPXModule {}
-export * from './gpxload/import-dialog';
-export * from './gpxsave/export-dialog';
+export * from './gpxload/gpxload-dialog';
+export * from './gpxsave/gpxsave-dialog';
diff --git a/src/app/modules/gpx/gpxlib.ts b/src/app/lib/components/dialogs/gpx/gpxlib.ts
similarity index 100%
rename from src/app/modules/gpx/gpxlib.ts
rename to src/app/lib/components/dialogs/gpx/gpxlib.ts
diff --git a/src/app/modules/gpx/gpxload/gpxload.css b/src/app/lib/components/dialogs/gpx/gpxload/gpxload-dialog.css
similarity index 78%
rename from src/app/modules/gpx/gpxload/gpxload.css
rename to src/app/lib/components/dialogs/gpx/gpxload/gpxload-dialog.css
index 2e908007..4bdb923b 100644
--- a/src/app/modules/gpx/gpxload/gpxload.css
+++ b/src/app/lib/components/dialogs/gpx/gpxload/gpxload-dialog.css
@@ -1,24 +1,16 @@
.gpxload-dialog {
font-family: roboto;
- position: relative; width: 100%;
-}
-
-.dialog-content {
- position: relative;
- min-height: 300px;
- max-height: 400px;
- width: 100%;
- min-width: 240px;
- overflow-y: auto;
+ position: relative; width: 75vw;
}
.dialog-icon {
display: none;
}
-.card-group {
- padding: 5px 5% 5px 5%;
+.mat-expansion-panel-body {
+ padding: 0 12px 6px;
}
+
.card-group-title {
font-weight: bold;
font-size: 10pt;
@@ -36,6 +28,7 @@
.pnlSelectedItems {
display: none;
+ line-height: 2.9em;
}
.pnlSelect {
@@ -65,6 +58,7 @@ button {
@media only screen and (min-width : 475px) {
.pnlSelectedItems {
display: inline;
+ line-height: 2.9em;
}
.txtSelect {
display: inline;
@@ -89,9 +83,6 @@ button {
/* large */
@media only screen and (min-width : 800px) {
- .card-group {
- padding: 5px 5% 5px 5%;
- }
}
diff --git a/src/app/modules/gpx/gpxload/gpxload.facade.ts b/src/app/lib/components/dialogs/gpx/gpxload/gpxload-dialog.facade.ts
similarity index 99%
rename from src/app/modules/gpx/gpxload/gpxload.facade.ts
rename to src/app/lib/components/dialogs/gpx/gpxload/gpxload-dialog.facade.ts
index e7ba96a7..c3684bcb 100644
--- a/src/app/modules/gpx/gpxload/gpxload.facade.ts
+++ b/src/app/lib/components/dialogs/gpx/gpxload/gpxload-dialog.facade.ts
@@ -5,7 +5,7 @@ import { Subject, Observable } from 'rxjs';
import { AppInfo } from 'src/app/app.info';
import { SignalKClient } from 'signalk-client-angular';
-import { SKResources } from '../../skresources';
+import { SKResources } from '../../../../../modules/skresources';
import {
GPX,
GPXRoute,
diff --git a/src/app/modules/gpx/gpxload/import-dialog.html b/src/app/lib/components/dialogs/gpx/gpxload/gpxload-dialog.html
similarity index 94%
rename from src/app/modules/gpx/gpxload/import-dialog.html
rename to src/app/lib/components/dialogs/gpx/gpxload/gpxload-dialog.html
index 1908b64f..ff0ea9aa 100644
--- a/src/app/modules/gpx/gpxload/import-dialog.html
+++ b/src/app/lib/components/dialogs/gpx/gpxload/gpxload-dialog.html
@@ -12,7 +12,7 @@
-
-
- {{data.fileName}}
-
-
-
-
+ {{data.fileName}}
Point:
-
+
LineString:
-
+
MultiLineString:
-
+
Polygon:
-
+
+
+
+
Invalid GPX Data:
-
+
-
- {{data.fileName}}
-
+ {{data.fileName}}