Relocate dgal into bathmery package, and Relocate cogJob types into s…

…hared package.
linz · Nov 2, 2023 · 95bbd3c · 95bbd3c
1 parent b915f44
commit 95bbd3c
Show file tree

Hide file tree

Showing 23 changed files with 11 additions and 1,293 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/package.json b/packages/cli/package.json
@@ -55,7 +55,6 @@
     "ansi-colors": "^4.1.1",
     "deep-diff": "^1.0.2",
     "flatgeobuf": "^3.23.1",
-    "node-fetch": "^3.2.3",
     "p-limit": "^4.0.0",
     "pretty-json-log": "^1.0.0",
     "slugify": "^1.6.5",

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/src/cog/types.js';
 
 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