fix bugs for node module usage

Author: PrincessGod

lib/obj23dtiles.js

@@ -5,8 +5,11 @@ var obj2gltf = require('./obj2gltf');
 var obj2B3dm = require('./obj2B3dm');
 var obj2I3dm = require('./obj2I3dm');
 var obj2Tileset = require('./obj2Tileset');
+var combine = require('./combineTileset');
 
 module.exports = obj23dtiles;
+obj23dtiles.combine = combine;
+
 function obj23dtiles(objPath, outputPath, options) {
     console.time('Total');
 
@@ -18,6 +21,12 @@ function obj23dtiles(objPath, outputPath, options) {
             if(typeof options.tilesetOptions === 'string') {
                 options.tilesetOptions = fsExtra.readJsonSync(options.tilesetOptions);
             }
+            if(typeof options.customBatchTable === 'string') {
+                options.customBatchTable = fsExtra.readJsonSync(options.customBatchTable);
+            }
+            if (typeof options.customFeatureTable === 'string') {
+                options.customFeatureTable = fsExtra.readJsonSync(options.customFeatureTable);
+            }
 
             obj2Tileset(objPath, outputPath, options)
                 .then(function(result) {
@@ -43,25 +52,16 @@ function obj23dtiles(objPath, outputPath, options) {
                     console.timeEnd('Total');
                 })
                 .catch(function(error) {
-                    console.log(error.message);
+                    console.log(error.message || error);
                     process.exit(1);
                 });
         } else if (options.i3dm) {
             options.binary = true;
             options.batchId = false;
-            if(typeof options.tilesetOptions === 'string') {
-                options.tilesetOptions = fsExtra.readJsonSync(options.tilesetOptions);
-            }
             if (!options.customFeatureTable) {
                 console.log('Convert to i3dm need a custom FeatureTable.');
                 process.exit(1);
             }
-            if (typeof options.customFeatureTable === 'string') {
-                options.customFeatureTable = fsExtra.readJsonSync(options.customFeatureTable);
-            }
-            if (options.customBatchTable && typeof options.customBatchTable === 'string') {
-                options.customBatchTable = fsExtra.readJsonSync(options.customBatchTable);
-            }
 
             obj2Tileset(objPath, outputPath, options)
                 .then(function(result) {
@@ -87,7 +87,7 @@ function obj23dtiles(objPath, outputPath, options) {
                     console.timeEnd('Total');
                 })
                 .catch(function(error) {
-                    console.log(error.message);
+                    console.log(error.message || error);
                     process.exit(1);
                 });
         }
@@ -112,7 +112,7 @@ function obj23dtiles(objPath, outputPath, options) {
                 console.timeEnd('Total');
             })
             .catch(function(error) {
-                console.log(error.message);
+                console.log(error.message || error);
                 process.exit(1);
             });
     }
@@ -123,12 +123,6 @@ function obj23dtiles(objPath, outputPath, options) {
             console.log('Convert to i3dm need a custom FeatureTable.');
             process.exit(1);
         }
-        if (typeof options.customFeatureTable === 'string') {
-            options.customFeatureTable = fsExtra.readJsonSync(options.customFeatureTable);
-        }
-        if (options.customBatchTable && typeof options.customBatchTable === 'string') {
-            options.customBatchTable = fsExtra.readJsonSync(options.customBatchTable);
-        }
         obj2I3dm(objPath, options)
             .then(function(result){
                 var i3dm = result.i3dm;
@@ -146,7 +140,7 @@ function obj23dtiles(objPath, outputPath, options) {
                 console.timeEnd('Total');
             })
             .catch(function(error) {
-                console.log(error.message);
+                console.log(error.message || error);
                 process.exit(1);
             });
     }
@@ -167,7 +161,7 @@ function obj23dtiles(objPath, outputPath, options) {
                 console.timeEnd('Total');
             })
             .catch(function(error) {
-                console.log(error.message);
+                console.log(error.message || error);
                 process.exit(1);
             });
     }

lib/obj2b3dm.js

@@ -1,5 +1,4 @@
 'use strict';
-var fsExtra = require('fs-extra');
 var createB3dm = require('./createB3dm');
 var obj2gltf = require('./obj2gltf');
 
@@ -17,36 +16,25 @@ function obj2B3dm(objPath, options) {
         .then(function (result) {
             var glb = result.gltf;
             var batchTableJson = result.batchTableJson;
-
+            var customBatchTable = batchTableJson;
             return new Promise(function (resolve, reject) {
                 if (options.customBatchTable) {
-                    return fsExtra.readJson(options.customBatchTable)
-                        .then(function (customBatchTable) {
-                            if (!(customBatchTable.batchId && customBatchTable.batchId.length === batchTableJson.batchId.length)) {
-                                reject('Custom BatchTable should have a proper "batchId" Array.');
-                            }
-                            resolve({
-                                b3dm : createB3dm({
-                                    glb: glb,
-                                    featureTableJson: {
-                                        BATCH_LENGTH: batchTableJson.batchId.length
-                                    },
-                                    batchTableJson: customBatchTable
-                                }),
-                                batchTableJson : batchTableJson
-                            });
-                        });
+                    var length = options.customBatchTable[Object.keys(options.customBatchTable)[0]].length;
+                    if (length !== batchTableJson.batchId.length ) {
+                        reject('Custom BatchTable properties\'s length should be equals to default BatchTable \'batchId\' length.');
+                    }
+                    customBatchTable = options.customBatchTable;
+                    resolve({
+                        b3dm : createB3dm({
+                            glb: glb,
+                            featureTableJson: {
+                                BATCH_LENGTH: length
+                            },
+                            batchTableJson: customBatchTable
+                        }),
+                        batchTableJson : batchTableJson
+                    });
                 }
-                resolve({
-                    b3dm : createB3dm({
-                        glb: glb,
-                        featureTableJson: {
-                            BATCH_LENGTH: batchTableJson.batchId.length
-                        },
-                        batchTableJson: batchTableJson
-                    }),
-                    batchTableJson : batchTableJson
-                });
             });
         });
 }