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

Jump to bottom

Convert schema JSON that PDAL provides to Kart format #633

Merged
merged 1 commit into from
May 27, 2022
Merged

Convert schema JSON that PDAL provides to Kart format #633

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
Convert schema JSON that PDAL provies to Kart format
  • Loading branch information
@olsen232
olsen232 committed May 27, 2022
commit 370d4afbf1372d5f5a37480e5afb0f3abb35525f
32 changes: 31 additions & 1 deletion kart/point_cloud/import_.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -324,14 +324,44 @@ def extract_pc_tile_metadata(
"count": info["count"],
}
if extract_schema:
result["schema"] = metadata["filters.info"]["schema"]
result["schema"] = _pdal_schema_to_kart_schema(
metadata["filters.info"]["schema"]
)
if calc_crs84_extent:
crs84_extent = _calc_crs84_extent(native_extent, native_crs)
if crs84_extent is not None:
result["crs84-extent"] = crs84_extent
return result


def _pdal_schema_to_kart_schema(pdal_schema):
return [
_pdal_col_schema_to_kart_col_schema(col) for col in pdal_schema["dimensions"]
]


def _pdal_col_schema_to_kart_col_schema(pdal_col_schema):
return {
"name": pdal_col_schema["name"],
"dataType": _pdal_type_to_kart_type(pdal_col_schema["type"]),
# Kart measures data-sizes in bits, PDAL in bytes.
"size": pdal_col_schema["size"] * 8,
}


# TODO - investigate what types PDAL can actually return - it's not the same as the LAZ spec.
# TODO - our dataset types don't have any notion of signed vs unsigned.
_PDAL_TYPE_TO_KART_TYPE = {
"floating": "float",
"unsigned": "integer",
"string": "text",
}


def _pdal_type_to_kart_type(pdal_type):
return _PDAL_TYPE_TO_KART_TYPE.get(pdal_type) or pdal_type


def _calc_crs84_extent(src_extent, src_crs):
"""
Given a 3D extent with a particular CRS, return a CRS84 extent that surrounds that extent.
Expand Down
Binary file modified tests/data/point-cloud/auckland.tgz
View file
Open in desktop
Binary file not shown.
98 changes: 43 additions & 55 deletions tests/test_point_cloud.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,28 +60,22 @@ def test_import_single_las(
r = cli_runner.invoke(["meta", "get", "autzen", "schema.json", "-ojson"])
assert r.exit_code == 0, r.stderr
assert json.loads(r.stdout) == {
"autzen": {
"schema.json": {
"dimensions": [
{"name": "X", "size": 8, "type": "floating"},
{"name": "Y", "size": 8, "type": "floating"},
{"name": "Z", "size": 8, "type": "floating"},
{"name": "Intensity", "size": 2, "type": "unsigned"},
{"name": "ReturnNumber", "size": 1, "type": "unsigned"},
{"name": "NumberOfReturns", "size": 1, "type": "unsigned"},
{
"name": "ScanDirectionFlag",
"size": 1,
"type": "unsigned",
},
{"name": "EdgeOfFlightLine", "size": 1, "type": "unsigned"},
{"name": "Classification", "size": 1, "type": "unsigned"},
{"name": "ScanAngleRank", "size": 4, "type": "floating"},
{"name": "UserData", "size": 1, "type": "unsigned"},
{"name": "PointSourceId", "size": 2, "type": "unsigned"},
{"name": "GpsTime", "size": 8, "type": "floating"},
],
}
'autzen': {
'schema.json': [
{'name': 'X', 'dataType': 'float', 'size': 64},
{'name': 'Y', 'dataType': 'float', 'size': 64},
{'name': 'Z', 'dataType': 'float', 'size': 64},
{'name': 'Intensity', 'dataType': 'integer', 'size': 16},
{'name': 'ReturnNumber', 'dataType': 'integer', 'size': 8},
{'name': 'NumberOfReturns', 'dataType': 'integer', 'size': 8},
{'name': 'ScanDirectionFlag', 'dataType': 'integer', 'size': 8},
{'name': 'EdgeOfFlightLine', 'dataType': 'integer', 'size': 8},
{'name': 'Classification', 'dataType': 'integer', 'size': 8},
{'name': 'ScanAngleRank', 'dataType': 'float', 'size': 32},
{'name': 'UserData', 'dataType': 'integer', 'size': 8},
{'name': 'PointSourceId', 'dataType': 'integer', 'size': 16},
{'name': 'GpsTime', 'dataType': 'float', 'size': 64},
]
}
}

Expand Down Expand Up @@ -143,31 +137,25 @@ def test_import_several_las(
r = cli_runner.invoke(["meta", "get", "auckland", "schema.json", "-ojson"])
assert r.exit_code == 0, r.stderr
assert json.loads(r.stdout) == {
"auckland": {
"schema.json": {
"dimensions": [
{"name": "X", "size": 8, "type": "floating"},
{"name": "Y", "size": 8, "type": "floating"},
{"name": "Z", "size": 8, "type": "floating"},
{"name": "Intensity", "size": 2, "type": "unsigned"},
{"name": "ReturnNumber", "size": 1, "type": "unsigned"},
{"name": "NumberOfReturns", "size": 1, "type": "unsigned"},
{
"name": "ScanDirectionFlag",
"size": 1,
"type": "unsigned",
},
{"name": "EdgeOfFlightLine", "size": 1, "type": "unsigned"},
{"name": "Classification", "size": 1, "type": "unsigned"},
{"name": "ScanAngleRank", "size": 4, "type": "floating"},
{"name": "UserData", "size": 1, "type": "unsigned"},
{"name": "PointSourceId", "size": 2, "type": "unsigned"},
{"name": "GpsTime", "size": 8, "type": "floating"},
{"name": "Red", "size": 2, "type": "unsigned"},
{"name": "Green", "size": 2, "type": "unsigned"},
{"name": "Blue", "size": 2, "type": "unsigned"},
],
}
'auckland': {
'schema.json': [
{'name': 'X', 'dataType': 'float', 'size': 64},
{'name': 'Y', 'dataType': 'float', 'size': 64},
{'name': 'Z', 'dataType': 'float', 'size': 64},
{'name': 'Intensity', 'dataType': 'integer', 'size': 16},
{'name': 'ReturnNumber', 'dataType': 'integer', 'size': 8},
{'name': 'NumberOfReturns', 'dataType': 'integer', 'size': 8},
{'name': 'ScanDirectionFlag', 'dataType': 'integer', 'size': 8},
{'name': 'EdgeOfFlightLine', 'dataType': 'integer', 'size': 8},
{'name': 'Classification', 'dataType': 'integer', 'size': 8},
{'name': 'ScanAngleRank', 'dataType': 'float', 'size': 32},
{'name': 'UserData', 'dataType': 'integer', 'size': 8},
{'name': 'PointSourceId', 'dataType': 'integer', 'size': 16},
{'name': 'GpsTime', 'dataType': 'float', 'size': 64},
{'name': 'Red', 'dataType': 'integer', 'size': 16},
{'name': 'Green', 'dataType': 'integer', 'size': 16},
{'name': 'Blue', 'dataType': 'integer', 'size': 16},
]
}
}

Expand Down Expand Up @@ -296,10 +284,10 @@ def test_working_copy_edit(cli_runner, data_working_copy, monkeypatch, requires_
'+ extent.native = 1754987.85,1755987.77,5920219.76,5921219.64,-1.66,99.83',
'- points.count = 1558',
'+ points.count = 4231',
'- oid = sha256:ca99a9670adf54aae4d0f380da21880f265fcbc659cf0d804d1f7bec4004bc38',
'+ oid = sha256:188afd71a6b1cb5309c3192a285e9f3167aa8b43e80c96b6ca917b0397376a67',
'- size = 24527',
'+ size = 69593',
'- oid = sha256:78d4867cb7256e188fadcff6e2338489fc6e6787a74cc0f7eb9420fa028e190c',
'+ oid = sha256:e3003c43cd3ab4151da80b12878e179b6f31ebe14db3a8989ba86fc3adf937c7',
'- size = 24537',
'+ size = 69609',
'--- auckland:tile:auckland_3_3.copc.laz',
'- name = auckland_3_3.copc.laz',
'- extent.crs84 = 174.7726418,174.7819673,-36.82369125,-36.82346553,-1.28,9.8',
Expand Down Expand Up @@ -334,10 +322,10 @@ def test_working_copy_edit(cli_runner, data_working_copy, monkeypatch, requires_
'+ extent.native = 1754987.85,1755987.77,5920219.76,5921219.64,-1.66,99.83',
'- points.count = 1558',
'+ points.count = 4231',
'- oid = sha256:ca99a9670adf54aae4d0f380da21880f265fcbc659cf0d804d1f7bec4004bc38',
'+ oid = sha256:188afd71a6b1cb5309c3192a285e9f3167aa8b43e80c96b6ca917b0397376a67',
'- size = 24527',
'+ size = 69593',
'- oid = sha256:78d4867cb7256e188fadcff6e2338489fc6e6787a74cc0f7eb9420fa028e190c',
'+ oid = sha256:e3003c43cd3ab4151da80b12878e179b6f31ebe14db3a8989ba86fc3adf937c7',
'- size = 24537',
'+ size = 69609',
'--- auckland:tile:auckland_3_3.copc.laz',
'- name = auckland_3_3.copc.laz',
'- extent.crs84 = 174.7726418,174.7819673,-36.82369125,-36.82346553,-1.28,9.8',
Expand Down