@situm/react-native 3.0.0-beta.0 → 3.0.0-beta.2

package/src/wayfinding/hooks/index.ts

@@ -1,23 +1,23 @@
 /* eslint-disable @typescript-eslint/no-explicit-any */
 import { useEffect, useRef, useState } from "react";
 
-import type {
-  Building,
-  DirectionPoint,
-  LocationRequestOptions,
-  Poi,
+import {
+  type Building,
+  type DirectionPoint,
+  type LocationRequestOptions,
+  LocationStatus,
+  LocationStatusName,
+  NavigationStatus,
+  NavigationUpdateType,
+  type Poi,
+  type Position,
+  type SDKError,
+  type SDKNavigation,
 } from "../../index";
 import SitumPlugin from "../../sdk";
 import requestPermission from "../../utils/requestPermission";
 import {
-  NavigateToPoiType,
-  NavigationStatus,
-  NavigationUpdateType,
-  Position,
-  PositioningStatus,
   resetLocation,
-  SDKError,
-  SDKNavigation,
   selectBuildings,
   selectCurrentBuilding,
   selectDestinationPoiID,
@@ -29,7 +29,6 @@ import {
   selectNavigation,
   selectPois,
   selectUser,
-  selectWebViewRef,
   setAuth,
   setBuildings,
   setCurrentBuilding,
@@ -44,23 +43,16 @@ import {
   State,
 } from "../store/index";
 import { useDispatch, useSelector } from "../store/utils";
-import { sendMessageToViewer } from "../utils";
-import Mapper from "../utils/mapper";
 
 const defaultNavigationOptions = {
   distanceToGoalThreshold: 4,
   outsideRouteThreshold: 5,
 };
 
-export interface LocationStatus {
-  statusName: string;
-  statusCode: number;
-}
-
 // Hook to define references that point to functions
 // used on listeners. These references are updated whenever
 // one of the dependencies on the array change
-const useCallbackRef = <T>(fn: T, deps: any[]) => {
+export const useCallbackRef = <T>(fn: T, deps: any[]) => {
   const fnRef = useRef(fn);
 
   useEffect(() => {
@@ -73,7 +65,6 @@ const useCallbackRef = <T>(fn: T, deps: any[]) => {
 
 const useSitum = () => {
   const dispatch = useDispatch();
-  const webViewRef = useSelector(selectWebViewRef);
   const isSdkInitialized = useSelector(selectIsSdkInitialized);
   const user = useSelector(selectUser);
   const location = useSelector(selectLocation);
@@ -170,7 +161,7 @@ const useSitum = () => {
     });
 
   const initializeBuildingById = async (buildingId: string) => {
-    if (buildings.length === 0) return;
+    if (!buildings || buildings.length === 0) return;
     const newBuilding = buildings.find(
       (b: Building) => b.buildingIdentifier === buildingId
     );
@@ -212,7 +203,7 @@ const useSitum = () => {
   const startPositioning = () => {
     console.debug("Situm > hook > Starting positioning...");
 
-    if (location.status !== PositioningStatus.STOPPED) {
+    if (location.status !== LocationStatusName.STOPPED) {
       console.debug("Situm > hook > Positioning has already started");
       return;
     }
@@ -231,11 +222,11 @@ const useSitum = () => {
         );
       },
       (status: LocationStatus) => {
-        if (status.statusName in PositioningStatus) {
+        if (status.statusName in LocationStatusName) {
           console.debug(
             `Situm > hook > Positioning state updated ${status.statusName}`
           );
-          dispatch(setLocationStatus(status.statusName as PositioningStatus));
+          dispatch(setLocationStatus(status.statusName as LocationStatusName));
         }
       },
       (err: string) => {
@@ -421,34 +412,6 @@ const useSitum = () => {
     });
   };
 
-  const navigateToPoi = async ({
-    poi,
-    poiId,
-  }: {
-    poi?: Poi;
-    poiId?: number;
-  }) => {
-    if (!poi && !poiId) return;
-    const validPoi = pois?.find(
-      (p) =>
-        p?.identifier === poiId?.toString() ||
-        // @ts-ignore
-        p?.identifier === poi?.id?.toString()
-    );
-    if (!validPoi) {
-      console.error("Situm > hook > Invalid value as poi or poiId");
-      return;
-    }
-
-    sendMessageToViewer(
-      webViewRef.current,
-      Mapper.navigateToPoi({
-        // @ts-ignore
-        navigationTo: poi?.id || poiId,
-      } as NavigateToPoiType)
-    );
-  };
-
   const stopNavigation = (): void => {
     console.debug("Stopping navigation");
     if (!navigation || navigation.status === NavigationStatus.STOP) {
@@ -464,27 +427,6 @@ const useSitum = () => {
     dispatch(setNavigation({ status: NavigationStatus.STOP }));
     dispatch(setDestinationPoiID(undefined));
   };
-
-  const cancelNavigation = (): void => {
-    stopNavigation();
-    sendMessageToViewer(webViewRef.current, Mapper.cancelNavigation());
-  };
-
-  const selectPoi = (poiId: number): void => {
-    const poi = pois?.find((p) => p?.identifier === poiId?.toString());
-    if (!poi) {
-      console.error("Situm > hook > Invalid value as poiId");
-      return;
-    }
-    if (navigation.status !== NavigationStatus.STOP) {
-      console.error(
-        "Situm > hook > Navigation on course, poi selection is unavailable"
-      );
-      return;
-    }
-    sendMessageToViewer(webViewRef.current, Mapper.selectPoi(poiId));
-  };
-
   const stopNavigationRef = useCallbackRef(stopNavigation, [navigation]);
 
   useEffect(() => {
@@ -530,9 +472,6 @@ const useSitum = () => {
     calculateRoute,
     startNavigation,
     stopNavigation,
-    cancelNavigation,
-    selectPoi,
-    navigateToPoi,
   };
 };
 

package/src/wayfinding/store/index.tsx

@@ -1,98 +1,31 @@
 /* eslint-disable @typescript-eslint/no-explicit-any */
 import React, { createContext, MutableRefObject, useReducer } from "react";
-//@ts-ignore
-import { Building, Poi } from "react-native-situm-plugin";
 
+import {
+  Building,
+  Location,
+  LocationStatusName,
+  NavigationStatus,
+  Poi,
+  SDKError,
+  SDKNavigation,
+} from "../../sdk/types/index.d";
 import { createReducer } from "./utils";
 
-export interface Location {
-  position?: Position;
-  accuracy?: number;
-  bearing?: {
-    degrees: number;
-    degreesClockwise: number;
-  };
-  hasBearing?: boolean;
-  status: PositioningStatus;
-}
-
-export interface Position {
-  coordinate: {
-    latitude: number;
-    longitude: number;
-  };
-  cartesianCoordinate: {
-    x: number;
-    y: number;
-  };
-  isIndoor?: boolean;
-  isOutdoor?: boolean;
-  buildingIdentifier?: string;
-  floorIdentifier?: string;
-}
-
-export enum PositioningStatus {
-  STARTING = "STARTING",
-  CALCULATING = "CALCULATING",
-  // This status will always be sent to mapviewer-web, in case we recieve
-  // a location from SDK.
-  POSITIONING = "POSITIONING",
-  USER_NOT_IN_BUILDING = "USER_NOT_IN_BUILDING",
-  STOPPED = "STOPPED",
-}
-
-export interface SDKNavigation {
-  //closestPositionInRoute: any;
-  currentIndication?: any;
-  //currentStepIndex:number;
-  //distanceToEndStep: number;
-  distanceToGoal?: number;
-  //nextIndication: any;
-  points?: any;
-  routeStep?: any;
-  segments?: any;
-  route?: Directions;
-  //timeToEndStep: number;
-  //timeToGoal: number;
-  type?: NavigationUpdateType;
-  status: NavigationStatus;
-}
-
-export enum NavigationStatus {
-  START = "start",
-  STOP = "stop",
-  UPDATE = "update",
-}
-
-export enum NavigationUpdateType {
-  progress = "PROGRESS",
-  userOutsideRoute = "OUT_OF_ROUTE",
-  destinationReached = "DESTINATION_REACHED",
-}
-
 // TODO: add types
 export type Directions = any;
 
-export type NavigateToPoiType = {
-  navigationTo: number;
-  type?: string;
-};
-
 interface User {
   email?: string;
   apiKey?: string;
 }
-export interface SDKError {
-  code?: number;
-  message: string;
-}
 
 export interface State {
   webViewRef: MutableRefObject<undefined>;
   sdkInitialized: boolean;
   user?: User;
   location?: Location;
-  buildings: Building[];
+  buildings: Building[] | null;
   currentBuilding: Building;
   pois: Poi[];
   directions?: Directions;
@@ -105,8 +38,8 @@ export const initialState: State = {
   webViewRef: undefined,
   sdkInitialized: false,
   user: undefined,
-  location: { status: PositioningStatus.STOPPED },
-  buildings: [],
+  location: { status: LocationStatusName.STOPPED },
+  buildings: null,
   currentBuilding: undefined,
   pois: [],
   directions: undefined,
@@ -132,7 +65,7 @@ const Reducer = createReducer<State>({
   setLocation: (state: State, payload: State["location"]) => {
     return { ...state, location: payload };
   },
-  setLocationStatus: (state: State, payload: PositioningStatus) => {
+  setLocationStatus: (state: State, payload: LocationStatusName) => {
     return { ...state, location: { ...state.location, status: payload } };
   },
   resetLocation: (state: State) => {

package/src/wayfinding/types/index.d.ts

@@ -1,4 +1,6 @@
 //@ts-ignore
+import { DirectionPoint } from "src/sdk/types";
+
 import { ErrorName } from "../components/MapView";
 
 interface MapViewError {
@@ -6,6 +8,12 @@ interface MapViewError {
   description: string;
 }
 
+export interface MapViewRef {
+  selectPoi: (poiId: number) => void;
+  navigateToPoi: ({ poi, poiId }: { poi?: Poi; poiId?: number }) => void;
+  cancelNavigation: () => void;
+}
+
 export interface WayfindingResult {
   status: string;
   message: string;
@@ -30,21 +38,12 @@ export interface OnFloorChangedResult {
   fromFloorName: string;
   toFloorName: string;
 }
-export interface Point {
-  buildingId: string;
-  floorId: string;
-  latitude: number;
-  longitude: number;
-}
-export interface Error {
-  code: number;
-  message: string;
-}
+
 export interface Destination {
   category: string;
   identifier?: string;
   name?: string;
-  point: Point;
+  point: DirectionPoint;
 }
 export interface Navigation {
   status: string;

package/src/wayfinding/utils/mapper.ts

@@ -1,11 +1,12 @@
 /* eslint-disable @typescript-eslint/no-explicit-any */
-import { Destination, Navigation, Point } from "..";
 import {
-  Directions,
+  DirectionPoint,
   Location,
   NavigateToPoiType,
   SDKNavigation,
-} from "../store/index";
+} from "../../sdk/types/index.d";
+import { Destination, Navigation } from "..";
+import { Directions } from "../store/index";
 
 const mapperWrapper = (type: string, payload: unknown) =>
   JSON.stringify({ type, payload });
@@ -42,7 +43,7 @@ const Mapper = {
 
   cancelNavigation: () => mapperWrapper(`navigation.cancel`, {}),
 
-  selectPoi: (poiId: number) =>
+  selectPoi: (poiId: number | null) =>
     mapperWrapper(`cartography.select_poi`, { identifier: poiId }),
 
   followUser: (follow: boolean) => mapperWrapper("camera.follow_user", follow),
@@ -89,18 +90,20 @@ const Mapper = {
         identifier: navigation?.destinationId,
         //name:, //TODO
         point: {
-          buildingId:
+          buildingIdentifier:
             navigation.to.buildingIdentifier ||
             navigation.TO.buildingIdentifier,
-          floorId:
+          floorIdentifier:
             navigation.to.floorIdentifier || navigation.TO.floorIdentifier,
-          latitude:
-            navigation.to.coordinate.latitude ||
-            navigation.TO.coordinate.latitude,
-          longitude:
-            navigation.to.coordinate.longitude ||
-            navigation.TO.coordinate.longitude,
-        } as Point,
+          coordinate: {
+            latitude:
+              navigation.to.coordinate.latitude ||
+              navigation.TO.coordinate.latitude,
+            longitude:
+              navigation.to.coordinate.longitude ||
+              navigation.TO.coordinate.longitude,
+          },
+        } as DirectionPoint,
       } as Destination,
     } as Navigation;
   },