Force use-fixed-camera-params with split-merge

Former-commit-id: da8e64b4f5

opendm/osfm.py

@@ -237,9 +237,10 @@ def get_submodel_argv(project_name = None, submodels_path = None, submodel_name
         adding --orthophoto-cutline
         adding --dem-euclidean-map
         adding --skip-3dmodel (split-merge does not support 3D model merging)
+        adding --use-fixed-camera-params (to mitigate bowl effect)
         removing --gcp (the GCP path if specified is always "gcp_list.txt")
     """
-    assure_always = ['--orthophoto-cutline', '--dem-euclidean-map', '--skip-3dmodel']
+    assure_always = ['--orthophoto-cutline', '--dem-euclidean-map', '--skip-3dmodel', '--use-fixed-camera-params']
     remove_always_2 = ['--split', '--split-overlap', '--rerun-from', '--rerun', '--gcp', '--end-with', '--sm-cluster']
     remove_always_1 = ['--rerun-all', '--pc-csv', '--pc-las', '--pc-ept']
 

stages/splitmerge.py

@@ -25,6 +25,10 @@ class ODMSplitStage(types.ODM_Stage):
         outputs['large'] = len(photos) > args.split
 
         if outputs['large']:
+            # Split-merge is on, always use --use_fixed_camera_params
+            log.ODM_INFO("--use-fixed-camera-params will be turned ON")
+            args.use_fixed_camera_params = True
+
             # If we have a cluster address, we'll use a distributed workflow
             local_workflow = not bool(args.sm_cluster)