Update API dates use timespan (#85)

* Update API dates use timespan

* Fix dest types

* Add ArgParse.parse_item for type Date

* Add warning for sub year periods see #78

* Improve seasonal warning

* Apply suggestion

Co-authored-by: @felixcremer

Author: danlooo

src/main.jl

@@ -2,6 +2,9 @@ using ArgParse
 using YAXArrays: YAXDefaults
 
 const argparsesettings = ArgParseSettings()
+
+ArgParse.parse_item(::Type{Date}, x::AbstractString) = Date(x)
+
 @add_arg_table! argparsesettings begin
     "--threshold", "-t"
     help = "Threshold for the recurrence matrix computation"
@@ -11,12 +14,17 @@ const argparsesettings = ArgParseSettings()
     help = "Polarisation that should be stacked"
     default = "VH"
 
-    "--years", "--year", "-y"
-    help = "Year in which the RQA Trend should be detected. 
-    We take a buffer of six month before and after the year to end up with two years of data."
-    default = [2018, 2019, 2020, 2021, 2022, 2023]
-    nargs = '+'
-    arg_type = Int
+    "--start-date"
+    help = "Start date of the time series to analyze in ISO 8601 format YYYY-MM-DD"
+    required = true
+    arg_type = Date
+    dest_name = "start_date"
+
+    "--end-date"
+    help = "End date of the time series to analyze in ISO 8601 format YYYY-MM-DD"
+    required = true
+    arg_type = Date
+    dest_name = "end_date"
 
     "--orbit", "-o"
     help = "One of: Orbit number, 'A' for ascending, 'D' for descending, '*' for all orbits"
@@ -58,13 +66,14 @@ end
 
 function main(;
     tiles::Vector{String},
-    continent::String, 
+    continent::String,
     indir::String,
     outdir="out.zarr",
-    years=[2018, 2019, 2020, 2021, 2022, 2023],
-    polarisation="VH", 
-    orbit="*", 
-    threshold=3.0, 
+    start_date::Date,
+    end_date::Date,
+    polarisation="VH",
+    orbit="*",
+    threshold=3.0,
     folders=["V01R01", "V0M2R4", "V1M0R1", "V1M1R1", "V1M1R2"]
 )
     if isdir(indir) && isempty(indir)
@@ -76,6 +85,11 @@ function main(;
         mkdir(outdir)
         @info "Write output to $outdir"
     end
+
+    if monthday(start_date) != monthday(end_date)
+        @warn "Selected time series does not include a multiple of whole years. This might introduce seasonal bias."
+    end
+
     YAXDefaults.workdir[] = outdir
 
     corruptedfiles = "corrupted_tiles.txt"
@@ -89,42 +103,39 @@ function main(;
         relorbits = unique([split(basename(x), "_")[5][2:end] for x in allfilenames])
         @show relorbits
         for relorbit in relorbits
-            for y in years
-
-                filenames = allfilenames[findall(contains("$(relorbit)_E"), allfilenames)]
-                @time cube = gdalcube(filenames)
-
-                path = joinpath(YAXDefaults.workdir[], "$(tilefolder)_rqatrend_$(polarisation)_$(relorbit)_thresh_$(threshold)_year_$(y)")
-                @show path
-                ispath(path * ".done") && continue
-                ispath(path * "_zerotimesteps.done") && continue
+            filenames = allfilenames[findall(contains("$(relorbit)_E"), allfilenames)]
+            @time cube = gdalcube(filenames)
+
+            path = joinpath(YAXDefaults.workdir[], "$(tilefolder)_rqatrend_$(polarisation)_$(relorbit)_thresh_$(threshold)")
+            @show path
+            ispath(path * ".done") && continue
+            ispath(path * "_zerotimesteps.done") && continue
+
+            tcube = cube[Time=start_date .. end_date]
+            @show size(cube)
+            @show size(tcube)
+            if size(tcube, 3) == 0
+                touch(path * "_zerotimesteps.done")
+                continue
+            end
+            try
+                @time rqatrend(tcube; thresh=threshold, outpath=path * ".zarr", overwrite=true)
+            catch e
 
-                tcube = cube[Time=Date(y - 1, 7, 1) .. Date(y + 1, 7, 1)]
-                @show size(cube)
-                @show size(tcube)
-                if size(tcube, 3) == 0
-                    touch(path * "_zerotimesteps.done")
+                if hasproperty(e, :captured) && e.captured.ex isa ArchGDAL.GDAL.GDALError
+                    println("Found GDALError:")
+                    println(e.captured.ex.msg)
                     continue
+                else
+                    rethrow(e)
                 end
-                try
-                    @time rqatrend(tcube; thresh=threshold, outpath=path * ".zarr", overwrite=true)
-                catch e
-
-                    if hasproperty(e, :captured) && e.captured.ex isa ArchGDAL.GDAL.GDALError
-                        println("Found GDALError:")
-                        println(e.captured.ex.msg)
-                        continue
-                    else
-                        rethrow(e)
-                    end
-                end
-                #=@everywhere begin
-                    fname = "$(VERSION)_$(getpid())_$(time_ns()).heapsnapshot"
-                    Profile.take_heap_snapshot(fname;streaming=true)
-                end
-                =#
-                touch(path * ".done")
             end
+            #=@everywhere begin
+                fname = "$(VERSION)_$(getpid())_$(time_ns()).heapsnapshot"
+                Profile.take_heap_snapshot(fname;streaming=true)
+            end
+            =#
+            touch(path * ".done")
         end
     end
 end

test/testdata.jl

@@ -5,7 +5,7 @@
     ensure_artifact_installed("rqatestdata", "Artifacts.toml")
     testdatapath = joinpath(artifact"rqatestdata", "RQADeforestationTestData-2.0")
 
-    testdir = "tmp/testdata" 
+    testdir = "tmp/testdata"
     rm(testdir, recursive=true, force=true)
     mkpath(testdir)
     outdir = "$testdir/out.zarr"
@@ -16,6 +16,8 @@
     copy!(ARGS, [
         "--tile", "E051N018T3",
         "--continent", "EU",
+        "--start-date", "2021-01-01",
+        "--end-date", "2021-12-31",
         "--in-dir", indir,
         "--out-dir", outdir,
     ])