Merge remote-tracking branch 'origin/dev' into dev

src/app/interface/data.ts

@@ -4,7 +4,7 @@ export interface Locations {
   lat: number;
   lon: number;
   distance?: number;
-  waypoints?: waypoint[];
+  waypoints: waypoint[];
 }
 
 export interface waypoint {

src/app/list/list.component.html

@@ -10,7 +10,7 @@
     <h3>
       {{waypoinst.name}}
     </h3>
-    <h4>Distance: }</h4>
+    <h4>Distance: {{getDistance(waypoinst.lat, location.lon)}}</h4>
   </div>
 
 </div>

src/app/list/list.component.ts

@@ -1,9 +1,7 @@
 import {Component, OnInit} from '@angular/core';
 import {Locations} from "../interface/data";
 import {ReadjsonService} from "../service/readjson.service";
-import {Observable} from "rxjs";
 import {ActivatedRoute} from "@angular/router";
-import {Cord} from "../interface/cord";
 import {positionService} from "../service/position.service";
 
 @Component({
@@ -16,13 +14,14 @@ export class ListComponent implements OnInit {
   locations: Partial<Locations>[] | undefined;
   location: Partial<Locations> | undefined;
 
-  isNear: boolean = true;
-
   positionCord: any;
 
+  isNear: boolean = true;
+
   distance: number = 0;
 
-  constructor(private route: ActivatedRoute ,private readjsonService: ReadjsonService, private positionService: positionService) {}
+  constructor(private route: ActivatedRoute, private readjsonService: ReadjsonService, private positionService: positionService) {
+  }
 
   async ngOnInit() {
     this.route.params.subscribe(params => {
@@ -37,7 +36,6 @@ export class ListComponent implements OnInit {
         });
       }
     });
-    this.positionCord = await this.readjsonService.getLocations();
     this.setDistance();
   }
 
@@ -54,10 +52,23 @@ export class ListComponent implements OnInit {
       }
     }
   }
+
   private setDistance(): void {
     if (this.location && this.isNear) {
       this.distance = this.positionService.getDistanceBetweenCoordinates(this.location.lat, this.location.lon, this.positionCord.lat, this.positionCord.lon);
       console.log("Distanza: " + this.distance + " km");
     }
   }
+
+  getDistance(latLocation: number | undefined, lonLocation: number | undefined): any {
+    setInterval(async () => {
+      this.positionCord = await this.positionService.getLocation();
+      if (this.location) {
+        return this.positionService.getDistanceBetweenCoordinates(latLocation, lonLocation, this.positionCord.lat, this.positionCord.lon);
+      } else {
+        return 0;
+      }
+    }, 1000);
+  }
+
 }

src/app/service/position.service.ts

@@ -26,7 +26,7 @@ export class positionService{
     }
   }*/
 
-  getDistanceBetweenCoordinates(lat1: number | undefined, lon1: number | undefined, lat2: number, lon2: number) {
+  getDistanceBetweenCoordinates(lat1: number | undefined, lon1: number | undefined, lat2: number, lon2: number): number{
     if (lat1 === undefined || lon1 === undefined) {
       console.log('lat1 or lon1 is undefined')
       return 0;
@@ -38,8 +38,7 @@ export class positionService{
       Math.cos(this.deg2rad(lat1)) * Math.cos(this.deg2rad(lat2)) *
       Math.sin(dLon / 2) * Math.sin(dLon / 2);
     const c = 2 * Math.atan2(Math.sqrt(a), Math.sqrt(1 - a));
-    const distance = earthRadius * c; // Distanza in km
+    return earthRadius * c;
-    return distance;
   }
 
 

src/app/service/readjson.service.ts

@@ -39,18 +39,22 @@ export class ReadjsonService{
     );
   }
 
-/*
+
   getWaypoints(location: string, id: number): Observable<waypoint[]> {
     return this.locations.pipe(
       map((locations) => {
         const foundLocation: Locations | undefined = locations.find((loc: Locations) => loc.location === location);
+        if (foundLocation?.waypoints) {
           return foundLocation ? foundLocation.waypoints.filter((way: waypoint) => way.id === id) : [];
+        } else {
+          return [];
+        }
       }),
       tap(data => console.log("data requested", data))
     );
   }
 
- */
+
 
 
 }