Whitelist - gather coordinates for one to many routing

src/lib/bookingApiParameters.ts

@@ -2,7 +2,7 @@ import type { BusStop } from './busStop';
 import type { Capacities } from './capacities';
 import type { Coordinates } from './location';
 
-export type CheckBookingValidityParameters = {
+export type WhiteListRequest = {
 	userChosen: Coordinates;
 	busStops: BusStop[];
 	startFixed: boolean;

src/lib/compositionTypes.ts

@@ -2,11 +2,39 @@ import type { Capacities } from './capacities';
 import type { Interval } from './interval';
 import type { Coordinates } from './location';
 
+export type Company = {
+	id: number;
+	coordinates: Coordinates;
+	vehicles: Vehicle[];
+	zoneId: number;
+	busStopFilter: boolean[];
+};
+
+export type Vehicle = {
+	id: number;
+	capacities: Capacities;
+	tours: Tour[];
+	events: Event[];
+	availabilities: Interval[];
+	lastEventBefore: Event | undefined;
+	firstEventAfter: Event | undefined;
+};
+
+export type Tour = {
+	arrival: Date;
+	departure: Date;
+};
+
 export type Event = {
 	capacities: Capacities;
 	is_pickup: boolean;
 	time: Interval;
 	id: number;
 	coordinates: Coordinates;
 	tourId: number;
+	arrival: Date;
+	departure: Date;
+	communicated: Date;
+	approachDuration: number;
+	returnDuration: number;
 };

src/lib/typeAliases.ts

@@ -0,0 +1 @@
+export type VehicleId = number;

src/routes/api/blacklisting/blacklisting.test.ts

@@ -1,4 +1,4 @@
-import type { CheckBookingValidityParameters } from '$lib/bookingApiParameters';
+import type { WhiteListRequest as BlackListRequest } from '$lib/bookingApiParameters';
 import { Coordinates } from '$lib/location';
 import { describe, it, expect, beforeEach } from 'vitest';
 import { getViableBusStops } from './viableBusStops';
@@ -41,7 +41,7 @@ describe('blacklisting test', () => {
 		await setAvailability(taxi, dateInXMinutes(0), dateInXMinutes(90));
 		await setTour(taxi, dateInXMinutes(0), dateInXMinutes(90));
 
-		const r: CheckBookingValidityParameters = {
+		const r: BlackListRequest = {
 			userChosen: inNiesky,
 			busStops: [{ times: [dateInXMinutes(50)], coordinates: inNiesky }],
 			startFixed: true,
@@ -58,7 +58,7 @@ describe('blacklisting test', () => {
 
 		await setAvailability(taxi, dateInXMinutes(0), dateInXMinutes(90));
 
-		const r: CheckBookingValidityParameters = {
+		const r: BlackListRequest = {
 			userChosen: inNiesky,
 			busStops: [{ times: [dateInXMinutes(50)], coordinates: inNiesky }],
 			startFixed: true,
@@ -75,7 +75,7 @@ describe('blacklisting test', () => {
 
 		await setTour(taxi, dateInXMinutes(0), dateInXMinutes(90));
 
-		const r: CheckBookingValidityParameters = {
+		const r: BlackListRequest = {
 			userChosen: inNiesky,
 			busStops: [{ times: [dateInXMinutes(50)], coordinates: inNiesky }],
 			startFixed: true,
@@ -91,7 +91,7 @@ describe('blacklisting test', () => {
 		const taxi = await addTaxi(company, capacities);
 		await setTour(taxi, dateInXMinutes(0), dateInXMinutes(900));
 
-		const r: CheckBookingValidityParameters = {
+		const r: BlackListRequest = {
 			userChosen: inNiesky,
 			busStops: [
 				{ times: [dateInXMinutes(50), dateInXMinutes(10)], coordinates: inNiesky },
@@ -110,7 +110,7 @@ describe('blacklisting test', () => {
 		const taxi = await addTaxi(company, capacities);
 		await setTour(taxi, dateInXMinutes(0), dateInXMinutes(900));
 
-		const r: CheckBookingValidityParameters = {
+		const r: BlackListRequest = {
 			userChosen: inNiesky,
 			busStops: [{ times: [dateInXMinutes(50)], coordinates: inNiesky }],
 			startFixed: true,
@@ -126,7 +126,7 @@ describe('blacklisting test', () => {
 		const taxi = await addTaxi(company, capacities);
 		await setTour(taxi, dateInXMinutes(0), dateInXMinutes(900));
 
-		const r: CheckBookingValidityParameters = {
+		const r: BlackListRequest = {
 			userChosen: inNiesky,
 			busStops: [{ times: [dateInXMinutes(50)], coordinates: inZittau }],
 			startFixed: true,
@@ -142,7 +142,7 @@ describe('blacklisting test', () => {
 		const taxi = await addTaxi(company, capacities);
 		await setTour(taxi, dateInXMinutes(0), dateInXMinutes(900));
 
-		const r: CheckBookingValidityParameters = {
+		const r: BlackListRequest = {
 			userChosen: inZittau,
 			busStops: [{ times: [dateInXMinutes(50)], coordinates: inNiesky }],
 			startFixed: true,
@@ -158,7 +158,7 @@ describe('blacklisting test', () => {
 		const taxi = await addTaxi(company, capacities);
 		await setTour(taxi, dateInXMinutes(0), dateInXMinutes(900));
 
-		const r: CheckBookingValidityParameters = {
+		const r: BlackListRequest = {
 			userChosen: inNiesky,
 			busStops: [{ times: [dateInXMinutes(50)], coordinates: inNiesky }],
 			startFixed: true,
@@ -174,7 +174,7 @@ describe('blacklisting test', () => {
 		const taxi = await addTaxi(company, capacities);
 		await setTour(taxi, dateInXMinutes(0), dateInXMinutes(900));
 
-		const r: CheckBookingValidityParameters = {
+		const r: BlackListRequest = {
 			userChosen: inNiesky,
 			busStops: [{ times: [dateInXMinutes(50)], coordinates: inNiesky }],
 			startFixed: true,
@@ -190,7 +190,7 @@ describe('blacklisting test', () => {
 		const taxi = await addTaxi(company, capacities);
 		await setTour(taxi, dateInXMinutes(0), dateInXMinutes(900));
 
-		const r: CheckBookingValidityParameters = {
+		const r: BlackListRequest = {
 			userChosen: inNiesky,
 			busStops: [{ times: [dateInXMinutes(50)], coordinates: inNiesky }],
 			startFixed: true,
@@ -206,7 +206,7 @@ describe('blacklisting test', () => {
 		const taxi = await addTaxi(company, capacities);
 		await setTour(taxi, dateInXMinutes(0), dateInXMinutes(900));
 
-		const r: CheckBookingValidityParameters = {
+		const r: BlackListRequest = {
 			userChosen: inNiesky,
 			busStops: [{ times: [dateInXMinutes(50)], coordinates: inNiesky }],
 			startFixed: true,
@@ -219,7 +219,7 @@ describe('blacklisting test', () => {
 	it('blacklisting fail, no vehicle', async () => {
 		await addCompany(Zone.NIESKY);
 
-		const r: CheckBookingValidityParameters = {
+		const r: BlackListRequest = {
 			userChosen: inNiesky,
 			busStops: [{ times: [dateInXMinutes(50)], coordinates: inNiesky }],
 			startFixed: true,
@@ -230,7 +230,7 @@ describe('blacklisting test', () => {
 	});
 
 	it('blacklisting fail, no company', async () => {
-		const r: CheckBookingValidityParameters = {
+		const r: BlackListRequest = {
 			userChosen: inNiesky,
 			busStops: [{ times: [dateInXMinutes(50)], coordinates: inNiesky }],
 			startFixed: true,
@@ -244,7 +244,7 @@ describe('blacklisting test', () => {
 		const capacities: Capacities = { passengers: 3, bikes: 3, wheelchairs: 3, luggage: 3 };
 		const company = await addCompany(Zone.NIESKY);
 		await addTaxi(company, capacities);
-		const r: CheckBookingValidityParameters = {
+		const r: BlackListRequest = {
 			userChosen: inNiesky,
 			busStops: [{ times: [dateInXMinutes(50)], coordinates: inNiesky }],
 			startFixed: true,
@@ -260,7 +260,7 @@ describe('blacklisting test', () => {
 		const taxi = await addTaxi(company, capacities);
 		await setTour(taxi, dateInXMinutes(0), dateInXMinutes(900));
 
-		const r: CheckBookingValidityParameters = {
+		const r: BlackListRequest = {
 			userChosen: inNiesky,
 			busStops: [
 				{ times: [dateInXMinutes(50)], coordinates: inZittau },
@@ -281,7 +281,7 @@ describe('blacklisting test', () => {
 		const taxi = await addTaxi(company, capacities);
 		await setTour(taxi, dateInXMinutes(0), dateInXMinutes(900));
 
-		const r: CheckBookingValidityParameters = {
+		const r: BlackListRequest = {
 			userChosen: inNiesky,
 			busStops: [{ times: [dateInXMinutes(1000), dateInXMinutes(50)], coordinates: inNiesky }],
 			startFixed: true,
@@ -294,7 +294,7 @@ describe('blacklisting test', () => {
 	});
 
 	it('blacklisting, no busStops', async () => {
-		const r: CheckBookingValidityParameters = {
+		const r: BlackListRequest = {
 			userChosen: inNiesky,
 			busStops: [],
 			startFixed: true,
@@ -309,7 +309,7 @@ describe('blacklisting test', () => {
 		const company = await addCompany(Zone.NIESKY);
 		const taxi = await addTaxi(company, capacities);
 		await setTour(taxi, dateInXMinutes(0), dateInXMinutes(900));
-		const r: CheckBookingValidityParameters = {
+		const r: BlackListRequest = {
 			userChosen: inNiesky,
 			busStops: [
 				{ times: [], coordinates: inNiesky },
@@ -329,7 +329,7 @@ describe('blacklisting test', () => {
 		const company = await addCompany(Zone.NIESKY);
 		const taxi = await addTaxi(company, capacities);
 		await setTour(taxi, dateInXMinutes(0), dateInXMinutes(900));
-		const r: CheckBookingValidityParameters = {
+		const r: BlackListRequest = {
 			userChosen: inNiesky,
 			busStops: [{ times: [], coordinates: inNiesky }],
 			startFixed: true,
@@ -346,7 +346,7 @@ describe('blacklisting test', () => {
 
 		await setAvailability(taxi, dateInXMinutes(0), dateInXMinutes(90));
 
-		const r: CheckBookingValidityParameters = {
+		const r: BlackListRequest = {
 			userChosen: inNiesky,
 			busStops: [
 				{
@@ -368,7 +368,7 @@ describe('blacklisting test', () => {
 
 		await setAvailability(taxi, dateInXMinutes(0), dateInXMinutes(90));
 
-		const r: CheckBookingValidityParameters = {
+		const r: BlackListRequest = {
 			userChosen: inNiesky,
 			busStops: [
 				{
@@ -390,7 +390,7 @@ describe('blacklisting test', () => {
 
 		await setAvailability(taxi, dateInXMinutes(0), dateInXMinutes(90));
 
-		const r: CheckBookingValidityParameters = {
+		const r: BlackListRequest = {
 			userChosen: inNiesky,
 			busStops: [
 				{ times: [dateInXMinutesYMs(0, -MAX_PASSENGER_WAITING_TIME_PICKUP)], coordinates: inNiesky }
@@ -409,7 +409,7 @@ describe('blacklisting test', () => {
 
 		await setAvailability(taxi, dateInXMinutes(0), dateInXMinutes(90));
 
-		const r: CheckBookingValidityParameters = {
+		const r: BlackListRequest = {
 			userChosen: inNiesky,
 			busStops: [
 				{

src/routes/api/blacklisting/viableBusStops.ts

@@ -125,7 +125,7 @@ export const getViableBusStops = async (
 	busStops: BusStop[],
 	startFixed: boolean,
 	capacities: Capacities
-): Promise<BlacklistingResult[]> => {
+): Promise<BlacklistingResponse[]> => {
 	if (busStops.length == 0 || !busStops.some((b) => b.times.length != 0)) {
 		return [];
 	}
@@ -160,7 +160,7 @@ export const getViableBusStops = async (
 	return dbResult;
 };
 
-type BlacklistingResult = {
+type BlacklistingResponse = {
 	timeIndex: number;
 	busstopindex: number;
 };

src/routes/api/whitelist/capacitySimulation.test.ts

@@ -13,7 +13,12 @@ function createEventCapacitiesOnly(capacities: Capacities, is_pickup: boolean):
 		time: new Interval(now, now),
 		id: 1,
 		coordinates: new Coordinates(1, 1),
-		tourId: 1
+		tourId: 1,
+		arrival: new Date(),
+		departure: new Date(),
+		communicated: new Date(),
+		approachDuration: 0,
+		returnDuration: 0
 	};
 }
 

src/routes/api/whitelist/insertionTypes.ts

@@ -0,0 +1,11 @@
+import type { Vehicle } from '$lib/compositionTypes';
+import type { Range } from './capacitySimulation';
+
+export type InsertionInfo = {
+	companyIdx: number;
+	prevEventIdxInRoutingResults: number;
+	nextEventIdxInRoutingResults: number;
+	vehicle: Vehicle;
+	idxInEvents: number;
+	currentRange: Range;
+};

src/routes/api/whitelist/routing.ts

@@ -0,0 +1,80 @@
+import { oneToMany } from '$lib/api';
+import type { BusStop } from '$lib/busStop';
+import type { Company } from '$lib/compositionTypes';
+import { Coordinates } from '$lib/location';
+import type { VehicleId } from '$lib/typeAliases';
+import type { Range } from './capacitySimulation';
+import { iterateAllInsertions } from './utils';
+
+export type InsertionRoutingResult = {
+	company: number[];
+	event: number[];
+};
+
+export type RoutingResults = {
+	busStops: InsertionRoutingResult[];
+	userChosen: InsertionRoutingResult;
+};
+
+export function gatherRoutingCoordinates(
+	companies: Company[],
+	insertionsByVehicle: Map<VehicleId, Range[]>
+) {
+	if (companies.length == 0) {
+		return { forward: [], backward: [] };
+	}
+	const backward = new Array<Coordinates>();
+	const forward = new Array<Coordinates>();
+	companies.forEach((company) => {
+		forward.push(company.coordinates);
+		backward.push(company.coordinates);
+	});
+	iterateAllInsertions(companies, insertionsByVehicle, (insertionInfo, _insertionCounter) => {
+		const vehicle = insertionInfo.vehicle;
+		const idxInEvents = insertionInfo.idxInEvents;
+		if (idxInEvents != 0) {
+			backward.push(vehicle.events[idxInEvents - 1].coordinates);
+		} else if (vehicle.lastEventBefore != undefined) {
+			backward.push(vehicle.lastEventBefore.coordinates);
+		}
+		if (idxInEvents != vehicle.events.length) {
+			forward.push(vehicle.events[idxInEvents].coordinates);
+		} else if (vehicle.firstEventAfter != undefined) {
+			forward.push(vehicle.firstEventAfter.coordinates);
+		}
+	});
+	return { forward, backward };
+}
+
+export async function routing(
+	companies: Company[],
+	many: { forward: Coordinates[]; backward: Coordinates[] },
+	userChosen: Coordinates,
+	busStops: BusStop[],
+	startFixed: boolean
+): Promise<RoutingResults> {
+	const userChosenResult = await oneToMany(
+		userChosen,
+		startFixed ? many.backward : many.forward,
+		!startFixed
+	);
+	const ret = {
+		userChosen: {
+			company: userChosenResult.slice(0, companies.length),
+			event: userChosenResult.slice(companies.length)
+		},
+		busStops: new Array<InsertionRoutingResult>(busStops.length)
+	};
+	for (let busStopIdx = 0; busStopIdx != busStops.length; ++busStopIdx) {
+		const busStopResult = await oneToMany(
+			busStops[busStopIdx].coordinates,
+			!startFixed ? many.backward : many.forward,
+			startFixed
+		);
+		ret.busStops[busStopIdx] = {
+			company: busStopResult.slice(0, companies.length),
+			event: busStopResult.slice(companies.length)
+		};
+	}
+	return ret;
+}