Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat(cli): Relocate dgal and cog from cli package. BM-879 #2984

Merged
merged 5 commits into from
Nov 2, 2023
Merged
Show file tree
Hide file tree
Changes from 4 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions packages/bathymetry/src/bathy.maker.ts
Original file line number Diff line number Diff line change
@@ -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';
Expand All @@ -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 */
Expand Down Expand Up @@ -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++) {
Expand Down
File renamed without changes.
2 changes: 1 addition & 1 deletion packages/cli/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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]
Expand Down
2 changes: 1 addition & 1 deletion packages/cli/src/cli/config/action.import.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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/build/cog/types.js';
Wentao-Kuang marked this conversation as resolved.
Show resolved Hide resolved

const PublicUrlBase = Env.isProduction() ? 'https://basemaps.linz.govt.nz/' : 'https://dev.basemaps.linz.govt.nz/';

Expand Down
98 changes: 0 additions & 98 deletions packages/cli/src/cog/__tests__/builder.test.ts

This file was deleted.

Loading
Loading