Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Only query single route if segmentRange specified #522

Merged
merged 14 commits into from
Jul 12, 2024
Merged

Only query single route if segmentRange specified #522

Changes from 5 commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
49fcade
fixed issue
vishalkrishnads Jun 20, 2024
60b147e
Merge branch 'master' into issue-520
vishalkrishnads Jun 26, 2024
08121d4
removed previous approach
vishalkrishnads Jun 26, 2024
cc6a179
implemented possible fix
vishalkrishnads Jun 26, 2024
6e57314
fixed issue on login
vishalkrishnads Jul 3, 2024
044ae18
fixed logical error
vishalkrishnads Jul 7, 2024
3ab6c28
update comma-api
sshane Jul 12, 2024
c879021
stash
sshane Jul 12, 2024
62d6af0
fixed driveview not loading
vishalkrishnads Jul 12, 2024
fafd47e
revert all to master
sshane Jul 12, 2024
b7e2699
toooooooo messy
sshane Jul 12, 2024
b19d813
clean up
sshane Jul 12, 2024
b41ab80
more
sshane Jul 12, 2024
34d8b02
add comment
sshane Jul 12, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 16 additions & 6 deletions src/actions/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,9 @@ import MyCommaAuth from '@commaai/my-comma-auth';

import * as Types from './types';
import { resetPlayback, selectLoop } from '../timeline/playback';
import {hasRoutesData } from '../timeline/segments';
import { hasRoutesData } from '../timeline/segments';
import { getDeviceFromState, deviceVersionAtLeast } from '../utils';
import { getCommaAccessToken } from '@commaai/my-comma-auth/storage';

let routesRequest = null;
let routesRequestPromise = null;
Expand Down Expand Up @@ -37,7 +38,7 @@ export function checkRoutesData() {
dongleId,
};

routesRequestPromise = routesRequest.req.then((routesData) => {
routesRequestPromise = routesRequest.req.then(async (routesData) => {
state = getState();
const currentRange = state.filter;
if (currentRange.start !== fetchRange.start
Expand All @@ -53,14 +54,24 @@ export function checkRoutesData() {
return;
}

const routes = routesData.map((r) => {
if (!state.currentRoute && state.segmentRange) {
sshane marked this conversation as resolved.
Show resolved Hide resolved
await fetch(`https://api.aks.comma.ai/v1/devices/${dongleId}/routes_segments?route_str=${`${dongleId}|${state.segmentRange.log_id}`.replace(/%7C/g, '|')}`, {
headers: { 'Authorization': `JWT ${await getCommaAccessToken()}` }
})
.then(res => res.json())
.then(res => {
routesData.push(res[0])
}).catch(err => console.error(err.message))
}

let routes = routesData.map((r) => {
let startTime = r.segment_start_times[0];
let endTime = r.segment_end_times[r.segment_end_times.length - 1];

// TODO: these will all be relative times soon
// fix segment boundary times for routes that have the wrong time at the start
if ((Math.abs(r.start_time_utc_millis - startTime) > 24 * 60 * 60 * 1000)
&& (Math.abs(r.end_time_utc_millis - endTime) < 10 * 1000)) {
&& (Math.abs(r.end_time_utc_millis - endTime) < 10 * 1000)) {
startTime = r.start_time_utc_millis;
endTime = r.end_time_utc_millis;
r.segment_start_times = r.segment_numbers.map((x) => startTime + (x * 60 * 1000));
Expand Down Expand Up @@ -111,7 +122,6 @@ export function checkLastRoutesData() {
return
}

console.log(`fetching ${limit +LIMIT_INCREMENT } routes`)
dispatch({
type: Types.ACTION_UPDATE_ROUTE_LIMIT,
limit: limit + LIMIT_INCREMENT,
Expand Down Expand Up @@ -157,7 +167,7 @@ function updateTimeline(state, dispatch, log_id, start, end, allowPathChange) {
}

if (allowPathChange) {
const desiredPath = urlForState(state.dongleId, log_id, Math.floor(start/1000), Math.floor(end/1000), false);
const desiredPath = urlForState(state.dongleId, log_id, Math.floor(start / 1000), Math.floor(end / 1000), false);
if (window.location.pathname !== desiredPath) {
dispatch(push(desiredPath));
}
Expand Down