incyclist-services 1.7.58 → 1.7.60

package/lib/cjs/devices/access/service.js

@@ -222,7 +222,7 @@ let DeviceAccessService = (() => {
                 this.interfaces[ifaceName].state = 'connecting';
                 this.emit('interface-changed', ifaceName, { ...this.interfaces[ifaceName], state: 'connecting' });
                 await impl.disconnect();
-                const connected = await impl.connect();
+                const connected = await impl.connect(true);
                 const state = connected ? 'connected' : 'disconnected';
                 this.interfaces[ifaceName].state = state;
                 this.emit('interface-changed', ifaceName, this.interfaces[ifaceName]);

package/lib/cjs/devices/pairing/service.js

@@ -205,9 +205,10 @@ let DevicePairingService = (() => {
         async prepareStart(adapterFilter = []) {
             const stillPairing = this.isPairing();
             const stillScanning = this.isScanning();
+            const adapters = this.state?.adapters ?? [];
             this.logEvent({ message: 'Stop Pairing (OK)', stillPairing, stillScanning });
             try {
-                this.pauseAdapters(this.state.adapters.filter(a => !adapterFilter.includes(a.udid)));
+                this.pauseAdapters(adapters.filter(a => !adapterFilter.includes(a.udid)));
                 if (this.isPairing()) {
                     this.removePairingCallbacks();
                 }

package/lib/cjs/maps/MapArea/options.js

@@ -28,15 +28,16 @@ class OptionManager {
         for (const segment of segments ?? []) {
             try {
                 const path = segment.path;
-                const opts = await this.getNextOptions(segment);
+                const result = await this.getNextOptions(segment);
+                const opts = result.options;
                 if (opts?.length === 1) {
                     if (opts[0].id === segment.id) {
                         (0, utils_1.concatPaths)(path, opts[0].path, 'after', opts[0].id);
                     }
                     else {
                         let foundSameSegment = false;
-                        opts[0].path.forEach((point, j) => {
-                            if (j === 0)
+                        opts[0].path.forEach((point) => {
+                            if (point === opts[0].path[0])
                                 return;
                             foundSameSegment = points.some(pAll => pAll.id === point.id);
                         });
@@ -58,7 +59,7 @@ class OptionManager {
     async getNextOptions(from, props) {
         try {
             if (from?.id === undefined || from?.path === undefined || from?.path.length < 1) {
-                return [];
+                return { options: [], isValid: true };
             }
             const lastPoint = from.path.length > 0 ? from.path.at(-1) : undefined;
             const fromWayId = lastPoint?.wayId ?? from.id;
@@ -68,7 +69,7 @@ class OptionManager {
                 const query = { id: from.id, path: from.path, map: map };
                 originalWay = this.getWay(query);
                 if (!originalWay) {
-                    return [];
+                    return { options: [], isValid: true };
                 }
             }
             const way = { ...originalWay, path: from.path };
@@ -77,13 +78,13 @@ class OptionManager {
                 if (way.path.length > 1)
                     location = way.path.at(-2);
                 else {
-                    return [];
+                    return { options: [], isValid: true };
                 }
             }
             const map = await this.service.load(location);
             if (!map) {
                 if (!this.map?.isWithinBoundary(location))
-                    return [];
+                    return { options: [], isValid: true };
             }
             else {
                 this.setMap(map);
@@ -118,11 +119,11 @@ class OptionManager {
                 const fromNode = from.path?.at(-2);
                 options = options.filter(o => o.path.length > 0 && o.path[1].id !== fromNode.id);
             }
-            return options;
+            return { options, isValid: true };
         }
         catch (err) {
             this.logError(err, 'getNextOptions');
-            return [];
+            return { options: [], isValid: false };
         }
     }
     async checkMinDistance(options, minDistance) {
@@ -130,8 +131,8 @@ class OptionManager {
             if (option?.path?.length > 0) {
                 const distance = this.getDistance(option.path);
                 if (distance < minDistance) {
-                    const branches = await this.getNextOptions(option, { minDistance: minDistance - distance });
-                    option.options = branches ?? [];
+                    const result = await this.getNextOptions(option, { minDistance: minDistance - distance });
+                    option.options = result.options ?? [];
                 }
             }
         }

package/lib/cjs/ride/display/service.js

@@ -619,25 +619,30 @@ let RideDisplayService = (() => {
             this.adjustCurrentStepDuration(time, newDuration);
             this.updateActivityWorkout();
         }
-        adjustPower(increase, large) {
+        adjustPower(increase, large, gearFallback = true) {
             try {
                 if (this.getWorkoutRide().inUse()) {
                     const inc = large ? 5 : 1;
-                    if (increase)
-                        this.getWorkoutRide().powerUp(inc);
-                    else
-                        this.getWorkoutRide().powerDown(inc);
+                    this.adjustWorkout(increase, inc);
                 }
                 else {
                     const sgn = increase ? 1 : -1;
                     const inc = large ? sgn * 50 : sgn * 5;
-                    this.devicePowerUp(inc);
+                    this.devicePowerUp(inc, gearFallback);
                 }
             }
             catch (err) {
                 this.logError(err, 'adjustPower');
             }
         }
+        adjustWorkout(increase, inc) {
+            if (this.getWorkoutRide().inUse()) {
+                if (increase)
+                    this.getWorkoutRide().powerUp(inc);
+                else
+                    this.getWorkoutRide().powerDown(inc);
+            }
+        }
         adjustCurrentStepDuration(time, newDuration) {
             let delta = 0;
             this.actualWorkout?.steps?.forEach(s => {
@@ -845,7 +850,7 @@ let RideDisplayService = (() => {
             devices.off('cycling-mode-toggle', h.toggleCyclingModeHandler);
             delete this.startDeviceHandlers;
         }
-        devicePowerUp(inc) {
+        devicePowerUp(inc, gearFallback = true) {
             const device = this.getDeviceRide().getControlAdapter();
             if (!device)
                 return;
@@ -861,9 +866,12 @@ let RideDisplayService = (() => {
                 if (Math.abs(gearDelta) > 1) {
                     gearDelta = Math.sign(gearDelta) * 5;
                 }
-                this.getRideModeService().sendUpdate({ gearDelta });
+                this.gearChange(gearDelta);
             }
         }
+        gearChange(gearDelta) {
+            this.getRideModeService().sendUpdate({ gearDelta });
+        }
         simulatorPowerUp(mode, powerInc) {
             const simMode = mode.getSetting('mode');
             let request = {};
@@ -985,6 +993,22 @@ let RideDisplayService = (() => {
                 this.adjustPower(true, duration > 1000);
             else if (key === 'down')
                 this.adjustPower(false, duration > 1000);
+            else if (key == 'r-shift-up')
+                this.gearChange(1);
+            else if (key == 'r-shift-down')
+                this.gearChange(-1);
+            else if (key == 'l-shift-up')
+                this.gearChange(5);
+            else if (key == 'l-shift-down')
+                this.gearChange(-5);
+            else if (key == 'y')
+                this.adjustPower(true, duration > 1000, false);
+            else if (key == 'b')
+                this.adjustPower(false, duration > 1000, false);
+            else if (key == 'a')
+                this.forward();
+            else if (key == 'z')
+                this.backward();
         }
         startListeningForDeviceData() {
             const { deviceDataHandler } = this.startDeviceHandlers ?? {};

package/lib/cjs/ride/page/service.js

@@ -292,7 +292,8 @@ let RidePageService = (() => {
                 startOverlayProps: isStarting ? this.getRideDisplay().getStartOverlayProps() : null,
                 menuProps: this.menuProps,
                 rideView: props.rideView,
-                route: props.route
+                route: props.route,
+                displayObserver: props.displayObserver
             };
             return displayProps;
         }

package/lib/cjs/ride/route/FreeRideDisplayService.js

@@ -422,11 +422,11 @@ let FreeRideDisplayService = (() => {
                         this.logError(err, 'getNextOptions');
                         options = undefined;
                     }
-                    if (!options?.length && !finished && !forStart) {
+                    if (!options?.length && !finished && !forStart && !freeRide.isLastQueryValid()) {
                         this.logEvent({ message: 'no options available - retry in 3000ms', });
                         await (0, sleep_1.sleep)(3000);
                     }
-                } while (!options?.length && !finished && !forStart);
+                } while (!options?.length && !finished && !forStart && !freeRide.isLastQueryValid());
                 this.internalEmitter.off('stop-query', setFinished);
             };
             return new Promise(done => {

package/lib/cjs/ride/route/GpxDisplayService.js

@@ -103,6 +103,8 @@ let GpxDisplayService = (() => {
                 displayPosition: this.mapLoaded ? null : this.position,
                 sideViews
             };
+            if (this.isMobile()) {
+            }
             return props;
         }
         getSatelliteViewProps() {
@@ -120,7 +122,7 @@ let GpxDisplayService = (() => {
         }
         getStartOverlayProps() {
             const rideView = this.getRideView();
-            if (rideView === 'map') {
+            if (rideView === 'map' || this.isMobile()) {
                 return {
                     mapType: this.getRideViewName(),
                     mapState: 'Loaded'
@@ -134,7 +136,7 @@ let GpxDisplayService = (() => {
         }
         isStartRideCompleted() {
             const rideView = this.getRideView();
-            if (rideView === 'map') {
+            if (rideView === 'map' || this.isMobile()) {
                 this.mapLoaded = true;
                 return true;
             }
@@ -159,7 +161,7 @@ let GpxDisplayService = (() => {
         }
         getRideView() {
             if (this.isMobile())
-                return 'map';
+                return 'sv';
             const rideView = this.getUserSettings().get('preferences.rideView', 'sv');
             return rideView;
         }

package/lib/cjs/routes/free-ride/service.js

@@ -75,6 +75,7 @@ let FreeRideService = (() => {
         selectedOption;
         options;
         currentSegment;
+        lastOptionsQueryValid = true;
         constructor() {
             super('FreeRide');
             this.options = [];
@@ -137,7 +138,12 @@ let FreeRideService = (() => {
         }
         async loadNextOptions(from, forStart) {
             const optionManager = (0, service_2.useMapArea)().getOptionManager();
-            let opts = await optionManager.getNextOptions(from) ?? [];
+            const result = await optionManager.getNextOptions(from);
+            let opts = result.options;
+            this.lastOptionsQueryValid = result.isValid;
+            if (!result.isValid) {
+                return [];
+            }
             opts = this.evaluateOptions(opts, from);
             if (forStart)
                 await this.getNextLevelOptions(opts);
@@ -289,8 +295,11 @@ let FreeRideService = (() => {
                 let segment = o;
                 let done = false;
                 let isSingle = false;
+                let lastHandlerWasNoOption = false;
                 do {
-                    const nextOpts = await optionManager.getNextOptions(segment);
+                    const nextOptsResult = await optionManager.getNextOptions(segment);
+                    const nextOpts = nextOptsResult.options;
+                    const isValid = nextOptsResult.isValid;
                     const handleSingleOption = () => {
                         if (segmentUpdated)
                             return;
@@ -315,6 +324,11 @@ let FreeRideService = (() => {
                             done = true;
                             return;
                         }
+                        if (lastHandlerWasNoOption) {
+                            o.options = [];
+                            done = true;
+                            return;
+                        }
                         try {
                             const map = segment.map ?? this.getMapArea().getMap(segment.path[0]);
                             const newPath = [];
@@ -343,13 +357,21 @@ let FreeRideService = (() => {
                     };
                     if (nextOpts?.length === 1) {
                         handleSingleOption();
+                        lastHandlerWasNoOption = false;
                     }
-                    else if (!nextOpts?.length) {
+                    else if (!nextOpts?.length && isValid) {
                         handleNoOption();
+                        lastHandlerWasNoOption = true;
+                    }
+                    else if (!nextOpts?.length && !isValid) {
+                        o.options = [];
+                        done = true;
+                        lastHandlerWasNoOption = false;
                     }
                     else {
                         o.options = nextOpts;
                         done = true;
+                        lastHandlerWasNoOption = false;
                     }
                     await (0, utils_2.waitNextTick)();
                 } while (!done);
@@ -364,6 +386,9 @@ let FreeRideService = (() => {
         getOptions() {
             return this.options;
         }
+        isLastQueryValid() {
+            return this.lastOptionsQueryValid;
+        }
         selectOption(option) {
             const current = this.selectedOption;
             const options = this.options ?? [];

package/lib/cjs/ui/service.js

@@ -183,15 +183,18 @@ let UserInterfaceServcie = (() => {
             this.isTerminated = false;
             this.isTerminating = false;
             try {
+                let resumeRequired = true;
+                if (this.backgroundTimer) {
+                    clearTimeout(this.backgroundTimer);
+                    resumeRequired = false;
+                }
+                this.logEvent({ message: 'onAppResume called' });
                 this.startHeartbeatWorker();
                 this.backgroundPausedByService = false;
                 this.appState = 'Active';
-                this.logEvent({ message: 'onAppResume called' });
-                if (this.backgroundTimer) {
-                    clearTimeout(this.backgroundTimer);
-                    return;
+                if (resumeRequired) {
+                    this.resume();
                 }
-                this.resume();
             }
             catch (err) {
                 this.logError(err, 'onAppPause');
@@ -228,15 +231,15 @@ let UserInterfaceServcie = (() => {
         }
         async pause() {
             await pages_1.IncyclistPageService.pausePage();
-            (0, devices_1.useDeviceAccess)().disconnect();
+            await (0, devices_1.useDeviceAccess)().disconnect();
             if (this.getMessageQueue().disconnect)
                 this.getMessageQueue().disconnect();
         }
-        resume() {
+        async resume() {
             if (this.getMessageQueue().connect)
                 this.getMessageQueue().connect();
-            (0, devices_1.useDeviceAccess)().connect();
-            pages_1.IncyclistPageService.resumePage();
+            await (0, devices_1.useDeviceAccess)().connect();
+            await pages_1.IncyclistPageService.resumePage();
         }
         startHeartbeatWorker() {
             if (this.heartbeatIv)

package/lib/cjs/video/VideoSyncHelper.js

@@ -442,7 +442,7 @@ class VideoSyncHelper extends service_1.IncyclistService {
             }
             const s0 = mapping.distance;
             const v = mapping.videoSpeed / 3.6;
-            const t = mapping.time + (distance - s0) / v;
+            const t = mapping.time === 0 ? mapping.time + distance / v : mapping.time + (distance - s0) / v;
             if (!Number.isNaN(t)) {
                 return t;
             }

package/lib/esm/devices/access/service.js

@@ -216,7 +216,7 @@ let DeviceAccessService = (() => {
                 this.interfaces[ifaceName].state = 'connecting';
                 this.emit('interface-changed', ifaceName, { ...this.interfaces[ifaceName], state: 'connecting' });
                 await impl.disconnect();
-                const connected = await impl.connect();
+                const connected = await impl.connect(true);
                 const state = connected ? 'connected' : 'disconnected';
                 this.interfaces[ifaceName].state = state;
                 this.emit('interface-changed', ifaceName, this.interfaces[ifaceName]);

package/lib/esm/devices/pairing/service.js

@@ -199,9 +199,10 @@ let DevicePairingService = (() => {
         async prepareStart(adapterFilter = []) {
             const stillPairing = this.isPairing();
             const stillScanning = this.isScanning();
+            const adapters = this.state?.adapters ?? [];
             this.logEvent({ message: 'Stop Pairing (OK)', stillPairing, stillScanning });
             try {
-                this.pauseAdapters(this.state.adapters.filter(a => !adapterFilter.includes(a.udid)));
+                this.pauseAdapters(adapters.filter(a => !adapterFilter.includes(a.udid)));
                 if (this.isPairing()) {
                     this.removePairingCallbacks();
                 }

package/lib/esm/maps/MapArea/options.js

@@ -22,15 +22,16 @@ export class OptionManager {
         for (const segment of segments ?? []) {
             try {
                 const path = segment.path;
-                const opts = await this.getNextOptions(segment);
+                const result = await this.getNextOptions(segment);
+                const opts = result.options;
                 if (opts?.length === 1) {
                     if (opts[0].id === segment.id) {
                         concatPaths(path, opts[0].path, 'after', opts[0].id);
                     }
                     else {
                         let foundSameSegment = false;
-                        opts[0].path.forEach((point, j) => {
-                            if (j === 0)
+                        opts[0].path.forEach((point) => {
+                            if (point === opts[0].path[0])
                                 return;
                             foundSameSegment = points.some(pAll => pAll.id === point.id);
                         });
@@ -52,7 +53,7 @@ export class OptionManager {
     async getNextOptions(from, props) {
         try {
             if (from?.id === undefined || from?.path === undefined || from?.path.length < 1) {
-                return [];
+                return { options: [], isValid: true };
             }
             const lastPoint = from.path.length > 0 ? from.path.at(-1) : undefined;
             const fromWayId = lastPoint?.wayId ?? from.id;
@@ -62,7 +63,7 @@ export class OptionManager {
                 const query = { id: from.id, path: from.path, map: map };
                 originalWay = this.getWay(query);
                 if (!originalWay) {
-                    return [];
+                    return { options: [], isValid: true };
                 }
             }
             const way = { ...originalWay, path: from.path };
@@ -71,13 +72,13 @@ export class OptionManager {
                 if (way.path.length > 1)
                     location = way.path.at(-2);
                 else {
-                    return [];
+                    return { options: [], isValid: true };
                 }
             }
             const map = await this.service.load(location);
             if (!map) {
                 if (!this.map?.isWithinBoundary(location))
-                    return [];
+                    return { options: [], isValid: true };
             }
             else {
                 this.setMap(map);
@@ -112,11 +113,11 @@ export class OptionManager {
                 const fromNode = from.path?.at(-2);
                 options = options.filter(o => o.path.length > 0 && o.path[1].id !== fromNode.id);
             }
-            return options;
+            return { options, isValid: true };
         }
         catch (err) {
             this.logError(err, 'getNextOptions');
-            return [];
+            return { options: [], isValid: false };
         }
     }
     async checkMinDistance(options, minDistance) {
@@ -124,8 +125,8 @@ export class OptionManager {
             if (option?.path?.length > 0) {
                 const distance = this.getDistance(option.path);
                 if (distance < minDistance) {
-                    const branches = await this.getNextOptions(option, { minDistance: minDistance - distance });
-                    option.options = branches ?? [];
+                    const result = await this.getNextOptions(option, { minDistance: minDistance - distance });
+                    option.options = result.options ?? [];
                 }
             }
         }

package/lib/esm/ride/display/service.js

@@ -616,25 +616,30 @@ let RideDisplayService = (() => {
             this.adjustCurrentStepDuration(time, newDuration);
             this.updateActivityWorkout();
         }
-        adjustPower(increase, large) {
+        adjustPower(increase, large, gearFallback = true) {
             try {
                 if (this.getWorkoutRide().inUse()) {
                     const inc = large ? 5 : 1;
-                    if (increase)
-                        this.getWorkoutRide().powerUp(inc);
-                    else
-                        this.getWorkoutRide().powerDown(inc);
+                    this.adjustWorkout(increase, inc);
                 }
                 else {
                     const sgn = increase ? 1 : -1;
                     const inc = large ? sgn * 50 : sgn * 5;
-                    this.devicePowerUp(inc);
+                    this.devicePowerUp(inc, gearFallback);
                 }
             }
             catch (err) {
                 this.logError(err, 'adjustPower');
             }
         }
+        adjustWorkout(increase, inc) {
+            if (this.getWorkoutRide().inUse()) {
+                if (increase)
+                    this.getWorkoutRide().powerUp(inc);
+                else
+                    this.getWorkoutRide().powerDown(inc);
+            }
+        }
         adjustCurrentStepDuration(time, newDuration) {
             let delta = 0;
             this.actualWorkout?.steps?.forEach(s => {
@@ -842,7 +847,7 @@ let RideDisplayService = (() => {
             devices.off('cycling-mode-toggle', h.toggleCyclingModeHandler);
             delete this.startDeviceHandlers;
         }
-        devicePowerUp(inc) {
+        devicePowerUp(inc, gearFallback = true) {
             const device = this.getDeviceRide().getControlAdapter();
             if (!device)
                 return;
@@ -858,9 +863,12 @@ let RideDisplayService = (() => {
                 if (Math.abs(gearDelta) > 1) {
                     gearDelta = Math.sign(gearDelta) * 5;
                 }
-                this.getRideModeService().sendUpdate({ gearDelta });
+                this.gearChange(gearDelta);
             }
         }
+        gearChange(gearDelta) {
+            this.getRideModeService().sendUpdate({ gearDelta });
+        }
         simulatorPowerUp(mode, powerInc) {
             const simMode = mode.getSetting('mode');
             let request = {};
@@ -982,6 +990,22 @@ let RideDisplayService = (() => {
                 this.adjustPower(true, duration > 1000);
             else if (key === 'down')
                 this.adjustPower(false, duration > 1000);
+            else if (key == 'r-shift-up')
+                this.gearChange(1);
+            else if (key == 'r-shift-down')
+                this.gearChange(-1);
+            else if (key == 'l-shift-up')
+                this.gearChange(5);
+            else if (key == 'l-shift-down')
+                this.gearChange(-5);
+            else if (key == 'y')
+                this.adjustPower(true, duration > 1000, false);
+            else if (key == 'b')
+                this.adjustPower(false, duration > 1000, false);
+            else if (key == 'a')
+                this.forward();
+            else if (key == 'z')
+                this.backward();
         }
         startListeningForDeviceData() {
             const { deviceDataHandler } = this.startDeviceHandlers ?? {};

package/lib/esm/ride/page/service.js

@@ -289,7 +289,8 @@ let RidePageService = (() => {
                 startOverlayProps: isStarting ? this.getRideDisplay().getStartOverlayProps() : null,
                 menuProps: this.menuProps,
                 rideView: props.rideView,
-                route: props.route
+                route: props.route,
+                displayObserver: props.displayObserver
             };
             return displayProps;
         }

package/lib/esm/ride/route/FreeRideDisplayService.js

@@ -416,11 +416,11 @@ let FreeRideDisplayService = (() => {
                         this.logError(err, 'getNextOptions');
                         options = undefined;
                     }
-                    if (!options?.length && !finished && !forStart) {
+                    if (!options?.length && !finished && !forStart && !freeRide.isLastQueryValid()) {
                         this.logEvent({ message: 'no options available - retry in 3000ms', });
                         await sleep(3000);
                     }
-                } while (!options?.length && !finished && !forStart);
+                } while (!options?.length && !finished && !forStart && !freeRide.isLastQueryValid());
                 this.internalEmitter.off('stop-query', setFinished);
             };
             return new Promise(done => {

package/lib/esm/ride/route/GpxDisplayService.js

@@ -100,6 +100,8 @@ let GpxDisplayService = (() => {
                 displayPosition: this.mapLoaded ? null : this.position,
                 sideViews
             };
+            if (this.isMobile()) {
+            }
             return props;
         }
         getSatelliteViewProps() {
@@ -117,7 +119,7 @@ let GpxDisplayService = (() => {
         }
         getStartOverlayProps() {
             const rideView = this.getRideView();
-            if (rideView === 'map') {
+            if (rideView === 'map' || this.isMobile()) {
                 return {
                     mapType: this.getRideViewName(),
                     mapState: 'Loaded'
@@ -131,7 +133,7 @@ let GpxDisplayService = (() => {
         }
         isStartRideCompleted() {
             const rideView = this.getRideView();
-            if (rideView === 'map') {
+            if (rideView === 'map' || this.isMobile()) {
                 this.mapLoaded = true;
                 return true;
             }
@@ -156,7 +158,7 @@ let GpxDisplayService = (() => {
         }
         getRideView() {
             if (this.isMobile())
-                return 'map';
+                return 'sv';
             const rideView = this.getUserSettings().get('preferences.rideView', 'sv');
             return rideView;
         }

package/lib/esm/routes/free-ride/service.js

@@ -69,6 +69,7 @@ let FreeRideService = (() => {
         selectedOption;
         options;
         currentSegment;
+        lastOptionsQueryValid = true;
         constructor() {
             super('FreeRide');
             this.options = [];
@@ -131,7 +132,12 @@ let FreeRideService = (() => {
         }
         async loadNextOptions(from, forStart) {
             const optionManager = useMapArea().getOptionManager();
-            let opts = await optionManager.getNextOptions(from) ?? [];
+            const result = await optionManager.getNextOptions(from);
+            let opts = result.options;
+            this.lastOptionsQueryValid = result.isValid;
+            if (!result.isValid) {
+                return [];
+            }
             opts = this.evaluateOptions(opts, from);
             if (forStart)
                 await this.getNextLevelOptions(opts);
@@ -283,8 +289,11 @@ let FreeRideService = (() => {
                 let segment = o;
                 let done = false;
                 let isSingle = false;
+                let lastHandlerWasNoOption = false;
                 do {
-                    const nextOpts = await optionManager.getNextOptions(segment);
+                    const nextOptsResult = await optionManager.getNextOptions(segment);
+                    const nextOpts = nextOptsResult.options;
+                    const isValid = nextOptsResult.isValid;
                     const handleSingleOption = () => {
                         if (segmentUpdated)
                             return;
@@ -309,6 +318,11 @@ let FreeRideService = (() => {
                             done = true;
                             return;
                         }
+                        if (lastHandlerWasNoOption) {
+                            o.options = [];
+                            done = true;
+                            return;
+                        }
                         try {
                             const map = segment.map ?? this.getMapArea().getMap(segment.path[0]);
                             const newPath = [];
@@ -337,13 +351,21 @@ let FreeRideService = (() => {
                     };
                     if (nextOpts?.length === 1) {
                         handleSingleOption();
+                        lastHandlerWasNoOption = false;
                     }
-                    else if (!nextOpts?.length) {
+                    else if (!nextOpts?.length && isValid) {
                         handleNoOption();
+                        lastHandlerWasNoOption = true;
+                    }
+                    else if (!nextOpts?.length && !isValid) {
+                        o.options = [];
+                        done = true;
+                        lastHandlerWasNoOption = false;
                     }
                     else {
                         o.options = nextOpts;
                         done = true;
+                        lastHandlerWasNoOption = false;
                     }
                     await waitNextTick();
                 } while (!done);
@@ -358,6 +380,9 @@ let FreeRideService = (() => {
         getOptions() {
             return this.options;
         }
+        isLastQueryValid() {
+            return this.lastOptionsQueryValid;
+        }
         selectOption(option) {
             const current = this.selectedOption;
             const options = this.options ?? [];

package/lib/esm/ui/service.js

@@ -180,15 +180,18 @@ let UserInterfaceServcie = (() => {
             this.isTerminated = false;
             this.isTerminating = false;
             try {
+                let resumeRequired = true;
+                if (this.backgroundTimer) {
+                    clearTimeout(this.backgroundTimer);
+                    resumeRequired = false;
+                }
+                this.logEvent({ message: 'onAppResume called' });
                 this.startHeartbeatWorker();
                 this.backgroundPausedByService = false;
                 this.appState = 'Active';
-                this.logEvent({ message: 'onAppResume called' });
-                if (this.backgroundTimer) {
-                    clearTimeout(this.backgroundTimer);
-                    return;
+                if (resumeRequired) {
+                    this.resume();
                 }
-                this.resume();
             }
             catch (err) {
                 this.logError(err, 'onAppPause');
@@ -225,15 +228,15 @@ let UserInterfaceServcie = (() => {
         }
         async pause() {
             await IncyclistPageService.pausePage();
-            useDeviceAccess().disconnect();
+            await useDeviceAccess().disconnect();
             if (this.getMessageQueue().disconnect)
                 this.getMessageQueue().disconnect();
         }
-        resume() {
+        async resume() {
             if (this.getMessageQueue().connect)
                 this.getMessageQueue().connect();
-            useDeviceAccess().connect();
-            IncyclistPageService.resumePage();
+            await useDeviceAccess().connect();
+            await IncyclistPageService.resumePage();
         }
         startHeartbeatWorker() {
             if (this.heartbeatIv)

package/lib/esm/video/VideoSyncHelper.js

@@ -439,7 +439,7 @@ export class VideoSyncHelper extends IncyclistService {
             }
             const s0 = mapping.distance;
             const v = mapping.videoSpeed / 3.6;
-            const t = mapping.time + (distance - s0) / v;
+            const t = mapping.time === 0 ? mapping.time + distance / v : mapping.time + (distance - s0) / v;
             if (!Number.isNaN(t)) {
                 return t;
             }

package/lib/types/maps/MapArea/options.d.ts

@@ -1,5 +1,5 @@
 import { EventLogger } from "gd-eventlog";
-import { FreeRideContinuation, GetNextOptionProps, IMapArea, IMapAreaService, IncyclistNode, IncyclistWay, PathCrossingInfo, WayInfo } from "./types";
+import { FreeRideContinuation, GetNextOptionProps, IMapArea, IMapAreaService, IncyclistNode, IncyclistWay, NextOptionsResult, PathCrossingInfo, WayInfo } from "./types";
 export declare class OptionManager {
     protected service: IMapAreaService;
     protected map?: IMapArea;
@@ -7,7 +7,7 @@ export declare class OptionManager {
     constructor(service: IMapAreaService, map?: IMapArea);
     setMap(map: IMapArea): void;
     getStartOptions(way: IncyclistWay, crossing: PathCrossingInfo): Promise<Array<FreeRideContinuation>>;
-    getNextOptions(from: WayInfo | FreeRideContinuation, props?: GetNextOptionProps): Promise<Array<FreeRideContinuation>>;
+    getNextOptions(from: WayInfo | FreeRideContinuation, props?: GetNextOptionProps): Promise<NextOptionsResult>;
     protected checkMinDistance(options: Array<FreeRideContinuation>, minDistance: number): Promise<void>;
     protected getDistance(path: IncyclistNode[]): number;
     protected checkOptionsOnDifferentWay(location: IncyclistNode, w: IncyclistWay, options: FreeRideContinuation[]): FreeRideContinuation[];

package/lib/types/maps/MapArea/types.d.ts

@@ -37,6 +37,10 @@ export type FreeRideContinuation = {
     map?: IMapArea;
     ui?: FreeRideOption;
 };
+export type NextOptionsResult = {
+    options: Array<FreeRideContinuation>;
+    isValid: boolean;
+};
 export interface IMapAreaService {
     load(location: IncyclistNode): Promise<IMapArea | undefined>;
     getMap(location: IncyclistNode): IMapArea | undefined;

package/lib/types/ride/base/types.d.ts

@@ -11,6 +11,7 @@ import { FreeRideOption } from "../../routes/list/types";
 import { MapViewPort } from "../route/types";
 import { LatLng } from "../../utils/geo";
 import { Unit } from "../../i18n";
+import { IObserver } from "../../types";
 export type RideType = 'Free-Ride' | 'GPX' | 'Video' | 'Workout';
 export type CurrentRideState = 'Idle' | 'Starting' | 'Started' | 'Active' | 'Paused' | 'Error' | 'Finished' | 'Closing';
 export type CurrentRideDeviceState = 'Starting' | 'Started' | 'Error';
@@ -102,6 +103,7 @@ export interface MapOverlayDisplayProps extends OverlayDisplayProps {
 export type RideViewType = 'sv' | 'map' | 'sat';
 export interface GpxDisplayProps extends RouteDisplayProps {
     rideView: RideViewType;
+    displayObserver?: IObserver;
 }
 export interface RouteOptionDisplayProps {
     optionsDelay?: number;

package/lib/types/ride/display/service.d.ts

@@ -78,7 +78,8 @@ export declare class RideDisplayService extends IncyclistService implements ICur
     onRouteUpdated(route: Route): void;
     protected onRouteCompleted(): void;
     protected onForward(workoutTime: number, remaining: number): void;
-    adjustPower(increase: boolean, large: boolean): void;
+    adjustPower(increase: boolean, large: boolean, gearFallback?: boolean): void;
+    adjustWorkout(increase: boolean, inc: number): void;
     protected adjustCurrentStepDuration(time: number, newDuration: number): void;
     protected onBackward(workoutTime: number, duration: number, jumpType: 'current' | 'previous', jumpFrom: Step, jumpTo: Step): void;
     protected adjustStepDuration(s: Step, newDuration: any): void;
@@ -95,7 +96,8 @@ export declare class RideDisplayService extends IncyclistService implements ICur
     protected stopDevices(exit?: boolean): void;
     protected initDeviceHandlers(): void;
     protected resetDeviceHandlers(): void;
-    protected devicePowerUp(inc: number): void;
+    protected devicePowerUp(inc: number, gearFallback?: boolean): void;
+    protected gearChange(gearDelta: number): void;
     protected simulatorPowerUp(mode: CyclingMode, powerInc: number): void;
     protected onDeviceStartRequest(devices: AdapterStateInfo[]): void;
     protected updateStartOverlay(): void;

package/lib/types/ride/page/types.d.ts

@@ -20,6 +20,7 @@ export interface VideoRidePageDisplayProps extends RidePageDisplayProps {
 }
 export interface GPXRidePageDisplayProps extends RidePageDisplayProps {
     rideView?: RideViewType;
+    displayObserver?: IObserver;
 }
 export type AnyRidePageDisplayProps = VideoRidePageDisplayProps | RidePageDisplayProps;
 export interface RideMenuProps {

package/lib/types/routes/free-ride/service.d.ts

@@ -8,6 +8,7 @@ export declare class FreeRideService extends IncyclistService {
     protected selectedOption: FreeRideContinuation;
     protected options: FreeRideContinuation[];
     protected currentSegment: FreeRideContinuation;
+    protected lastOptionsQueryValid: boolean;
     constructor();
     selectStartPosition(position?: LatLng | undefined): Promise<{
         position: IncyclistNode;
@@ -34,6 +35,7 @@ export declare class FreeRideService extends IncyclistService {
     protected getNextLevelOptions(opts: FreeRideContinuation[]): Promise<void>;
     protected buildId(opt: FreeRideContinuation): string;
     getOptions(): FreeRideContinuation[];
+    isLastQueryValid(): boolean;
     selectOption(option: FreeRideContinuation | string | number): FreeRideContinuation[];
     applyOption(option?: FreeRideContinuation): void;
     applyStartOption(startOption?: FreeRideOption): void;

package/lib/types/ui/service.d.ts

@@ -29,7 +29,7 @@ export declare class UserInterfaceServcie extends IncyclistService {
     onAppResume(): Promise<boolean>;
     protected onSessionStart(): void;
     protected pause(): Promise<void>;
-    protected resume(): void;
+    protected resume(): Promise<void>;
     protected startHeartbeatWorker(): void;
     protected stopHeartbeatWorker(): void;
     protected sendHeartbeat(): void;

package/package.json

@@ -1,13 +1,13 @@
 {
   "name": "incyclist-services",
-  "version": "1.7.58",
+  "version": "1.7.60",
   "peerDependencies": {
     "gd-eventlog": "^0.1.27"
   },
   "dependencies": {
     "@garmin/fitsdk": "^21.200.0",
     "axios": "^1.15.2",
-    "incyclist-devices": "^3.0.14",
+    "incyclist-devices": "^3.0.16",
     "promise.any": "^2.0.6",
     "semver": "^7.7.4",
     "tcx-builder": "^1.1.1",