Update tools to 0.5.0

README.md

@@ -87,7 +87,7 @@ npx 3d-tiles-validator --optionsFile exampleOptions.json
 The options represent the properties of the `ValidationOptions` class. For example, using the following `exampleOptions.json` file, then the validator will only validate the tileset JSON structure, but _no_ tile content data:
 ```JSON
 {
-  "validateContentData": false,
+  "validateContentData": false
 }
 ```
 The following options will cause the validator to _include_ B3DM- and GLB files in the validation process, but ignore all other content types:

package.json

@@ -26,7 +26,7 @@
     "@gltf-transform/core": "^3.2.1",
     "@gltf-transform/extensions": "^3.2.1",
     "@gltf-transform/functions": "^3.2.1",
-    "3d-tiles-tools": "0.4.4",
+    "3d-tiles-tools": "0.5.0",
     "cesium": "^1.97.0",
     "gltf-validator": "^2.0.0-dev.3.9",
     "minimatch": "^5.1.0",

specs/extensions/MaxarContentGeojonValidationSpec.ts

@@ -5,20 +5,20 @@ describe("Tileset MAXAR_content_geojson extension validation", function () {
     const result = await Validators.validateTilesetFile(
       "specs/data/extensions/maxarContentGeojson/validTilesetWithGeojson.json"
     );
-    // Expect one warning for skipping the GeoJSON validation
+    // Expect one info for skipping the GeoJSON validation
     // and one for the missing declaration of the
     // MAXAR_content_geojson usage in the extensionsUsed
     expect(result.length).toEqual(2);
-    expect(result.get(0).type).toEqual("CONTENT_VALIDATION_WARNING");
+    expect(result.get(0).type).toEqual("CONTENT_VALIDATION_INFO");
     expect(result.get(1).type).toEqual("EXTENSION_FOUND_BUT_NOT_USED");
   });
 
   it("detects issues in validTilesetWithMaxarContentGeojson", async function () {
     const result = await Validators.validateTilesetFile(
       "specs/data/extensions/maxarContentGeojson/validTilesetWithMaxarContentGeojson.json"
     );
-    // Expect one warning for skipping the GeoJSON validation
+    // Expect one info for skipping the GeoJSON validation
     expect(result.length).toEqual(1);
-    expect(result.get(0).type).toEqual("CONTENT_VALIDATION_WARNING");
+    expect(result.get(0).type).toEqual("CONTENT_VALIDATION_INFO");
   });
 });

src/main.ts

@@ -116,7 +116,7 @@ async function main() {
   if (argv.optionsFile) {
     config.options = await readOptionsFile(argv.optionsFile);
   }
-  ValidatorMain.performValidation(args, config);
+  await ValidatorMain.performValidation(args, config);
 }
 
-main();
+void main();

src/validation/ContentDataValidators.ts

@@ -82,21 +82,21 @@ export class ContentDataValidators {
 
     // Certain content types are known to be encountered,
     // but are not (yet) validated. These can either be
-    // ignored, or cause a warning. In the future, this
+    // ignored, or cause an info. In the future, this
     // should be configurable, probably even on a per-type
     // basis, via the command line or a config file
     const ignoreUnhandledContentTypes = false;
     let geomValidator = Validators.createEmptyValidator();
     let vctrValidator = Validators.createEmptyValidator();
     let geojsonValidator = Validators.createEmptyValidator();
     if (!ignoreUnhandledContentTypes) {
-      geomValidator = Validators.createContentValidationWarning(
+      geomValidator = Validators.createContentValidationInfo(
         "Skipping 'geom' validation"
       );
-      vctrValidator = Validators.createContentValidationWarning(
+      vctrValidator = Validators.createContentValidationInfo(
         "Skipping 'vctr' validation"
       );
-      geojsonValidator = Validators.createContentValidationWarning(
+      geojsonValidator = Validators.createContentValidationInfo(
         "Skipping 'geojson' validation"
       );
     }

src/validation/TilesetPackageValidator.ts

@@ -150,14 +150,14 @@ export class TilesetPackageValidator implements Validator<string> {
       context.addIssue(issue);
       return true;
     }
-    tilesetSource.open(uri);
+    await tilesetSource.open(uri);
     const result = await TilesetPackageValidator.validatePackageInternal(
       uri,
       tilesetSource,
       isContent,
       context
     );
-    tilesetSource.close();
+    await tilesetSource.close();
     return result;
   }
 

src/validation/TilesetTraversingValidator.ts

@@ -1,5 +1,6 @@
 import path from "path";
 import { defined } from "3d-tiles-tools";
+import { ImplicitTilings } from "3d-tiles-tools";
 import { ExplicitTraversedTile } from "3d-tiles-tools";
 
 import { ValidationContext } from "./ValidationContext";
@@ -157,7 +158,6 @@ export class TilesetTraversingValidator {
     // should cause the validation to fail with which message.
     // Maybe some of these validation steps should be pulled
     // out of "validateTile", or enabled/disabled via flags.
-
     if (traversedTile instanceof ExplicitTraversedTile) {
       const explicitPartIsValid =
         await TilesetTraversingValidator.validateExplicitTraversedTile(
@@ -237,21 +237,25 @@ export class TilesetTraversingValidator {
         return false;
       }
 
-      // If the tile is the root of a subtree, then
-      // validate the subtree data
-      const subtreeUri = traversedTile.getSubtreeUri();
-      if (defined(subtreeUri)) {
-        const subtreeRootValid =
-          await TilesetTraversingValidator.validateSubtreeRoot(
-            path,
-            implicitTiling,
-            subtreeUri,
-            validationState,
-            context
-          );
-        if (!subtreeRootValid) {
-          return false;
-        }
+      // Validate the subtree data that will be expected
+      // for the root of the implicit tileset
+      const rootCoordinates =
+        ImplicitTilings.createRootCoordinates(implicitTiling);
+      const subtreeUri = ImplicitTilings.substituteTemplateUri(
+        implicitTiling.subdivisionScheme,
+        implicitTiling.subtrees.uri,
+        rootCoordinates
+      );
+      const subtreeRootValid =
+        await TilesetTraversingValidator.validateSubtreeRoot(
+          path,
+          implicitTiling,
+          subtreeUri,
+          validationState,
+          context
+        );
+      if (!subtreeRootValid) {
+        return false;
       }
     }
 
@@ -355,7 +359,7 @@ export class TilesetTraversingValidator {
    * resolve the resulting data, and pass it to a `SubtreeValidator`.
    *
    * @param tilePath - The path for `ValidationIssue` instances
-   * @param implicitTiling - The `TileImpllicitTiling`
+   * @param implicitTiling - The `TileImplicitTiling`
    * @param subtreeUri - The subtree URI
    * @param validationState - The `ValidationState`
    * @param context - The `ValidationContext`

src/validation/Validators.ts

@@ -393,26 +393,26 @@ export class Validators {
   }
 
   /**
-   * Creates a `Validator` that only adds a `CONTENT_VALIDATION_WARNING`
+   * Creates a `Validator` that only adds a `CONTENT_VALIDATION_INFO`
    * with the given message to the given context when it is called.
    *
    * This is used for "dummy" validators that handle content data types
    * that are already anticipated (like VCTR or GEOM), but not validated
    * explicitly.
    *
-   * @param message - The message for the warning
+   * @param message - The message for the info
    * @returns The new validator
    * @internal
    */
-  static createContentValidationWarning(message: string): Validator<Buffer> {
+  static createContentValidationInfo(message: string): Validator<Buffer> {
     return {
       async validateObject(
         inputPath: string,
         //eslint-disable-next-line @typescript-eslint/no-unused-vars
         input: Buffer,
         context: ValidationContext
       ): Promise<boolean> {
-        const issue = ContentValidationIssues.CONTENT_VALIDATION_WARNING(
+        const issue = ContentValidationIssues.CONTENT_VALIDATION_INFO(
           inputPath,
           message
         );