make geolocation promise

src/components/molecules/Visualizer/Engine/Cesium/common.ts

@@ -154,23 +154,6 @@ export const vo = (
     [""]: undefined,
   }[o || ""]);
 
-// export const getCurrentLocation = () => {
-//   let myLocation;
-//   if (navigator.geolocation) {
-//     navigator.geolocation.getCurrentPosition(function (position) {
-//       if (!position) return undefined;
-//       myLocation = {
-//         lat: position.coords.latitude,
-//         lng: position.coords.longitude,
-//         height: position.coords.altitude ?? 5000,
-//       };
-//       return myLocation;
-//     });
-//   }
-//   if (myLocation !== undefined) return myLocation;
-//   return undefined;
-// };
-
 export const getCurrentLocation = () => {
   const currentLocation = useGeolocation;
   if (currentLocation?.()?.lat == undefined && currentLocation?.()?.lng == undefined)

src/components/molecules/Visualizer/storybook.tsx

@@ -102,6 +102,7 @@ export const context: ProviderProps = {
   onMouseEvent: act("onMouseEvent"),
   captureScreen: act("captureScreen"),
   getLocationFromScreen: act("getLocationFromScreen"),
+  getCurrentLocation: act("getCurrentLocation"),
   enableScreenSpaceCameraController: act("enableScreenSpaceCameraController"),
   lookHorizontal: act("lookHorizontal"),
   lookVertical: act("lookVertical"),

src/util/geolocation.ts

@@ -5,20 +5,38 @@ type CurrentLocation = {
   lng: number;
   height: number;
 };
+const initialLocation: CurrentLocation = {
+  lat: 5.70249,
+  lng: 39.7622,
+  height: 5000,
+};
+const goSuccess = (position: GeolocationPosition) => {
+  return {
+    lat: position.coords.latitude,
+    lng: position.coords.longitude,
+    heigh: position.coords.altitude ?? 5000,
+  };
+};
+
+const goError = (err: GeolocationPositionError) => {
+  console.error("Error Code = " + err.code + " - " + err.message);
+  return initialLocation;
+};
 
+const getPosition = () =>
+  new Promise((resolve, reject) =>
+    navigator.geolocation.getCurrentPosition(
+      pos => resolve(goSuccess(pos)),
+      err => reject(goError(err)),
+    ),
+  );
 export const useGeolocation = (): CurrentLocation | undefined => {
   const [location, setLocation] = useState<CurrentLocation>();
 
-  const handleSuccess = (position: any) => {
-    const { lat, lng, height } = position.coords;
-    setLocation({
-      lat,
-      lng,
-      height,
-    });
-  };
-
-  navigator.geolocation.getCurrentPosition(handleSuccess);
-
+  getPosition()
+    .then((position: CurrentLocation | any) => {
+      setLocation({ ...position });
+    })
+    .catch(error => console.error("error:", error.message));
   return location;
 };