Minior fix

Author: Wentao-Kuang

packages/cli-vector/src/cli/cli.join.ts

@@ -103,26 +103,26 @@ export const JoinCommand = command({
   args: JoinArgs,
   async handler(args) {
     const logger = getLogger(this, args, 'cli-vector');
-    const outputPath = `tmp/join/`;
+    const outputPath = `/tmp/join/`;
     const tileMatrix = TileMatrixSets.find(args.tileMatrix);
     if (tileMatrix == null) throw new Error(`Tile matrix ${args.tileMatrix} is not supported`);
     const bucketPath = new URL(`vector/${tileMatrix.projection.code}/`, args.target);
     const filePaths = await download(args.fromFile, outputPath, logger);
 
     // Mbtiles output path to be string type path to avoid issues with tippecanoe and better-sqlite3
-    const outputMbtiles = `${outputPath}/${args.filename}.mbtiles`;
+    const outputMbtiles = fsa.toUrl(`${outputPath}${args.filename}.mbtiles`);
     logger.info({ files: filePaths.length, outputMbtiles }, 'JoinMbtiles: Start');
-    await tileJoin(filePaths, outputMbtiles, logger);
+    await tileJoin(filePaths, outputMbtiles.pathname, logger);
     logger.info({ files: filePaths.length, outputMbtiles }, 'JoinMbtiles: End');
 
     const outputCotar = fsa.toUrl(`${outputPath}/${args.filename}.tar.co`);
     logger.info({ mbtiles: outputMbtiles, outputCotar }, 'ToTartTiles: Start');
-    await toTarTiles(outputMbtiles, outputCotar, logger);
+    await toTarTiles(outputMbtiles.pathname, outputCotar.pathname, logger);
     logger.info({ mbtiles: outputMbtiles, outputCotar }, 'ToTartTiles: End');
 
     const outputIndex = fsa.toUrl(`${outputPath}/${args.filename}.tar.index`);
     logger.info({ cotar: outputCotar, outputIndex }, 'toTarIndex: Start');
-    await toTarIndex(outputCotar, outputIndex, logger);
+    await toTarIndex(outputCotar.pathname, outputIndex.pathname, logger);
     logger.info({ cotar: outputCotar, outputIndex }, 'toTarIndex: End');
 
     logger.info({ target: bucketPath, tileMatrix: tileMatrix.identifier }, 'CreateStac: Start');
@@ -131,7 +131,7 @@ export const JoinCommand = command({
 
     // Upload output to s3
     logger.info({ target: bucketPath, tileMatrix: tileMatrix.identifier }, 'Upload: Start');
-    await upload(fsa.toUrl(outputMbtiles), bucketPath, logger);
+    await upload(outputMbtiles, bucketPath, logger);
     await upload(outputCotar, bucketPath, logger);
     await upload(outputIndex, bucketPath, logger);
     // Upload stac Files

packages/cli-vector/src/transform/covt.ts

@@ -1,13 +1,13 @@
-import { fsa, LogType, SourceMemory, urlToString } from '@basemaps/shared';
+import { fsa, LogType, SourceMemory } from '@basemaps/shared';
 import { CotarIndexBuilder, CotarIndexOptions, TarReader } from '@cotar/builder';
 import { CotarIndex } from '@cotar/core';
 import { promises as fs } from 'fs';
 
 /**
  * Create index for the COVT tar file
  */
-export async function toTarIndex(input: URL, output: URL, logger: LogType): Promise<URL> {
-  logger.info({ output: output.href }, 'Cotar.Index:Start');
+export async function toTarIndex(input: string, output: string, logger: LogType): Promise<string> {
+  logger.info({ output: output }, 'Cotar.Index:Start');
 
   const fd = await fs.open(input, 'r');
 
@@ -16,11 +16,11 @@ export async function toTarIndex(input: URL, output: URL, logger: LogType): Prom
 
   const index = await CotarIndex.create(new SourceMemory('index', buffer));
   await TarReader.validate(fd, index);
-  await fs.writeFile(urlToString(output), buffer);
-  await fs.appendFile(urlToString(input), buffer);
+  await fs.writeFile(output, buffer);
+  await fs.appendFile(input, buffer);
 
   await fd.close();
-  if (!(await fsa.exists(output))) throw new Error('Error - Cotar.Index creation Failure.');
+  if (!(await fsa.exists(fsa.toUrl(output)))) throw new Error('Error - Cotar.Index creation Failure.');
 
   logger.info({ index, count }, 'Cotar.Index:Done');
   return output;

packages/cli-vector/src/transform/mbtiles.to.ttiles.ts

@@ -33,7 +33,7 @@ export async function* readMbTiles(
   return null;
 }
 
-export async function toTarTiles(input: string, output: URL, logger: LogType, limit = -1): Promise<void> {
+export async function toTarTiles(input: string, output: string, logger: LogType, limit = -1): Promise<void> {
   const packer = tar.pack();
   const startTime = Date.now();
   let writeCount = 0;
@@ -43,7 +43,7 @@ export async function toTarTiles(input: string, output: URL, logger: LogType, li
 
   let startTileTime = Date.now();
   for await (const { tile, index, total } of readMbTiles(input, limit, logger)) {
-    if (index === 0) logger.info({ path: output.href, count: total }, 'Covt.Tar:Start');
+    if (index === 0) logger.info({ path: output, count: total }, 'Covt.Tar:Start');
 
     const z = tile.zoom_level;
     const x = tile.tile_column;
@@ -64,5 +64,5 @@ export async function toTarTiles(input: string, output: URL, logger: LogType, li
   logger.debug('Covt.Tar:Finalize');
   packer.finalize();
   await writeProm;
-  logger.info({ path: output.href, count: writeCount, duration: Date.now() - startTime }, 'Covt.Tar:Done');
+  logger.info({ path: output, count: writeCount, duration: Date.now() - startTime }, 'Covt.Tar:Done');
 }