mobility-toolbox-js 1.7.5-beta.1 → 1.7.5-beta.2

package/ol/controls/RoutingControl.js

@@ -30,6 +30,8 @@ const REGEX_VIA_POINT_COORD = /^([\d.]+),([\d.]+)$/;
 // !8596126$4 a station with id 8596126
 const REGEX_VIA_POINT_STATION_ID = /^!([^$]*)(\$?([a-zA-Z0-9]{0,2}))$/;
 
+const STOP_FETCH_ABORT_CONTROLLER_KEY = 'stop-fetch';
+
 const getFlatCoordinatesFromSegments = (segmentArray) => {
   const coords = [];
   segmentArray.forEach((seg) => {
@@ -255,7 +257,7 @@ class RoutingControl extends Control {
    */
   reset() {
     // Clear viaPoints and source
-    this.cancelDrawRoute();
+    this.abortRequests();
     this.viaPoints = [];
     this.routingLayer.olLayer.getSource().clear();
     this.dispatchEvent({
@@ -265,17 +267,24 @@ class RoutingControl extends Control {
   }
 
   /**
-   * Aborts drawing a route
+   * Aborts viapoint and route requests
    * @private
    */
-  cancelDrawRoute() {
-    this.routingLayer.olLayer.getSource().clear();
+  abortRequests() {
+    // Abort Routing API requests
     this.graphs.forEach(([graph]) => {
       if (this.abortControllers[graph]) {
         this.abortControllers[graph].abort();
       }
       this.abortControllers[graph] = new AbortController();
     });
+
+    // Abort Stops API requests
+    this.abortControllers[STOP_FETCH_ABORT_CONTROLLER_KEY]?.abort();
+    this.abortControllers[
+      STOP_FETCH_ABORT_CONTROLLER_KEY
+    ] = new AbortController();
+
     this.loading = false;
   }
 
@@ -288,7 +297,8 @@ class RoutingControl extends Control {
    */
   drawRoute() {
     /* Calls RoutingAPI to draw a route using the viaPoints array */
-    this.cancelDrawRoute();
+    this.abortRequests();
+    this.routingLayer.olLayer.getSource().clear();
 
     if (!this.viaPoints.length) {
       return null;
@@ -296,7 +306,11 @@ class RoutingControl extends Control {
 
     if (this.viaPoints.length === 1) {
       // Add point for first node
-      return this.drawViaPoint(this.viaPoints[0], 0);
+      return this.drawViaPoint(
+        this.viaPoints[0],
+        0,
+        this.abortControllers[STOP_FETCH_ABORT_CONTROLLER_KEY],
+      );
     }
 
     const formattedViaPoints = this.viaPoints.map((viaPoint) => {
@@ -318,7 +332,13 @@ class RoutingControl extends Control {
     this.routingLayer.olLayer.getSource().clear();
 
     // Create point features for the viaPoints
-    this.viaPoints.forEach((viaPoint, idx) => this.drawViaPoint(viaPoint, idx));
+    this.viaPoints.forEach((viaPoint, idx) =>
+      this.drawViaPoint(
+        viaPoint,
+        idx,
+        this.abortControllers[STOP_FETCH_ABORT_CONTROLLER_KEY],
+      ),
+    );
 
     return Promise.all(
       this.graphs.map(([graph], index) => {
@@ -403,7 +423,7 @@ class RoutingControl extends Control {
    *
    * @private
    */
-  drawViaPoint(viaPoint, idx) {
+  drawViaPoint(viaPoint, idx, abortController) {
     const pointFeature = new Feature();
     pointFeature.set('viaPointIdx', idx);
 
@@ -429,6 +449,7 @@ class RoutingControl extends Control {
 
       return fetch(
         `${this.stopsApiUrl}lookup/${stationId}?key=${this.stopsApiKey}`,
+        { signal: abortController.signal },
       )
         .then((res) => res.json())
         .then((stationData) => {
@@ -440,6 +461,10 @@ class RoutingControl extends Control {
           return pointFeature;
         })
         .catch((error) => {
+          if (error.name === 'AbortError') {
+            // Ignore abort error
+            return;
+          }
           // Dispatch error event and execute error function
           this.dispatchEvent({
             type: 'error',
@@ -489,6 +514,7 @@ class RoutingControl extends Control {
     if (stationName) {
       return fetch(
         `${this.stopsApiUrl}?key=${this.stopsApiKey}&q=${stationName}&limit=1`,
+        { signal: abortController.signal },
       )
         .then((res) => res.json())
         .then((stationData) => {

package/package.json

@@ -2,7 +2,7 @@
   "name": "mobility-toolbox-js",
   "license": "MIT",
   "description": "Toolbox for JavaScript applications in the domains of mobility and logistics.",
-  "version": "1.7.5-beta.1",
+  "version": "1.7.5-beta.2",
   "main": "index.js",
   "module": "module.js",
   "dependencies": {