Merge pull request #89 from pierotofy/cameracalib

Export cameras.json

docs/index.adoc

@@ -1,4 +1,4 @@
-= node-opendronemap
+= NodeODM
 
 
 [[_overview]]
@@ -8,7 +8,7 @@ REST API to access ODM
 
 === Version information
 [%hardbreaks]
-_Version_ : 1.5.2
+_Version_ : 1.5.3
 
 
 === Contact information

libs/Task.js

@@ -341,7 +341,8 @@ module.exports = class Task{
             let allPaths = ['odm_orthophoto/odm_orthophoto.tif', 'odm_orthophoto/odm_orthophoto.mbtiles',
                               'odm_georeferencing', 'odm_texturing',
                               'odm_dem/dsm.tif', 'odm_dem/dtm.tif', 'dsm_tiles', 'dtm_tiles',
-                              'orthophoto_tiles', 'potree_pointcloud', 'entwine_pointcloud', 'images.json'];
+                              'orthophoto_tiles', 'potree_pointcloud', 'entwine_pointcloud', 
+                              'images.json', 'cameras.json'];
             
             // Did the user request different outputs than the default?
             if (this.outputs.length > 0) allPaths = this.outputs;

libs/odmInfo.js

@@ -222,6 +222,18 @@ module.exports = {
                         }
                     }
                 },
+                {
+                    regex: /^(json)$/,
+                    validate: function(matches, value){
+                        try{
+                            if (typeof value !== 'string') return false;
+                            JSON.parse(value);
+                            return true;
+                        }catch(e){
+                            return false;
+                        }
+                    }
+                },
                 {
                     regex: /^(string|path)$/,
                     validate: function(){

package.json

@@ -1,6 +1,6 @@
 {
   "name": "NodeODM",
-  "version": "1.5.2",
+  "version": "1.5.3",
   "description": "REST API to access ODM",
   "main": "index.js",
   "scripts": {

tests/processing_results/cameras.json

@@ -0,0 +1 @@
+{"dji fc300s 4000 2250 perspective 0.5555": {"k2": 0.016, "projection_type": "perspective", "k1": 0.006, "height": 2250, "width": 4000, "focal": 0.5616905969087824}}