Accept kwargs in table interface that are passed to the Header constr…

…uctor. (#31)

Project.toml

@@ -1,7 +1,7 @@
 name = "LazIO"
 uuid = "c3605908-9f0f-11e8-0a72-0d361c15a277"
 authors = ["Maarten Pronk <git@evetion.nl>"]
-version = "0.3.1"
+version = "0.3.2"
 
 [deps]
 Dates = "ade2ca70-3891-5945-98fb-dc099432e06a"

src/table.jl

@@ -13,10 +13,9 @@ const column_names = (fieldnames(LazPoint)..., :number_of_returns)
 function determine_offset(min_value, max_value, scale; threshold=10^7)
     s = round(Int64, ((min_value + max_value) / 2) / scale / threshold)
     s *= threshold * scale
-
     # Try to convert back and forth and check overflow
-    (muladd(round(Int32, (min_value - s) / scale), scale, s) > 0) == (min_value > 0) || error("Can't fit offset in this scale, try to coarsen it.")
-    (muladd(round(Int32, (max_value - s) / scale), scale, s) > 0) == (max_value > 0) || error("Can't fit offset in this scale, try to coarsen it.")
+    (muladd(round(Int32, (min_value - s) / scale), scale, s) > 0) == (min_value > 0) || error("Can't fit offset for min with this scale, try to coarsen it.")
+    (muladd(round(Int32, (max_value - s) / scale), scale, s) > 0) == (max_value > 0) || error("Can't fit offset for max with this scale, try to coarsen it.")
     s
 end
 
@@ -42,15 +41,15 @@ function Base.setproperty!(p::LazPoint, name, value, header)
     end
 end
 
-function write(fn::AbstractString, table, bbox; scale=0.01)
+function write(fn::AbstractString, table, bbox; scale=0.01, kwargs...)
 
     schema = Tables.schema(table)
     isnothing(schema) && error("A Schema is required")
     all(name in column_names for name in schema.names) || error("Can't map all columns to LazPoint")
 
     rows = Tables.rows(table)
 
-    header = LazHeader()
+    header = LazHeader(;kwargs...)
     header.x_offset = determine_offset(bbox.min_x, bbox.max_x, scale)
     header.y_offset = determine_offset(bbox.min_y, bbox.max_y, scale)
     header.z_offset = determine_offset(bbox.min_z, bbox.max_z, scale)

src/utils.jl

@@ -10,3 +10,27 @@ end
 macro check(obj, ex)
     return :( $(esc(ex)) == 0 ? nothing : laszip_error($(esc(obj))) )
 end
+
+
+function readstring(s::NTuple{T,UInt8}) where T
+    lastchar = findlast(s .!= 0)
+    if isnothing(lastchar)
+        return ""
+    else
+        return join(Char.(s[1:lastchar]))
+    end
+end
+
+function writestring(str::AbstractString, nb::Integer)
+    s = ascii(str)
+    n = length(s)
+    npad = nb - n
+    if npad < 0
+        error("string too long")
+    elseif npad == 0
+        NTuple{nb,UInt8}(codeunits(ascii(s)))
+    else
+        writestr = string(s * "\0"^npad)
+        NTuple{nb,UInt8}(codeunits(ascii(writestr)))
+    end
+end

test/testio.jl

@@ -83,10 +83,11 @@ end
              return_number = [1,2,1],
              number_of_returns = [1,2,3])
     bounds = (min_x = 11000.01, max_x = 32000., min_y = 11000., max_y = 32000., min_z = 11000., max_z = 32000.01)
-    LazIO.write(manual_fn, table, bounds, scale=0.01)
+    LazIO.write(manual_fn, table, bounds, scale=0.01, system_identifier=LazIO.writestring("Laser shooter, pew pew!", 32))
 
     ds = LazIO.open(manual_fn)
 
+    @test LazIO.readstring(ds.header.system_identifier) == "Laser shooter, pew pew!"
     @test length(ds) == 3
     @test first(ds).X == 1100001
     @test muladd(first(ds).X, ds.header.x_scale_factor, ds.header.x_offset) ≈ 11000.01