Fix the URL paths

Author: Wentao-Kuang

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

@@ -3,14 +3,14 @@ import { fsa, LogType, Url, UrlArrayJsonFile } from '@basemaps/shared';
 import { CliId, CliInfo } from '@basemaps/shared/build/cli/info.js';
 import { getLogger, logArguments } from '@basemaps/shared/build/cli/log.js';
 import { command, option, string } from 'cmd-ts';
+import { mkdirSync } from 'fs';
 import { basename } from 'path';
 import { createGzip } from 'zlib';
 
 import { createStacFiles } from '../stac.js';
 import { toTarIndex } from '../transform/covt.js';
 import { toTarTiles } from '../transform/mbtiles.to.ttiles.js';
 import { tileJoin } from '../transform/tippecanoe.js';
-import { mkdirSync } from 'fs';
 
 async function download(filePaths: URL[], outputPath: string, logger: LogType): Promise<URL[]> {
   const paths: URL[] = [];
@@ -52,8 +52,9 @@ async function upload(file: URL, bucketPath: URL, logger: LogType): Promise<URL>
   }
 
   // Upload to s3 or copy to local
-  let path = new URL(`/topographic/${CliId}/`, bucketPath);
-  if (path.protocol === 'file:') mkdirSync(path);
+  let path = new URL(`topographic/${CliId}/`, bucketPath);
+  logger.info({ file: file, path: path }, 'Load:Path');
+  if (path.protocol === 'file:') mkdirSync(path, { recursive: true });
   if (filename.endsWith('catalog.json')) path = new URL(filename, bucketPath); // Upload catalog to root directory
   await fsa.write(path, stream);
   logger.info({ file: file, path: path }, 'Load:Finish');
@@ -103,6 +104,9 @@ export const JoinCommand = command({
   async handler(args) {
     const logger = getLogger(this, args, 'cli-vector');
     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);
 
     const outputMbtiles = fsa.toUrl(`${outputPath}/${args.filename}.mbtiles`);
@@ -120,9 +124,6 @@ export const JoinCommand = command({
     await toTarIndex(outputCotar, outputIndex, logger);
     logger.info({ cotar: outputCotar, outputIndex }, 'toTarIndex: End');
 
-    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);
     logger.info({ target: bucketPath, tileMatrix: tileMatrix.identifier }, 'CreateStac: Start');
     const stacFiles = await createStacFiles(args.fromFile, bucketPath, args.filename, tileMatrix, args.title, logger);
     logger.info({ cotar: outputCotar, outputIndex }, 'CreateStac: End');

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

@@ -63,7 +63,7 @@ export async function tileJoin(inputs: URL[], output: URL, logger: LogType): Pro
   cmd.mount(dirname(output.pathname));
 
   cmd.args.push('-pk');
-  cmd.args.push('-o', output.href);
+  cmd.args.push('-o', output.pathname);
   for (const input of inputs) {
     if (input.href.endsWith('mbtiles')) {
       cmd.mount(dirname(input.pathname));