diff --git a/opendm/config.py b/opendm/config.py index 1b74f9b3..645cb23e 100755 --- a/opendm/config.py +++ b/opendm/config.py @@ -60,18 +60,17 @@ class StoreValue(argparse.Action): setattr(namespace, self.dest, values) setattr(namespace, self.dest + '_is_set', True) +parser = SettingsParser(description='OpenDroneMap', + usage='%(prog)s [options] ', + yaml_file=open(context.settings_path)) args = None -def config(argv=None, settings_yaml=context.settings_path): +def config(argv=None): global args if args is not None and argv is None: return args - parser = SettingsParser(description='OpenDroneMap', - usage='%(prog)s [options] ', - yaml_file=open(settings_yaml)) - parser.add_argument('--project-path', metavar='', action=StoreValue, diff --git a/tests/test_osfm.py b/tests/test_osfm.py index fff55642..0dd337f0 100644 --- a/tests/test_osfm.py +++ b/tests/test_osfm.py @@ -37,13 +37,6 @@ class TestOSFM(unittest.TestCase): self.assertEqual(get_submodel_argv(args, "/submodels", "submodel_0000")[1:], ['--crop', '0.015625', '--orthophoto-cutline', '--dem-euclidean-map', '--skip-3dmodel', '--project-path', '/submodels', 'submodel_0000']) - # Using settings.yaml with project-path - args = config.config(["brighton"], os.path.join(os.path.dirname(os.path.realpath(__file__)), "assets", "settings.yaml")) - self.assertEqual(get_submodel_argv(args)[1:], - ['--orthophoto-cutline', '--dem-euclidean-map', '--skip-3dmodel']) - self.assertEqual(get_submodel_argv(args, "/submodels", "submodel_0000")[1:], - ['--orthophoto-cutline', '--dem-euclidean-map', '--skip-3dmodel', '--project-path', '/submodels', 'submodel_0000']) - # With sm-cluster, pc-csv and others args = config.config(["--project-path", "/datasets", "--split", "200", "--pc-csv"]) self.assertEqual(get_submodel_argv(args)[1:],