aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/Costasdev.Busurbano.Backend/Services/OtpService.cs1
-rw-r--r--src/frontend/app/data/PlannerApi.ts2
-rw-r--r--src/frontend/app/hooks/usePlanner.ts4
-rw-r--r--src/frontend/app/routes/home.tsx12
-rw-r--r--src/frontend/app/routes/planner.tsx2
5 files changed, 11 insertions, 10 deletions
diff --git a/src/Costasdev.Busurbano.Backend/Services/OtpService.cs b/src/Costasdev.Busurbano.Backend/Services/OtpService.cs
index 77eddd3..82c43e0 100644
--- a/src/Costasdev.Busurbano.Backend/Services/OtpService.cs
+++ b/src/Costasdev.Busurbano.Backend/Services/OtpService.cs
@@ -1,6 +1,5 @@
using System.Globalization;
using System.Text;
-using System.Text.Json;
using Costasdev.Busurbano.Backend.Configuration;
using Costasdev.Busurbano.Backend.Types.Otp;
using Costasdev.Busurbano.Backend.Types.Planner;
diff --git a/src/frontend/app/data/PlannerApi.ts b/src/frontend/app/data/PlannerApi.ts
index df504ad..be61d4b 100644
--- a/src/frontend/app/data/PlannerApi.ts
+++ b/src/frontend/app/data/PlannerApi.ts
@@ -29,6 +29,7 @@ export interface Leg {
routeName?: string;
routeShortName?: string;
routeLongName?: string;
+ routeColor?: string;
headsign?: string;
agencyName?: string;
from?: PlannerPlace;
@@ -38,6 +39,7 @@ export interface Leg {
distanceMeters: number;
geometry?: PlannerGeometry;
steps: Step[];
+ intermediateStops?: PlannerPlace[];
}
export interface PlannerPlace {
diff --git a/src/frontend/app/hooks/usePlanner.ts b/src/frontend/app/hooks/usePlanner.ts
index 8a2959a..6123f8a 100644
--- a/src/frontend/app/hooks/usePlanner.ts
+++ b/src/frontend/app/hooks/usePlanner.ts
@@ -86,7 +86,7 @@ export function usePlanner() {
plan: result,
searchTime: time ?? new Date(),
arriveBy: arriveByParam,
- selectedItineraryIndex: null,
+ selectedItineraryIndex: undefined,
};
localStorage.setItem(STORAGE_KEY, JSON.stringify(toStore));
} catch (err) {
@@ -131,7 +131,7 @@ export function usePlanner() {
if (stored) {
try {
const data: StoredRoute = JSON.parse(stored);
- data.selectedItineraryIndex = null;
+ data.selectedItineraryIndex = undefined;
localStorage.setItem(STORAGE_KEY, JSON.stringify(data));
} catch (e) {
// Ignore
diff --git a/src/frontend/app/routes/home.tsx b/src/frontend/app/routes/home.tsx
index 7c13da6..e97659a 100644
--- a/src/frontend/app/routes/home.tsx
+++ b/src/frontend/app/routes/home.tsx
@@ -120,9 +120,9 @@ export default function StopList() {
const a =
Math.sin(dLat / 2) * Math.sin(dLat / 2) +
Math.cos(toRadians(lat1)) *
- Math.cos(toRadians(lat2)) *
- Math.sin(dLon / 2) *
- Math.sin(dLon / 2);
+ Math.cos(toRadians(lat2)) *
+ Math.sin(dLon / 2) *
+ Math.sin(dLon / 2);
const c = 2 * Math.atan2(Math.sqrt(a), Math.sqrt(1 - a));
return R * c;
};
@@ -342,9 +342,9 @@ export default function StopList() {
)}
{!loading && data
? (userLocation
- ? sortedAllStops.slice(0, 6)
- : sortedAllStops
- ).map((stop) => <StopItem key={stop.stopId} stop={stop} />)
+ ? sortedAllStops.slice(0, 6)
+ : sortedAllStops
+ ).map((stop) => <StopItem key={stop.stopId} stop={stop} />)
: null}
</ul>
</div>
diff --git a/src/frontend/app/routes/planner.tsx b/src/frontend/app/routes/planner.tsx
index b0fc9b1..c44a672 100644
--- a/src/frontend/app/routes/planner.tsx
+++ b/src/frontend/app/routes/planner.tsx
@@ -391,7 +391,7 @@ const ItineraryDetail = ({
</div>
{/* Details Panel */}
- <div className="h-1/3 md:h-full md:w-96 lg:w-[28rem] overflow-y-auto bg-white dark:bg-slate-900 border-t md:border-t-0 md:border-l border-slate-200 dark:border-slate-700">
+ <div className="h-1/3 md:h-full md:w-96 lg:w-md overflow-y-auto bg-white dark:bg-slate-900 border-t md:border-t-0 md:border-l border-slate-200 dark:border-slate-700">
<div className="px-4 py-4">
<h2 className="text-xl font-bold mb-4">
{t("planner.itinerary_details")}