Restored some things lost by merge

src/errors/LocationResolverError.ts

@@ -0,0 +1,3 @@
+export default class LocationResolverError extends Error {
+
+}

src/query-runner/LocationResolverDefault.ts

@@ -1,4 +1,5 @@
 import { inject, injectable } from "inversify";
+import LocationResolverError from "../errors/LocationResolverError";
 import IStop from "../fetcher/stops/IStop";
 import IStopsProvider from "../fetcher/stops/IStopsProvider";
 import ILocation from "../interfaces/ILocation";
@@ -30,7 +31,7 @@ export default class LocationResolverDefault implements ILocationResolver {
         return this.resolveById(input);
       }
 
-      return Promise.reject(`Location "${input}" is a string, but not an ID`);
+      return Promise.reject(new LocationResolverError(`Location "${input}" is a string, but not an ID`));
     }
 
     const location: ILocation = input;
@@ -44,7 +45,9 @@ export default class LocationResolverDefault implements ILocationResolver {
     }
 
     if (!hasCoords) {
-      return Promise.reject(`Location "${JSON.stringify(input)}" should have latitude and longitude`);
+      return Promise.reject(
+        new LocationResolverError(`Location "${JSON.stringify(input)}" should have latitude and longitude`),
+      );
     }
 
     return location;
@@ -62,7 +65,7 @@ export default class LocationResolverDefault implements ILocationResolver {
       };
     }
 
-    throw new Error(`No fetcher for id ${id}`);
+    return Promise.reject(new LocationResolverError(`No fetcher for id ${id}`));
   }
 
   private isId(testString: string): boolean {

src/query-runner/QueryRunnerDefault.ts

@@ -1,6 +1,8 @@
 import { AsyncIterator } from "asynciterator";
 import { inject, injectable } from "inversify";
+import { cat } from "shelljs";
 import Defaults from "../Defaults";
+import InvalidQueryError from "../errors/InvalidQueryError";
 import ILocation from "../interfaces/ILocation";
 import IPath from "../interfaces/IPath";
 import IQuery from "../interfaces/IQuery";
@@ -37,7 +39,7 @@ export default class QueryRunnerDefault implements IQueryRunner {
       return this.publicTransportPlanner.plan(resolvedQuery);
 
     } else {
-      return Promise.reject("Query not supported");
+      throw new InvalidQueryError("Query should have publicTransportOnly = true");
     }
   }
 
@@ -83,8 +85,14 @@ export default class QueryRunnerDefault implements IQueryRunner {
       resolvedQuery.maximumArrivalTime = newMaximumArrivalTime;
     }
 
-    resolvedQuery.from = await this.resolveEndpoint(from);
-    resolvedQuery.to = await this.resolveEndpoint(to);
+    try {
+      resolvedQuery.from = await this.resolveEndpoint(from);
+      resolvedQuery.to = await this.resolveEndpoint(to);
+
+    } catch (e) {
+      return Promise.reject(new InvalidQueryError(e));
+    }
+
     resolvedQuery.minimumWalkingSpeed = minimumWalkingSpeed || walkingSpeed || Defaults.defaultMinimumWalkingSpeed;
     resolvedQuery.maximumWalkingSpeed = maximumWalkingSpeed || walkingSpeed || Defaults.defaultMaximumWalkingSpeed;