From 7d38103084511e13306caa12b5bc0efb23bb9729 Mon Sep 17 00:00:00 2001 From: Stephen Mather <1174901+smathermather@users.noreply.github.com> Date: Sat, 29 Jul 2023 00:42:06 -0400 Subject: [PATCH 1/5] Update docs to reflect dem resolution defaults Also ignore ignore-gsd, but also don't advertise it in orthophoto resolution. Replaces https://github.com/OpenDroneMap/docs/pull/176#issuecomment-1656550757 --- opendm/config.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/opendm/config.py b/opendm/config.py index 91c89c2a0..1098447d7 100755 --- a/opendm/config.py +++ b/opendm/config.py @@ -275,7 +275,7 @@ def config(argv=None, parser=None): help='Ignore Ground Sampling Distance (GSD). GSD ' 'caps the maximum resolution of image outputs and ' 'resizes images when necessary, resulting in faster processing and ' - 'lower memory usage. Since GSD is an estimate, sometimes ignoring it can result in slightly better image output quality. Default: %(default)s') + 'lower memory usage. Since GSD is an estimate, sometimes ignoring it can result in slightly better image output quality. Never use it, unless you are positive you need it, and even then: don't use it. Default: %(default)s') parser.add_argument('--no-gpu', action=StoreTrue, @@ -543,7 +543,7 @@ def config(argv=None, parser=None): action=StoreValue, type=float, default=5, - help='DSM/DTM resolution in cm / pixel. Note that this value is capped to 2x the ground sampling distance (GSD) estimate. To remove the cap, check --ignore-gsd also.' + help='DSM/DTM resolution in cm / pixel.' ' Default: %(default)s') parser.add_argument('--dem-decimation', @@ -570,7 +570,7 @@ def config(argv=None, parser=None): action=StoreValue, default=5, type=float, - help=('Orthophoto resolution in cm / pixel. Note that this value is capped by a ground sampling distance (GSD) estimate. To remove the cap, check --ignore-gsd also. ' + help=('Orthophoto resolution in cm / pixel. Note that this value is capped by a ground sampling distance (GSD) estimate.' 'Default: %(default)s')) parser.add_argument('--orthophoto-no-tiled', From a96b59b893a2e2e5f650c78e739e45ddb114ab45 Mon Sep 17 00:00:00 2001 From: Stephen Mather <1174901+smathermather@users.noreply.github.com> Date: Sat, 29 Jul 2023 00:47:04 -0400 Subject: [PATCH 2/5] Helpful note on GSD limit For elevation models too! --- opendm/config.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/opendm/config.py b/opendm/config.py index 1098447d7..9815cef16 100755 --- a/opendm/config.py +++ b/opendm/config.py @@ -543,7 +543,7 @@ def config(argv=None, parser=None): action=StoreValue, type=float, default=5, - help='DSM/DTM resolution in cm / pixel.' + help='DSM/DTM resolution in cm / pixel. Note that this value is capped by a ground sampling distance (GSD) estimate.' ' Default: %(default)s') parser.add_argument('--dem-decimation', From 8daf08a2198c16733af857dfc23ab5a23c54bde8 Mon Sep 17 00:00:00 2001 From: Stephen Mather <1174901+smathermather@users.noreply.github.com> Date: Sat, 29 Jul 2023 00:59:49 -0400 Subject: [PATCH 3/5] Change ignore-gsd language --- opendm/config.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/opendm/config.py b/opendm/config.py index 9815cef16..5098f1da6 100755 --- a/opendm/config.py +++ b/opendm/config.py @@ -272,10 +272,11 @@ def config(argv=None, parser=None): action=StoreTrue, nargs=0, default=False, - help='Ignore Ground Sampling Distance (GSD). GSD ' - 'caps the maximum resolution of image outputs and ' - 'resizes images when necessary, resulting in faster processing and ' - 'lower memory usage. Since GSD is an estimate, sometimes ignoring it can result in slightly better image output quality. Never use it, unless you are positive you need it, and even then: don't use it. Default: %(default)s') + help='Ignore Ground Sampling Distance (GSD).' + 'A memory and processor hungry change to the default behavior when set to true.' + 'Ordinarily, GSD estimates are used to cap the maximum resolution of image outputs and resizes images when necessary, resulting in faster processing and lower memory usage. ' + 'Since GSD is an estimate, sometimes ignoring it can result in slightly better image output quality. ' + 'Never set --ignore-gsd to true unless you are positive you need it, and even then: don't use it. Default: %(default)s') parser.add_argument('--no-gpu', action=StoreTrue, From 3b1f1be6fc822fc1f680db6a12f4a1bf3f92b0ef Mon Sep 17 00:00:00 2001 From: Stephen Mather <1174901+smathermather@users.noreply.github.com> Date: Sat, 29 Jul 2023 01:02:02 -0400 Subject: [PATCH 4/5] spaced --- opendm/config.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/opendm/config.py b/opendm/config.py index 5098f1da6..441d1dab5 100755 --- a/opendm/config.py +++ b/opendm/config.py @@ -273,7 +273,7 @@ def config(argv=None, parser=None): nargs=0, default=False, help='Ignore Ground Sampling Distance (GSD).' - 'A memory and processor hungry change to the default behavior when set to true.' + 'A memory and processor hungry change to the default behavior when set to true. ' 'Ordinarily, GSD estimates are used to cap the maximum resolution of image outputs and resizes images when necessary, resulting in faster processing and lower memory usage. ' 'Since GSD is an estimate, sometimes ignoring it can result in slightly better image output quality. ' 'Never set --ignore-gsd to true unless you are positive you need it, and even then: don't use it. Default: %(default)s') From 08e54077ea3a3b79e5391c41b6e69881512aca71 Mon Sep 17 00:00:00 2001 From: Stephen Mather <1174901+smathermather@users.noreply.github.com> Date: Sat, 29 Jul 2023 01:03:57 -0400 Subject: [PATCH 5/5] when vs. if --- opendm/config.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/opendm/config.py b/opendm/config.py index 441d1dab5..77a40829a 100755 --- a/opendm/config.py +++ b/opendm/config.py @@ -273,7 +273,7 @@ def config(argv=None, parser=None): nargs=0, default=False, help='Ignore Ground Sampling Distance (GSD).' - 'A memory and processor hungry change to the default behavior when set to true. ' + 'A memory and processor hungry change relative to the default behavior if set to true. ' 'Ordinarily, GSD estimates are used to cap the maximum resolution of image outputs and resizes images when necessary, resulting in faster processing and lower memory usage. ' 'Since GSD is an estimate, sometimes ignoring it can result in slightly better image output quality. ' 'Never set --ignore-gsd to true unless you are positive you need it, and even then: don't use it. Default: %(default)s')