Merge branch 'master' into fix/debug-page-terrain

linz · Jul 9, 2024 · 253589d · 253589d
2 parents 4c561d0 + 2734115
commit 253589d
Show file tree

Hide file tree

Showing 6 changed files with 68 additions and 84 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -32,8 +32,7 @@
     "esbuild": "^0.19.8",
     "lerna": "^8.0.0",
     "rimraf": "^5.0.5",
-    "sinon": "^17.0.1",
-    "typescript": "5.4.x"
+    "sinon": "^17.0.1"
   },
   "workspaces": {
     "packages": [

diff --git a/packages/cogify/package.json b/packages/cogify/package.json
@@ -53,6 +53,7 @@
     "access": "public"
   },
   "files": [
-    "build/"
+    "build/",
+    "dist/"
   ]
 }
diff --git a/packages/lambda-tiler/src/routes/preview.ts b/packages/lambda-tiler/src/routes/preview.ts
@@ -1,7 +1,7 @@
 import { ConfigTileSetRaster, ConfigTileSetRasterOutput, TileSetType } from '@basemaps/config';
 import { Bounds, LatLon, Projection, TileMatrixSet } from '@basemaps/geo';
 import { CompositionTiff, TileMakerContext, Tiler } from '@basemaps/tiler';
-import { SharpOverlay, TileMakerSharp } from '@basemaps/tiler-sharp';
+import { TileMakerSharp } from '@basemaps/tiler-sharp';
 import { HttpHeader, LambdaHttpRequest, LambdaHttpResponse } from '@linzjs/lambda';
 import sharp from 'sharp';
 
@@ -163,12 +163,12 @@ export async function renderPreview(req: LambdaHttpRequest, ctx: PreviewRenderCo
   req.timer.start('compose:overlay');
   // Remove with typescript >=5.5.0
 
-  const overlays = (await Promise.all(
+  const overlays = await Promise.all(
     compositions.map((comp) => {
       if (tileContext.pipeline) return TilerSharp.composeTilePipeline(comp, tileContext);
       return TilerSharp.composeTileTiff(comp, tileContext.resizeKernel);
     }),
-  ).then((items) => items.filter((f) => f != null))) as SharpOverlay[];
+  ).then((items) => items.filter((f) => f != null));
   req.timer.end('compose:overlay');
 
   // Create the output image and render all the individual pieces into them

diff --git a/packages/lambda-tiler/src/routes/tile.xyz.raster.ts b/packages/lambda-tiler/src/routes/tile.xyz.raster.ts
@@ -110,7 +110,7 @@ export const TileXyzRaster = {
 
     // Remove with typescript >=5.5.0
 
-    return (await Promise.all(toLoad)).filter((f) => f != null) as CloudArchive[];
+    return (await Promise.all(toLoad)).filter((f) => f != null);
   },
 
   async getAssetsForTile(req: LambdaHttpRequest, tileSet: ConfigTileSetRaster, xyz: TileXyz): Promise<URL[]> {

diff --git a/packages/shared/package.json b/packages/shared/package.json
@@ -28,7 +28,6 @@
     "@aws-sdk/util-dynamodb": "^3.470.0",
     "@basemaps/config": "^7.5.0",
     "@basemaps/geo": "^7.5.0",
-    "@basemaps/tiler": "^7.5.0",
     "@chunkd/fs": "^11.2.0",
     "@chunkd/fs-aws": "^11.2.2",
     "@chunkd/middleware": "^11.1.0",