Merge branch 'master' into docs/split-docs

linz · Nov 2, 2023 · 865b98f · 865b98f
2 parents 0482b67 + 6ebb106
commit 865b98f
Show file tree

Hide file tree

Showing 23 changed files with 13 additions and 1,321 deletions.
diff --git a/packages/bathymetry/src/bathy.maker.ts b/packages/bathymetry/src/bathy.maker.ts
@@ -1,5 +1,3 @@
-import { Gdal } from '@basemaps/cli/build/gdal/gdal.js';
-import { GdalCommand } from '@basemaps/cli/build/gdal/gdal.command.js';
 import { Bounds, Epsg, Tile, TileMatrixSet } from '@basemaps/geo';
 import { fsa, LogType, s3ToVsis3 } from '@basemaps/shared';
 import * as os from 'os';
@@ -11,6 +9,8 @@ import { FilePath, FileType } from './file.js';
 import { Hash } from './hash.js';
 import { MapnikRender } from './mapnik.js';
 import { Stac } from './stac.js';
+import { GdalCommand } from './gdal/gdal.command.js';
+import { Gdal } from './gdal/gdal.js';
 
 interface BathyMakerContext {
   /** unique id for this build */
@@ -108,7 +108,7 @@ export class BathyMaker {
     const gdalVersion = await this.gdalVersion;
     logger.info({ gdalVersion }, 'GdalVersion');
 
-    const promises = [];
+    const promises: Promise<string>[] = [];
     let extent: Bounds | null = null;
     for (let x = 0; x < tmsZoom.matrixWidth; x++) {
       for (let y = 0; y < tmsZoom.matrixHeight; y++) {

diff --git a/.../src/gdal/__tests__/gdal.progress.test.ts → .../src/gdal/__tests__/gdal.progress.test.ts b/.../src/gdal/__tests__/gdal.progress.test.ts → .../src/gdal/__tests__/gdal.progress.test.ts
diff --git a/packages/cli/src/gdal/gdal.command.ts → packages/bathymetry/src/gdal/gdal.command.ts b/packages/cli/src/gdal/gdal.command.ts → packages/bathymetry/src/gdal/gdal.command.ts
diff --git a/packages/cli/src/gdal/gdal.docker.ts → packages/bathymetry/src/gdal/gdal.docker.ts b/packages/cli/src/gdal/gdal.docker.ts → packages/bathymetry/src/gdal/gdal.docker.ts
diff --git a/packages/cli/src/gdal/gdal.local.ts → packages/bathymetry/src/gdal/gdal.local.ts b/packages/cli/src/gdal/gdal.local.ts → packages/bathymetry/src/gdal/gdal.local.ts
diff --git a/packages/cli/src/gdal/gdal.progress.ts → ...ages/bathymetry/src/gdal/gdal.progress.ts b/packages/cli/src/gdal/gdal.progress.ts → ...ages/bathymetry/src/gdal/gdal.progress.ts
diff --git a/packages/cli/src/gdal/gdal.ts → packages/bathymetry/src/gdal/gdal.ts b/packages/cli/src/gdal/gdal.ts → packages/bathymetry/src/gdal/gdal.ts
diff --git a/packages/cli/Dockerfile b/packages/cli/Dockerfile
@@ -12,7 +12,7 @@ ENV NODE_MAJOR=18
 RUN echo "deb [signed-by=/etc/apt/keyrings/nodesource.gpg] https://deb.nodesource.com/node_$NODE_MAJOR.x nodistro main" | tee /etc/apt/sources.list.d/nodesource.list
 
 RUN apt-get update
-RUN apt-get install -y nodejs git
+RUN apt-get install -y nodejs
 
 # Install sharp TODO update this when we change sharp versions
 RUN npm install [email protected]

diff --git a/packages/cli/src/cli/config/action.import.ts b/packages/cli/src/cli/config/action.import.ts
@@ -17,7 +17,7 @@ import fetch from 'node-fetch';
 import { invalidateCache } from '../util.js';
 import { Q, Updater } from './config.update.js';
 import { FeatureCollection } from 'geojson';
-import { CogJobJson } from '../../cog/types.js';
+import { CogJobJson } from '@basemaps/shared';
 
 const PublicUrlBase = Env.isProduction() ? 'https://basemaps.linz.govt.nz/' : 'https://dev.basemaps.linz.govt.nz/';
 

diff --git a/packages/cli/src/cog/__tests__/builder.test.ts b/packages/cli/src/cog/__tests__/builder.test.ts