fix(lambda-tiler): regression in invalid url parsing causing 500 Error (

#1212) #1212
linz · Sep 23, 2020 · 400126c · 400126c
1 parent 69cca66
commit 400126c
Show file tree

Hide file tree

Showing 2 changed files with 45 additions and 1 deletion.
diff --git a/packages/shared/src/__test__/api.path.test.ts b/packages/shared/src/__test__/api.path.test.ts
@@ -0,0 +1,43 @@
+import { Epsg } from '@basemaps/geo';
+import { ImageFormat } from '@basemaps/tiler';
+import o from 'ospec';
+import { tileAttributionFromPath, TileType, tileWmtsFromPath, tileXyzFromPath } from '../api.path';
+
+o.spec('api.path', () => {
+    o('tileXyzFromPath', () => {
+        o(tileXyzFromPath(['aerial', 'EPSG:3857', '10', '3456', '5432.webp'])).deepEquals({
+            type: TileType.Image,
+            name: 'aerial',
+            projection: Epsg.Google,
+            x: 3456,
+            y: 5432,
+            z: 10,
+            ext: ImageFormat.WEBP,
+        });
+        o(tileXyzFromPath([])).equals(null);
+        o(tileXyzFromPath(['aerial', 'EPSG:3857', '10', '3456'])).equals(null);
+    });
+
+    o('tileWmtsFromPath', () => {
+        o(tileWmtsFromPath(['aerial', 'EPSG:3857', 'WMTSCapabilities.xml'])).deepEquals({
+            type: TileType.WMTS,
+            name: 'aerial',
+            projection: Epsg.Google,
+        });
+        o(tileWmtsFromPath([])).deepEquals({
+            type: TileType.WMTS,
+            name: '',
+            projection: null,
+        });
+    });
+
+    o('tileAttributionFromPath', () => {
+        o(tileAttributionFromPath(['aerial', 'EPSG:3857', 'attribution.json'])).deepEquals({
+            type: TileType.Attribution,
+            name: 'aerial',
+            projection: Epsg.Google,
+        });
+        o(tileAttributionFromPath([])).equals(null);
+        o(tileAttributionFromPath(['aerial', 'attribution.json'])).equals(null);
+    });
+});
diff --git a/packages/shared/src/api.path.ts b/packages/shared/src/api.path.ts
@@ -50,6 +50,7 @@ function parseTargetEpsg(text: string): Epsg | null {
 }
 
 export function tileXyzFromPath(path: string[]): TileDataXyz | null {
+    if (path.length < 5) return null;
     const name = path[0];
     const projection = parseTargetEpsg(path[1]);
     if (projection == null) return null;
@@ -88,7 +89,7 @@ export function tileAttributionFromPath(path: string[]): TileDataAttribution | n
 export function tileWmtsFromPath(path: string[]): TileDataWmts | null {
     if (path.length > 3) return null;
 
-    const name = path.length == 1 ? '' : path[0];
+    const name = path.length < 2 ? '' : path[0];
     let projection = null;
     if (path.length == 3) {
         projection = parseTargetEpsg(path[1]);