From 4ccb2d50750e1079942c24efe8be311aa82e8b73 Mon Sep 17 00:00:00 2001
From: tito <tito.arrigo@icloud.com>
Date: Sat, 15 Apr 2023 12:30:52 +0200
Subject: [PATCH] detail + position modifiche

---
 src/app/detail/detail.component.html |  2 +-
 src/app/detail/detail.component.ts   |  1 +
 src/app/service/position.service.ts  | 15 ++++++++++++++-
 3 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/src/app/detail/detail.component.html b/src/app/detail/detail.component.html
index 2b677fa..2ae121d 100644
--- a/src/app/detail/detail.component.html
+++ b/src/app/detail/detail.component.html
@@ -12,7 +12,7 @@
       allowfullscreen>
     </iframe>
   </div>
-  <button (click)="generateQRCode()">
+  <button>
     <svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="17.334" height="23.4863">
       <g>
         <rect height="23.4863" opacity="0" width="17.334" x="0" y="0"/>
diff --git a/src/app/detail/detail.component.ts b/src/app/detail/detail.component.ts
index 524716a..2783901 100755
--- a/src/app/detail/detail.component.ts
+++ b/src/app/detail/detail.component.ts
@@ -38,6 +38,7 @@ export class DetailComponent implements OnInit {
     console.log(this.id);
     console.log(this.embed);
     this.cord = await this.positionService.getLocation();
+    console.log(this.cord);
     this.checkDistanceTimer();
   }
 
diff --git a/src/app/service/position.service.ts b/src/app/service/position.service.ts
index 4b974bd..875fdc2 100644
--- a/src/app/service/position.service.ts
+++ b/src/app/service/position.service.ts
@@ -7,7 +7,7 @@ import{Cord} from "../interface/cord";
 export class positionService{
   cord: Cord = { lat: 0, lon: 0 };
 
-  getDistanceBetweenCoordinates(lat1: number | undefined, lon1: number | undefined, lat2: number, lon2: number) {
+  /*getDistanceBetweenCoordinates(lat1: number | undefined, lon1: number | undefined, lat2: number, lon2: number) {
     if (lat1 === undefined || lon1 === undefined) {
       console.log('lat1 or lon1 is undefined')
       return 0;
@@ -24,8 +24,21 @@ export class positionService{
       // Distance in km
       return earthRadius * c;
     }
+  }*/
+
+  getDistanceBetweenCoordinates(lat1: number, lon1: number, lat2: number, lon2: number) {
+    const earthRadius = 6371; // Raggio della Terra in km
+    const dLat = this.deg2rad(lat2 - lat1);
+    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));
+    const distance = earthRadius * c; // Distanza in km
+    return distance;
   }
 
+
   deg2rad(deg: number) {
     return deg * (Math.PI / 180)
   }