Skip to content

Commit

Permalink
Remove invalid 'quiet' flag
Browse files Browse the repository at this point in the history 
The flag was interperted as the flag that indicates
whether external tilesets should be processed.
  • Loading branch information
@javagl
javagl committed Oct 22, 2023
1 parent 4e51cb9 commit 90a7b04
Show file tree
Hide file tree
Showing 5 changed files with 20 additions and 25 deletions.
13 changes: 6 additions & 7 deletions specs/tilesetProcessing/BasicTilesetProcessorSpec.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@ const externalInput = "./specs/data/tilesetProcessing/externalProcessing";
const externalOutput =
"./specs/data/output/tilesetProcessing/externalProcessing";

const quiet = true;
const overwrite = true;

/**
Expand All @@ -36,7 +35,7 @@ describe("BasicTilesetProcessor on explicit input", function () {
});

it("forEachExplicitTile covers all explicit tiles", async function () {
const tilesetProcessor = new BasicTilesetProcessor(quiet);
const tilesetProcessor = new BasicTilesetProcessor();
await tilesetProcessor.begin(basicInput, basicOutput, overwrite);

const actualContentUris: string[][] = [];
Expand All @@ -58,7 +57,7 @@ describe("BasicTilesetProcessor on explicit input", function () {
});

it("forEachTile covers all tiles", async function () {
const tilesetProcessor = new BasicTilesetProcessor(quiet);
const tilesetProcessor = new BasicTilesetProcessor();
await tilesetProcessor.begin(basicInput, basicOutput, overwrite);

const actualContentUris: string[][] = [];
Expand All @@ -81,7 +80,7 @@ describe("BasicTilesetProcessor on explicit input", function () {
});

it("processTileContentEntries processes the tile content entries", async function () {
const tilesetProcessor = new BasicTilesetProcessor(quiet);
const tilesetProcessor = new BasicTilesetProcessor();
await tilesetProcessor.begin(basicInput, basicOutput, overwrite);
const specEntryProcessor = new SpecEntryProcessor();
await tilesetProcessor.processTileContentEntries(
Expand Down Expand Up @@ -118,7 +117,7 @@ describe("BasicTilesetProcessor on explicit input", function () {
});

it("processTileContentEntries processes the tile content entries for external tilesets", async function () {
const tilesetProcessor = new BasicTilesetProcessor(quiet);
const tilesetProcessor = new BasicTilesetProcessor();
await tilesetProcessor.begin(externalInput, externalOutput, overwrite);
const specEntryProcessor = new SpecEntryProcessor();
await tilesetProcessor.processTileContentEntries(
Expand Down Expand Up @@ -217,7 +216,7 @@ describe("BasicTilesetProcessor on explicit input", function () {
});

it("processTileContentEntries updates the content URIs", async function () {
const tilesetProcessor = new BasicTilesetProcessor(quiet);
const tilesetProcessor = new BasicTilesetProcessor();
await tilesetProcessor.begin(basicInput, basicOutput, overwrite);
const specEntryProcessor = new SpecEntryProcessor();
await tilesetProcessor.processTileContentEntries(
Expand Down Expand Up @@ -246,7 +245,7 @@ describe("BasicTilesetProcessor on explicit input", function () {
});

it("processTileContentEntries updates the tile contents", async function () {
const tilesetProcessor = new BasicTilesetProcessor(quiet);
const tilesetProcessor = new BasicTilesetProcessor();
await tilesetProcessor.begin(basicInput, basicOutput, overwrite);

const inputTilesetJsonBuffer = fs.readFileSync(
Expand Down
9 changes: 4 additions & 5 deletions specs/tilesetProcessing/ImplicitTilesetProcessorSpec.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@ import { TilesetSources } from "../../src/tilesetData/TilesetSources";
const implicitInput = "./specs/data/tilesetProcessing/implicitProcessing";
const implicitOutput =
"./specs/data/output/tilesetProcessing/implicitProcessing";
const quiet = true;
const overwrite = true;

/**
Expand All @@ -30,7 +29,7 @@ describe("BasicTilesetProcessor on implicit input", function () {
});

it("forEachExplicitTile covers all explicit tiles", async function () {
const tilesetProcessor = new BasicTilesetProcessor(quiet);
const tilesetProcessor = new BasicTilesetProcessor();
await tilesetProcessor.begin(implicitInput, implicitOutput, overwrite);

// There is only one explicit tile in the 'implicitProcessing' data
Expand All @@ -46,7 +45,7 @@ describe("BasicTilesetProcessor on implicit input", function () {
});

it("forEachTile covers all tiles", async function () {
const tilesetProcessor = new BasicTilesetProcessor(quiet);
const tilesetProcessor = new BasicTilesetProcessor();
await tilesetProcessor.begin(implicitInput, implicitOutput, overwrite);

const actualContentUris: string[][] = [];
Expand All @@ -67,7 +66,7 @@ describe("BasicTilesetProcessor on implicit input", function () {
});

it("processTileContentEntries processes the tile content entries", async function () {
const tilesetProcessor = new BasicTilesetProcessor(quiet);
const tilesetProcessor = new BasicTilesetProcessor();
await tilesetProcessor.begin(implicitInput, implicitOutput, overwrite);
const specEntryProcessor = new SpecEntryProcessor();
await tilesetProcessor.processTileContentEntries(
Expand All @@ -88,7 +87,7 @@ describe("BasicTilesetProcessor on implicit input", function () {
});

it("processTileContentEntries updates the content URIs", async function () {
const tilesetProcessor = new BasicTilesetProcessor(quiet);
const tilesetProcessor = new BasicTilesetProcessor();
await tilesetProcessor.begin(implicitInput, implicitOutput, overwrite);
const specEntryProcessor = new SpecEntryProcessor();
await tilesetProcessor.processTileContentEntries(
Expand Down
17 changes: 8 additions & 9 deletions specs/tilesetProcessing/PackageTilesetProcessorSpec.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@ const implicitOutput = outputRoot + "implicitProcessing";
const implicitOutput3tz = outputRoot + "implicitProcessing.3tz";
const implicitOutput3dtiles = outputRoot + "implicitProcessing.3dtiles";

const quiet = true;
const overwrite = true;

/**
Expand All @@ -35,7 +34,7 @@ describe("BasicTilesetProcessor on packages", function () {
});

it("writes basic from directories to 3TZ", async function () {
const tilesetProcessor = new BasicTilesetProcessor(quiet);
const tilesetProcessor = new BasicTilesetProcessor();
await tilesetProcessor.begin(basicInput, basicOutput3tz, overwrite);
await tilesetProcessor.end();

Expand All @@ -47,7 +46,7 @@ describe("BasicTilesetProcessor on packages", function () {
});

it("writes basic from 3TZ to directories", async function () {
const tilesetProcessor = new BasicTilesetProcessor(quiet);
const tilesetProcessor = new BasicTilesetProcessor();
await tilesetProcessor.begin(basicInput3tz, basicOutput, overwrite);
await tilesetProcessor.end();

Expand All @@ -59,7 +58,7 @@ describe("BasicTilesetProcessor on packages", function () {
});

it("writes basic from directories to 3DTILES", async function () {
const tilesetProcessor = new BasicTilesetProcessor(quiet);
const tilesetProcessor = new BasicTilesetProcessor();
await tilesetProcessor.begin(basicInput, basicOutput3dtiles, overwrite);
await tilesetProcessor.end();

Expand All @@ -71,7 +70,7 @@ describe("BasicTilesetProcessor on packages", function () {
});

it("writes basic from 3DTILES to directories", async function () {
const tilesetProcessor = new BasicTilesetProcessor(quiet);
const tilesetProcessor = new BasicTilesetProcessor();
await tilesetProcessor.begin(basicInput3dtiles, basicOutput, overwrite);
await tilesetProcessor.end();

Expand All @@ -83,7 +82,7 @@ describe("BasicTilesetProcessor on packages", function () {
});

it("writes implicit from directories to 3TZ", async function () {
const tilesetProcessor = new BasicTilesetProcessor(quiet);
const tilesetProcessor = new BasicTilesetProcessor();
await tilesetProcessor.begin(implicitInput, implicitOutput3tz, overwrite);
await tilesetProcessor.end();

Expand All @@ -95,7 +94,7 @@ describe("BasicTilesetProcessor on packages", function () {
});

it("writes implicit from 3TZ to directories", async function () {
const tilesetProcessor = new BasicTilesetProcessor(quiet);
const tilesetProcessor = new BasicTilesetProcessor();
await tilesetProcessor.begin(implicitInput3tz, implicitOutput, overwrite);
await tilesetProcessor.end();

Expand All @@ -107,7 +106,7 @@ describe("BasicTilesetProcessor on packages", function () {
});

it("writes implicit from directories to 3DTILES", async function () {
const tilesetProcessor = new BasicTilesetProcessor(quiet);
const tilesetProcessor = new BasicTilesetProcessor();
await tilesetProcessor.begin(
implicitInput,
implicitOutput3dtiles,
Expand All @@ -123,7 +122,7 @@ describe("BasicTilesetProcessor on packages", function () {
});

it("writes implicit from 3DTILES to directories", async function () {
const tilesetProcessor = new BasicTilesetProcessor(quiet);
const tilesetProcessor = new BasicTilesetProcessor();
await tilesetProcessor.begin(
implicitInput3dtiles,
implicitOutput,
Expand Down
3 changes: 1 addition & 2 deletions src/pipelines/TilesetStageExecutor.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -231,8 +231,7 @@ export class TilesetStageExecutor {
overwrite: boolean
) {
try {
const quiet = false;
const tilesetProcessor = new BasicTilesetProcessor(quiet);
const tilesetProcessor = new BasicTilesetProcessor();
await tilesetProcessor.begin(currentInput, currentOutput, overwrite);

const contentStages = tilesetStage.contentStages;
Expand Down
3 changes: 1 addition & 2 deletions src/tilesetProcessing/TileContentProcessing.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,7 @@ export class TileContentProcessing {
overwrite: boolean,
tileContentProcessor: TileContentProcessor
): Promise<void> {
const quiet = false;
const tilesetProcessor = new BasicTilesetProcessor(quiet);
const tilesetProcessor = new BasicTilesetProcessor();
await tilesetProcessor.begin(
tilesetSourceName,
tilesetTargetName,
Expand Down

0 comments on commit 90a7b04

Please sign in to comment.