incyclist-services 1.7.112 → 1.7.114

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

@@ -617,49 +617,50 @@ let ActivityRideService = (() => {
                 const avatar = (0, avatars_1.useAvatars)().get(key);
                 return { position, avatar, ...a };
             });
-            if (props.length > maxEntries) {
-                const currentIdx = props.findIndex(a => a.title === 'current');
-                if (currentIdx < maxEntries - 1) {
-                    const deleted = props.splice(maxEntries - 1);
-                    props.push({ title: `+${deleted.length}`, tsStart: null, distanceGap: '', timeGap: '' });
-                }
-                else if (currentIdx > maxEntries - 1) {
-                    if (currentIdx < props.length - 2) {
-                        const deleted = props.splice(currentIdx + 1);
-                        props.splice(maxEntries - 2, currentIdx - (maxEntries - 2));
-                        props.push({ title: `+${deleted.length}`, tsStart: null, distanceGap: '', timeGap: '' });
-                    }
-                    else if (currentIdx === props.length - 2) {
-                        props.splice(maxEntries - 2, props.length - maxEntries);
-                    }
-                    else {
-                        const keep = maxEntries - 1;
-                        const cut = props.length - maxEntries;
-                        props.splice(keep, cut);
-                    }
-                }
-                else if (currentIdx === props.length - 2) {
-                    props.splice(maxEntries - 2, props.length - maxEntries);
-                }
-                else if (currentIdx === maxEntries - 1) {
-                    const deleted = props.splice(currentIdx + 1, props.length - currentIdx);
-                    props.push({ title: `+${deleted.length}`, tsStart: null, distanceGap: '', timeGap: '' });
-                    props.splice(currentIdx - 1, 1);
-                }
-            }
+            const selected = this.selectPrevRidesRows(props, maxEntries);
             let logInfo = '';
             try {
                 const buildLog = (pr) => {
                     const distanceGap = typeof pr.distance === 'object' ? `${pr.distance?.value}${pr.distance?.unit}` : pr.distance;
                     return `${pr.position}:${pr.avatar?.shirt}-${pr.avatar?.helmet}:${pr.title}:${pr.timeGap}:${distanceGap}`;
                 };
-                logInfo = `(${props.length}/${prevRides.length})`
-                    + props.map(buildLog).join(',');
+                logInfo = `(${selected.length}/${prevRides.length})`
+                    + selected.map(buildLog).join(',');
             }
             catch {
             }
             this.logEvent({ message: 'PrevRides', prevRides: logInfo });
-            return props;
+            return selected;
+        }
+        selectPrevRidesRows(props, maxEntries) {
+            if (props.length <= maxEntries)
+                return props;
+            const currentIdx = props.findIndex(a => a.title === 'current');
+            const selectedIdx = new Set();
+            if (maxEntries >= 3) {
+                selectedIdx.add(0);
+                selectedIdx.add(props.length - 1);
+            }
+            if (currentIdx >= 0)
+                selectedIdx.add(currentIdx);
+            let above = currentIdx - 1;
+            let below = currentIdx + 1;
+            let takeAbove = true;
+            while (selectedIdx.size < maxEntries && (above >= 0 || below < props.length)) {
+                const canAbove = above >= 0;
+                const canBelow = below < props.length;
+                const useAbove = canAbove && (takeAbove || !canBelow);
+                if (useAbove) {
+                    selectedIdx.add(above);
+                    above--;
+                }
+                else {
+                    selectedIdx.add(below);
+                    below++;
+                }
+                takeAbove = !takeAbove;
+            }
+            return Array.from(selectedIdx).sort((a, b) => a - b).map(i => props[i]);
         }
         getPrevActivityLog(ai, current) {
             try {