From e062b4a577bb43bbad36a9fad37e2cadace48d3e Mon Sep 17 00:00:00 2001
From: log101 <ffrknerdm@gmail.com>
Date: Tue, 6 Feb 2024 20:27:45 +0300
Subject: [PATCH] feat: fix geolocation errors on initSelectionMap

---
 src/layouts/Layout.astro        |   3 +
 src/lib/utils.ts                |   4 ++
 src/pages/[id].astro            |   9 ---
 src/pages/api/debug.ts          |  11 ++++
 src/pages/index.astro           |   3 -
 src/scripts/initSelectionMap.js | 103 ++++++++++++++++++--------------
 6 files changed, 75 insertions(+), 58 deletions(-)
 create mode 100644 src/pages/api/debug.ts

diff --git a/src/layouts/Layout.astro b/src/layouts/Layout.astro
index 1ba3ab8..9a82e55 100644
--- a/src/layouts/Layout.astro
+++ b/src/layouts/Layout.astro
@@ -25,6 +25,9 @@
       src="https://unpkg.com/leaflet@1.9.4/dist/leaflet.js"
       integrity="sha256-20nQCchB9co0qIjJZRGuk2/Z9VM+kNiyxNV1lvTlZBo="
       crossorigin=""></script>
+    <script
+      type="text/javascript"
+      src="https://cdn.jsdelivr.net/npm/toastify-js"></script>
     <meta property="og:title" content="Konulu Konum" />
     <meta property="og:description" content="Sevdiklerinizi şaşırtın!" />
     <meta property="og:url" content="konulu-konum.vercel.app" />
diff --git a/src/lib/utils.ts b/src/lib/utils.ts
index d084cca..7532410 100644
--- a/src/lib/utils.ts
+++ b/src/lib/utils.ts
@@ -4,3 +4,7 @@ import { twMerge } from "tailwind-merge"
 export function cn(...inputs: ClassValue[]) {
   return twMerge(clsx(inputs))
 }
+
+export function remoteLog(data: any) {
+  fetch("/api/debug", { method: "POST", headers: { "Content-Type": "application/json" }, body: JSON.stringify(data) })
+}
diff --git a/src/pages/[id].astro b/src/pages/[id].astro
index e575a67..536734a 100644
--- a/src/pages/[id].astro
+++ b/src/pages/[id].astro
@@ -33,15 +33,6 @@ dayjs.extend(relativeTime);
 
 dayjs.extend(utc);
 
-console.log(
-  'then',
-  data?.created_at,
-  'now',
-  dayjs().format(),
-  'now utc',
-  dayjs.utc().format()
-);
-
 // @ts-expect-error Generated<string> is string
 const dateFromNow = dayjs(data?.created_at).add(3, 'hour').from(dayjs.utc());
 ---
diff --git a/src/pages/api/debug.ts b/src/pages/api/debug.ts
new file mode 100644
index 0000000..75c9874
--- /dev/null
+++ b/src/pages/api/debug.ts
@@ -0,0 +1,11 @@
+import type { APIRoute } from "astro"
+
+export const POST: APIRoute = async ({ request }) => {
+  const data = await request.json()
+
+  console.log(data)
+
+  return new Response(null, {
+    status: 200
+  })
+}
diff --git a/src/pages/index.astro b/src/pages/index.astro
index eac9c1e..c98bb03 100644
--- a/src/pages/index.astro
+++ b/src/pages/index.astro
@@ -157,9 +157,6 @@ import { Checkbox } from '@/components/ui/checkbox';
       </div>
     </form>
     <script src="../scripts/initSelectionMap.js"></script>
-    <script
-      type="text/javascript"
-      src="https://cdn.jsdelivr.net/npm/toastify-js"></script>
   </main>
 
   <script>
diff --git a/src/scripts/initSelectionMap.js b/src/scripts/initSelectionMap.js
index 4f7a03c..131c2e1 100644
--- a/src/scripts/initSelectionMap.js
+++ b/src/scripts/initSelectionMap.js
@@ -1,3 +1,5 @@
+import { remoteLog } from "@/lib/utils";
+
 var map = L.map('map').setView([41.024857599001905, 28.940787550837882], 10);
 
 L.tileLayer('https://tile.openstreetmap.org/{z}/{x}/{y}.png', {
@@ -22,33 +24,48 @@ var currentLocationIcon = L.icon({
 
 let currentLocationMarker;
 
-let watchId = -1;
 function startWatchingLocation() {
-    watchId = navigator.geolocation.watchPosition(
-        (position) => {
-            const pos = {
-                lat: position.coords.latitude,
-                lng: position.coords.longitude
-            }
-
-            if (currentLocationMarker) {
-                currentLocationMarker.setLatLng(pos);
-            } else {
-                currentLocationMarker = L.marker(pos, { icon: currentLocationIcon });
-                currentLocationMarker.addTo(map);
-            }
-        },
-        () => null,
-        { enableHighAccuracy: true, timeout: 27000, maximumAge: 10000 }
-    )
+    map.locate({ watch: true })
 }
 
-function onLocationError(e) {
-    alert(e.message);
+function onLocationError() {
+    // @ts-ignore
+    Toastify({
+        text: 'Konum izni alınamadı, lütfen tarayıcınızın ve cihazınızın gizlilik ayarlarını kontrol edin.',
+        duration: 3000,
+        gravity: 'top', // `top` or `bottom`
+        position: 'center', // `left`, `center` or `right`
+        stopOnFocus: true, // Prevents dismissing of toast on hover
+        style: {
+            background: 'black',
+            borderRadius: '6px',
+            margin: '16px',
+        },
+        onClick: function () { }, // Callback after click
+    }).showToast();
+}
+
+
+function onLocationSuccess(locationEvent) {
+    const position = locationEvent.latlng
+
+    const currentPos = {
+        lat: position.lat,
+        lng: position.lng
+    }
+
+    if (currentLocationMarker) {
+        currentLocationMarker.setLatLng(currentPos);
+    } else {
+        currentLocationMarker = L.marker(currentPos, { icon: currentLocationIcon });
+        currentLocationMarker.addTo(map);
+    }
 }
 
 map.on('locationerror', onLocationError);
 
+map.on('locationfound', onLocationSuccess)
+
 L.Control.GoToCurrentLocation = L.Control.extend({
     onAdd: function (map) {
         const locationButton = document.createElement('button');
@@ -60,11 +77,29 @@ L.Control.GoToCurrentLocation = L.Control.extend({
         locationButton.type = 'button'
 
         locationButton.addEventListener('click', (ev) => {
-            if (watchId === -1) {
+            if (locationButton.textContent != 'Konumuma Git') {
                 startWatchingLocation()
                 locationButton.textContent = 'Konumuma Git';
             } else {
-                map.setView(currentLocationMarker.getLatLng(), 12);
+                if (currentLocationMarker) {
+                    map.setView(currentLocationMarker.getLatLng(), 12);
+                } else {
+                    // @ts-ignore
+                    Toastify({
+                        text: 'Konum izni alınamadı, lütfen tarayıcınızın ve cihazınızın gizlilik ayarlarını kontrol edin.',
+                        duration: 3000,
+                        gravity: 'top', // `top` or `bottom`
+                        position: 'center', // `left`, `center` or `right`
+                        stopOnFocus: true, // Prevents dismissing of toast on hover
+                        style: {
+                            background: 'black',
+                            borderRadius: '6px',
+                            margin: '16px',
+                        },
+                        onClick: function () { }, // Callback after click
+                    }).showToast();
+                }
+
             }
             L.DomEvent.stopPropagation(ev)
         })
@@ -79,30 +114,6 @@ L.control.currentLocation = function (opts) {
 
 L.control.currentLocation({ position: 'bottomleft' }).addTo(map);
 
-navigator.permissions
-    .query({ name: "geolocation" })
-    .then((permissionStatus) => {
-        if (permissionStatus.state === 'granted') {
-            navigator.geolocation.watchPosition(
-                (position) => {
-                    const pos = {
-                        lat: position.coords.latitude,
-                        lng: position.coords.longitude
-                    }
-
-                    if (currentLocationMarker) {
-                        currentLocationMarker.setLatLng(pos);
-                    } else {
-                        currentLocationMarker = L.marker(pos, { icon: currentLocationIcon });
-                        currentLocationMarker.addTo(map);
-                    }
-                },
-                () => null,
-                { enableHighAccuracy: true, maximumAge: 10000, timeout: 57000 }
-            )
-        }
-    });
-
 
 map.on('click', (e) => {
     if (targetLocationMarker) {