Fix outbounds line burn (#951)

* fix out of bounds line burning

* no show

* omg

Author: rafaqz

src/methods/burning/line.jl

@@ -115,23 +115,23 @@ function _burn_line!(f::Function, c::Function, dims::Tuple, line::NamedTuple)
     # Ray/Slope calculations
     # Straight distance to the first vertical/horizontal grid boundaries
     if relstop.x > relstart.x
-        xoffset = trunc(relstart.x) - relstart.x + 1 
-        xmoves = trunc(Int, relstop.x) - trunc(Int, relstart.x)
+        xoffset = floor(relstart.x) - relstart.x + 1 
+        xmoves = floor(Int, relstop.x) - floor(Int, relstart.x)
     else
-        xoffset = relstart.x - trunc(relstart.x)
-        xmoves = trunc(Int, relstart.x) - trunc(Int, relstop.x)
+        xoffset = relstart.x - floor(relstart.x)
+        xmoves = floor(Int, relstart.x) - floor(Int, relstop.x)
     end
     if relstop.y > relstart.y
-        yoffset = trunc(relstart.y) - relstart.y + 1
-        ymoves = trunc(Int, relstop.y) - trunc(Int, relstart.y)
+        yoffset = floor(relstart.y) - relstart.y + 1
+        ymoves = floor(Int, relstop.y) - floor(Int, relstart.y)
     else
-        yoffset = relstart.y - trunc(relstart.y)
-        ymoves = trunc(Int, relstart.y) - trunc(Int, relstop.y)
+        yoffset = relstart.y - floor(relstart.y)
+        ymoves = floor(Int, relstart.y) - floor(Int, relstop.y)
     end
     manhattan_distance = xmoves + ymoves
 
     # Int starting points for the line. +1 converts to julia indexing
-    j, i = trunc(Int, relstart.x) + 1, trunc(Int, relstart.y) + 1 # Int
+    j, i = floor(Int, relstart.x) + 1, floor(Int, relstart.y) + 1 # Int
 
     n_on_line = 0
 

test/extract.jl

@@ -211,12 +211,10 @@ end
     # Single LineString
     @test extract(rast, linestring) isa Vector{T}
     @test all(extract(rast_m, linestring) .=== T[
-        (geometry = (9.0, 0.1), test = 1)
         (geometry = (10.0, 0.1), test = 3)
         (geometry = (10.0, 0.2), test = missing)
     ])
     @test all(extract(rast_m, linestring; skipmissing=true) .=== Tsm[
-        (geometry = (9.0, 0.1), test = 1)
         (geometry = (10.0, 0.1), test = 3)
     ])
 
@@ -227,11 +225,8 @@ end
           extract(rast_m, fc; skipmissing=true, threaded=true) == 
           extract(rast_m, linestrings; skipmissing=true) == 
           extract(rast_m, linestrings; skipmissing=true, threaded=true) == Tsm[
-        (geometry = (9.0, 0.1), test = 1)
         (geometry = (10.0, 0.1), test = 3)
-        (geometry = (9.0, 0.1), test = 1)
         (geometry = (10.0, 0.1), test = 3)
-        (geometry = (9.0, 0.1), test = 1)
         (geometry = (10.0, 0.1), test = 3)
     ]
 
@@ -241,35 +236,33 @@ end
               extract(rast_m, fc; skipmissing=false, threaded=true) .===
               extract(rast_m, linestrings; skipmissing=false) .=== 
               extract(rast_m, linestrings; skipmissing=false, threaded=true) .=== T[
-        (geometry = (9.0, 0.1), test = 1)
         (geometry = (10.0, 0.1), test = 3)
         (geometry = (10.0, 0.2), test = missing)
-        (geometry = (9.0, 0.1), test = 1)
         (geometry = (10.0, 0.1), test = 3)
         (geometry = (10.0, 0.2), test = missing)
-        (geometry = (9.0, 0.1), test = 1)
         (geometry = (10.0, 0.1), test = 3)
         (geometry = (10.0, 0.2), test = missing)
     ])
 
     @test extract(rast_m, linestrings; skipmissing=true, flatten=false) isa Vector{Vector{Tsm}}
     @test extract(rast_m, linestrings; skipmissing=true, flatten=false) == 
         extract(rast_m, linestrings; skipmissing=true, flatten=false, threaded=true) == Vector{Tsm}[
-        [(geometry = (9.0, 0.1), test = 1), (geometry = (10.0, 0.1), test = 3)],
-        [(geometry = (9.0, 0.1), test = 1), (geometry = (10.0, 0.1), test = 3)],
-        [(geometry = (9.0, 0.1), test = 1), (geometry = (10.0, 0.1), test = 3)],
+        [(geometry = (10.0, 0.1), test = 3)],
+        [(geometry = (10.0, 0.1), test = 3)],
+        [(geometry = (10.0, 0.1), test = 3)],
     ]
 
     # Nested Vector holding missing needs special handling to check equality
     @test extract(rast_m, linestrings; skipmissing=false, flatten=false) isa Vector{Vector{T}}
     ref = Vector{T}[
-        [(geometry = (9.0, 0.1), test = 1), (geometry = (10.0, 0.1), test = 3), (geometry = (10.0, 0.2), test = missing)] ,
-        [(geometry = (9.0, 0.1), test = 1), (geometry = (10.0, 0.1), test = 3), (geometry = (10.0, 0.2), test = missing)],
-        [(geometry = (9.0, 0.1), test = 1), (geometry = (10.0, 0.1), test = 3), (geometry = (10.0, 0.2), test = missing)],
+        [(geometry = (10.0, 0.1), test = 3), (geometry = (10.0, 0.2), test = missing)] ,
+        [(geometry = (10.0, 0.1), test = 3), (geometry = (10.0, 0.2), test = missing)],
+        [(geometry = (10.0, 0.1), test = 3), (geometry = (10.0, 0.2), test = missing)],
     ]
     matching(a, b) = all(map(===, a, b))
     @test all(map(matching, extract(rast_m, linestrings; skipmissing=false, flatten=false, threaded=false), ref))
     @test all(map(matching, extract(rast_m, linestrings; skipmissing=false, flatten=false, threaded=true), ref))
+
 end
 
 @testset "Extract a line" begin

test/methods.jl

@@ -364,6 +364,7 @@ end
         @test !zonal(x -> x isa Raster, rast; of=polygon, skipmissing=true)
         @test zonal(x -> x isa Raster, rast; of=polygon, skipmissing=false)
     end
+
 end
 
 @testset "zonal return missing" begin