kopia lustrzana https://github.com/OpenDroneMap/ODM
Options choices syntax fix, changed DEM compression to DEFLATE
Former-commit-id: 790088249f
pull/1161/head
rodzic
aa7ec13c20
commit
5d793ce58e
|
@ -144,7 +144,7 @@ def config(argv=None):
|
||||||
default='sift',
|
default='sift',
|
||||||
choices=['sift', 'hahog'],
|
choices=['sift', 'hahog'],
|
||||||
help=('Choose the algorithm for extracting keypoints and computing descriptors. '
|
help=('Choose the algorithm for extracting keypoints and computing descriptors. '
|
||||||
'Can be one of: [sift, hahog]. Default: '
|
'Can be one of: %(choices)s. Default: '
|
||||||
'%(default)s'))
|
'%(default)s'))
|
||||||
|
|
||||||
parser.add_argument('--feature-quality',
|
parser.add_argument('--feature-quality',
|
||||||
|
@ -153,7 +153,7 @@ def config(argv=None):
|
||||||
default='high',
|
default='high',
|
||||||
choices=['ultra', 'high', 'medium', 'low', 'lowest'],
|
choices=['ultra', 'high', 'medium', 'low', 'lowest'],
|
||||||
help=('Set feature extraction quality. Higher quality generates better features, but requires more memory and takes longer. '
|
help=('Set feature extraction quality. Higher quality generates better features, but requires more memory and takes longer. '
|
||||||
'Can be one of: [ultra, high, medium, low, lowest]. Default: '
|
'Can be one of: %(choices)s. Default: '
|
||||||
'%(default)s'))
|
'%(default)s'))
|
||||||
|
|
||||||
parser.add_argument('--matcher-neighbors',
|
parser.add_argument('--matcher-neighbors',
|
||||||
|
@ -204,7 +204,7 @@ def config(argv=None):
|
||||||
help=('Set a camera projection type. Manually setting a value '
|
help=('Set a camera projection type. Manually setting a value '
|
||||||
'can help improve geometric undistortion. By default the application '
|
'can help improve geometric undistortion. By default the application '
|
||||||
'tries to determine a lens type from the images metadata. Can be '
|
'tries to determine a lens type from the images metadata. Can be '
|
||||||
'set to one of: [auto, perspective, brown, fisheye, spherical]. Default: '
|
'set to one of: %(choices)s. Default: '
|
||||||
'%(default)s'))
|
'%(default)s'))
|
||||||
|
|
||||||
parser.add_argument('--radiometric-calibration',
|
parser.add_argument('--radiometric-calibration',
|
||||||
|
@ -217,7 +217,7 @@ def config(argv=None):
|
||||||
'to obtain reflectance values (otherwise you will get digital number values). '
|
'to obtain reflectance values (otherwise you will get digital number values). '
|
||||||
'[camera] applies black level, vignetting, row gradient gain/exposure compensation (if appropriate EXIF tags are found). '
|
'[camera] applies black level, vignetting, row gradient gain/exposure compensation (if appropriate EXIF tags are found). '
|
||||||
'[camera+sun] is experimental, applies all the corrections of [camera], plus compensates for spectral radiance registered via a downwelling light sensor (DLS) taking in consideration the angle of the sun. '
|
'[camera+sun] is experimental, applies all the corrections of [camera], plus compensates for spectral radiance registered via a downwelling light sensor (DLS) taking in consideration the angle of the sun. '
|
||||||
'Can be set to one of: [none, camera, camera+sun]. Default: '
|
'Can be set to one of: %(choices)s. Default: '
|
||||||
'%(default)s'))
|
'%(default)s'))
|
||||||
|
|
||||||
parser.add_argument('--max-concurrency',
|
parser.add_argument('--max-concurrency',
|
||||||
|
@ -616,9 +616,7 @@ def config(argv=None):
|
||||||
type=str,
|
type=str,
|
||||||
choices=['JPEG', 'LZW', 'PACKBITS', 'DEFLATE', 'LZMA', 'NONE'],
|
choices=['JPEG', 'LZW', 'PACKBITS', 'DEFLATE', 'LZMA', 'NONE'],
|
||||||
default='DEFLATE',
|
default='DEFLATE',
|
||||||
help='Set the compression to use. Note that this could '
|
help='Set the compression to use for orthophotos. Options: %(choices)s.\nDefault: %(default)s')
|
||||||
'break gdal_translate if you don\'t know what you '
|
|
||||||
'are doing. Options: %(choices)s.\nDefault: %(default)s')
|
|
||||||
|
|
||||||
parser.add_argument('--orthophoto-cutline',
|
parser.add_argument('--orthophoto-cutline',
|
||||||
action=StoreTrue,
|
action=StoreTrue,
|
||||||
|
|
|
@ -236,11 +236,15 @@ def create_dem(input_point_cloud, dem_type, output_type='max', radiuses=['0.56']
|
||||||
run('gdalbuildvrt -resolution highest -r bilinear "%s" "%s" "%s"' % (merged_vrt_path, geotiff_small_filled_path, geotiff_tmp_path))
|
run('gdalbuildvrt -resolution highest -r bilinear "%s" "%s" "%s"' % (merged_vrt_path, geotiff_small_filled_path, geotiff_tmp_path))
|
||||||
run('gdal_translate '
|
run('gdal_translate '
|
||||||
'-co NUM_THREADS={threads} '
|
'-co NUM_THREADS={threads} '
|
||||||
|
'-co TILED=YES '
|
||||||
|
'-co COMPRESS=DEFLATE '
|
||||||
'--config GDAL_CACHEMAX {max_memory}% '
|
'--config GDAL_CACHEMAX {max_memory}% '
|
||||||
'{merged_vrt} {geotiff}'.format(**kwargs))
|
'{merged_vrt} {geotiff}'.format(**kwargs))
|
||||||
else:
|
else:
|
||||||
run('gdal_translate '
|
run('gdal_translate '
|
||||||
'-co NUM_THREADS={threads} '
|
'-co NUM_THREADS={threads} '
|
||||||
|
'-co TILED=YES '
|
||||||
|
'-co COMPRESS=DEFLATE '
|
||||||
'--config GDAL_CACHEMAX {max_memory}% '
|
'--config GDAL_CACHEMAX {max_memory}% '
|
||||||
'{tiles_vrt} {geotiff}'.format(**kwargs))
|
'{tiles_vrt} {geotiff}'.format(**kwargs))
|
||||||
|
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
def get_dem_vars(args):
|
def get_dem_vars(args):
|
||||||
return {
|
return {
|
||||||
'TILED': 'YES',
|
'TILED': 'YES',
|
||||||
'COMPRESS': 'LZW',
|
'COMPRESS': 'DEFLATE',
|
||||||
'BLOCKXSIZE': 512,
|
'BLOCKXSIZE': 512,
|
||||||
'BLOCKYSIZE': 512,
|
'BLOCKYSIZE': 512,
|
||||||
'BIGTIFF': 'IF_SAFER',
|
'BIGTIFF': 'IF_SAFER',
|
||||||
|
|
Ładowanie…
Reference in New Issue