JoeKung/Progetto-m152-Angular
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

adding waypoinst list on list.component --> in working

Browse Source
This commit is contained in:
Joe Küng
2023-04-15 15:11:31 +02:00
parent e0950acce6
commit 92c5db204d
2 changed files with 21 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/app/list/list.component.html
View File

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

29
src/app/list/list.component.ts
View File

@@ -1,9 +1,7 @@
import {Component, OnInit} from '@angular/core'; import {Component, OnInit} from '@angular/core';
import {Locations} from "../interface/data"; import {Locations} from "../interface/data";
import {ReadjsonService} from "../service/readjson.service"; import {ReadjsonService} from "../service/readjson.service";
import {Observable} from "rxjs";
import {ActivatedRoute} from "@angular/router"; import {ActivatedRoute} from "@angular/router";
import {Cord} from "../interface/cord";
import {positionService} from "../service/position.service"; import {positionService} from "../service/position.service";
@Component({ @Component({
@@ -16,13 +14,14 @@ export class ListComponent implements OnInit {
locations: Partial<Locations>[] | undefined; locations: Partial<Locations>[] | undefined;
location: Partial<Locations> | undefined; location: Partial<Locations> | undefined;
isNear: boolean = true;
positionCord: any; positionCord: any;
isNear: boolean = true;
distance: number = 0; 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() { async ngOnInit() {
this.route.params.subscribe(params => { this.route.params.subscribe(params => {
@@ -37,7 +36,6 @@ export class ListComponent implements OnInit {
}); });
} }
}); });
this.positionCord = await this.readjsonService.getLocations();
this.setDistance(); this.setDistance();
} }
@@ -48,16 +46,29 @@ export class ListComponent implements OnInit {
if (this.locations[i].location === this.locationParams) { if (this.locations[i].location === this.locationParams) {
this.location = this.locations[i]; this.location = this.locations[i];
console.log("Location trovata:", this.location); console.log("Location trovata:", this.location);
this.isNear= false; this.isNear = false;
break; break;
} }
} }
} }
} }
private setDistance(): void{
if (this.location && this.isNear){ 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); this.distance = this.positionService.getDistanceBetweenCoordinates(this.location.lat, this.location.lon, this.positionCord.lat, this.positionCord.lon);
console.log("Distanza: " + this.distance + " km"); 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);
}
} }