@situm/react-native 3.15.0-beta.1 → 3.15.0-beta.3

package/src/wayfinding/components/MapView.tsx

@@ -41,7 +41,7 @@ import { ErrorName } from "../types/constants";
 import { sendMessageToViewer } from "../utils";
 import ViewerMapper from "../utils/mapper";
 import { setError, setLocationStatus } from "../store";
-const SITUM_BASE_DOMAIN = "https://map-viewer.situm.com";
+const SITUM_BASE_DOMAIN = "https://maps.situm.com";
 
 const NETWORK_ERROR_CODE = {
   android: -2,
@@ -59,7 +59,7 @@ export type MapViewConfiguration = {
    */
   apiDomain?: string;
   /**
-   * A String parameter that allows you to specify which domain will be displayed inside our webview. Defaults to "https://map-viewer.situm.com/".
+   * A String parameter that allows you to specify which domain will be displayed inside our webview. Defaults to "https://maps.situm.com/".
    * In most cases this parameter shouldn't be changed.
    */
   viewerDomain?: string;
@@ -157,16 +157,16 @@ const MapView = React.forwardRef<MapViewRef, MapViewProps>(
       onExternalLinkClicked = undefined,
       onFavoritePoisUpdated = () => {},
     },
-    ref
+    ref,
   ) => {
-    const webViewRef = useRef<WebView>();
+    const webViewRef = useRef<WebView>(null);
     const [_onDirectionsRequestInterceptor, setInterceptor] =
       useState<OnDirectionsRequestInterceptor>();
 
     // Local states
     const [mapLoaded, setMapLoaded] = useState<boolean>(false);
     const [buildingIdentifier, setBuildingIdentifier] = useState<string>(
-      configuration.buildingIdentifier
+      configuration.buildingIdentifier,
     );
     const {
       init,
@@ -198,7 +198,7 @@ const MapView = React.forwardRef<MapViewRef, MapViewProps>(
 
       sendMessageToViewer(
         webViewRef.current,
-        ViewerMapper.navigateToPoi(payload)
+        ViewerMapper.navigateToPoi(payload),
       );
     }, []);
 
@@ -213,7 +213,7 @@ const MapView = React.forwardRef<MapViewRef, MapViewProps>(
 
       sendMessageToViewer(
         webViewRef.current,
-        ViewerMapper.navigateToCar(payload)
+        ViewerMapper.navigateToCar(payload),
       );
     }, []);
 
@@ -226,7 +226,7 @@ const MapView = React.forwardRef<MapViewRef, MapViewProps>(
 
       sendMessageToViewer(
         webViewRef.current,
-        ViewerMapper.navigateToPoint(payload)
+        ViewerMapper.navigateToPoint(payload),
       );
     }, []);
 
@@ -253,13 +253,13 @@ const MapView = React.forwardRef<MapViewRef, MapViewProps>(
       }
       if (SitumPlugin.navigationIsRunning()) {
         console.error(
-          "Situm > hook > Navigation on course, poi category selection is unavailable"
+          "Situm > hook > Navigation on course, poi category selection is unavailable",
         );
         return;
       }
       sendMessageToViewer(
         webViewRef.current,
-        ViewerMapper.selectPoiCategory(categoryId)
+        ViewerMapper.selectPoiCategory(categoryId),
       );
     }, []);
 
@@ -270,16 +270,16 @@ const MapView = React.forwardRef<MapViewRef, MapViewProps>(
         }
         if (SitumPlugin.navigationIsRunning()) {
           console.error(
-            "Situm > hook > Navigation on course, floor selection is unavailable"
+            "Situm > hook > Navigation on course, floor selection is unavailable",
           );
           return;
         }
         sendMessageToViewer(
           webViewRef.current,
-          ViewerMapper.selectFloor(floorId, options)
+          ViewerMapper.selectFloor(floorId, options),
         );
       },
-      []
+      [],
     );
 
     const _search = useCallback((payload: SearchFilter) => {
@@ -293,10 +293,10 @@ const MapView = React.forwardRef<MapViewRef, MapViewProps>(
         }
         sendMessageToViewer(
           webViewRef.current,
-          ViewerMapper.setDirectionsOptions(directionsOptions)
+          ViewerMapper.setDirectionsOptions(directionsOptions),
         );
       },
-      []
+      [],
     );
 
     const _setFavoritePois = useCallback((poiIds: number[]) => {
@@ -305,7 +305,7 @@ const MapView = React.forwardRef<MapViewRef, MapViewProps>(
       }
       sendMessageToViewer(
         webViewRef.current,
-        ViewerMapper.setFavoritePois(poiIds)
+        ViewerMapper.setFavoritePois(poiIds),
       );
     }, []);
 
@@ -313,14 +313,14 @@ const MapView = React.forwardRef<MapViewRef, MapViewProps>(
       if (locationStatus) {
         sendMessageToViewer(
           webViewRef.current,
-          ViewerMapper.locationStatus(locationStatus)
+          ViewerMapper.locationStatus(locationStatus),
         );
       }
       if (error) {
         // Right now, status and errors share message on the viewer:
         sendMessageToViewer(
           webViewRef.current,
-          ViewerMapper.locationError(error)
+          ViewerMapper.locationError(error),
         );
       }
     };
@@ -339,81 +339,77 @@ const MapView = React.forwardRef<MapViewRef, MapViewProps>(
      *    onLoad={onLoad} />
      */
 
-    useImperativeHandle(
-      ref,
-      () => {
-        return {
-          followUser() {
-            _followUser(true);
-          },
-          unfollowUser() {
-            _followUser(false);
-          },
-          selectPoi(poiId: number) {
-            _selectPoi(poiId);
-          },
-          selectCar() {
-            _selectCar();
-          },
-          selectPoiCategory(poiId: number) {
-            _selectPoiCategory(poiId);
-          },
-          selectFloor(poiId: number, options?: CartographySelectionOptions) {
-            _selectFloor(poiId, options);
-          },
-          setDirectionsOptions(directionsOptions: MapViewDirectionsOptions) {
-            _setDirectionsOptions(directionsOptions);
-          },
-          setFavoritePois(poiIds: number[]) {
-            _setFavoritePois(poiIds);
-          },
-          deselectPoi() {
-            webViewRef.current &&
-              sendMessageToViewer(
-                webViewRef.current,
-                ViewerMapper.selectPoi(null)
-              );
-          },
-          navigateToPoi(payload): void {
-            _navigateToPoi(payload);
-          },
-          navigateToCar(payload): void {
-            _navigateToCar(payload);
-          },
-          navigateToPoint(payload: NavigateToPointPayload): void {
-            _navigateToPoint(payload);
-          },
-          setOnDirectionsRequestInterceptor(directionRequestInterceptor): void {
-            setInterceptor(() => directionRequestInterceptor);
-          },
-          cancelNavigation(): void {
-            if (!webViewRef.current) return;
-            stopNavigation();
+    useImperativeHandle(ref, () => {
+      return {
+        followUser() {
+          _followUser(true);
+        },
+        unfollowUser() {
+          _followUser(false);
+        },
+        selectPoi(poiId: number) {
+          _selectPoi(poiId);
+        },
+        selectCar() {
+          _selectCar();
+        },
+        selectPoiCategory(poiId: number) {
+          _selectPoiCategory(poiId);
+        },
+        selectFloor(poiId: number, options?: CartographySelectionOptions) {
+          _selectFloor(poiId, options);
+        },
+        setDirectionsOptions(directionsOptions: MapViewDirectionsOptions) {
+          _setDirectionsOptions(directionsOptions);
+        },
+        setFavoritePois(poiIds: number[]) {
+          _setFavoritePois(poiIds);
+        },
+        deselectPoi() {
+          webViewRef.current &&
             sendMessageToViewer(
               webViewRef.current,
-              ViewerMapper.cancelNavigation()
+              ViewerMapper.selectPoi(null),
             );
-          },
-          search(payload): void {
-            _search(payload);
-          },
-        };
-      },
-      [
-        stopNavigation,
-        _navigateToPoi,
-        _followUser,
-        _navigateToCar,
-        _navigateToPoint,
-        _selectPoi,
-        _selectCar,
-        _selectPoiCategory,
-        _selectFloor,
-        _setDirectionsOptions,
-        _setFavoritePois,
-        _search,
-      ]
-    );
+        },
+        navigateToPoi(payload): void {
+          _navigateToPoi(payload);
+        },
+        navigateToCar(payload): void {
+          _navigateToCar(payload);
+        },
+        navigateToPoint(payload: NavigateToPointPayload): void {
+          _navigateToPoint(payload);
+        },
+        setOnDirectionsRequestInterceptor(directionRequestInterceptor): void {
+          setInterceptor(() => directionRequestInterceptor);
+        },
+        cancelNavigation(): void {
+          if (!webViewRef.current) return;
+          stopNavigation();
+          sendMessageToViewer(
+            webViewRef.current,
+            ViewerMapper.cancelNavigation(),
+          );
+        },
+        search(payload): void {
+          _search(payload);
+        },
+      };
+    }, [
+      stopNavigation,
+      _navigateToPoi,
+      _followUser,
+      _navigateToCar,
+      _navigateToPoint,
+      _selectPoi,
+      _selectCar,
+      _selectPoiCategory,
+      _selectFloor,
+      _setDirectionsOptions,
+      _setFavoritePois,
+      _search,
+    ]);
 
     useEffect(() => {
       SitumPlugin.validateMapViewProjectSettings();
@@ -426,7 +422,7 @@ const MapView = React.forwardRef<MapViewRef, MapViewProps>(
 
       console.error(
         "Error code:",
-        error.code ? error.code : " no code provided"
+        error.code ? error.code : " no code provided",
       );
       console.error("Error detected:", error.message);
     }, [error]);
@@ -444,7 +440,7 @@ const MapView = React.forwardRef<MapViewRef, MapViewProps>(
 
       sendMessageToViewer(
         webViewRef.current,
-        ViewerMapper.locationStatus(locationStatus)
+        ViewerMapper.locationStatus(locationStatus),
       );
       // Callbacks used in `useEffect` won't be invoked if the value of locationStatus
       // is set but hasn't changed. Set locationStatus to null always to avoid missing
@@ -458,7 +454,7 @@ const MapView = React.forwardRef<MapViewRef, MapViewProps>(
 
       sendMessageToViewer(
         webViewRef.current,
-        ViewerMapper.locationError(error)
+        ViewerMapper.locationError(error),
       );
       // Callbacks used in `useEffect` won't be invoked if the value of locationStatus
       // is set but hasn't changed. Set locationStatus to null always to avoid missing
@@ -472,7 +468,7 @@ const MapView = React.forwardRef<MapViewRef, MapViewProps>(
 
       sendMessageToViewer(
         webViewRef.current,
-        ViewerMapper.navigation(navigation)
+        ViewerMapper.navigation(navigation),
       );
     }, [navigation, mapLoaded]);
 
@@ -489,7 +485,7 @@ const MapView = React.forwardRef<MapViewRef, MapViewProps>(
 
       sendMessageToViewer(
         webViewRef.current,
-        ViewerMapper.setLanguage(configuration.language)
+        ViewerMapper.setLanguage(configuration.language),
       );
     }, [configuration.language, mapLoaded]);
 
@@ -498,7 +494,7 @@ const MapView = React.forwardRef<MapViewRef, MapViewProps>(
       if (webViewRef.current && mapLoaded) {
         sendMessageToViewer(
           webViewRef.current,
-          ViewerMapper.initialConfiguration(style)
+          ViewerMapper.initialConfiguration(style),
         );
       }
     }, [webViewRef, mapLoaded, style]);
@@ -565,7 +561,7 @@ const MapView = React.forwardRef<MapViewRef, MapViewProps>(
       }
     };
 
-    const _onShouldStartLoadWithRequest = (request) => {
+    const _onShouldStartLoadWithRequest = (request: any) => {
       if (
         request &&
         request.url &&
@@ -586,23 +582,26 @@ const MapView = React.forwardRef<MapViewRef, MapViewProps>(
 
     const _effectiveProfile = () => {
       let effectiveProfile = configuration.profile;
-      if (configuration.remoteIdentifier && configuration.remoteIdentifier.length > 0) {
-        console.warn('Situm> MapView> [!] "remoteIdentifier" is deprecated. Use "profile" instead.');
+      if (
+        configuration.remoteIdentifier &&
+        configuration.remoteIdentifier.length > 0
+      ) {
+        console.warn(
+          'Situm> MapView> [!] "remoteIdentifier" is deprecated. Use "profile" instead.',
+        );
         if (!configuration.profile || configuration.profile.length == 0) {
           effectiveProfile = configuration.remoteIdentifier;
         }
       }
       return effectiveProfile;
-    }
+    };
 
     return (
       <WebView
         ref={webViewRef}
         source={{
           uri: `${configuration.viewerDomain || SITUM_BASE_DOMAIN}/${
-            _effectiveProfile()
-              ? `id/${_effectiveProfile()}`
-              : ""
+            _effectiveProfile() ? `id/${_effectiveProfile()}` : ""
           }?&apikey=${
             configuration.situmApiKey
           }&wl=true&global=true&mode=embed${
@@ -638,7 +637,7 @@ const MapView = React.forwardRef<MapViewRef, MapViewProps>(
         }}
       />
     );
-  }
+  },
 );
 
 export default MapView;

package/src/wayfinding/hooks/index.ts

@@ -62,98 +62,96 @@ export const useSitumInternal = () => {
   };
 
   function registerCallbacks() {
-    SitumPlugin.internalSetMethodCallMapDelegate((internalCall: InternalCall) => {
-      switch(internalCall.type) {
-        case InternalCallType.LOCATION:
-          let location = internalCall.get<Location>();
-          dispatch(
-            setLocation({
-              ...location,
-            })
-          );
-          break;
-        case InternalCallType.LOCATION_STATUS:
-          let statusName = internalCall.get<string>();
-          if (statusName in LocationStatusName) {
+    SitumPlugin.internalSetMethodCallMapDelegate(
+      (internalCall: InternalCall) => {
+        switch (internalCall.type) {
+          case InternalCallType.LOCATION:
+            let location = internalCall.get<Location>();
             dispatch(
-              setLocationStatus(statusName)
+              setLocation({
+                ...location,
+              }),
             );
-          }
-          break;
-        case InternalCallType.LOCATION_STOPPED:
-          // TODO: LOCATION_STOPPED exists only in RN, delete!
-          dispatch(resetLocation());
-          break;
-        case InternalCallType.LOCATION_ERROR:
-          let error = internalCall.get<Error>();
-          dispatch(
-            setError(error)
-          );
-          break;
-        case InternalCallType.NAVIGATION_START:
-          dispatch(
-            setNavigation({
-              type: NavigationUpdateType.PROGRESS,
-              status: NavigationStatus.START,
-            })
-          );
-          break;
-        case InternalCallType.NAVIGATION_DESTINATION_REACHED:
-          dispatch(
-            setNavigation({
-              type: NavigationUpdateType.DESTINATION_REACHED,
-              status: NavigationStatus.UPDATE,
-            })
-          );
-          break;
-        case InternalCallType.NAVIGATION_PROGRESS:
-          let progress = internalCall.get<NavigationProgress>();
-          dispatch(
-            setNavigation({
-              currentIndication: progress?.currentIndication,
-              routeStep: progress?.routeStep,
-              distanceToGoal: progress?.distanceToGoal,
-              points: progress?.points,
-              type: NavigationUpdateType.PROGRESS,
-              segments: progress?.segments,
-              status: NavigationStatus.UPDATE,
-            })
-          );
-          break;
-        case InternalCallType.NAVIGATION_OUT_OF_ROUTE:
-          dispatch(
-            setNavigation({
-              type: NavigationUpdateType.OUT_OF_ROUTE,
-              status: NavigationStatus.UPDATE,
-            })
-          );
-          break;
-        case InternalCallType.NAVIGATION_CANCELLATION:
-          dispatch(
-            setNavigation({
-              type: NavigationUpdateType.CANCELLED,
-              status: NavigationStatus.STOP,
-            })
-          );
-          break;
-        case InternalCallType.NAVIGATION_ERROR:
-        case InternalCallType.GEOFENCES_ENTER:
-        case InternalCallType.GEOFENCES_EXIT:
-          // Do nothing.
-          break;
-      }
-    });
+            break;
+          case InternalCallType.LOCATION_STATUS:
+            let statusName = internalCall.get<string>();
+            if (statusName in LocationStatusName) {
+              dispatch(setLocationStatus(statusName));
+            }
+            break;
+          case InternalCallType.LOCATION_STOPPED:
+            // TODO: LOCATION_STOPPED exists only in RN, delete!
+            dispatch(resetLocation());
+            break;
+          case InternalCallType.LOCATION_ERROR:
+            let error = internalCall.get<Error>();
+            dispatch(setError(error));
+            break;
+          case InternalCallType.NAVIGATION_START:
+            dispatch(
+              setNavigation({
+                type: NavigationUpdateType.PROGRESS,
+                status: NavigationStatus.START,
+              }),
+            );
+            break;
+          case InternalCallType.NAVIGATION_DESTINATION_REACHED:
+            dispatch(
+              setNavigation({
+                type: NavigationUpdateType.DESTINATION_REACHED,
+                status: NavigationStatus.UPDATE,
+              }),
+            );
+            break;
+          case InternalCallType.NAVIGATION_PROGRESS:
+            let progress = internalCall.get<NavigationProgress>();
+            dispatch(
+              setNavigation({
+                currentIndication: progress?.currentIndication,
+                routeStep: progress?.routeStep,
+                distanceToGoal: progress?.distanceToGoal,
+                points: progress?.points,
+                type: NavigationUpdateType.PROGRESS,
+                segments: progress?.segments,
+                status: NavigationStatus.UPDATE,
+              }),
+            );
+            break;
+          case InternalCallType.NAVIGATION_OUT_OF_ROUTE:
+            dispatch(
+              setNavigation({
+                type: NavigationUpdateType.OUT_OF_ROUTE,
+                status: NavigationStatus.UPDATE,
+              }),
+            );
+            break;
+          case InternalCallType.NAVIGATION_CANCELLATION:
+            dispatch(
+              setNavigation({
+                type: NavigationUpdateType.CANCELLED,
+                status: NavigationStatus.STOP,
+              }),
+            );
+            break;
+          case InternalCallType.NAVIGATION_ERROR:
+          case InternalCallType.GEOFENCES_ENTER:
+          case InternalCallType.GEOFENCES_EXIT:
+            // Do nothing.
+            break;
+        }
+      },
+    );
   }
 
   const calculateRoute = async (
     payload: any,
     interceptor?: OnDirectionsRequestInterceptor,
-    updateRoute = true
+    updateRoute = true,
   ) => {
     console.debug("Situm > hook > calculating route");
 
     const directionsRequest = createDirectionsRequest(
-      payload.directionsRequest
+      payload.directionsRequest,
     );
     interceptor && interceptor(directionsRequest);
     const {
@@ -170,12 +168,17 @@ export const useSitumInternal = () => {
 
     const _buildings = await SitumPlugin.fetchBuildings();
     const _building = _buildings.find(
-      (b: Building) => b.buildingIdentifier === buildingIdentifier
+      (b: Building) => b.buildingIdentifier === buildingIdentifier,
     );
 
+    if (!_building) {
+      console.debug(`Situm > hook > Could not compute route: missing building`);
+      return;
+    }
+
     if (!to || !from || lockDirections) {
       console.debug(
-        `Situm > hook > Could not compute route (to: ${to}, from: ${from}, lockDirections: ${lockDirections})`
+        `Situm > hook > Could not compute route (to: ${to}, from: ${from}, lockDirections: ${lockDirections})`,
       );
       return;
     }
@@ -213,7 +216,7 @@ export const useSitumInternal = () => {
   // Navigation
   const startNavigation = (
     payload: any,
-    interceptor?: OnDirectionsRequestInterceptor
+    interceptor?: OnDirectionsRequestInterceptor,
   ) => {
     console.debug("Situm > hook > request to start navigation");
     // TODO: we should delegate this to the sdk plugin
@@ -232,11 +235,11 @@ export const useSitumInternal = () => {
             status: NavigationStatus.START,
             type: NavigationUpdateType.PROGRESS,
             ...r,
-          })
+          }),
         );
         try {
           const navigationRequest = createNavigationRequest(
-            payload.navigationRequest
+            payload.navigationRequest,
           );
           SitumPlugin.requestNavigationUpdates({
             ...defaultNavigationRequest,
@@ -250,7 +253,7 @@ export const useSitumInternal = () => {
               message: "Could not update navigation",
               code: ErrorCode.UNKNOWN,
               type: ErrorType.NON_CRITICAL,
-            } as Error)
+            } as Error),
           );
           stopNavigation();
         }
@@ -258,8 +261,8 @@ export const useSitumInternal = () => {
       .catch((e) => {
         console.error(
           `Situm > hook > Could not compute route for navigation ${JSON.stringify(
-            e
-          )}`
+            e,
+          )}`,
         );
       });
   };
@@ -279,8 +282,8 @@ export const useSitumInternal = () => {
       .catch((e) => {
         console.warn(
           `Situm > hook > Could not remove navigation updates ${JSON.stringify(
-            e
-          )}`
+            e,
+          )}`,
         );
       });
   };

package/src/wayfinding/store/index.tsx

@@ -19,13 +19,13 @@ interface User {
 }
 
 export interface State {
-  webViewRef: MutableRefObject<undefined>;
+  webViewRef: MutableRefObject<undefined> | undefined;
   sdkInitialized: boolean;
   user?: User;
   location?: Location;
   locationStatus?: LocationStatusName;
   buildings: Building[] | null;
-  currentBuilding: Building;
+  currentBuilding: Building | undefined;
   pois: Poi[];
   directions?: Directions;
   navigation?: NavigationProgress;
@@ -38,8 +38,8 @@ export const initialState: State = {
   webViewRef: undefined,
   sdkInitialized: false,
   user: undefined,
-  location: null,
-  locationStatus: null,
+  location: undefined,
+  locationStatus: undefined,
   buildings: null,
   currentBuilding: undefined,
   pois: [],

package/src/wayfinding/types/index.ts

@@ -1,4 +1,4 @@
-import { AccessibilityMode } from "src/sdk";
+import { AccessibilityMode } from "../../sdk/types/constants";
 
 import type { DirectionsRequest, Point } from "../../sdk/types";
 export type { MapViewConfiguration, MapViewProps } from "../components/MapView";

package/src/wayfinding/utils/index.ts

@@ -1,5 +1,6 @@
 import WebView from "react-native-webview";
 
-export const sendMessageToViewer = (viewer: WebView, message: string) => {
+export const sendMessageToViewer = (viewer: WebView | null, message: string) => {
+  if (!viewer) return;
   viewer.injectJavaScript(`window.postMessage(${message})`);
 };