return json for all 404s

src/controllers/tileController.ts

@@ -1,8 +1,7 @@
 import {NextFunction, Request, Response} from "express";
 import {AppLocals} from "../types/app";
 import asyncControllerHandler from "../errors/asyncControllerHandler";
-import {GroutError} from "../errors/groutError";
-import {ErrorType} from "../errors/errorType";
+import notFound from "../errors/notFound";
 
 export class TileController {
     static getTile = async (req: Request, res: Response, next: NextFunction) => {
@@ -11,8 +10,6 @@ export class TileController {
             const {tileDatasets} = req.app.locals as AppLocals;
 
             // TODO: check coords params and throw 400 GroutError if not ints
-            // TODO: also throw error if requested dataset or level not found
-            // TODO: also return JSON response if route is not matched (always return JSON response in all cases!)
             let tileData = null;
             if (tileDatasets[dataset] && tileDatasets[dataset][level]) {
                 const db = tileDatasets[dataset][level];
@@ -29,7 +26,7 @@ export class TileController {
                     "Content-Encoding": "gzip"
                 }).end(tileData);
             } else {
-                res.writeHead(404).end();
+                throw notFound(req);
             }
         });
     };

src/errors/notFound.ts

@@ -0,0 +1,8 @@
+import { Request } from "express";
+import {ErrorType} from "./errorType";
+import {GroutError} from "./groutError";
+
+export default (req: Request) => {
+    const { url } = req;
+    throw new GroutError(`Route not found: ${url}`, 404, ErrorType.NOT_FOUND);
+};

src/routes.ts

@@ -1,10 +1,15 @@
 import { Router } from "express";
 import { IndexController } from "./controllers/indexController";
 import { TileController } from "./controllers/tileController";
+import notFound from "./errors/notFound";
 
 export const registerRoutes = () => {
     const router = Router();
     router.get("/", IndexController.getIndex);
     router.get("/tile/:dataset/:level/:z/:x/:y", TileController.getTile);
+
+    // Throw 404 error for any unmatched routes
+    router.use(notFound);
+
     return router;
 };