second patch

jl-pkgs · Jul 11, 2024 · e182ce2 · e182ce2
1 parent 848df14
commit e182ce2
Show file tree

Hide file tree

Showing 8 changed files with 4 additions and 306 deletions.
diff --git a/Project.toml b/Project.toml
@@ -33,9 +33,9 @@ TerraRastersExt = "Rasters"
 [compat]
 ArchGDAL = "0.10"
 DocStringExtensions = "0.9"
-Ipaper = "0.1.16, 0.1.17"
+Ipaper = "0.1.16, 0.1.17, 0.2"
 NCDatasets = "0.13, 0.14"
-NetCDFTools = "0.1.10"
+NetCDFTools = "0.1.10, 0.2"
 Rasters = "0.11, 0.12"
 Reexport = "1.2"
 Statistics = "1.9, 1.10"

diff --git a/src/GDAL/gdal_polygonize.jl b/src/GDAL/gdal_polygonize.jl
@@ -1,29 +1,3 @@
-# const drivers = AG.listdrivers()
-const shortnames = Dict(
-  (".tif", ".tiff") => "GTiff",
-  (".nc", ".nc4") => "netCDF",
-  (".img",) => "HFA",
-  (".xyz",) => "XYZ",
-  (".shp",) => "ESRI Shapefile",
-  (".geojson",) => "GeoJSON",
-  (".fgb",) => "FlatGeobuf",
-  (".gdb",) => "OpenFileGDB",
-  (".gml",) => "GML",
-  (".gpkg",) => "GPKG"
-)
-
-## corresponding functions
-function find_shortname(fn::AbstractString)
-  _, ext = splitext(fn)
-  for (k, v) in shortnames
-    if ext in k
-      return v
-    end
-  end
-  error("Cannot determine GDAL Driver for $fn")
-end
-
-
 # file = "clusterIds_temporal-(perc_50%,1980-2015).tif"
 """
   $(TYPEDSIGNATURES)

diff --git a/src/GDAL/getgeotransform.jl b/src/GDAL/getgeotransform.jl
diff --git a/src/Rasters/Raster.jl b/src/Rasters/Raster.jl
diff --git a/src/Rasters/st.jl b/src/Rasters/st.jl
diff --git a/src/Rasters/write_tiff.jl b/src/Rasters/write_tiff.jl
diff --git a/src/Terra.jl b/src/Terra.jl
@@ -32,8 +32,6 @@ include("MFDataset/MFDataset.jl")
 include("apply.jl")
 include("tools_Ipaper.jl")
 
-export Raster, brick, 
-  rast_apply, 
-  set_names
+export rast_apply, set_names
 
 end # module
diff --git a/src/st_resample.jl b/src/st_resample.jl
@@ -22,7 +22,7 @@ function st_resample(z::ZArray; fact=10, missingval=0)
 end
 
 function st_resample(zs::Vector{<:ZArray}; fact=10, missingval=0)
-  res = Vector{Raster}(undef, length(zs))
+  res = Vector{SpatRaster}(undef, length(zs))
   Threads.@threads for i = eachindex(zs)
     println("running $i")
     z = zs[i]