Skip to content

Handle no wkt but supplied units #52

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

Merged
merged 3 commits into from
Apr 23, 2025
Merged

Handle no wkt but supplied units #52

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1e51fda
allow units to be supplied & used when no wkt
MeganDawson42 Apr 17, 2025
a21a24d
plumb through verbose
MeganDawson42 Apr 17, 2025
493bd52
more than 1 is still an error
MeganDawson42 Apr 17, 2025
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
4 changes: 3 additions & 1 deletion src/georef.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -242,15 +242,17 @@ end

get_wkt_string(ogc_wkt::OGC_WKT) = ogc_wkt.wkt_str
get_horizontal_unit(ogc_wkt::OGC_WKT) = ogc_wkt.unit
get_horizontal_unit(::Missing) = missing
get_vertical_unit(ogc_wkt::OGC_WKT) = ogc_wkt.vert_unit
get_vertical_unit(::Missing) = missing

"""
$(TYPEDSIGNATURES)

Given an OGC WKT coordinate system `wkt`, attempt to parse conversion units (to metres) with optional operator supplied overrides.
Can opt to convert all axes units or just the vertical.
"""
function conversion_from_vlrs(wkt::OGC_WKT;
function conversion_from_vlrs(wkt::Union{OGC_WKT, Missing};
convert_x_y_units::Union{String, Missing} = missing,
convert_z_units::Union{String, Missing} = missing)::Union{Missing, SVector{3}}

Expand Down
14 changes: 10 additions & 4 deletions src/read.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,8 @@ Read LAS data from an IO source
function read_las_data(io::TIO, required_columns::TTuple=DEFAULT_LAS_COLUMNS;
convert_to_metres::Bool = true,
convert_x_y_units::Union{String, Missing} = missing,
convert_z_units::Union{String, Missing} = missing) where {TIO <: Union{Base.AbstractPipe,IO}, TTuple}
convert_z_units::Union{String, Missing} = missing,
verbose::Bool = false) where {TIO <: Union{Base.AbstractPipe,IO}, TTuple}

header = read(io, LasHeader)

Expand All @@ -118,7 +119,7 @@ function read_las_data(io::TIO, required_columns::TTuple=DEFAULT_LAS_COLUMNS;
as_table = make_table(records, required_columns, xyz)

conversion = if convert_to_metres
convert_units!(as_table, vlrs, convert_x_y_units, convert_z_units)
convert_units!(as_table, vlrs, convert_x_y_units, convert_z_units, verbose = verbose)
else
NO_CONVERSION
end
Expand Down Expand Up @@ -263,8 +264,13 @@ function convert_units!(pointcloud::AbstractVector{<:NamedTuple}, vlrs::Vector{L
if ismissing(convert_x_y_units) && ismissing(convert_z_units) && count(these_are_wkts) == 0
return NO_CONVERSION
else
@assert count(these_are_wkts) == 1 "Expected to find 1 OGC WKT VLR, instead found $(count(these_are_wkts))"
ogc_wkt = get_data(vlrs[findfirst(these_are_wkts)])
@assert count(these_are_wkts) <= 1 "Expected to find 1 OGC WKT VLR, instead found $(count(these_are_wkts))"
ogc_wkt = if count(these_are_wkts) == 0
verbose && @info "No OGC WKT VLR found"
missing
else
get_data(vlrs[findfirst(these_are_wkts)])
end
conversion = conversion_from_vlrs(ogc_wkt, convert_x_y_units = convert_x_y_units, convert_z_units = convert_z_units)
if !ismissing(conversion) && any(conversion .!= 1.0)
verbose && @info "Positions converted to meters using conversion $(conversion)"
Expand Down
Loading