From d6c3350bbbab383fb88c8ca6a6eed4a689bf79a7 Mon Sep 17 00:00:00 2001 From: Nate-Wessel Date: Wed, 27 Nov 2024 16:23:59 +0000 Subject: [PATCH 1/4] allow backend to wrap --- backend/app/get_travel_time.py | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/backend/app/get_travel_time.py b/backend/app/get_travel_time.py index c411f92..6c98cfc 100644 --- a/backend/app/get_travel_time.py +++ b/backend/app/get_travel_time.py @@ -36,6 +36,9 @@ def get_travel_time(start_node, end_node, start_time, end_time, start_date, end_ SELECT 1 FROM ref.holiday WHERE ta.dt = holiday.dt )''' + # if end_time is less than the start_time, then we wrap around midnight + ToD_and_or = 'AND' if end_time > start_time else 'OR' + query = f''' SELECT link_dir, @@ -45,8 +48,10 @@ def get_travel_time(start_node, end_node, start_time, end_time, start_date, end_ FROM here.ta WHERE link_dir = ANY(%(link_dir_list)s) - AND tod >= %(start_time)s::time - AND tod < %(end_time)s::time + AND ( + tod >= %(start_time)s::time + {ToD_and_or} tod < %(end_time)s::time + ) AND date_part('ISODOW', dt) = ANY(%(dow_list)s) AND dt >= %(start_date)s::date AND dt < %(end_date)s::date From 65df2efdee00bc8443cf8fdb352971b09c335075 Mon Sep 17 00:00:00 2001 From: Nate-Wessel Date: Wed, 27 Nov 2024 18:30:20 +0000 Subject: [PATCH 2/4] update factor completeness criteria --- frontend/src/timeRange.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/src/timeRange.js b/frontend/src/timeRange.js index 22ef535..146aa73 100644 --- a/frontend/src/timeRange.js +++ b/frontend/src/timeRange.js @@ -21,7 +21,7 @@ export class TimeRange extends Factor { if(!(this.#startTime && this.#endTime)){ return false } - return this.startHour < this.endHour + return this.startHour != this.endHour } get name(){ if(this.#startTime || this.#endTime){ From fc52e7516eb7b91a4534e1916768ca5ba66b6532 Mon Sep 17 00:00:00 2001 From: Nate-Wessel Date: Wed, 27 Nov 2024 18:50:48 +0000 Subject: [PATCH 3/4] update hours-in-range calculation --- frontend/src/timeRange.js | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/frontend/src/timeRange.js b/frontend/src/timeRange.js index 146aa73..5cdf2fc 100644 --- a/frontend/src/timeRange.js +++ b/frontend/src/timeRange.js @@ -68,7 +68,12 @@ export class TimeRange extends Factor { } get hoursInRange(){ // how many hours are in the timeRange? if(! this.isComplete){ return undefined } - return this.endHour - this.startHour + if(this.endHour > this.startHour){ + return this.endHour - this.startHour + } else { + console.log(this.endHour,this.startHour, 24 - this.startHour + this.endHour) + return 24 - this.startHour + this.endHour + } } } From 5d2fee3ca68e735eea3c630b9e4828b3ed74f5cf Mon Sep 17 00:00:00 2001 From: Nate-Wessel Date: Wed, 27 Nov 2024 18:54:41 +0000 Subject: [PATCH 4/4] remove logging --- frontend/src/timeRange.js | 1 - 1 file changed, 1 deletion(-) diff --git a/frontend/src/timeRange.js b/frontend/src/timeRange.js index 5cdf2fc..7a14e5b 100644 --- a/frontend/src/timeRange.js +++ b/frontend/src/timeRange.js @@ -71,7 +71,6 @@ export class TimeRange extends Factor { if(this.endHour > this.startHour){ return this.endHour - this.startHour } else { - console.log(this.endHour,this.startHour, 24 - this.startHour + this.endHour) return 24 - this.startHour + this.endHour } }