proximiio-js-library 1.12.76 → 1.12.78

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

@@ -132,6 +132,7 @@ export interface Options {
         dashKeepOriginalRouteLayer?: boolean;
         cityRouteSpeedMultiplier?: number;
         cityPointIconUrl?: string;
+        cityRouteMaxDuration?: number;
     };
     useRasterTiles?: boolean;
     rasterTilesOptions?: {

package/lib/components/map/main.js

@@ -193,6 +193,7 @@ export class Map {
                 autoRestart: true,
                 dashKeepOriginalRouteLayer: false,
                 cityRouteSpeedMultiplier: 5,
+                cityRouteMaxDuration: 5,
             },
             useRasterTiles: false,
             handleUrlParams: false,
@@ -2767,16 +2768,18 @@ export class Map {
                         // @ts-ignore;
                         this.map.fitBounds(boundingBox, {
                             padding: this.defaultOptions.fitBoundsPadding,
-                            bearing: this.map.getBearing(),
+                            bearing: 0,
                             pitch: this.map.getPitch(),
                             animate: false,
+                            maxZoom: 15,
                         });
                     }
                     else {
                         // @ts-ignore
                         this.map.flyTo({
                             center: center(routeToCenter).geometry.coordinates,
-                            zoom: this.defaultOptions.minFitBoundsDistance < 10 ? 22 : this.map.getZoom(),
+                            zoom: this.defaultOptions.minFitBoundsDistance < 10 ? 15 : this.map.getZoom(),
+                            bearing: 0,
                         });
                     }
                     return;
@@ -2911,7 +2914,11 @@ export class Map {
                 if (this.routingSource.navigationType === 'city') {
                     baseSpeed = baseSpeed / this.defaultOptions.routeAnimation.cityRouteSpeedMultiplier;
                 }
-                const totalDuration = totalDistance * baseSpeed; // Total animation duration based on route length
+                let totalDuration = totalDistance * baseSpeed; // Total animation duration based on route length
+                if (this.routingSource.navigationType === 'city' &&
+                    totalDuration > this.defaultOptions.routeAnimation.cityRouteMaxDuration * 1000) {
+                    totalDuration = this.defaultOptions.routeAnimation.cityRouteMaxDuration * 1000;
+                }
                 let startTime;
                 this.map.setCenter(route.geometry.coordinates[0]);
                 const animate = (currentTime) => {
@@ -2995,6 +3002,9 @@ export class Map {
                             this.lerp(cameraCoords[1], targetCoords[1], this.defaultOptions.routeAnimation.cameraLerpTolerance),
                         ];
                         if (!this.defaultOptions.routeAnimation.followRouteAngle) {
+                            if (this.routingSource.navigationType === 'city') {
+                                this.map.setBearing(0);
+                            }
                             this.map.easeTo({
                                 center: this.defaultOptions.routeAnimation.cameraUseLerp
                                     ? interpolatedCoords
@@ -3573,10 +3583,12 @@ export class Map {
         }
         if (this.routingSource && this.routingSource.route && this.routingSource.route[`path-part-${newStep}`]) {
             this.currentStep = newStep;
-            this.centerOnRoute(this.routingSource.route[`path-part-${newStep}`]);
             if (this.routingSource.navigationType === 'city') {
                 this.animateRoute();
             }
+            else {
+                this.centerOnRoute(this.routingSource.route[`path-part-${newStep}`]);
+            }
             this.onStepSetListener.next(this.currentStep);
             return step;
         }