code adjustments

Author: ToniGrbic

apps/app/src/constants/geolocation.ts

@@ -2,8 +2,6 @@ export const TARGET_LAT: number = 43.508133;
 
 export const TARGET_LON: number = 16.440193;
 
-export const VALIDATION_RADIUS_M: number = 250;
+export const VALIDATION_RADIUS_M: number = 350;
 
-export const ACCURACY_LIMIT_M: number = 250;
-
-export const EARTH_RADIUS_M: number = 6371000; // Earth radius (m)
+export const EARTH_RADIUS_M: number = 6371000;

apps/app/src/hooks/useGeoValidation.ts

@@ -1,9 +1,9 @@
 import { useCallback, useEffect, useMemo, useState } from 'react';
 import { validateWithinRadius } from '@/validation/validateGeolocation';
-import { ACCURACY_LIMIT_M } from '@/constants/geolocation';
+import { VALIDATION_RADIUS_M } from '@/constants/geolocation';
 
 type GeoResult = {
-  ok: boolean;
+  isOk: boolean;
   distanceMeters: number;
   accuracyMeters: number | null;
 };
@@ -12,12 +12,11 @@ export function useGeoValidation(options?: {
   accuracyLimitMeters?: number;
   geolocationOptions?: PositionOptions;
 }) {
-  const accuracyLimit = options?.accuracyLimitMeters ?? ACCURACY_LIMIT_M;
+  const accuracyLimit = options?.accuracyLimitMeters ?? VALIDATION_RADIUS_M;
   const geoOptions = useMemo(
     () =>
       options?.geolocationOptions ?? {
-        // koristit ce vise baterije radi gps-a, mozda nam se neisplati
-        // enableHighAccuracy: true,
+        enableHighAccuracy: true,
         timeout: 15000,
         maximumAge: 0,
       },
@@ -42,28 +41,29 @@ export function useGeoValidation(options?: {
         const accuracy = pos.coords.accuracy ?? null;
 
         // Reject low-accuracy fixes first
-        if (accuracy == null || accuracy > accuracyLimit) {
+        if (!accuracy || accuracy > accuracyLimit) {
           const msg = `Location accuracy too low (${accuracy ? Math.round(accuracy) : '?'}m).`;
           setIsOk(false);
           setError(msg);
           setResult(
-            accuracy == null
+            !accuracy
               ? null
-              : { ok: false, distanceMeters: NaN, accuracyMeters: accuracy },
+              : { isOk: false, distanceMeters: NaN, accuracyMeters: accuracy },
           );
           return;
         }
 
-        const r = validateWithinRadius(pos.coords);
+        const { isOk, distanceMeters } = validateWithinRadius(pos.coords);
 
         const payload: GeoResult = {
-          ok: r.ok,
-          distanceMeters: r.distanceMeters,
+          isOk,
+          distanceMeters,
           accuracyMeters: accuracy,
         };
 
         setResult(payload);
-        setIsOk(r.ok);
+        setIsOk(isOk);
+        console.log('Geo validation result:', payload);
       },
       (err) => {
         setIsOk(false);

apps/app/src/validation/validateGeolocation.ts

@@ -5,13 +5,14 @@ import {
   VALIDATION_RADIUS_M,
 } from '@/constants/geolocation';
 
-/* const TARGET = { lat: 43.393407, lon: 16.281887 }; */ // example (Split)
+
 type Coordinates = {
   lat: number;
   lon: number;
 };
 
-const TARGET_COORDS: Coordinates = { lat: TARGET_LAT, lon: TARGET_LON }; // DUMP location
+/* const TARGET_COORDS  = { lat: 43.393407, lon: 16.281887 }; */ // for testing, set to your location
+const TARGET_COORDS: Coordinates = { lat: TARGET_LAT, lon: TARGET_LON }; 
 
 // Haversine distance in meters
 export function distanceMeters(a: Coordinates, b: Coordinates): number {
@@ -40,7 +41,7 @@ export function validateWithinRadius(userCoords: GeolocationCoordinates) {
   const dist = distanceMeters(user, TARGET_COORDS);
 
   return {
-    ok: dist <= VALIDATION_RADIUS_M,
+    isOk: dist <= VALIDATION_RADIUS_M,
     distanceMeters: dist,
     accuracyMeters: userCoords.accuracy, // reported by device
   };