-

Author: vouillon

src/lib/visibility.ml

@@ -33,7 +33,7 @@ let test
     let h' =
       ((dst_h -. src_h) *. float ((dx * dx') + (dy * dy')) /. d /. d) +. src_h
     in
-    let res = d' > 0.97 *. d || h < h' in
+    let res = d' > 0.94 *. d || h < h' in
     (*    Format.eprintf "%g - %g %g - %b@." (d' /. d) h h' res;*)
     res
   in

src/web/viewer.ml

@@ -684,27 +684,11 @@ let wait_for_service_worker =
              (as_target r));
         fut
 
-(*
-let get_position () =
-  let open Fut.Syntax in
-  let open Brr_io.Geolocation in
-  let opts = opts ~high_accuracy:true () in
-  let+ pos = get ~opts (of_navigator Brr.G.navigator) in
-  match pos with
-  | Ok pos -> Ok (Pos.latitude pos, Pos.longitude pos, 0.)
-  | Error _ -> assert false
-*)
-
-let get_position () =
+let get_preset_position () =
   let pos =
-    if true then (44.3950846, 6.7669714, 170.)
-    else if
-      (*if true then (48.849418, 2.3674101, 0.)
-      else*)
-      true
-    then (44.607649, 6.8204019, 220.)
-      (*(44.607728, 6.821075, 0.)*)
-      (* Col Girardin *)
+    if true then (44.3950846, 6.7669714, 170.) (* La Chalannette, Jausiers *)
+    else if true then (48.849418, 2.3674101, 0.) (* Paris *)
+    else if true then (44.607649, 6.8204019, 220.) (* Col Girardin *)
     else if true then (44.209067, 6.9423065, 0.) (* Col du Blainon *)
     else if true then (44.207447, 6.906400, 40.)
       (* Auron vers est vallée de la Tinée *)
@@ -717,6 +701,17 @@ let get_position () =
   in
   Fut.return (Ok pos)
 
+let get_position () =
+  if true then get_preset_position ()
+  else
+    let open Fut.Syntax in
+    let open Brr_io.Geolocation in
+    let opts = opts ~high_accuracy:true () in
+    let+ pos = get ~opts (of_navigator Brr.G.navigator) in
+    match pos with
+    | Ok pos -> Ok (Pos.latitude pos, Pos.longitude pos, 0.)
+    | Error err -> Error (Jv.Error.v (Error.message err))
+
 let main () =
   let* () = to_lwt wait_for_service_worker in
   let* lat, lon, angle = to_lwt (get_position ()) in