@furkot/directions 2.0.0 → 2.0.2

package/lib/service/openroute/index.js

@@ -1,3 +1,6 @@
+// https://openrouteservice.org/dev/#/api-docs/directions
+
+const LatLon = require('geodesy/latlon-spherical');
 const { pathType, travelMode } = require("../../model");
 const status = require('../status');
 const util = require('../util');
@@ -17,6 +20,7 @@ const profileRestrictions = {
   }
 };
 const ferryType = 9;
+const maxRoundabout = 12 * 60 * 60; // 12 hours maximum for route that is 10 times longer than direct distance
 
 function nextFerry(result, points = [-1, -1]) {
   let { waytypes } = result;
@@ -87,9 +91,35 @@ function extractDirections(result, { distance, duration, steps }, i) {
   return result;
 }
 
+function toLatLon(p) {
+  return new LatLon(p[1], p[0]);
+}
+
+function directDistance(locations) {
+  return locations.reduce((result, next) => {
+    next = toLatLon(next);
+    result.dist += result.ll.distanceTo(next);
+    result.ll = next;
+    return result;
+  }, {
+    dist: 0,
+    ll: toLatLon(locations[0])
+  }).dist;
+}
+
 function getStatus(st, response) {
   if (!st && response && response.routes && response.routes.length) {
-    return status.success;
+    const { distance, duration } = response.routes.reduce((result, { summary}) => {
+      result.distance += summary.distance;
+      result.duration += summary.duration;
+      return result;
+    }, { distance: 0, duration: 0 });
+    const coordinates = response.metadata?.query?.coordinates;
+    const direct = coordinates ? directDistance(coordinates) : distance;
+    if (distance < 5 * direct || duration < maxRoundabout) {
+      return status.success;
+    }
+    delete response.routes;
   }
   return status.empty;
 }

package/lib/service/util.js

@@ -106,6 +106,7 @@ function collateResults(results, query) {
 
 function withTimeout(promise, millis, signal) {
   let id;
+  let resolve;
   let reject;
 
   signal?.addEventListener('abort', onabort);
@@ -120,10 +121,11 @@ function withTimeout(promise, millis, signal) {
     reject(signal.reason);
   }
 
-  function timeoutPromise(_, _reject) {
+  function timeoutPromise(_resolve, _reject) {
+    resolve = _resolve;
     reject = _reject;
     id = setTimeout(
-      () => reject(Error('timeout', { cause: Symbol.for('timeout') })),
+      () => resolve(),
       millis
     );
   }

package/lib/service/valhalla/index.js

@@ -25,6 +25,7 @@ const costingOptions = {
 };
 const minSpeed = 15 * 1000 / 3600; // bump speed when it is absurdly low
 const turnDistance = 100; // don't adjust speed of turns
+const maxRoundabout = 12 * 60 * 60; // 12 hours maximum for route that is 10 times longer than direct distance
 
 const maneuver = {
   ferryEnter: 28,
@@ -109,9 +110,17 @@ function toLatLon(p) {
   return new LatLon(p.lat, p.lon);
 }
 
-function minDistance(locations, units) {
+function directDistance(locations, units) {
   units = units === 'miles' ? util.metersInMile : util.metersInKm;
-  return 0.9 * toLatLon(locations[0]).distanceTo(toLatLon(util.last(locations))) / units;
+  return locations.reduce((result, next) => {
+    next = toLatLon(next);
+    result.dist += result.ll.distanceTo(next);
+    result.ll = next;
+    return result;
+  }, {
+    dist: 0,
+    ll: toLatLon(locations[0])
+  }).dist / units;
 }
 
 function getStatus(err, response) {
@@ -130,10 +139,14 @@ function getStatus(err, response) {
   }
   st = response.trip && response.trip.status;
   if (st === 0) {
-    if (response.trip.legs && response.trip.legs.length &&
+    if (response.trip.legs && response.trip.legs.length) {
+      const { length, time } = response.trip.summary;
+      const distance = directDistance(response.trip.locations, response.trip.units);
       // make sure points are not too far from roads
-      response.trip.summary.length > minDistance(response.trip.locations, response.trip.units)) {
-      return status.success;
+      if (length > 0.9 * distance &&
+          (length < 10 * distance || time < maxRoundabout)) {
+        return status.success;
+      }
     }
     delete response.trip.legs;
     return status.empty;
@@ -169,7 +182,7 @@ function init(options) {
     if (query.avoidHighways) {
       req.costing_options[req.costing].use_highways = 0;
     } else {
-      req.costing_options[req.costing].use_highways = 1;
+      req.costing_options[req.costing].use_highways = 1.1;
     }
     vehicleSize(query, req.costing_options[req.costing]);
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@furkot/directions",
-  "version": "2.0.0",
+  "version": "2.0.2",
   "description": "Directions service for Furkot",
   "author": {
     "name": "Damian Krzeminski",