Skip to content

Commit

Permalink
Use the TS RouteTool from the upstreamed NPM package
Browse files Browse the repository at this point in the history
  • Loading branch information
dabreegster committed May 14, 2024
1 parent 06362e8 commit 64336e0
Show file tree
Hide file tree
Showing 6 changed files with 27 additions and 325 deletions.
10 changes: 10 additions & 0 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 6 additions & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -54,8 +54,14 @@
"maplibre-gl": "^4.0.2",
"read-excel-file": "^5.7.1",
"route-snapper": "^0.3.0",
"route-snapper-ts": "^0.0.3",
"svelte": "^4.2.10",
"svelte-maplibre": "^0.9.2",
"uuid": "^9.0.1"
},
"overrides": {
"route-snapper-ts": {
"route-snapper": "^0.3.0"
}
}
}
9 changes: 5 additions & 4 deletions src/lib/draw/EditGeometryMode.svelte
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<script lang="ts">
import type { LineString, Point, Polygon } from "geojson";
import type { Feature, LineString, Point, Polygon } from "geojson";
import {
gjSchemeCollection,
mode,
Expand All @@ -12,11 +12,12 @@
import { interventionName } from "lib/sidebar/scheme_data";
import { schema } from "stores";
import { onDestroy, onMount } from "svelte";
import type { Feature, FeatureUnion } from "types";
import type { FeatureUnion } from "types";
import PointControls from "./point/PointControls.svelte";
import PolygonControls from "./polygon/PolygonControls.svelte";
import RouteControls from "./route/RouteControls.svelte";
import SnapPolygonControls from "./snap_polygon/SnapPolygonControls.svelte";
import { type Props } from "route-snapper-ts";
export let id: number;
Expand All @@ -39,14 +40,14 @@
name = interventionName(feature);
if (feature.geometry.type == "LineString") {
$routeTool?.editExistingRoute(feature as Feature<LineString>);
$routeTool?.editExistingRoute(feature as Feature<LineString, Props>);
$routeTool?.addEventListenerSuccess(onSuccess);
$routeTool?.addEventListenerUpdated(onUpdate);
$routeTool?.addEventListenerFailure(onFailure);
controls = "route";
} else if (feature.geometry.type == "Polygon") {
if (feature.properties.waypoints) {
$routeTool?.editExistingArea(feature as Feature<Polygon>);
$routeTool?.editExistingArea(feature as Feature<Polygon, Props>);
$routeTool?.addEventListenerSuccess(onSuccess);
$routeTool?.addEventListenerUpdated(onUpdate);
$routeTool?.addEventListenerFailure(onFailure);
Expand Down
8 changes: 5 additions & 3 deletions src/lib/draw/route/RouteSnapperLoader.svelte
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
<script lang="ts">
import { routeTool } from "lib/draw/stores";
import { ErrorMessage } from "govuk-svelte";
import init from "route-snapper";
import { map } from "stores";
import { onMount } from "svelte";
import { RouteTool } from "./route_tool";
import { init, RouteTool } from "route-snapper-ts";
import { routeToolGj, snapMode, undoLength } from "./stores";
export let url: string;
Expand All @@ -19,7 +19,9 @@
console.log(`Grabbing ${url}`);
try {
const graphBytes = await fetchWithProgress(url);
routeTool.set(new RouteTool($map, graphBytes));
routeTool.set(
new RouteTool($map, graphBytes, routeToolGj, snapMode, undoLength),
);
progress = 100;
routeToolReady = true;
} catch (err) {
Expand Down
Loading

0 comments on commit 64336e0

Please sign in to comment.