Cleanup and fix spec for Batch Table Hierarchy extension

Author: ggetz

Source/Scene/Cesium3DTileBatchTable.js

@@ -82,19 +82,13 @@ define([
          */
         this.featuresLength = featuresLength;
 
-        /**
-         * @private
-         */
-        this.batchTableBinary = batchTableBinary;
-
         this._translucentFeaturesLength = 0; // Number of features in the tile that are translucent
 
         var extensions;
         if (defined(batchTableJson)) {
             extensions = batchTableJson.extensions;
         }
         this._extensions = defaultValue(extensions, {});
-        this._extras = defined(batchTableJson) ? batchTableJson.extras : undefined;
 
         var properties = initializeProperties(batchTableJson);
         this._properties = properties;
@@ -182,11 +176,11 @@ define([
             return;
         }
 
-        var hierarchy = batchTable.getExtension('3DTILES_batch_table_hierarchy');
+        var hierarchy = batchTable._extensions['3DTILES_batch_table_hierarchy'];
 
         var legacyHierarchy = jsonHeader.HIERARCHY;
         if (defined(legacyHierarchy)) {
-            Cesium3DTileBatchTable._deprecationWarning('batchTableHierarchyExtension', 'The batch table HIERARCHY property has been moved to an extension. Use extension.3DTILES_batch_table_hierarchy instead.');
+            Cesium3DTileBatchTable._deprecationWarning('batchTableHierarchyExtension', 'The batch table HIERARCHY property has been moved to an extension. Use extensions.3DTILES_batch_table_hierarchy instead.');
             batchTable._extensions['3DTILES_batch_table_hierarchy'] = legacyHierarchy;
             hierarchy = legacyHierarchy;
         }
@@ -320,10 +314,6 @@ define([
     //>>includeEnd('debug');
 
     function getBinaryProperties(featuresLength, properties, binaryBody) {
-        if (!defined(properties)) {
-            return;
-        }
-
         var binaryProperties;
         for (var name in properties) {
             if (properties.hasOwnProperty(name)) {
@@ -1496,23 +1486,6 @@ define([
         }
     };
 
-    /**
-     * Returns the contents of the batch table extension, or <code>undefined</code>
-     * if the extension is not present.
-     * @param {String} extensionName The name of the extension.
-     *
-     * @returns {Object|undefined} The contents of the batch table extension, or <code>undefined</code>
-     * if the extension is not present.
-     */
-    Cesium3DTileBatchTable.prototype.getExtension = function(extensionName) {
-        var extensions = this._extensions;
-        if (!defined(extensions)) {
-            return;
-        }
-
-        return extensions[extensionName];
-    };
-
     Cesium3DTileBatchTable.prototype.isDestroyed = function() {
         return false;
     };

Source/Scene/Cesium3DTileset.js

@@ -1918,10 +1918,10 @@ define([
     };
 
     /**
-     * <code>true</code> if this the tileset JSON file lists the extension in extensionsUsed; otherwise, <code>false</code>.
+     * <code>true</code> if the tileset JSON file lists the extension in extensionsUsed; otherwise, <code>false</code>.
      * @param {String} extensionName The name of the extension to check.
      *
-     * @returns {Boolean} <code>true</code> if this the tileset JSON file lists the extension in extensionsUsed; otherwise, <code>false</code>.
+     * @returns {Boolean} <code>true</code> if the tileset JSON file lists the extension in extensionsUsed; otherwise, <code>false</code>.
      */
     Cesium3DTileset.prototype.hasExtension = function(extensionName) {
         if (!defined(this._extensionsUsed)) {

Specs/Data/Cesium3DTiles/Hierarchy/BatchTableHierarchyExtension/tile.b3dm Specs/Data/Cesium3DTiles/Hierarchy/BatchTableHierarchy/tile.b3dm

@@ -56,7 +56,7 @@ defineSuite([
         scene = createScene();
 
         // Keep the error from logging to the console when running tests
-        Batched3DModel3DTileContent._deprecationWarning = function() {};
+        spyOn(Batched3DModel3DTileContent, '_deprecationWarning');
     });
 
     afterAll(function() {
@@ -79,7 +79,6 @@ defineSuite([
     });
 
     it('recognizes the legacy 20-byte header', function() {
-        spyOn(Batched3DModel3DTileContent, '_deprecationWarning');
         return Cesium3DTilesTester.loadTileset(scene, deprecated1Url)
             .then(function(tileset) {
                 expect(Batched3DModel3DTileContent._deprecationWarning).toHaveBeenCalled();
@@ -91,7 +90,6 @@ defineSuite([
     });
 
     it('recognizes the legacy 24-byte header', function() {
-        spyOn(Batched3DModel3DTileContent, '_deprecationWarning');
         return Cesium3DTilesTester.loadTileset(scene, deprecated2Url)
             .then(function(tileset) {
                 expect(Batched3DModel3DTileContent._deprecationWarning).toHaveBeenCalled();
@@ -103,7 +101,6 @@ defineSuite([
     });
 
     it('logs deprecation warning for use of BATCHID without prefixed underscore', function() {
-        spyOn(Batched3DModel3DTileContent, '_deprecationWarning');
         return Cesium3DTilesTester.loadTileset(scene, deprecated1Url)
             .then(function(tileset) {
                 expect(Batched3DModel3DTileContent._deprecationWarning).toHaveBeenCalled();

Specs/Data/Cesium3DTiles/Hierarchy/BatchTableHierarchyExtension/tileset.json Specs/Data/Cesium3DTiles/Hierarchy/BatchTableHierarchy/tileset.json

@@ -37,7 +37,7 @@ defineSuite([
     var withBatchTableUrl = './Data/Cesium3DTiles/Batched/BatchedWithBatchTable/tileset.json';
     var withoutBatchTableUrl = './Data/Cesium3DTiles/Batched/BatchedWithoutBatchTable/tileset.json';
     var noBatchIdsUrl = './Data/Cesium3DTiles/Batched/BatchedNoBatchIds/tileset.json';
-    var batchTableHierarchyExtensionUrl = './Data/Cesium3DTiles/Hierarchy/BatchTableHierarchyExtension/tileset.json';
+    var batchTableHierarchyUrl = './Data/Cesium3DTiles/Hierarchy/BatchTableHierarchy/tileset.json';
     var batchTableHierarchyBinaryUrl = './Data/Cesium3DTiles/Hierarchy/BatchTableHierarchyBinary/tileset.json';
     var batchTableHierarchyMultipleParentsUrl = './Data/Cesium3DTiles/Hierarchy/BatchTableHierarchyMultipleParents/tileset.json';
     var batchTableHierarchyNoParentsUrl = './Data/Cesium3DTiles/Hierarchy/BatchTableHierarchyNoParents/tileset.json';
@@ -63,8 +63,8 @@ defineSuite([
         scene.camera.lookAt(center, new HeadingPitchRange(0.0, -1.57, 20.0));
 
         // Keep the error from logging to the console when running tests
-        Cesium3DTileBatchTable._deprecationWarning = function() {};
-        Batched3DModel3DTileContent._deprecationWarning = function() {};
+        spyOn(Cesium3DTileBatchTable, '_deprecationWarning');
+        spyOn(Batched3DModel3DTileContent, '_deprecationWarning');
     });
 
     afterAll(function() {
@@ -904,7 +904,7 @@ defineSuite([
     }
 
     it('renders tileset with batch table hierarchy extension', function() {
-        return checkBatchTableHierarchy(batchTableHierarchyExtensionUrl, false);
+        return checkBatchTableHierarchy(batchTableHierarchyUrl, false);
     });
 
     it('renders tileset with batch table hierarchy using binary properties', function() {
@@ -924,7 +924,6 @@ defineSuite([
     });
 
     it('warns about deprecated batch hierarchy (pre-version 1.0)', function() {
-        spyOn(Cesium3DTileBatchTable, '_deprecationWarning');
         return checkBatchTableHierarchy(batchTableHierarchyLegacyUrl, false)
             .then(function(tileset) {
                 expect(Cesium3DTileBatchTable._deprecationWarning).toHaveBeenCalled();

Specs/Scene/Batched3DModel3DTileContentSpec.js

@@ -86,6 +86,8 @@ defineSuite([
     var withBatchTableUrl = 'Data/Cesium3DTiles/Batched/BatchedWithBatchTable/tileset.json';
     var noBatchIdsUrl = 'Data/Cesium3DTiles/Batched/BatchedNoBatchIds/tileset.json';
 
+    var withBatchTableHierarchyUrl = 'Data/Cesium3DTiles/Hierarchy/BatchTableHierarchy/tileset.json';
+
     var withTransformBoxUrl = 'Data/Cesium3DTiles/Batched/BatchedWithTransformBox/tileset.json';
     var withTransformSphereUrl = 'Data/Cesium3DTiles/Batched/BatchedWithTransformSphere/tileset.json';
     var withTransformRegionUrl = 'Data/Cesium3DTiles/Batched/BatchedWithTransformRegion/tileset.json';
@@ -358,6 +360,13 @@ defineSuite([
         });
     });
 
+    it('hasExtension returns true if the tileset JSON file uses the specified extension', function() {
+        return Cesium3DTilesTester.loadTileset(scene, withBatchTableHierarchyUrl).then(function(tileset) {
+            expect(tileset.hasExtension('3DTILES_batch_table_hierarchy')).toBe(true);
+            expect(tileset.hasExtension('3DTILES_nonexistant_extension')).toBe(false);
+        });
+    });
+
     it('passes version in query string to tiles', function() {
         return Cesium3DTilesTester.loadTileset(scene, tilesetUrl).then(function(tileset) {
             expect(tileset._root.content._resource.url).toEqual(getAbsoluteUri(tilesetUrl.replace('tileset.json','parent.b3dm?v=1.2.3')));