Standarized resolution units to cm / pixel

opendm/config.py

@@ -406,8 +406,8 @@ def config():
     parser.add_argument('--dem-resolution',
                         metavar='<float>',
                         type=float,
-                        default=0.1,
-                        help='Length of raster cell edges in meters.'
+                        default=5,
+                        help='DSM/DTM resolution in cm / pixel.'
                              '\nDefault: %(default)s')
 
     parser.add_argument('--dem-maxangle',
@@ -464,9 +464,9 @@ def config():
 
     parser.add_argument('--orthophoto-resolution',
                         metavar='<float > 0.0>',
-                        default=20.0,
+                        default=5,
                         type=float,
-                        help=('Orthophoto ground resolution in pixels/meter'
+                        help=('Orthophoto resolution in cm / pixel.\n'
                               'Default: %(default)s'))
 
     parser.add_argument('--orthophoto-target-srs',

scripts/odm_dem.py

@@ -91,7 +91,7 @@ class ODMDEMCell(ecto.Cell):
                 if args.dsm: products.append('dsm')
                 if args.dtm: products.append('dtm')
 
-                radius_steps = [args.dem_resolution / 4.0]
+                radius_steps = [(float(args.dem_resolution) / 100.0) / 2.0]
                 for _ in range(args.dem_gapfill_steps - 1):
                     radius_steps.append(radius_steps[-1] * 2) # 2 is arbitrary, maybe there's a better value?
 
@@ -102,7 +102,7 @@ class ODMDEMCell(ecto.Cell):
                             radius=map(str, radius_steps),
                             gapfill=True,
                             outdir=odm_dem_root,
-                            resolution=args.dem_resolution,
+                            resolution=float(args.dem_resolution) / 100.0,
                             maxsd=args.dem_maxsd,
                             maxangle=args.dem_maxangle,
                             decimation=args.dem_decimation,

scripts/odm_meshing.py

@@ -78,7 +78,7 @@ class ODMeshingCell(ecto.Cell):
           if not io.file_exists(tree.odm_25dmesh) or rerun_cell:
 
               log.ODM_DEBUG('Writing ODM 2.5D Mesh file in: %s' % tree.odm_25dmesh)
-              dsm_resolution = 1.0 / float(args.orthophoto_resolution)
+              dsm_resolution = float(args.orthophoto_resolution) / 100.0 
 
               # Create reference DSM at half ortho resolution
               dsm_resolution *= 2

scripts/odm_orthophoto.py

@@ -11,7 +11,7 @@ from opendm.cropper import Cropper
 
 class ODMOrthoPhotoCell(ecto.Cell):
     def declare_params(self, params):
-        params.declare("resolution", 'Orthophoto ground resolution in pixels/meter', 20)
+        params.declare("resolution", 'Orthophoto resolution in cm / pixel', 5)
         params.declare("t_srs", 'Target SRS', None)
         params.declare("no_tiled", 'Do not tile tiff', False)
         params.declare("compress", 'Compression type', 'DEFLATE')
@@ -56,7 +56,7 @@ class ODMOrthoPhotoCell(ecto.Cell):
                 'log': tree.odm_orthophoto_log,
                 'ortho': tree.odm_orthophoto_file,
                 'corners': tree.odm_orthophoto_corners,
-                'res': self.params.resolution,
+                'res': 1.0 / (float(self.params.resolution) / 100.0),
                 'verbose': verbose
             }