Skip to content

Commit

Permalink
Add non-perecentage-based progress bar for unpacking
Browse files Browse the repository at this point in the history
  • Loading branch information
Pete-Y-CS committed Jul 10, 2023
1 parent 061a24a commit 75290fc
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 9 deletions.
19 changes: 12 additions & 7 deletions src/lib/draw/route/RouteMode.svelte
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
<script lang="ts">
import type { LineString } from "geojson";
import init from "route-snapper";
import { onMount } from "svelte";
import { onMount, tick } from "svelte";
import type { FeatureWithProps } from "../../../maplibre_helpers";
import { currentMode, map, routeInfo } from "../../../stores";
import { currentMode, map } from "../../../stores";
import type { Mode } from "../../../types";
import { handleUnsavedFeature, setupEventListeners } from "../common";
import type { EventHandler } from "../event_handler";
Expand All @@ -20,7 +20,7 @@
let progress: number = 0;
let routeToolReady = false;
let downloadComplete = false;
$: downloadComplete = progress >= 100;
let failedToLoadRouteTool = false;
// While the new feature is being drawn, remember its last valid version
Expand Down Expand Up @@ -52,8 +52,7 @@
url,
(percentLoaded) => (progress = percentLoaded)
);
downloadComplete = true;
routeTool = new RouteTool($map, graphBytes, routeInfoDeserialised);
routeTool = new RouteTool($map, graphBytes, routeToolInitialised);
} catch (err) {
console.log(`Route tool broke: ${err}`);
failedToLoadRouteTool = true;
Expand Down Expand Up @@ -104,7 +103,7 @@
return allChunks;
}
function routeInfoDeserialised() {
function routeToolInitialised() {
progress = 100;
routeToolReady = true;
}
Expand All @@ -113,11 +112,17 @@
{#if !routeToolReady && !failedToLoadRouteTool && !downloadComplete}
<label for="route-loading">Route tool loading</label>
<progress id="route-loading" value={progress}></progress>
{:else if !routeToolReady && downloadComplete}
{:else if downloadComplete && !routeToolReady && !failedToLoadRouteTool}
<label for="route-unpacking">Route data unpacking</label>
<progress id="route-unpacking"/>
{:else if failedToLoadRouteTool}
<p>Failed to load</p>
{:else if $currentMode == thisMode}
<RouteControls {routeTool} extendRoute />
{/if}

<style>
progress {
width: 100%;
}
</style>
4 changes: 2 additions & 2 deletions src/lib/draw/route/route_tool.ts
Original file line number Diff line number Diff line change
Expand Up @@ -35,13 +35,12 @@ export class RouteTool {
constructor(
map: Map,
graphBytes: Uint8Array,
deserialisedCallback = () => {}
initialisedCallback: () => {void}
) {
this.map = map;
console.time("Deserialize and setup JsRouteSnapper");
this.inner = new JsRouteSnapper(graphBytes);
console.timeEnd("Deserialize and setup JsRouteSnapper");
deserialisedCallback();
this.active = false;
this.eventListenersSuccess = [];
this.eventListenersUpdated = [];
Expand Down Expand Up @@ -86,6 +85,7 @@ export class RouteTool {
color: "black",
opacity: 0.5,
});
initialisedCallback();
}

onMouseMove = (e: MapMouseEvent) => {
Expand Down

0 comments on commit 75290fc

Please sign in to comment.