diff --git a/libs/Task.js b/libs/Task.js index 2e43092..8a8b800 100644 --- a/libs/Task.js +++ b/libs/Task.js @@ -50,6 +50,7 @@ module.exports = class Task{ this.options = options; this.gcpFiles = []; this.geoFiles = []; + this.alignFiles = []; this.imageGroupsFiles = []; this.output = []; this.runningProcesses = []; @@ -88,11 +89,15 @@ module.exports = class Task{ this.imageGroupsFiles.push(file); }else if (/\.txt$/gi.test(file)){ this.gcpFiles.push(file); + }else if (/^align.(tif|laz|las)$/.test(file)){ + this.alignFiles.push(file); } }); logger.debug(`Found ${this.gcpFiles.length} GCP files (${this.gcpFiles.join(" ")}) for ${this.uuid}`); logger.debug(`Found ${this.geoFiles.length} GEO files (${this.geoFiles.join(" ")}) for ${this.uuid}`); logger.debug(`Found ${this.imageGroupsFiles.length} image groups files (${this.imageGroupsFiles.join(" ")}) for ${this.uuid}`); + logger.debug(`Found ${this.alignFiles.length} alignment files (${this.alignFiles.join(" ")}) for ${this.uuid}`); + cb(null); } }); @@ -558,6 +563,9 @@ module.exports = class Task{ if (this.geoFiles.length > 0){ runnerOptions.geo = fs.realpathSync(path.join(this.getGcpFolderPath(), this.geoFiles[0])); } + if (this.alignFiles.length > 0){ + runnerOptions.align = fs.realpathSync(path.join(this.getGcpFolderPath(), this.alignFiles[0])); + } if (this.imageGroupsFiles.length > 0){ runnerOptions["split-image-groups"] = fs.realpathSync(path.join(this.getGcpFolderPath(), this.imageGroupsFiles[0])); } diff --git a/libs/odmInfo.js b/libs/odmInfo.js index 80a1885..7403f72 100644 --- a/libs/odmInfo.js +++ b/libs/odmInfo.js @@ -82,7 +82,7 @@ module.exports = { // (num cores can be set programmatically, so can gcpFile, etc.) if (["-h", "--project-path", "--cmvs-maxImages", "--time", "--zip-results", "--pmvs-num-cores", - "--start-with", "--gcp", "--images", "--geo", + "--start-with", "--gcp", "--images", "--geo", "--align", "--split-image-groups", "--copy-to", "--rerun-all", "--rerun", "--slam-config", "--video", "--version", "name"].indexOf(option) !== -1) continue;