Merge pull request #197 from pierotofy/gltf

Automatically set --gltf when processing with WebODM
OpenDroneMap · Jan 28, 2023 · 5d4703a · 5d4703a
2 parents d3ee44d + ca61927
commit 5d4703a
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 27 deletions.
diff --git a/libs/Task.js b/libs/Task.js
@@ -118,44 +118,32 @@ module.exports = class Task{
     }
 
     setPostProcessingOptsSteps(){
-        return [
-            cb => {
-                // If we need to post process results
-                // if pc-ept is supported (build entwine point cloud)
-                // we automatically add the pc-ept option to the task options by default
-                if (this.skipPostProcessing) cb();
-                else{
-                    odmInfo.supportsOption("pc-ept", (err, supported) => {
-                        if (err){
-                            console.warn(`Cannot check for supported option pc-ept: ${err}`);
-                        }else if (supported){
-                            if (!this.options.find(opt => opt.name === "pc-ept")){
-                                this.options.push({ name: 'pc-ept', value: true });
-                            }
-                        }
-                        cb();
-                    });
-                }
-            },
 
-            cb => {
+        const autoSet = (opt) => {
+            return cb => {
                 // If we need to post process results
-                // if cog is supported (build cloud optimized geotiffs)
-                // we automatically add the cog option to the task options by default
+                // if opt is supported
+                // we automatically add the opt to the task options by default
                 if (this.skipPostProcessing) cb();
                 else{
-                    odmInfo.supportsOption("cog", (err, supported) => {
+                    odmInfo.supportsOption(opt, (err, supported) => {
                         if (err){
-                            console.warn(`Cannot check for supported option cog: ${err}`);
+                            console.warn(`Cannot check for supported option ${opt}: ${err}`);
                         }else if (supported){
-                            if (!this.options.find(opt => opt.name === "cog")){
-                                this.options.push({ name: 'cog', value: true });
+                            if (!this.options.find(o => o.name === opt)){
+                                this.options.push({ name: opt, value: true });
                             }
                         }
                         cb();
                     });
                 }
             }
+        };
+
+        return [
+            autoSet("pc-ept"),
+            autoSet("cog"),
+            autoSet("gltf")
         ];
     }
 

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "NodeODM",
-  "version": "2.2.1",
+  "version": "2.2.2",
   "description": "REST API to access ODM",
   "main": "index.js",
   "scripts": {