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

package/lib/typescript/src/wayfinding/store/index.d.ts

@@ -1,75 +1,16 @@
 import React, { MutableRefObject } from "react";
-import { Building, Poi } from "react-native-situm-plugin";
-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 declare enum PositioningStatus {
-    STARTING = "STARTING",
-    CALCULATING = "CALCULATING",
-    POSITIONING = "POSITIONING",
-    USER_NOT_IN_BUILDING = "USER_NOT_IN_BUILDING",
-    STOPPED = "STOPPED"
-}
-export interface SDKNavigation {
-    currentIndication?: any;
-    distanceToGoal?: number;
-    points?: any;
-    routeStep?: any;
-    segments?: any;
-    route?: Directions;
-    type?: NavigationUpdateType;
-    status: NavigationStatus;
-}
-export declare enum NavigationStatus {
-    START = "start",
-    STOP = "stop",
-    UPDATE = "update"
-}
-export declare enum NavigationUpdateType {
-    progress = "PROGRESS",
-    userOutsideRoute = "OUT_OF_ROUTE",
-    destinationReached = "DESTINATION_REACHED"
-}
+import { Building, Location, LocationStatusName, Poi, SDKError, SDKNavigation } from "../../sdk/types/index.d";
 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;
@@ -86,7 +27,7 @@ export declare const selectWebViewRef: (state: State) => React.MutableRefObject<
 export declare const selectIsSDKInitialized: (state: State) => boolean;
 export declare const selectUser: (state: State) => User;
 export declare const selectLocation: (state: State) => Location;
-export declare const selectLocationStatus: (state: State) => PositioningStatus;
+export declare const selectLocationStatus: (state: State) => LocationStatusName;
 export declare const selectBuildings: (state: State) => Building[];
 export declare const selectCurrentBuilding: (state: State) => Building;
 export declare const selectPois: (state: State) => Poi[];

package/lib/typescript/src/wayfinding/store/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/wayfinding/store/index.tsx"],"names":[],"mappings":"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"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/wayfinding/store/index.tsx"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,EAAiB,gBAAgB,EAAc,MAAM,OAAO,CAAC;AAE3E,OAAO,EACL,QAAQ,EACR,QAAQ,EACR,kBAAkB,EAElB,GAAG,EACH,QAAQ,EACR,aAAa,EACd,MAAM,yBAAyB,CAAC;AAIjC,MAAM,MAAM,UAAU,GAAG,GAAG,CAAC;AAE7B,UAAU,IAAI;IACZ,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB;AAED,MAAM,WAAW,KAAK;IACpB,UAAU,EAAE,gBAAgB,CAAC,SAAS,CAAC,CAAC;IACxC,cAAc,EAAE,OAAO,CAAC;IACxB,IAAI,CAAC,EAAE,IAAI,CAAC;IACZ,QAAQ,CAAC,EAAE,QAAQ,CAAC;IACpB,SAAS,EAAE,QAAQ,EAAE,GAAG,IAAI,CAAC;IAC7B,eAAe,EAAE,QAAQ,CAAC;IAC1B,IAAI,EAAE,GAAG,EAAE,CAAC;IACZ,UAAU,CAAC,EAAE,UAAU,CAAC;IACxB,UAAU,CAAC,EAAE,aAAa,CAAC;IAC3B,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,KAAK,CAAC,EAAE,QAAQ,CAAC;CAClB;AAED,eAAO,MAAM,YAAY,EAAE,KAY1B,CAAC;AAEF,eAAO,MAAM,YAAY;WACd,KAAK;iCAA+B,KAAK,KAAK,KAAK;EAClD,CAAC;AA+Cb,eAAO,MAAM,gBAAgB,UAAW,KAAK,sCAE5C,CAAC;AAEF,eAAO,MAAM,sBAAsB,UAAW,KAAK,YAElD,CAAC;AAEF,eAAO,MAAM,UAAU,UAAW,KAAK,SAEtC,CAAC;AAEF,eAAO,MAAM,cAAc,UAAW,KAAK,aAE1C,CAAC;AAEF,eAAO,MAAM,oBAAoB,UAAW,KAAK,uBAEhD,CAAC;AAEF,eAAO,MAAM,eAAe,UAAW,KAAK,eAE3C,CAAC;AAEF,eAAO,MAAM,qBAAqB,UAAW,KAAK,aAEjD,CAAC;AAEF,eAAO,MAAM,UAAU,UAAW,KAAK,UAEtC,CAAC;AAEF,eAAO,MAAM,gBAAgB,UAAW,KAAK,QAE5C,CAAC;AAEF,eAAO,MAAM,gBAAgB,UAAW,KAAK,kBAE5C,CAAC;AAEF,eAAO,MAAM,sBAAsB,UAAW,KAAK,WAElD,CAAC;AAEF,eAAO,MAAM,WAAW,UAAW,KAAK,aAEvC,CAAC;AAEF,eAAO,MACL,aAAa,8CACb,iBAAiB,8CACjB,OAAO,8CACP,WAAW,8CACX,iBAAiB,8CACjB,aAAa,8CACb,YAAY,8CACZ,kBAAkB,8CAClB,OAAO,8CACP,aAAa,8CACb,aAAa,8CACb,mBAAmB,8CACnB,QAAQ,4CACS,CAAC;AAEpB,QAAA,MAAM,aAAa,EAAE,KAAK,CAAC,EAAE,CAC3B,KAAK,CAAC,iBAAiB,CAAC;IACtB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,MAAM,CAAC,EAAE,MAAM,CAAC;CACjB,CAAC,CAiBH,CAAC;AAEF,eAAe,aAAa,CAAC"}

package/lib/typescript/src/wayfinding/utils/mapper.d.ts

@@ -1,5 +1,6 @@
+import { Location, NavigateToPoiType, SDKNavigation } from "../../sdk/types/index.d";
 import { Navigation } from "..";
-import { Directions, Location, NavigateToPoiType, SDKNavigation } from "../store/index";
+import { Directions } from "../store/index";
 declare const Mapper: {
     location: (location: Location) => string;
     locationStatus: (locationStatus: Location["status"]) => string;
@@ -7,7 +8,7 @@ declare const Mapper: {
     navigation: (navigation: Navigation) => string;
     navigateToPoi: (navigate: NavigateToPoiType) => string;
     cancelNavigation: () => string;
-    selectPoi: (poiId: number) => string;
+    selectPoi: (poiId: number | null) => string;
     followUser: (follow: boolean) => string;
     initialConfiguration: (style: any, enablePoiClustering: any, showPoiNames: any, minZoom: any, maxZoom: any, initialZoom: any, useDashboardTheme: any) => string;
     routeToResult: (navigation: any) => Navigation;

package/lib/typescript/src/wayfinding/utils/mapper.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"mapper.d.ts","sourceRoot":"","sources":["../../../../../src/wayfinding/utils/mapper.ts"],"names":[],"mappings":"AACA,OAAO,EAAe,UAAU,EAAS,MAAM,IAAI,CAAC;AACpD,OAAO,EACL,UAAU,EACV,QAAQ,EACR,iBAAiB,EACjB,aAAa,EACd,MAAM,gBAAgB,CAAC;AAKxB,QAAA,MAAM,MAAM;yBACW,QAAQ;qCAiBI,QAAQ,CAAC,QAAQ,CAAC;wBAG/B,UAAU;6BAGL,UAAU;8BAGT,iBAAiB;;uBAKxB,MAAM;yBAGJ,OAAO;kCAGnB,GAAG,uBACW,GAAG,gBACV,GAAG,WACR,GAAG,WACH,GAAG,eACC,GAAG,qBACG,GAAG;gCA0BI,GAAG,KAAG,UAAU;qCAyBX,aAAa,KAAG,UAAU;CAmB5D,CAAC;AAEF,eAAe,MAAM,CAAC"}
+{"version":3,"file":"mapper.d.ts","sourceRoot":"","sources":["../../../../../src/wayfinding/utils/mapper.ts"],"names":[],"mappings":"AACA,OAAO,EAEL,QAAQ,EACR,iBAAiB,EACjB,aAAa,EACd,MAAM,yBAAyB,CAAC;AACjC,OAAO,EAAe,UAAU,EAAE,MAAM,IAAI,CAAC;AAC7C,OAAO,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAC;AAK5C,QAAA,MAAM,MAAM;yBACW,QAAQ;qCAiBI,QAAQ,CAAC,QAAQ,CAAC;wBAG/B,UAAU;6BAGL,UAAU;8BAGT,iBAAiB;;uBAKxB,MAAM,GAAG,IAAI;yBAGX,OAAO;kCAGnB,GAAG,uBACW,GAAG,gBACV,GAAG,WACR,GAAG,WACH,GAAG,eACC,GAAG,qBACG,GAAG;gCA0BI,GAAG,KAAG,UAAU;qCA2BX,aAAa,KAAG,UAAU;CAmB5D,CAAC;AAEF,eAAe,MAAM,CAAC"}

package/package.json

@@ -1,14 +1,15 @@
 {
   "name": "@situm/react-native",
-  "version": "3.0.0-beta.0",
+  "version": "3.0.0-beta.2",
+  "description": "Set of utilities that allow any developer to build React Native location based apps using Situm's indoor positioning system.",
   "private": false,
-  "repository": "https://github.com/situmtech/situm-react-native-plugin",
+  "repository": "https://github.com/situmtech/react-native",
   "author": "Situm Technologies <mobile@situm.com>",
   "license": "MIT",
   "bugs": {
-    "url": "https://github.com/situmtech/situm-react-native-plugin/issues"
+    "url": "https://github.com/situmtech/react-native/issues"
   },
-  "homepage": "https://github.com/situmtech/situm-react-native-plugin#readme",
+  "homepage": "https://github.com/situmtech/react-native#readme",
   "publishConfig": {
     "registry": "https://registry.npmjs.org/"
   },
@@ -16,7 +17,7 @@
   "module": "lib/module/index",
   "types": "lib/typescript/index.d.ts",
   "react-native": "src/index",
-  "source": "src/index.js",
+  "source": "src/index",
   "files": [
     "src",
     "lib",
@@ -38,14 +39,15 @@
   "scripts": {
     "android": "react-native run-android",
     "ios": "react-native run-ios",
-    "test": "yarn lint && yarn test:jest",
+    "test": "yarn typescript && yarn lint && yarn test:jest",
     "test:jest": "jest",
     "typescript": "tsc --noEmit",
     "lint:fix": "eslint \"src/**/*.{js,ts,tsx}\" --fix",
     "lint": "eslint \"src/**/*.{js,jsx,ts,tsx}\"",
     "prepare": "bob build",
     "example": "yarn --cwd example",
-    "bootstrap": "yarn example && yarn && yarn example pods"
+    "bootstrap": "yarn example && yarn && yarn example pods",
+    "doc": "typedoc --out ./docs/types ./src  --tsconfig ./tsconfig.json"
   },
   "keywords": [
     "react-native",
@@ -85,6 +87,7 @@
     "react-native": "^0.72.1",
     "react-native-builder-bob": "^0.20.4",
     "react-test-renderer": "18.2.0",
+    "typedoc": "^0.24.8",
     "typescript": "^5.0.4"
   },
   "dependencies": {
@@ -124,7 +127,7 @@
     ]
   },
   "sdkVersions": {
-    "android": "2.87.0@aar",
-    "ios": "2.60.3"
+    "android": "3.0.1@aar",
+    "ios": "2.61.1"
   }
 }

package/src/index.ts

@@ -2,5 +2,6 @@ import SitumPlugin from "./sdk";
 
 // Definitions
 export * from "./sdk/types/index.d";
+export * from "./wayfinding";
 
 export default SitumPlugin;

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

@@ -216,6 +216,7 @@ export type Point = {
   isIndoor: boolean;
   isOutdoor: boolean;
 };
+
 export type DirectionPoint = {
   floorIdentifier: Floor["floorIdentifier"];
   buildingIdentifier: Building["buildingIdentifier"];
@@ -598,6 +599,85 @@ export type RealTimeData = {
   locations: Location[];
 };
 
+export interface Location {
+  position?: Position;
+  accuracy?: number;
+  bearing?: {
+    degrees: number;
+    degreesClockwise: number;
+  };
+  hasBearing?: boolean;
+  status: LocationStatusName;
+}
+
+export interface Position {
+  coordinate: {
+    latitude: number;
+    longitude: number;
+  };
+  cartesianCoordinate: {
+    x: number;
+    y: number;
+  };
+  isIndoor?: boolean;
+  isOutdoor?: boolean;
+  buildingIdentifier?: string;
+  floorIdentifier?: string;
+}
+export interface LocationStatus {
+  statusName: LocationStatusName;
+  statusCode: number;
+}
+
+export enum LocationStatusName {
+  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 SDKError {
+  code?: number;
+  message: string;
+}
+
+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",
+}
+
+export type NavigateToPoiType = {
+  navigationTo: number;
+  type?: string;
+};
+
 export interface SitumPluginStatic {
   initSitumSDK(): void;
 

package/src/utils/requestPermission.ts

@@ -49,12 +49,12 @@ const checkAndroidPermissions = async () => {
       granted["android.permission.BLUETOOTH_SCAN"] === RESULTS.GRANTED
     ) {
       console.info(
-        "ACCESS_FINE_LOCATION, BLUETOOTH_CONNECT and ACCESS_FINE_LOCATION permissions granted"
+        "ACCESS_FINE_LOCATION, BLUETOOTH_CONNECT and BLUETOOTH_SCAN permissions granted"
       );
       return true;
     }
 
-    throw "ACCESS_FINE_LOCATION, BLUETOOTH_CONNECT and ACCESS_FINE_LOCATION permissions not granted";
+    throw "ACCESS_FINE_LOCATION, BLUETOOTH_CONNECT and BLUETOOTH_SCAN permissions not granted";
   } else {
     console.info("ANDROID VERSION < 30");
     granted = await request(PERMISSIONS.ANDROID.ACCESS_FINE_LOCATION);