From a9def132e70b2e61fe7a63d8ff5803859468a407 Mon Sep 17 00:00:00 2001 From: Stephen Mather <1174901+smathermather@users.noreply.github.com> Date: Sun, 20 Nov 2022 19:42:46 -0500 Subject: [PATCH 1/6] Update boot.py --- app/boot.py | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/app/boot.py b/app/boot.py index dbba6581..fd562773 100644 --- a/app/boot.py +++ b/app/boot.py @@ -14,7 +14,7 @@ from app.models import Preset from app.models import Theme from app.plugins import init_plugins from nodeodm.models import ProcessingNode -# noinspection PyUnresolvedReferences +# noinspection PyUnresolvedReferencesapp/boot.py#L20 from webodm.settings import MEDIA_ROOT from . import signals import logging @@ -119,6 +119,7 @@ def add_default_presets(): defaults={'options': [{'name': 'auto-boundary', 'value': True}, {'name': 'mesh-size', 'value': '300000'}, {'name': 'pc-geometric', 'value': True}, + {'name': 'feature-quality', 'value': 'ultra'}, {'name': 'pc-quality', 'value': 'high'}]}) Preset.objects.update_or_create(name='Point of Interest', system=True, defaults={'options': [{'name': 'auto-boundary', 'value': True}, @@ -147,6 +148,13 @@ def add_default_presets(): {'name': 'dem-resolution', 'value': "2.0"}, {'name': 'orthophoto-resolution', 'value': "2.0"}, ]}) + Preset.objects.update_or_create(name='Ultra Quality', system=True, + defaults={'options': [{'name': 'auto-boundary', 'value': True}, + {'name': 'dsm', 'value': True}, + {'name': 'pc-quality', 'value': 'ultra'}, + {'name': 'feature-quality', 'value': 'ultra'}, + {'name': 'dem-resolution', 'value': "2.0"}, + {'name': 'orthophoto-resolution', 'value': "2.0"}, Preset.objects.update_or_create(name='Default', system=True, defaults={'options': [{'name': 'auto-boundary', 'value': True}, {'name': 'dsm', 'value': True}]}) From cbc8644b340bb2640a66ff6c01ecf0102193b176 Mon Sep 17 00:00:00 2001 From: Stephen Mather <1174901+smathermather@users.noreply.github.com> Date: Sun, 20 Nov 2022 21:06:40 -0500 Subject: [PATCH 2/6] Update boot.py --- app/boot.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/boot.py b/app/boot.py index fd562773..95706714 100644 --- a/app/boot.py +++ b/app/boot.py @@ -154,7 +154,7 @@ def add_default_presets(): {'name': 'pc-quality', 'value': 'ultra'}, {'name': 'feature-quality', 'value': 'ultra'}, {'name': 'dem-resolution', 'value': "2.0"}, - {'name': 'orthophoto-resolution', 'value': "2.0"}, + {'name': 'orthophoto-resolution', 'value': "1.0"}, Preset.objects.update_or_create(name='Default', system=True, defaults={'options': [{'name': 'auto-boundary', 'value': True}, {'name': 'dsm', 'value': True}]}) From 711c6be42cf78e16a657ca0680738207715a5e8b Mon Sep 17 00:00:00 2001 From: Stephen Mather <1174901+smathermather@users.noreply.github.com> Date: Tue, 22 Nov 2022 13:52:57 -0500 Subject: [PATCH 3/6] Separate ultra building --- app/boot.py | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/app/boot.py b/app/boot.py index 95706714..0908678c 100644 --- a/app/boot.py +++ b/app/boot.py @@ -119,8 +119,14 @@ def add_default_presets(): defaults={'options': [{'name': 'auto-boundary', 'value': True}, {'name': 'mesh-size', 'value': '300000'}, {'name': 'pc-geometric', 'value': True}, - {'name': 'feature-quality', 'value': 'ultra'}, + {'name': 'feature-quality', 'value': 'high'}, {'name': 'pc-quality', 'value': 'high'}]}) + Preset.objects.update_or_create(name='Buildings Ultra Quality', system=True, + defaults={'options': [{'name': 'auto-boundary', 'value': True}, + {'name': 'mesh-size', 'value': '300000'}, + {'name': 'pc-geometric', 'value': True}, + {'name': 'feature-quality', 'value': 'ultra'}, + {'name': 'pc-quality', 'value': 'ultra'}]}) Preset.objects.update_or_create(name='Point of Interest', system=True, defaults={'options': [{'name': 'auto-boundary', 'value': True}, {'name': 'mesh-size', 'value': '300000'}, From fef544dadae780ef7c85db386f75fe93e6f71a65 Mon Sep 17 00:00:00 2001 From: Stephen Mather <1174901+smathermather@users.noreply.github.com> Date: Tue, 22 Nov 2022 16:05:14 -0500 Subject: [PATCH 4/6] Fix syntax in presets --- app/boot.py | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/app/boot.py b/app/boot.py index 0908678c..9dd9a8a3 100644 --- a/app/boot.py +++ b/app/boot.py @@ -101,14 +101,13 @@ def add_default_presets(): try: Preset.objects.update_or_create(name='Multispectral', system=True, defaults={'options': [{'name': 'auto-boundary', 'value': True}, - {'name': 'radiometric-calibration', 'value': 'camera'}, - ]}) + {'name': 'radiometric-calibration', 'value': 'camera'}]}) Preset.objects.update_or_create(name='Volume Analysis', system=True, defaults={'options': [{'name': 'auto-boundary', 'value': True}, {'name': 'dsm', 'value': True}, {'name': 'dem-resolution', 'value': '2'}, {'name': 'pc-quality', 'value': 'high'}, - {'name': 'use-3dmesh', 'value': True},]}) + {'name': 'use-3dmesh', 'value': True}]}) Preset.objects.update_or_create(name='3D Model', system=True, defaults={'options': [{'name': 'auto-boundary', 'value': True}, {'name': 'mesh-octree-depth', 'value': "12"}, @@ -126,7 +125,7 @@ def add_default_presets(): {'name': 'mesh-size', 'value': '300000'}, {'name': 'pc-geometric', 'value': True}, {'name': 'feature-quality', 'value': 'ultra'}, - {'name': 'pc-quality', 'value': 'ultra'}]}) + {'name': 'pc-quality', 'value': 'ultra'}]}) Preset.objects.update_or_create(name='Point of Interest', system=True, defaults={'options': [{'name': 'auto-boundary', 'value': True}, {'name': 'mesh-size', 'value': '300000'}, @@ -152,15 +151,14 @@ def add_default_presets(): {'name': 'dsm', 'value': True}, {'name': 'pc-quality', 'value': 'high'}, {'name': 'dem-resolution', 'value': "2.0"}, - {'name': 'orthophoto-resolution', 'value': "2.0"}, - ]}) + {'name': 'orthophoto-resolution', 'value': "2.0"}]}) Preset.objects.update_or_create(name='Ultra Quality', system=True, defaults={'options': [{'name': 'auto-boundary', 'value': True}, {'name': 'dsm', 'value': True}, {'name': 'pc-quality', 'value': 'ultra'}, {'name': 'feature-quality', 'value': 'ultra'}, {'name': 'dem-resolution', 'value': "2.0"}, - {'name': 'orthophoto-resolution', 'value': "1.0"}, + {'name': 'orthophoto-resolution', 'value': "1.0"}]}) Preset.objects.update_or_create(name='Default', system=True, defaults={'options': [{'name': 'auto-boundary', 'value': True}, {'name': 'dsm', 'value': True}]}) From b5b82ced5c84be1753e8b974460627ce991615cc Mon Sep 17 00:00:00 2001 From: Stephen Mather <1174901+smathermather@users.noreply.github.com> Date: Tue, 22 Nov 2022 23:38:00 -0500 Subject: [PATCH 5/6] match correct number of presets --- app/tests/test_api_preset.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/tests/test_api_preset.py b/app/tests/test_api_preset.py index 9fc7b5a3..1a9a95ab 100644 --- a/app/tests/test_api_preset.py +++ b/app/tests/test_api_preset.py @@ -58,7 +58,7 @@ class TestApiPreset(BootTestCase): self.assertTrue(res.status_code == status.HTTP_200_OK) # Only ours and global presets are available - self.assertTrue(len(res.data) == 14) + self.assertTrue(len(res.data) == 15) self.assertTrue('My Local Preset' in [preset['name'] for preset in res.data]) self.assertTrue('High Resolution' in [preset['name'] for preset in res.data]) self.assertTrue('Global Preset #1' in [preset['name'] for preset in res.data]) From f25b2962b8d64dcdc7b04f90384b7e5af3cf8504 Mon Sep 17 00:00:00 2001 From: Piero Toffanin Date: Wed, 23 Nov 2022 15:15:11 -0500 Subject: [PATCH 6/6] Fix unit test --- app/tests/test_api_preset.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/tests/test_api_preset.py b/app/tests/test_api_preset.py index 1a9a95ab..4b731ac1 100644 --- a/app/tests/test_api_preset.py +++ b/app/tests/test_api_preset.py @@ -58,7 +58,7 @@ class TestApiPreset(BootTestCase): self.assertTrue(res.status_code == status.HTTP_200_OK) # Only ours and global presets are available - self.assertTrue(len(res.data) == 15) + self.assertEqual(len(res.data), 16) self.assertTrue('My Local Preset' in [preset['name'] for preset in res.data]) self.assertTrue('High Resolution' in [preset['name'] for preset in res.data]) self.assertTrue('Global Preset #1' in [preset['name'] for preset in res.data])