Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Fixes #12763] 3D tiles geometricError mandatory field should be on t… #279

Merged
merged 5 commits into from
Dec 2, 2024
Merged

[Fixes #12763] 3D tiles geometricError mandatory field should be on t… #279

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
c760886
[Fixes #12763] 3D tiles geometricError mandatory field should be on t…
mattiagiupponi Dec 2, 2024
6e83a27
fix tests
mattiagiupponi Dec 2, 2024
26bd811
Update tests.py
mattiagiupponi Dec 2, 2024
be0c082
Update test_end2end.py
mattiagiupponi Dec 2, 2024
502ac5a
fix test
mattiagiupponi Dec 2, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion importer/handlers/tiles3d/handler.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@ def validate_3dtile_payload(payload):
"The mandatory 'boundingVolume' for the key 'root' is missing"
)

error = payload.get("root", {}).get("geometricError", None)
error = payload.get("geometricError", None) or payload.get("root", {}).get("geometricError", None)
if error is None:
raise Invalid3DTilesException(
"The mandatory 'geometricError' for the key 'root' is missing"
Expand Down
5 changes: 2 additions & 3 deletions importer/handlers/tiles3d/tests.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,7 @@ def test_validate_should_raise_exception_for_invalid_asset_key(self):
def test_validate_should_raise_exception_for_invalid_root_boundingVolume(self):
_json = {
"asset": {"version": "1.1"},
"geometricError": 1.0,
"geometricError": 1.0,
"root": {"foo": {"box": []}, "geometricError": 0.0},
}
_path = "/tmp/tileset.json"
Expand All @@ -159,7 +159,6 @@ def test_validate_should_raise_exception_for_invalid_root_boundingVolume(self):
def test_validate_should_raise_exception_for_invalid_root_geometricError(self):
_json = {
"asset": {"version": "1.1"},
"geometricError": 1.0,
"root": {"boundingVolume": {"box": []}, "foo": 0.0},
}
_path = "/tmp/tileset.json"
Expand All @@ -170,7 +169,7 @@ def test_validate_should_raise_exception_for_invalid_root_geometricError(self):

self.assertIsNotNone(_exc)
self.assertTrue(
"The mandatory 'geometricError' for the key 'root' is missing"
"The provided 3DTiles is not valid, some of the mandatory keys are missing. Mandatory keys are: 'asset', 'geometricError', 'root'"
in str(_exc.exception.detail)
)
os.remove(_path)
Expand Down
2 changes: 1 addition & 1 deletion importer/tests/end2end/test_end2end.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -543,7 +543,7 @@ def test_import_wms(self):
"lookup": resource_to_take,
"parse_remote_metadata": True,
}
initial_name = res.title
initial_name = res.title.lower().replace(" ", "_")
assert_payload = {
"subtype": "remote",
"title": res.title,
Expand Down
Loading