From 96b93d4d426e92752b043e797e6af38ab1ddcc6f Mon Sep 17 00:00:00 2001
From: grata <aramis.grata@bluewin.ch>
Date: Mon, 3 Apr 2023 15:39:55 +0200
Subject: [PATCH] created service to calculate distance between two coordinates

---
 src/app/detail/detail.component.ts           | 23 +++---------------
 src/app/service/calculateDistance.service.ts | 25 ++++++++++++++++++++
 2 files changed, 28 insertions(+), 20 deletions(-)
 create mode 100644 src/app/service/calculateDistance.service.ts

diff --git a/src/app/detail/detail.component.ts b/src/app/detail/detail.component.ts
index e57e9f1..cc3e753 100755
--- a/src/app/detail/detail.component.ts
+++ b/src/app/detail/detail.component.ts
@@ -1,5 +1,6 @@
 import {Component, OnInit} from '@angular/core';
 import {ActivatedRoute} from "@angular/router";
+import {CalculateDistanceService} from "../service/calculateDistance.service";
 
 @Component({
   selector: 'app-detail',
@@ -10,7 +11,7 @@ export class DetailComponent implements OnInit {
   private location: string | undefined;
   private id: number | undefined;
 
-  constructor(private route: ActivatedRoute) {
+  constructor(private route: ActivatedRoute , private calculateDistanceService: CalculateDistanceService) {
   }
 
   ngOnInit(): void {
@@ -65,7 +66,7 @@ export class DetailComponent implements OnInit {
     let lon2 = this.test.cordinates.split(",")[1];
     let intervalID = setInterval(() => {
       if (this.showNav) {
-        this.distance = this.getDistanceBetweenCoordinates(lat1, lon1, +lat2, +lon2);
+        this.distance = this.calculateDistanceService.getDistanceBetweenCoordinates(lat1, lon1, +lat2, +lon2);
         console.log(this.distance);
         if (this.distance == 0) {
           this.showNav = false;
@@ -82,23 +83,5 @@ export class DetailComponent implements OnInit {
     }, 1000);
   }
 
-  getDistanceBetweenCoordinates(lat1: number, lon1: number, lat2: number, lon2: number) {
-    const earthRadius = 6371; // Radius of the earth in km
-    const dLat = this.deg2rad(lat2 - lat1);  // deg2rad below
-    const dLon = this.deg2rad(lon2 - lon1);
-    const a =
-      Math.sin(dLat / 2) * Math.sin(dLat / 2) +
-      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));
-    // Distance in km
-    return earthRadius * c;
-  }
-
-  deg2rad(deg: number) {
-    return deg * (Math.PI / 180)
-  }
-
   ///
 }
diff --git a/src/app/service/calculateDistance.service.ts b/src/app/service/calculateDistance.service.ts
new file mode 100644
index 0000000..c91c0d5
--- /dev/null
+++ b/src/app/service/calculateDistance.service.ts
@@ -0,0 +1,25 @@
+import {Injectable} from '@angular/core';
+
+@Injectable({
+  providedIn: 'root'
+})
+export class CalculateDistanceService{
+  getDistanceBetweenCoordinates(lat1: number, lon1: number, lat2: number, lon2: number) {
+    const earthRadius = 6371; // Radius of the earth in km
+    const dLat = this.deg2rad(lat2 - lat1);  // deg2rad below
+    const dLon = this.deg2rad(lon2 - lon1);
+    const a =
+      Math.sin(dLat / 2) * Math.sin(dLat / 2) +
+      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));
+    // Distance in km
+    return earthRadius * c;
+  }
+
+  deg2rad(deg: number) {
+    return deg * (Math.PI / 180)
+  }
+
+}