proximiio-js-library 1.14.55 → 1.15.0

package/lib/components/map/getCurrentStep.js

@@ -1,5 +1,6 @@
 import { lineString, point } from '@turf/helpers';
 import pointToLineDistance from '@turf/point-to-line-distance';
+import distance from '@turf/distance';
 /**
  * Find the most appropriate navigation step index based on user's current position.
  *
@@ -16,16 +17,22 @@ const getCurrentStepIndex = ({ userPosition, steps, lastKnownStepIndex = 0, thre
     // Only check steps ahead of current one to avoid regressions
     for (let i = lastKnownStepIndex; i < steps.length; i++) {
         const step = steps[i];
-        if (step.navMode === 'mall' && !step.lineStringFeatureFromLastStep) {
+        const isStartOrLevelChanger = step.direction === 'START' || step.levelChangerId;
+        if (step.navMode === 'mall' && !step.lineStringFeatureFromLastStep && !isStartOrLevelChanger) {
             return;
         }
-        const lineCoords = step.navMode === 'mall' ? step.lineStringFeatureFromLastStep.geometry.coordinates : step.geometry.coordinates;
-        const line = lineString(lineCoords);
-        // Calculate shortest distance from user to this step's path
-        const distance = pointToLineDistance(userPoint, line, { units: 'meters' });
+        let pointDistance = 0;
+        if (isStartOrLevelChanger) {
+            pointDistance = distance(userPoint, point(step.coordinates), { units: 'meters' });
+        }
+        else {
+            const lineCoords = step.navMode === 'mall' ? step.lineStringFeatureFromLastStep.geometry.coordinates : step.geometry.coordinates;
+            const line = lineString(lineCoords);
+            pointDistance = pointToLineDistance(userPoint, line, { units: 'meters' });
+        }
         // If within threshold and closest so far, consider this as best candidate
-        if (distance < thresholdMeters && distance < minDistance) {
-            minDistance = distance;
+        if (pointDistance < thresholdMeters && pointDistance < minDistance) {
+            minDistance = pointDistance;
             closestStepIndex = i;
         }
     }

package/lib/components/map/guidanceStepsGenerator.d.ts

@@ -5,13 +5,15 @@ export default class GuidanceStepsGenerator {
     steps: GuidanceStep[];
     language: string;
     landMarkNav: boolean;
+    simplifiedTBT: boolean;
     pois?: Feature[];
     levelChangers?: Feature[];
     initialBearing: number;
-    constructor({ points, language, landMarkNav, pois, levelChangers, initialBearing, }: {
+    constructor({ points, language, landMarkNav, simplifiedTBT, pois, levelChangers, initialBearing, }: {
         points: Feature[];
         language: string;
         landMarkNav: boolean;
+        simplifiedTBT: boolean;
         pois?: Feature[];
         levelChangers?: Feature[];
         initialBearing: number;

package/lib/components/map/guidanceStepsGenerator.js

@@ -40,7 +40,7 @@ var LevelChangerTypes;
     LevelChangerTypes["ramp"] = "RAMP";
 })(LevelChangerTypes || (LevelChangerTypes = {}));
 export default class GuidanceStepsGenerator {
-    constructor({ points, language, landMarkNav, pois, levelChangers, initialBearing, }) {
+    constructor({ points, language, landMarkNav, simplifiedTBT, pois, levelChangers, initialBearing, }) {
         this.capitalize = (s) => s && String(s[0]).toUpperCase() + String(s).slice(1);
         this.points = points;
         this.language = language;
@@ -50,6 +50,7 @@ export default class GuidanceStepsGenerator {
             this.levelChangers = levelChangers;
             this.initialBearing = initialBearing;
         }
+        this.simplifiedTBT = simplifiedTBT;
         if (this.points && this.points.length > 0) {
             this.generateStepsFromPoints();
         }
@@ -86,6 +87,16 @@ export default class GuidanceStepsGenerator {
                     distanceFromLastStep === 0)) {
                 return;
             }
+            if (!this.simplifiedTBT &&
+                (direction === Direction.Start ||
+                    (direction === Direction.Finish && currentPoint.isPoi) ||
+                    direction === Direction.TurnAround) /*||
+            direction === `${Direction.Down}_${LevelChangerTypes[currentPoint.properties.type]}` ||
+            direction === `${Direction.Up}_${LevelChangerTypes[currentPoint.properties.type]}` ||
+            direction === `${Direction.Exit}_${LevelChangerTypes[currentPoint.properties.type]}` ||
+            distanceFromLastStep === 0*/) {
+                return;
+            }
             return {
                 bearingFromLastStep: this.getBearingFromLastStep(data),
                 coordinates: [point.geometry.coordinates[0], point.geometry.coordinates[1]],

package/lib/components/map/main.d.ts

@@ -98,6 +98,7 @@ export interface Options {
     newFeatureModalEvent?: string;
     enableTBTNavigation?: boolean;
     landmarkTBTNavigation?: boolean;
+    useSimplifiedTBTNavigation?: boolean;
     mapboxOptions?: MapboxOptions;
     zoomIntoPlace?: boolean;
     defaultPlaceId?: string;

package/lib/components/map/main.js

@@ -106,6 +106,7 @@ export class Map {
             newFeatureModalEvent: 'click',
             enableTBTNavigation: true,
             landmarkTBTNavigation: false,
+            useSimplifiedTBTNavigation: false,
             zoomIntoPlace: true,
             defaultFloorLevel: 0,
             isKiosk: false,
@@ -3550,7 +3551,9 @@ export class Map {
                 ? this.routingSource.route[`path-part-${this.currentStep}`]
                 : lineString(this.routingSource.levelPoints[this.state.floor.level].map((i) => i.geometry.coordinates), { level: this.state.floor.level });
             let routeUntilNextStep;
-            if (route.properties.source === 'cityRoute' || this.defaultOptions.landmarkTBTNavigation) {
+            if (route.properties.source === 'cityRoute' ||
+                this.defaultOptions.landmarkTBTNavigation ||
+                !this.defaultOptions.useSimplifiedTBTNavigation) {
                 // Step 1: Determine the current level to filter on
                 const level = route.properties.source === 'cityRoute'
                     ? route.properties.level // Use route level if it's a city route
@@ -3671,7 +3674,8 @@ export class Map {
                                         this.setNavStep('next');
                                     }
                                     if (this.defaultOptions.autoRestartAnimationAfterFloorChange &&
-                                        !this.defaultOptions.landmarkTBTNavigation) {
+                                        !this.defaultOptions.landmarkTBTNavigation &&
+                                        !this.defaultOptions.useSimplifiedTBTNavigation) {
                                         this.restartRouteAnimation({ delay: 0, recenter: true });
                                     }
                                 }, 2000);
@@ -3685,7 +3689,9 @@ export class Map {
                     const currentPoint = along(route, currentDistance);
                     const routeProgress = (this.currentStep / this.routingSource.steps.length) * 100;
                     // cut the line at the point
-                    const lineAlong = lineSplit(route.properties.source === 'cityRoute' || this.defaultOptions.landmarkTBTNavigation
+                    const lineAlong = lineSplit(route.properties.source === 'cityRoute' ||
+                        this.defaultOptions.landmarkTBTNavigation ||
+                        !this.defaultOptions.useSimplifiedTBTNavigation
                         ? routeUntilNextStep
                         : route, currentPoint).features[0];
                     if (this.defaultOptions.routeAnimation.lineProgress) {
@@ -4962,6 +4968,11 @@ export class Map {
             }
             return step;
         }
+        else if (this.routingSource && this.routingSource.points.length > 0 && this.routingSource.points[newStep]) {
+            this.currentStep = newStep;
+            this.onStepSetListener.next(this.currentStep);
+            return step;
+        }
         else {
             console.error(`Route not found`);
         }

package/lib/components/map/routing.d.ts

@@ -11,11 +11,12 @@ export default class Routing {
     setData(collection: FeatureCollection): void;
     toggleOnlyAccessible(onlyAccessible: any): void;
     setConfig(config: WayfindingConfigModel): void;
-    route({ start, finish, stops, landmarkTBT, priorityEntrance, }: {
+    route({ start, finish, stops, landmarkTBT, simplifiedTBT, priorityEntrance, }: {
         start: Feature;
         finish?: Feature;
         stops?: Feature[];
         landmarkTBT?: boolean;
+        simplifiedTBT?: boolean;
         priorityEntrance?: Feature;
     }): {
         paths: any;

package/lib/components/map/routing.js

@@ -61,7 +61,7 @@ export default class Routing {
         this.config = config;
         this.wayfinding.setConfiguration(config);
     }
-    route({ start, finish, stops, landmarkTBT = false, priorityEntrance, }) {
+    route({ start, finish, stops, landmarkTBT = false, simplifiedTBT = false, priorityEntrance, }) {
         const isMultipoint = stops && stops.length > 1;
         let points = null;
         let details = null;
@@ -214,7 +214,7 @@ export default class Routing {
                     }
                 }
             }
-            else {
+            else if (simplifiedTBT) {
                 if (this.forceFloorLevel !== null && this.forceFloorLevel !== undefined) {
                     if (typeof pathPoints['path-part-'.concat(pathPartIndex)] === 'undefined') {
                         pathPoints['path-part-'.concat(pathPartIndex)] = [];
@@ -237,6 +237,21 @@ export default class Routing {
                     }
                 }
             }
+            else {
+                if (typeof pathPoints[`path-part-${pathPartIndex}`] === 'undefined') {
+                    if (points[index + 1]) {
+                        pathPoints[`path-part-${pathPartIndex}`] = [];
+                        if (p.isLevelChanger && points[index + 1].isLevelChanger) {
+                            const leveledPoint = Object.assign(Object.assign({}, p), { properties: Object.assign(Object.assign({}, p.properties), { level: points[index + 1].properties.level }) });
+                            pathPoints[`path-part-${pathPartIndex}`].push(p, leveledPoint);
+                        }
+                        else {
+                            pathPoints[`path-part-${pathPartIndex}`].push(p, points[index + 1]);
+                        }
+                        pathPartIndex++;
+                    }
+                }
+            }
         });
         const paths = {};
         let stopIndex = 0;

package/lib/components/map/sources/routing_source.d.ts

@@ -36,6 +36,7 @@ export default class RoutingSource extends DataSource {
     fullPath?: Feature;
     isMultipoint: boolean;
     landmarkTBT: boolean;
+    simplifiedTBT: boolean;
     pois?: Feature[];
     levelChangers?: Feature[];
     initialBearing: number;
@@ -44,6 +45,7 @@ export default class RoutingSource extends DataSource {
     setConfig(config: WayfindingConfigModel): void;
     setNavigationType(type: 'mall' | 'city' | 'combined'): void;
     setLandmarkTBT(value: boolean): void;
+    setSimplifiedTBT(value: boolean): void;
     setInitialBearing(initialBearing: number): void;
     setPois(pois: Feature[]): void;
     setLevelChangers(levelChangers: Feature[]): void;

package/lib/components/map/sources/routing_source.js

@@ -21,6 +21,7 @@ export default class RoutingSource extends DataSource {
         this.routing = new Routing();
         this.navigationType = 'mall';
         this.landmarkTBT = false;
+        this.simplifiedTBT = false;
     }
     toggleAccessible(value) {
         this.routing.toggleOnlyAccessible(value);
@@ -34,6 +35,9 @@ export default class RoutingSource extends DataSource {
     setLandmarkTBT(value) {
         this.landmarkTBT = value;
     }
+    setSimplifiedTBT(value) {
+        this.simplifiedTBT = value;
+    }
     setInitialBearing(initialBearing) {
         this.initialBearing = initialBearing;
     }
@@ -68,7 +72,13 @@ export default class RoutingSource extends DataSource {
                     route = yield this.routing.cityRoute({ start, finish, language: this.language });
                 }
                 else if (this.navigationType === 'mall') {
-                    route = this.routing.route({ start, finish, stops, landmarkTBT: this.landmarkTBT });
+                    route = this.routing.route({
+                        start,
+                        finish,
+                        stops,
+                        landmarkTBT: this.landmarkTBT,
+                        simplifiedTBT: this.simplifiedTBT,
+                    });
                 }
                 else if (this.navigationType === 'combined' && connectingPoint) {
                     if (startAtMall) {
@@ -80,6 +90,7 @@ export default class RoutingSource extends DataSource {
                             finish: connectingPoint,
                             stops,
                             landmarkTBT: this.landmarkTBT,
+                            simplifiedTBT: this.simplifiedTBT,
                             priorityEntrance: entranceFeature,
                         });
                     }
@@ -92,6 +103,7 @@ export default class RoutingSource extends DataSource {
                             finish,
                             stops,
                             landmarkTBT: this.landmarkTBT,
+                            simplifiedTBT: this.simplifiedTBT,
                             priorityEntrance: entranceFeature,
                         });
                     }
@@ -111,6 +123,7 @@ export default class RoutingSource extends DataSource {
                         points: route === null || route === void 0 ? void 0 : route.points,
                         language: this.language,
                         landMarkNav: this.landmarkTBT,
+                        simplifiedTBT: this.simplifiedTBT,
                         pois: this.pois,
                         levelChangers: this.levelChangers,
                         initialBearing: this.initialBearing,
@@ -168,6 +181,7 @@ export default class RoutingSource extends DataSource {
                         points: mallRoute === null || mallRoute === void 0 ? void 0 : mallRoute.points,
                         language: this.language,
                         landMarkNav: this.landmarkTBT,
+                        simplifiedTBT: this.simplifiedTBT,
                         pois: this.pois,
                         levelChangers: this.levelChangers,
                         initialBearing: this.initialBearing,