Optimized routing
This commit is contained in:
BuTzZ
@@ -2,7 +2,7 @@ import { describe, expect, it } from "vitest";
|
||||
import { mkdtemp, rm, writeFile } from "node:fs/promises";
|
||||
import { tmpdir } from "node:os";
|
||||
import { join } from "node:path";
|
||||
import { buildRoute } from "@watermaps/shared";
|
||||
import { buildRoute, haversineDistanceNm } from "@watermaps/shared";
|
||||
import { createCache } from "../src/services/cache.js";
|
||||
import {
|
||||
FairwayService,
|
||||
@@ -12,7 +12,180 @@ import {
|
||||
overpassToGraph
|
||||
} from "../src/services/fairways.js";
|
||||
|
||||
const EMDEN_CANAL_REGRESSION_WAYS: Parameters<typeof localFairwaysToGraph>[0] = [
|
||||
{
|
||||
id: "28021006-tail",
|
||||
bbox: [7.4498965, 53.4492034, 7.4512561, 53.4500483],
|
||||
tags: { name: "Ems-Jade-Kanal", width: "8", waterway: "canal" },
|
||||
coordinates: [
|
||||
[53.4492034, 7.4498965],
|
||||
[53.4495624, 7.4505731],
|
||||
[53.4499672, 7.4511607],
|
||||
[53.4499875, 7.4511887],
|
||||
[53.4500483, 7.4512561]
|
||||
]
|
||||
},
|
||||
{
|
||||
id: "278807710",
|
||||
bbox: [7.4512561, 53.4500483, 7.4518959, 53.4504899],
|
||||
tags: {
|
||||
lock: "yes",
|
||||
name: "Ems-Jade-Kanal",
|
||||
width: "8",
|
||||
waterway: "canal"
|
||||
},
|
||||
coordinates: [
|
||||
[53.4500483, 7.4512561],
|
||||
[53.4502057, 7.4514971],
|
||||
[53.4504899, 7.4518959]
|
||||
]
|
||||
},
|
||||
{
|
||||
id: "278807709",
|
||||
bbox: [7.4518959, 53.4449969, 7.5736929, 53.4650304],
|
||||
tags: { name: "Ems-Jade-Kanal", width: "8", waterway: "canal" },
|
||||
coordinates: [
|
||||
[53.4504899, 7.4518959],
|
||||
[53.4505236, 7.4519531],
|
||||
[53.4509222, 7.4525426],
|
||||
[53.4516529, 7.453623],
|
||||
[53.4584592, 7.463384],
|
||||
[53.4595046, 7.4648841],
|
||||
[53.4599438, 7.465618],
|
||||
[53.460753, 7.4673133],
|
||||
[53.4616984, 7.46945],
|
||||
[53.4620622, 7.4701175],
|
||||
[53.4625348, 7.4707952],
|
||||
[53.4627636, 7.4711325],
|
||||
[53.4629466, 7.4713664],
|
||||
[53.4630916, 7.4715145],
|
||||
[53.4632388, 7.4716743],
|
||||
[53.4633943, 7.4717923],
|
||||
[53.4636131, 7.4718959],
|
||||
[53.4639548, 7.4720761],
|
||||
[53.4642607, 7.4722805],
|
||||
[53.4646149, 7.4724784],
|
||||
[53.4647858, 7.472612],
|
||||
[53.4650071, 7.4729838],
|
||||
[53.4650304, 7.4733641],
|
||||
[53.4649736, 7.4737867],
|
||||
[53.4645791, 7.4743077],
|
||||
[53.4642518, 7.4745346],
|
||||
[53.4640847, 7.4746604],
|
||||
[53.4624017, 7.4759267],
|
||||
[53.4618827, 7.4763916],
|
||||
[53.4602632, 7.479245],
|
||||
[53.4587935, 7.4819111],
|
||||
[53.4585086, 7.482532],
|
||||
[53.4583429, 7.482893],
|
||||
[53.4570519, 7.4861185],
|
||||
[53.455688, 7.4897057],
|
||||
[53.4554283, 7.4910088],
|
||||
[53.4543892, 7.4963485],
|
||||
[53.4532243, 7.5021539],
|
||||
[53.4531102, 7.5027225],
|
||||
[53.4520897, 7.5077114],
|
||||
[53.4519492, 7.5083984],
|
||||
[53.4508683, 7.5126327],
|
||||
[53.4490515, 7.5208022],
|
||||
[53.4489869, 7.5211006],
|
||||
[53.4485124, 7.5232942],
|
||||
[53.4466401, 7.5319367],
|
||||
[53.4451989, 7.5385911],
|
||||
[53.4450014, 7.5399242],
|
||||
[53.4449969, 7.5406774],
|
||||
[53.4456267, 7.5463127],
|
||||
[53.4457299, 7.5470025],
|
||||
[53.446674, 7.5509229],
|
||||
[53.4477404, 7.55515],
|
||||
[53.4478348, 7.5554891],
|
||||
[53.4491825, 7.5603283],
|
||||
[53.4525244, 7.5722942],
|
||||
[53.4529207, 7.5736929]
|
||||
]
|
||||
}
|
||||
];
|
||||
|
||||
describe("fairway graph extraction", () => {
|
||||
it("reports that no routing source is configured", async () => {
|
||||
const service = new FairwayService({
|
||||
cache: createCache(),
|
||||
fetcher: fetch,
|
||||
liveEnabled: false
|
||||
});
|
||||
|
||||
const lookup = await service.getGraphsForRoute({
|
||||
start: { lat: 53.4498, lon: 7.4509 },
|
||||
destination: { lat: 53.4646, lon: 7.4742 },
|
||||
vesselProfile: { draughtM: 1.4, safetyReserveM: 0.5 }
|
||||
});
|
||||
|
||||
expect(lookup.graphs).toEqual([]);
|
||||
expect(lookup.failures).toMatchObject([
|
||||
{
|
||||
source: "configuration",
|
||||
error: expect.objectContaining({ message: "No fairway source is configured" })
|
||||
}
|
||||
]);
|
||||
await service.close();
|
||||
});
|
||||
|
||||
it("retries a configured local routing index after a missing file is repaired", async () => {
|
||||
const temporaryDirectory = await mkdtemp(join(tmpdir(), "watermaps-missing-index-"));
|
||||
const localDataPath = join(temporaryDirectory, "missing-fairways.json");
|
||||
const service = new FairwayService({
|
||||
cache: createCache(),
|
||||
fetcher: fetch,
|
||||
liveEnabled: false,
|
||||
localDataPath
|
||||
});
|
||||
const request = {
|
||||
start: { lat: 53.4498, lon: 7.4509 },
|
||||
destination: { lat: 53.4646, lon: 7.4742 },
|
||||
vesselProfile: { draughtM: 1.4, safetyReserveM: 0.5 }
|
||||
};
|
||||
|
||||
try {
|
||||
const missingLookup = await service.getGraphsForRoute(request);
|
||||
expect(missingLookup.graphs).toEqual([]);
|
||||
expect(missingLookup.failures).toMatchObject([
|
||||
{
|
||||
source: "local",
|
||||
error: expect.objectContaining({ code: "ENOENT" })
|
||||
}
|
||||
]);
|
||||
|
||||
await writeFile(
|
||||
localDataPath,
|
||||
JSON.stringify({
|
||||
version: 1,
|
||||
source: "repaired-test",
|
||||
ways: [
|
||||
{
|
||||
id: "repaired-way",
|
||||
bbox: [7.4509, 53.4498, 7.4742, 53.4646],
|
||||
tags: { waterway: "canal", name: "Repaired test fairway" },
|
||||
coordinates: [
|
||||
[53.4498, 7.4509],
|
||||
[53.4646, 7.4742]
|
||||
]
|
||||
}
|
||||
]
|
||||
})
|
||||
);
|
||||
|
||||
const repairedLookup = await service.getGraphsForRoute(request);
|
||||
expect(repairedLookup.failures).toEqual([]);
|
||||
expect(repairedLookup.graphs).toHaveLength(1);
|
||||
expect(repairedLookup.graphs[0]?.edges[0]?.source).toBe(
|
||||
"local-geofabrik-repaired-test"
|
||||
);
|
||||
} finally {
|
||||
await service.close();
|
||||
await rm(temporaryDirectory, { recursive: true, force: true });
|
||||
}
|
||||
});
|
||||
|
||||
it("builds a routable graph from the persistent local Geofabrik format", () => {
|
||||
const graph = localFairwaysToGraph(
|
||||
[
|
||||
@@ -43,6 +216,110 @@ describe("fairway graph extraction", () => {
|
||||
expect(route?.dataSources).toContain("local-geofabrik-germany-test.osm.pbf");
|
||||
});
|
||||
|
||||
it("does not invent a traversable line between nearby disconnected waterway endpoints", () => {
|
||||
const graph = localFairwaysToGraph(
|
||||
[
|
||||
{
|
||||
id: "west",
|
||||
bbox: [7, 52, 7.01, 52],
|
||||
tags: { waterway: "canal" },
|
||||
coordinates: [
|
||||
[52, 7],
|
||||
[52, 7.01]
|
||||
]
|
||||
},
|
||||
{
|
||||
id: "east",
|
||||
bbox: [7.011, 52, 7.02, 52],
|
||||
tags: { waterway: "canal" },
|
||||
coordinates: [
|
||||
[52, 7.011],
|
||||
[52, 7.02]
|
||||
]
|
||||
}
|
||||
],
|
||||
[6.9, 51.9, 7.1, 52.1],
|
||||
"disconnected-test"
|
||||
);
|
||||
expect(graph).not.toBeNull();
|
||||
|
||||
const route = buildRoute(
|
||||
{
|
||||
start: { lat: 52, lon: 7 },
|
||||
destination: { lat: 52, lon: 7.02 },
|
||||
vesselProfile: { draughtM: 1, safetyReserveM: 0.3 }
|
||||
},
|
||||
graph ?? undefined
|
||||
);
|
||||
|
||||
expect(route).toBeNull();
|
||||
expect(graph?.edges.some((edge) => edge.source === "fairway-graph-connectors")).toBe(false);
|
||||
});
|
||||
|
||||
it("keeps the reported Ems-Jade-Kanal route on the full source geometry", () => {
|
||||
const start = { lat: 53.4498, lon: 7.4509 };
|
||||
const destination = { lat: 53.4646, lon: 7.4742 };
|
||||
const graph = localFairwaysToGraph(
|
||||
EMDEN_CANAL_REGRESSION_WAYS,
|
||||
[7.3, 53.3, 7.7, 53.6],
|
||||
"emden-canal-regression"
|
||||
);
|
||||
expect(graph).not.toBeNull();
|
||||
if (!graph) {
|
||||
throw new Error("Expected Ems-Jade-Kanal regression graph");
|
||||
}
|
||||
|
||||
const route = buildRoute(
|
||||
{
|
||||
start,
|
||||
destination,
|
||||
vesselProfile: { draughtM: 1.4, safetyReserveM: 0.5, cruiseSpeedKn: 6 }
|
||||
},
|
||||
graph
|
||||
);
|
||||
expect(route).not.toBeNull();
|
||||
if (!route) {
|
||||
throw new Error("Expected Ems-Jade-Kanal regression route");
|
||||
}
|
||||
|
||||
const coordinates = route.geometry.coordinates;
|
||||
const largestSegmentNm = coordinates.slice(1).reduce(
|
||||
(largest, coordinate, index) =>
|
||||
Math.max(
|
||||
largest,
|
||||
haversineDistanceNm(
|
||||
{ lon: coordinates[index]![0], lat: coordinates[index]![1] },
|
||||
{ lon: coordinate[0], lat: coordinate[1] }
|
||||
)
|
||||
),
|
||||
0
|
||||
);
|
||||
|
||||
expect(route.distanceNm).toBeGreaterThanOrEqual(1.2);
|
||||
expect(route.distanceNm).toBeLessThanOrEqual(1.35);
|
||||
expect(coordinates.length).toBeGreaterThanOrEqual(25);
|
||||
expect(largestSegmentNm).toBeLessThan(0.55);
|
||||
expect(coordinates).toContainEqual([7.4648841, 53.4595046]);
|
||||
expect(coordinates).toContainEqual([7.46945, 53.4616984]);
|
||||
expect(coordinates).toContainEqual([7.4724784, 53.4646149]);
|
||||
expect(route.dataSources).toContain(
|
||||
"local-geofabrik-emden-canal-regression"
|
||||
);
|
||||
expect(route.dataSources).not.toContain(
|
||||
"fairway-graph:emden-east-ems-seed"
|
||||
);
|
||||
expect(route.routeSnaps?.start.distanceM).toBeLessThan(5);
|
||||
expect(route.routeSnaps?.destination.distanceM).toBeLessThan(10);
|
||||
expect(coordinates[0]).toEqual([
|
||||
route.routeSnaps?.start.snapped.lon,
|
||||
route.routeSnaps?.start.snapped.lat
|
||||
]);
|
||||
expect(coordinates.at(-1)).toEqual([
|
||||
route.routeSnaps?.destination.snapped.lon,
|
||||
route.routeSnaps?.destination.snapped.lat
|
||||
]);
|
||||
});
|
||||
|
||||
it("allows country-wide requests against the persistent local index", async () => {
|
||||
const temporaryDirectory = await mkdtemp(join(tmpdir(), "watermaps-local-span-"));
|
||||
const localDataPath = join(temporaryDirectory, "germany-netherlands-fairways.json");
|
||||
@@ -78,10 +355,11 @@ describe("fairway graph extraction", () => {
|
||||
liveEnabled: false,
|
||||
localDataPath
|
||||
});
|
||||
const graphs = await service.getGraphsForRoute(request);
|
||||
const route = buildRoute(request, graphs[0]);
|
||||
const lookup = await service.getGraphsForRoute(request);
|
||||
const route = buildRoute(request, lookup.graphs[0]);
|
||||
|
||||
expect(graphs).toHaveLength(1);
|
||||
expect(lookup.failures).toEqual([]);
|
||||
expect(lookup.graphs).toHaveLength(1);
|
||||
expect(route?.routingMode).toBe("fairway");
|
||||
expect(route?.dataSources).toContain(
|
||||
"local-geofabrik-germany+netherlands"
|
||||
@@ -156,6 +434,7 @@ describe("fairway graph extraction", () => {
|
||||
geometry: {
|
||||
type: "LineString",
|
||||
coordinates: [
|
||||
[7.1752, 53.3306],
|
||||
[7.1751368, 53.3331995],
|
||||
[7.16, 53.42],
|
||||
[7.1474, 53.55],
|
||||
@@ -173,7 +452,8 @@ describe("fairway graph extraction", () => {
|
||||
type: "LineString",
|
||||
coordinates: [
|
||||
[7.1474, 53.55],
|
||||
[7.1414995, 53.6668156]
|
||||
[7.1414995, 53.6668156],
|
||||
[7.1474, 53.6741]
|
||||
]
|
||||
}
|
||||
}
|
||||
@@ -194,8 +474,16 @@ describe("fairway graph extraction", () => {
|
||||
expect(route).not.toBeNull();
|
||||
expect(route?.routingMode).toBe("fairway");
|
||||
expect(route?.dataSources).toContain("postgis-osm");
|
||||
expect(route?.geometry.coordinates[0]).toEqual([start.lon, start.lat]);
|
||||
expect(route?.geometry.coordinates.at(-1)).toEqual([destination.lon, destination.lat]);
|
||||
expect(route?.routeSnaps?.start.requested).toEqual(start);
|
||||
expect(route?.routeSnaps?.destination.requested).toEqual(destination);
|
||||
expect(route?.geometry.coordinates[0]).toEqual([
|
||||
route?.routeSnaps?.start.snapped.lon,
|
||||
route?.routeSnaps?.start.snapped.lat
|
||||
]);
|
||||
expect(route?.geometry.coordinates.at(-1)).toEqual([
|
||||
route?.routeSnaps?.destination.snapped.lon,
|
||||
route?.routeSnaps?.destination.snapped.lat
|
||||
]);
|
||||
expect(route?.geometry.coordinates.some(([lon, lat]) => lon === 7.1474 && lat === 53.55)).toBe(true);
|
||||
});
|
||||
|
||||
|
||||
Reference in New Issue
Block a user