images.json download path, URL changes

pull/51/head
Piero Toffanin 2018-11-24 13:34:53 -05:00
rodzic a1f4981788
commit 354bb9c591
5 zmienionych plików z 17 dodań i 10 usunięć

Wyświetl plik

@ -8,7 +8,7 @@ REST API to access OpenDroneMap
=== Version information === Version information
[%hardbreaks] [%hardbreaks]
_Version_ : 1.2.0 _Version_ : 1.2.1
=== Contact information === Contact information
@ -281,7 +281,7 @@ Retrieves an asset (the output of OpenDroneMap's processing) associated with a t
|=== |===
|Type|Name|Description|Schema|Default |Type|Name|Description|Schema|Default
|*Path*|*asset* + |*Path*|*asset* +
_required_|Type of asset to download. Use "all.zip" for zip file containing all assets.|enum (all.zip, orthophoto.tif)| _required_|Type of asset to download. Use "all.zip" for zip file containing all assets.|enum (all.zip, orthophoto.tif, images.json)|
|*Path*|*uuid* + |*Path*|*uuid* +
_required_|UUID of the task|string| _required_|UUID of the task|string|
|*Query*|*token* + |*Query*|*token* +

File diff suppressed because one or more lines are too long

Wyświetl plik

@ -419,6 +419,7 @@ app.get('/task/:uuid/output', authCheck, getTaskFromUuid, (req, res) => {
* enum: * enum:
* - all.zip * - all.zip
* - orthophoto.tif * - orthophoto.tif
* - images.json
* - * -
* name: token * name: token
* in: query * in: query

Wyświetl plik

@ -131,8 +131,14 @@ module.exports = class Task{
else filename = path.join('..', '..', 'processing_results', 'odm_orthophoto', `odm_${filename}`); else filename = path.join('..', '..', 'processing_results', 'odm_orthophoto', `odm_${filename}`);
}else{ }else{
filename = path.join('odm_orthophoto', `odm_${filename}`); filename = path.join('odm_orthophoto', `odm_${filename}`);
} }
}else{ }else if (filename == 'images.json'){
if (config.test){
filename = path.join('..', '..', 'processing_results', 'images.json');
}else{
// OK, do nothing
}
}else{
return false; // Invalid return false; // Invalid
} }

Wyświetl plik

@ -1,14 +1,14 @@
{ {
"name": "node-opendronemap", "name": "node-opendronemap",
"version": "1.2.0", "version": "1.2.1",
"description": "REST API to access OpenDroneMap", "description": "REST API to access ODM",
"main": "index.js", "main": "index.js",
"scripts": { "scripts": {
"test": "echo \"Error: no test specified\" && exit 1" "test": "echo \"Error: no test specified\" && exit 1"
}, },
"repository": { "repository": {
"type": "git", "type": "git",
"url": "git+https://github.com/pierotofy/node-OpenDroneMap.git" "url": "git+https://github.com/OpenDroneMap/NodeODM.git"
}, },
"keywords": [ "keywords": [
"opendronemap" "opendronemap"
@ -16,9 +16,9 @@
"author": "Piero Toffanin", "author": "Piero Toffanin",
"license": "GPL-3.0", "license": "GPL-3.0",
"bugs": { "bugs": {
"url": "https://github.com/pierotofy/node-OpenDroneMap/issues" "url": "https://github.com/OpenDroneMap/NodeODM/issues"
}, },
"homepage": "https://github.com/pierotofy/node-OpenDroneMap#readme", "homepage": "https://github.com/OpenDroneMap/NodeODM#readme",
"dependencies": { "dependencies": {
"archiver": "^1.0.0", "archiver": "^1.0.0",
"async": "^2.6.1", "async": "^2.6.1",