Merge pull request #1664 from pierotofy/flags

Keep only best SIFT features and other fixes

SuperBuild/cmake/External-OpenSfM.cmake

@@ -25,7 +25,7 @@ ExternalProject_Add(${_proj_name}
   #--Download step--------------
   DOWNLOAD_DIR      ${SB_DOWNLOAD_DIR}
   GIT_REPOSITORY    https://github.com/OpenDroneMap/OpenSfM/
-  GIT_TAG           316
+  GIT_TAG           319
   #--Update/Patch step----------
   UPDATE_COMMAND    git submodule update --init --recursive
   #--Configure step-------------

VERSION

@@ -1 +1 @@
-3.1.8
+3.1.9

opendm/config.py

@@ -159,7 +159,7 @@ def config(argv=None, parser=None):
                         action=StoreValue,
                         default=0,
                         type=int,
-                        help='Perform image matching with the nearest N images based on image filename order. Can speed up processing of sequential images, such as those extracted from video. Set to 0 to disable. Default: %(default)s')
+                        help='Perform image matching with the nearest N images based on image filename order. Can speed up processing of sequential images, such as those extracted from video. It is applied only on non-georeferenced datasets. Set to 0 to disable. Default: %(default)s')
 
     parser.add_argument('--use-fixed-camera-params',
                         action=StoreTrue,

opendm/osfm.py

@@ -248,7 +248,10 @@ def setup(self, args, images_path, reconstruction, append_config = [], rerun=Fal
             ]
 
             if args.matcher_order > 0:
-                config.append("matching_order_neighbors: %s" % args.matcher_order)
+                if not reconstruction.is_georeferenced():
+                    config.append("matching_order_neighbors: %s" % args.matcher_order)
+                else:
+                    log.ODM_WARNING("Georeferenced reconstruction, ignoring --matcher-order")
 
             if args.camera_lens != 'auto':
                 config.append("camera_projection_type: %s" % args.camera_lens.upper())

start-dev-env.sh

@@ -67,15 +67,15 @@ platform="Linux" # Assumed
 uname=$(uname)
 case $uname in
 	"Darwin")
-	platform="MacOS / OSX"
+	platform="MacOS"
 	;;
 	MINGW*)
 	platform="Windows"
 	;;
 esac
 
-if [[ $platform != "Linux" ]]; then
-	echo "This script only works on Linux."
+if [[ $platform != "Linux" && $platform != "MacOS" ]]; then
+	echo "This script only works on Linux and MacOS."
     exit 1
 fi