From 8f03ee70230966730dbc276e9f06ba69b6f36d9e Mon Sep 17 00:00:00 2001 From: Piero Toffanin Date: Mon, 14 Sep 2020 20:09:26 +0000 Subject: [PATCH] Fixes Former-commit-id: af946a9d6fd2fad67a22921b8756515463663b93 --- opendm/config.py | 10 ++++++---- run.py | 2 +- stages/dataset.py | 2 +- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/opendm/config.py b/opendm/config.py index 4b1f939c..b8b211e4 100755 --- a/opendm/config.py +++ b/opendm/config.py @@ -68,7 +68,7 @@ def config(argv=None): if args is not None and argv is None: return args - parser = SettingsParser(description='OpenDroneMap', + parser = SettingsParser(description='ODM', usage='%(prog)s [options] ', yaml_file=open(context.settings_path)) @@ -533,11 +533,13 @@ def config(argv=None): metavar='', action=StoreValue, default=None, - help=('Path to the image geolocation file containing the camera center coordinates used for georeferencing. Default: ' + help=('Path to the image geolocation file containing the camera center coordinates used for georeferencing. ' + 'Note that omega/phi/kappa are currently not supported (you can set them to 0). ' + 'Default: ' '%(default)s. The file needs to ' 'use the following format: \n' 'EPSG: or <+proj definition>\n' - 'image_name geo_x geo_y geo_z [omega (degrees)] [phi (degrees)] [kappa (degrees)] [horz (meters)] [vert accuracy (meters)]' + 'image_name geo_x geo_y geo_z [omega (degrees)] [phi (degrees)] [kappa (degrees)] [horz accuracy (meters)] [vert accuracy (meters)]' '')) parser.add_argument('--use-exif', @@ -669,7 +671,7 @@ def config(argv=None): parser.add_argument('--version', action='version', - version='OpenDroneMap {0}'.format(__version__), + version='ODM {0}'.format(__version__), help='Displays version number and exits. ') parser.add_argument('--split', diff --git a/run.py b/run.py index ee8f99cc..df0dab22 100755 --- a/run.py +++ b/run.py @@ -110,4 +110,4 @@ if __name__ == '__main__': log.ODM_INFO('MMMMMMMMMMMN- smNm/ +MMm :NNdo` .mMM` oMM+/yMM/ MMMMMMMMMMMM') log.ODM_INFO('MMMMMMMMMMMMNo- `:yMMMm `:sNMMM` sMMMMMMM+ NMMMMMMMMMMM') log.ODM_INFO('MMMMMMMMMMMMMMMNmmNMMMMMMMNmmmmNMMMMMMMNNMMMMMMMMMNNMMMMMMMMMMMM') - log.ODM_INFO('OpenDroneMap app finished - %s' % system.now()) + log.ODM_INFO('ODM app finished - %s' % system.now()) diff --git a/stages/dataset.py b/stages/dataset.py index 89d65d35..525a7d4b 100644 --- a/stages/dataset.py +++ b/stages/dataset.py @@ -91,7 +91,7 @@ class ODMLoadDatasetStage(types.ODM_Stage): dataset_list.write(photos[-1].filename + '\n') # Check if a geo file is available - if os.path.exists(tree.odm_geo_file): + if tree.odm_geo_file is not None and os.path.exists(tree.odm_geo_file): log.ODM_INFO("Found image geolocation file") gf = GeoFile(tree.odm_geo_file) updated = 0