diff --git a/importer/handlers/tiles3d/handler.py b/importer/handlers/tiles3d/handler.py index f7e58fb..b727363 100755 --- a/importer/handlers/tiles3d/handler.py +++ b/importer/handlers/tiles3d/handler.py @@ -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" diff --git a/importer/handlers/tiles3d/tests.py b/importer/handlers/tiles3d/tests.py index aee5595..52ae9b6 100755 --- a/importer/handlers/tiles3d/tests.py +++ b/importer/handlers/tiles3d/tests.py @@ -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" @@ -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" @@ -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) diff --git a/importer/tests/end2end/test_end2end.py b/importer/tests/end2end/test_end2end.py index db8225b..85c6baf 100644 --- a/importer/tests/end2end/test_end2end.py +++ b/importer/tests/end2end/test_end2end.py @@ -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,