Compatibility with latest ArchGDAL. (#33)

Author: evetion

Project.toml

@@ -1,7 +1,7 @@
 name = "GeoDataFrames"
 uuid = "62cb38b5-d8d2-4862-a48e-6a340996859f"
 authors = ["Maarten Pronk <git@evetion.nl> and contributors"]
-version = "0.2.0"
+version = "0.2.1"
 
 [deps]
 ArchGDAL = "c9ce4bd3-c3d5-55b8-8973-c0e20141b8c3"
@@ -11,11 +11,11 @@ Pkg = "44cfe95a-1eb2-52ea-b672-e2afdf69b78f"
 Tables = "bd369af6-aec1-5ad0-b16a-f7cc5008161c"
 
 [compat]
-ArchGDAL = "0.7.1"
-DataFrames = "0.22, 1.0"
+ArchGDAL = "0.8.3"
+DataFrames = "1.0"
 GeoFormatTypes = "0.3"
-Tables = "1.2, 1.3, 1.4"
-julia = "1.4"
+Tables = "1"
+julia = "1.6"
 
 [extras]
 Dates = "ade2ca70-3891-5945-98fb-dc099432e06a"

src/io.jl

@@ -10,68 +10,6 @@ const drivermapping = Dict(
     ".nc" => "netCDF",
 )
 
-# Support "exotic" types, but this needs some piracy
-Base.convert(::Type{AG.OGRFieldType}, ft::Type{Bool}) = AG.OFTInteger
-Base.convert(::Type{AG.OGRFieldType}, ft::Type{Int16}) = AG.OFTInteger
-Base.convert(::Type{AG.OGRFieldType}, ft::Type{Float32}) = AG.OFTReal
-
-function Base.convert(::Type{AG.OGRFieldType}, ft::Type{Int8})
-    @warn "Int8 fields will become Int16"
-    return AG.OFTInteger
-end
-function Base.convert(::Type{AG.OGRFieldType}, ft::Type{UInt8})
-    @warn "UInt8 fields will become Int16"
-    return AG.OFTInteger
-end
-function Base.convert(::Type{AG.OGRFieldType}, ft::Type{UInt16})
-    @warn "UInt16 fields will become Int32"
-    return AG.OFTInteger
-end
-function Base.convert(::Type{AG.OGRFieldType}, ft::Type{UInt32})
-    @warn "UInt32 fields will become Int64"
-    return AG.OFTInteger64
-end
-
-subtypes = Dict(
-    Bool => AG.OFSTBoolean,
-    Int16 => AG.OFSTInt16,
-    Float32 => AG.OFSTFloat32,
-    Int8 => AG.OFSTInt16,
-    UInt8 => AG.OFSTInt16,
-)
-
-
-function AG.setfield!(feature::AG.Feature, i::Integer, value::Bool)
-    AG.GDAL.ogr_f_setfieldinteger(feature.ptr, i, value)
-    return feature
-end
-
-function AG.setfield!(feature::AG.Feature, i::Integer, value::Int16)
-    AG.GDAL.ogr_f_setfieldinteger(feature.ptr, i, value)
-    return feature
-end
-
-function AG.setfield!(feature::AG.Feature, i::Integer, value::Float32)
-    AG.GDAL.ogr_f_setfielddouble(feature.ptr, i, value)
-    return feature
-end
-
-function AG.setfield!(feature::AG.Feature, i::Integer, value::Union{UInt8,Int8})
-    AG.GDAL.ogr_f_setfielddouble(feature.ptr, i, Int16(value))
-    return feature
-end
-
-function AG.setfield!(feature::AG.Feature, i::Integer, value::UInt16)
-    AG.GDAL.ogr_f_setfielddouble(feature.ptr, i, Int32(value))
-    return feature
-end
-
-function AG.setfield!(feature::AG.Feature, i::Integer, value::UInt32)
-    AG.GDAL.ogr_f_setfielddouble(feature.ptr, i, Int64(value))
-    return feature
-end
-
-
 function read(fn::AbstractString; kwargs...)
     ds = AG.read(fn; kwargs...)
     if AG.nlayer(ds) > 1
@@ -95,7 +33,7 @@ function read(ds, layer)
     df
 end
 
-function write(fn::AbstractString, table; layer_name::AbstractString = "data", geom_column::Symbol = :geom, crs::Union{GFT.GeoFormat,Nothing} = nothing, driver::Union{Nothing,AbstractString} = nothing)
+function write(fn::AbstractString, table; layer_name::AbstractString="data", geom_column::Symbol=:geom, crs::Union{GFT.GeoFormat,Nothing}=nothing, driver::Union{Nothing,AbstractString}=nothing)
     rows = Tables.rows(table)
     sch = Tables.schema(rows)
 
@@ -128,17 +66,17 @@ function write(fn::AbstractString, table; layer_name::AbstractString = "data", g
     end
     AG.create(
         fn,
-        driver = driver
+        driver=driver
     ) do ds
         spatialref = crs === nothing ? AG.SpatialRef() : AG.importCRS(crs)
         AG.createlayer(
-            name = layer_name,
-            geom = geom_type,
-            spatialref = spatialref
+            name=layer_name,
+            geom=geom_type,
+            spatialref=spatialref
         ) do layer
             for (name, type) in fields
                 AG.createfielddefn(String(name), convert(AG.OGRFieldType, type)) do fd
-                    AG.setsubtype!(fd, get(subtypes, type, AG.OFSTNone))
+                    AG.setsubtype!(fd, convert(AG.OGRFieldSubType, type))
                     AG.addfielddefn!(layer, fd)
                 end
             end
@@ -155,7 +93,7 @@ function write(fn::AbstractString, table; layer_name::AbstractString = "data", g
                     end
                 end
             end
-            AG.copy(layer, dataset = ds, name = layer_name)
+            AG.copy(layer, dataset=ds, name=layer_name)
         end
     end
     fn

test/runtests.jl

@@ -7,8 +7,8 @@ import GeoDataFrames as GDF
 import GeoFormatTypes as GFT
 
 # Use ArchGDAL datasets to test with
-const testdatadir = @__DIR__
-
+const testdatadir = joinpath(@__DIR__, "data")
+isdir(testdatadir) || mkdir(testdatadir)
 REPO_URL = "https://github.com/yeesian/ArchGDALDatasets/blob/master/"
 
 remotefiles = [
@@ -23,7 +23,7 @@ remotefiles = [
 for (f, sha) in remotefiles
     localfn = joinpath(testdatadir, basename(f))
     url = REPO_URL * f * "?raw=true"
-    PlatformEngines.download_verify(url, sha, localfn; force = true)
+    PlatformEngines.download_verify(url, sha, localfn; force=true)
 end
 
 
@@ -63,10 +63,10 @@ end
 
     @testset "Read self written file" begin
         # Save table with a few random points
-        table = DataFrame(geom = AG.createpoint.(coords), name = "test")
+        table = DataFrame(geom=AG.createpoint.(coords), name="test")
         GDF.write("test_points.shp", table)
-        GDF.write("test_points.gpkg", table, layer_name = "test_points")
-        GDF.write("test_points.geojson", table, layer_name = "test_points")
+        GDF.write("test_points.gpkg", table, layer_name="test_points")
+        GDF.write("test_points.geojson", table, layer_name="test_points")
 
         ntable = GDF.read("test_points.shp")
         @test nrow(ntable) == 10
@@ -81,40 +81,51 @@ end
         t = GDF.read(fn)
 
         # Save table from reading
-        GDF.write("test_read.shp", t, layer_name = "test_coastline")
-        GDF.write("test_read.gpkg", t, layer_name = "test_coastline")
-        GDF.write("test_read.geojson", t, layer_name = "test_coastline")
+        GDF.write("test_read.shp", t, layer_name="test_coastline")
+        GDF.write("test_read.gpkg", t, layer_name="test_coastline")
+        GDF.write("test_read.geojson", t, layer_name="test_coastline")
 
     end
 
     @testset "Write shapefile with non-GDAL types" begin
-        coords = zip(rand(Float32, 2), rand(Float32, 2))
+        coords = collect(zip(rand(Float32, 2), rand(Float32, 2)))
         t = DataFrame(
-            geom = AG.createpoint.(coords),
-            name = ["test", "test2"],
-            flag = [typemax(UInt8), typemax(UInt8)],
-            ex1 = [typemax(Int8), typemax(Int8)],
-            ex2 = [typemax(UInt16), typemax(UInt16)],
-            ex3 = [typemax(UInt32), typemax(UInt32)],
-            check = [false, true],
-            z = [Float32(8), Float32(-1)],
-            odd = [1, missing],
-            date = [now(), now()]
+            geom=AG.createpoint.(coords),
+            name=["test", "test2"],
+            flag=UInt8[typemin(UInt8), typemax(UInt8)],
+            ex1=Int16[typemin(Int8), typemax(Int8)],
+            ex2=Int32[typemin(UInt16), typemax(UInt16)],
+            ex3=Int64[typemin(UInt32), typemax(UInt32)],
+            check=[false, true],
+            z=Float32[Float32(8), Float32(-1)],
+            y=Float16[Float16(8), Float16(-1)],
+            odd=[1, missing],
+            date=[DateTime("2022-03-31T15:38:41"), DateTime("2022-03-31T15:38:41")]
         )
-
         GDF.write("test_exotic.shp", t)
         GDF.write("test_exotic.gpkg", t)
         GDF.write("test_exotic.geojson", t)
+        tt = GDF.read("test_exotic.gpkg")
+        @test AG.getx.(tt.geom, 0) == AG.getx.(t.geom, 0)
+        @test tt.flag == t.flag
+        @test tt.ex1 == t.ex1
+        @test tt.ex2 == t.ex2
+        @test tt.ex3 == t.ex3
+        @test tt.check == t.check
+        @test tt.z == t.z
+        @test tt.y == t.y
+        @test ismissing.(tt.odd) == ismissing.(t.odd)
+        @test tt.date == t.date
     end
 
     @testset "Read shapefile with non-GDAL types" begin
-        t = GDF.read("test_exotic.shp")
+        GDF.read("test_exotic.shp")
         GDF.read("test_exotic.gpkg")
         GDF.read("test_exotic.geojson")
     end
 
     @testset "Spatial operations" begin
-        table = DataFrame(geom = AG.createpoint.(coords), name = "test")
+        table = DataFrame(geom=AG.createpoint.(coords), name="test")
 
         # Buffer to also write polygons
         table.geom = AG.buffer(table.geom, 10)
@@ -124,9 +135,9 @@ end
     end
 
     @testset "Reproject" begin
-        table = DataFrame(geom = AG.createpoint.([[0, 0, 0]]), name = "test")
+        table = DataFrame(geom=AG.createpoint.([[0, 0, 0]]), name="test")
         AG.reproject(table.geom, GFT.EPSG(4326), GFT.EPSG(28992))
         @test GDF.AG.getpoint(table.geom[1], 0)[1] ≈ -587791.596556932
-        GDF.write("test_reprojection.gpkg", table, crs = GFT.EPSG(28992))
+        GDF.write("test_reprojection.gpkg", table, crs=GFT.EPSG(28992))
     end
 end