Skip to content

Commit

Permalink
Added skippostprocess parameter, converted tabs to spaces in files
Browse files Browse the repository at this point in the history
  • Loading branch information
pierotofy committed Jan 4, 2019
1 parent 4355849 commit cdf175f
Show file tree
Hide file tree
Showing 15 changed files with 1,193 additions and 1,165 deletions.
4 changes: 3 additions & 1 deletion docs/index.adoc
Expand Up @@ -8,7 +8,7 @@ REST API to access ODM

=== Version information
[%hardbreaks]
_Version_ : 1.3.0
_Version_ : 1.3.1


=== Contact information
Expand Down Expand Up @@ -299,6 +299,8 @@ _optional_|Images to process, plus an optional GCP file. If included, the GCP fi
_optional_|An optional name to be associated with the task|string|
|*FormData*|*options* +
_optional_|Serialized JSON string of the options to use for processing, as an array of the format: [{name: option1, value: value1}, {name: option2, value: value2}, …]. For example, [{"name":"cmvs-maxImages","value":"500"},{"name":"time","value":true}]. For a list of all options, call /options|string|
|*FormData*|*skipPostProcessing* +
_optional_|When set, skips generation of map tiles, derivate assets, point cloud tiles.|boolean|
|*FormData*|*zipurl* +
_optional_|URL of the zip file containing the images to process, plus an optional GCP file. If included, the GCP file should have .txt extension|string|
|===
Expand Down
2 changes: 1 addition & 1 deletion docs/swagger.json

Large diffs are not rendered by default.

10 changes: 9 additions & 1 deletion index.js
Expand Up @@ -119,6 +119,12 @@ let server;
* required: false
* type: string
* -
* name: skipPostProcessing
* in: formData
* description: 'When set, skips generation of map tiles, derivate assets, point cloud tiles.'
* required: false
* type: boolean
* -
* name: token
* in: query
* description: 'Token required for authentication (when authentication is required).'
Expand Down Expand Up @@ -287,7 +293,9 @@ app.post('/task/new', authCheck, (req, res, next) => {
res.json({ uuid: req.id });
cb();
}
}, req.body.options, req.body.webhook);
}, req.body.options,
req.body.webhook,
req.body.skipPostProcessing === 'true');
}
], err => {
if (err) die(err.message);
Expand Down
6 changes: 3 additions & 3 deletions libs/Directories.js
Expand Up @@ -20,9 +20,9 @@ let config = require('../config');
let path = require('path');

class Directories{
static get data(){
return !config.test ? "data" : path.join("tests", "data");
}
static get data(){
return !config.test ? "data" : path.join("tests", "data");
}
}

module.exports = Directories;

0 comments on commit cdf175f

Please sign in to comment.