Rename option, misc refactor

opendm/config.py

@@ -154,12 +154,12 @@ def config(argv=None, parser=None):
                         type=int,
                         help='Perform image matching with the nearest images based on GPS exif data. Set to 0 to match by triangulation. Default: %(default)s')
     
-    parser.add_argument('--matcher-order-neighbors',
-                            metavar='<positive integer>',
-                            action=StoreValue,
-                            default=0,
-                            type=int,
-                            help='Perform image matching with the nearest images based on image order. Set to 0 to disable. Default: %(default)s')
+    parser.add_argument('--matcher-order',
+                        metavar='<positive integer>',
+                        action=StoreValue,
+                        default=0,
+                        type=int,
+                        help='Perform image matching with the nearest images based on image filenames order. Set to 0 to disable. Default: %(default)s')
 
     parser.add_argument('--use-fixed-camera-params',
                         action=StoreTrue,

opendm/osfm.py

@@ -247,8 +247,8 @@ class OSFMContext:
                 "retriangulation_ratio: 2",
             ]
             
-            if args.matcher_order_neighbors > 0:
-                config.append(f"matching_order_neighbors: {args.matcher_order_neighbors}")
+            if args.matcher_order > 0:
+                config.append("matching_order_neighbors: %s" % args.matcher_order)
 
             if args.camera_lens != 'auto':
                 config.append("camera_projection_type: %s" % args.camera_lens.upper())