ncaron/matcher
1
0
Fork 1
mirror of https://gitlab.com/mobicoop/v3/service/matcher.git synced 2026-01-01 08:22:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

rename CarpoolRoute

Browse Source
This commit is contained in:
sbriat
2023-09-06 16:39:44 +02:00
parent 98530af14a
commit d16997a84f
18 changed files with 108 additions and 95 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/modules/geography/core/domain/route.entity.ts
View File

@@ -15,16 +15,11 @@ export class RouteEntity extends AggregateRoot<RouteProps> {
protected readonly _id: AggregateID;
static create = async (create: CreateRouteProps): Promise<RouteEntity> => {
let routes: Route[];
try {
routes = await create.georouter.routes(
this.getPaths(create.roles, create.waypoints),
create.georouterSettings,
);
if (!routes || routes.length == 0) throw new RouteNotFoundException();
} catch (e: any) {
throw e;
}
const routes: Route[] = await create.georouter.routes(
this.getPaths(create.roles, create.waypoints),
create.georouterSettings,
);
if (!routes || routes.length == 0) throw new RouteNotFoundException();
let baseRoute: Route;
let driverRoute: Route | undefined;
let passengerRoute: Route | undefined;

12
src/modules/geography/infrastructure/graphhopper-georouter.ts
View File

@@ -39,16 +39,16 @@ export class GraphhopperGeorouter implements GeorouterPort {
paths: Path[],
settings: GeorouterSettings,
): Promise<Route[]> => {
this.setDefaultUrlArgs();
this.setSettings(settings);
return this.getRoutes(paths);
this._setDefaultUrlArgs();
this._setSettings(settings);
return this._getRoutes(paths);
};
private setDefaultUrlArgs = (): void => {
private _setDefaultUrlArgs = (): void => {
this.urlArgs = ['vehicle=car', 'weighting=fastest', 'points_encoded=false'];
};
private setSettings = (settings: GeorouterSettings): void => {
private _setSettings = (settings: GeorouterSettings): void => {
if (settings.detailedDuration) {
this.urlArgs.push('details=time');
}
@@ -62,7 +62,7 @@ export class GraphhopperGeorouter implements GeorouterPort {
}
};
private getRoutes = async (paths: Path[]): Promise<Route[]> => {
private _getRoutes = async (paths: Path[]): Promise<Route[]> => {
const routes = Promise.all(
paths.map(async (path) => {
const url: string = [