diff --git a/.gitignore b/.gitignore index b09cd7b..9269aeb 100644 --- a/.gitignore +++ b/.gitignore @@ -33,6 +33,7 @@ vignettes/*.pdf *.obj # winlibs windows +inst # vignette files vignettes/* !vignettes/*.Rmd diff --git a/DESCRIPTION b/DESCRIPTION index 7a085d9..f956458 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -6,7 +6,7 @@ Authors@R: c( person(given = "Marius", family = "Appel", role = c("aut", "cre"), - email = "marius.appel@uni-muenster.de", + email = "marius.appel@hs-bochum.de", comment = c(ORCID = "0000-0001-5281-3896")), person(given = "Edzer", family = "Pebesma", @@ -59,7 +59,6 @@ RoxygenNote: 7.2.2 LinkingTo: Rcpp, BH Suggests: knitr, - magrittr, rmarkdown, stars, av, diff --git a/R/stac.R b/R/stac.R index d2f36f9..4bef393 100644 --- a/R/stac.R +++ b/R/stac.R @@ -79,9 +79,11 @@ stac_image_collection <- function(s, out_file = tempfile(fileext = ".sqlite"), # if no eo:bands metadata found, consider asset if type contains "image/*" and role equals "data" sroles = s[[i]]$assets[[j]]$roles stype = s[[i]]$assets[[j]]$type - - if (grepl("image/", stype, fixed=TRUE) && sroles == "data") { - bands = union(bands, asset_name) + + if (is.character(sroles) && is.character(stype)) { + if (grepl("image/", stype, fixed=TRUE) && sroles == "data") { + bands = union(bands, asset_name) + } } } } diff --git a/README.Rmd b/README.Rmd index fbe7537..4c8fd65 100644 --- a/README.Rmd +++ b/README.Rmd @@ -83,7 +83,7 @@ brew install sqlite ## Download example data ```{r download} if (!dir.exists("L8_Amazon")) { - download.file("https://uni-muenster.sciebo.de/s/e5yUZmYGX0bo4u9/download", destfile = "L8_Amazon.zip") + download.file("http://data.gdalcubes.org/L8_Amazon.zip", destfile = "L8_Amazon.zip",mode = "wb") unzip("L8_Amazon.zip", exdir = "L8_Amazon") } ``` diff --git a/README.md b/README.md index 43a609e..13c1214 100644 --- a/README.md +++ b/README.md @@ -90,7 +90,7 @@ Use [Homebrew](https://brew.sh) to install system libraries with ``` r if (!dir.exists("L8_Amazon")) { - download.file("https://uni-muenster.sciebo.de/s/e5yUZmYGX0bo4u9/download", destfile = "L8_Amazon.zip") + download.file("https://hs-bochum.sciebo.de/s/8XcKAmPfPGp2CYh/download", destfile = "L8_Amazon.zip") unzip("L8_Amazon.zip", exdir = "L8_Amazon") } ``` diff --git a/configure b/configure index 62e9353..6c728ea 100755 --- a/configure +++ b/configure @@ -2,7 +2,7 @@ # Guess values for system-dependent variables and create Makefiles. # Generated by GNU Autoconf 2.71 for gdalcubes 0.6.4. # -# Report bugs to . +# Report bugs to . # # # Copyright (C) 1992-1996, 1998-2017, 2020-2021 Free Software Foundation, @@ -267,10 +267,10 @@ then : printf "%s\n" "$0: be upgraded to zsh 4.3.4 or later." else printf "%s\n" "$0: Please tell bug-autoconf@gnu.org and -$0: marius.appel@uni-muenster.de about your system, -$0: including any error possibly output before this -$0: message. Then install a modern shell, or manually run -$0: the script under such a shell if you do have one." +$0: marius.appel@hs-bochum.de about your system, including +$0: any error possibly output before this message. Then +$0: install a modern shell, or manually run the script +$0: under such a shell if you do have one." fi exit 1 fi @@ -612,7 +612,7 @@ PACKAGE_NAME='gdalcubes' PACKAGE_TARNAME='gdalcubes' PACKAGE_VERSION='0.6.4' PACKAGE_STRING='gdalcubes 0.6.4' -PACKAGE_BUGREPORT='marius.appel@uni-muenster.de' +PACKAGE_BUGREPORT='marius.appel@hs-bochum.de' PACKAGE_URL='' # Factoring default headers for most tests. @@ -1375,7 +1375,7 @@ Some influential environment variables: Use these variables to override the choices made by `configure' or to help it to find libraries and programs with nonstandard names/locations. -Report bugs to . +Report bugs to . _ACEOF ac_status=$? fi @@ -4429,7 +4429,7 @@ Usage: $0 [OPTION]... [TAG]... Configuration files: $config_files -Report bugs to ." +Report bugs to ." _ACEOF ac_cs_config=`printf "%s\n" "$ac_configure_args" | sed "$ac_safe_unquote"` diff --git a/configure.ac b/configure.ac index ac906fe..32040e5 100644 --- a/configure.ac +++ b/configure.ac @@ -1,6 +1,6 @@ # Process this file with autoconf to produce a configure script. -AC_INIT([gdalcubes],[0.6.4],[marius.appel@uni-muenster.de]) +AC_INIT([gdalcubes],[0.6.4],[marius.appel@hs-bochum.de]) AC_LANG(C++) # find R home and set CC/CFLAGS diff --git a/src/gdalcubes/src/aggregate_space.cpp b/src/gdalcubes/src/aggregate_space.cpp index 67c55c2..8f83ca3 100644 --- a/src/gdalcubes/src/aggregate_space.cpp +++ b/src/gdalcubes/src/aggregate_space.cpp @@ -1,7 +1,7 @@ /* MIT License - Copyright (c) 2022 Marius Appel + Copyright (c) 2022 Marius Appel Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal @@ -460,4 +460,4 @@ std::shared_ptr aggregate_space_cube::read_chunk(chunkid_t id) { } return out; } -} // namespace gdalcubes \ No newline at end of file +} // namespace gdalcubes diff --git a/src/gdalcubes/src/aggregate_space.h b/src/gdalcubes/src/aggregate_space.h index 2be7c1a..c6d5685 100644 --- a/src/gdalcubes/src/aggregate_space.h +++ b/src/gdalcubes/src/aggregate_space.h @@ -1,7 +1,7 @@ /* MIT License - Copyright (c) 2022 Marius Appel + Copyright (c) 2022 Marius Appel Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/src/gdalcubes/src/aggregate_time.cpp b/src/gdalcubes/src/aggregate_time.cpp index d5f457b..a9a74f9 100644 --- a/src/gdalcubes/src/aggregate_time.cpp +++ b/src/gdalcubes/src/aggregate_time.cpp @@ -1,7 +1,7 @@ /* MIT License - Copyright (c) 2021 Marius Appel + Copyright (c) 2021 Marius Appel Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal @@ -419,4 +419,4 @@ std::shared_ptr aggregate_time_cube::read_chunk(chunkid_t id) { } return out; } -} // namespace gdalcubes \ No newline at end of file +} // namespace gdalcubes diff --git a/src/gdalcubes/src/aggregate_time.h b/src/gdalcubes/src/aggregate_time.h index cd6cdfa..0aa4d76 100644 --- a/src/gdalcubes/src/aggregate_time.h +++ b/src/gdalcubes/src/aggregate_time.h @@ -1,7 +1,7 @@ /* MIT License - Copyright (c) 2021 Marius Appel + Copyright (c) 2021 Marius Appel Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/src/gdalcubes/src/apply_pixel.cpp b/src/gdalcubes/src/apply_pixel.cpp index 6d79794..27b4aef 100644 --- a/src/gdalcubes/src/apply_pixel.cpp +++ b/src/gdalcubes/src/apply_pixel.cpp @@ -1,7 +1,7 @@ /* MIT License - Copyright (c) 2019 Marius Appel + Copyright (c) 2019 Marius Appel Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal @@ -207,4 +207,4 @@ bool apply_pixel_cube::parse_expressions() { return res; } -} // namespace gdalcubes \ No newline at end of file +} // namespace gdalcubes diff --git a/src/gdalcubes/src/apply_pixel.h b/src/gdalcubes/src/apply_pixel.h index f53f89e..7a16fbb 100644 --- a/src/gdalcubes/src/apply_pixel.h +++ b/src/gdalcubes/src/apply_pixel.h @@ -1,7 +1,7 @@ /* MIT License - Copyright (c) 2019 Marius Appel + Copyright (c) 2019 Marius Appel Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/src/gdalcubes/src/collection_format.cpp b/src/gdalcubes/src/collection_format.cpp index ca83ba4..bd1b7ba 100644 --- a/src/gdalcubes/src/collection_format.cpp +++ b/src/gdalcubes/src/collection_format.cpp @@ -1,7 +1,7 @@ /* MIT License - Copyright (c) 2019 Marius Appel + Copyright (c) 2019 Marius Appel Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal @@ -82,4 +82,4 @@ void collection_format::load_string(std::string jsonstr) { _j = json11::Json::parse(jsonstr, err); } -} // namespace gdalcubes \ No newline at end of file +} // namespace gdalcubes diff --git a/src/gdalcubes/src/collection_format.h b/src/gdalcubes/src/collection_format.h index 3fd6715..4bf6612 100644 --- a/src/gdalcubes/src/collection_format.h +++ b/src/gdalcubes/src/collection_format.h @@ -1,7 +1,7 @@ /* MIT License - Copyright (c) 2019 Marius Appel + Copyright (c) 2019 Marius Appel Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/src/gdalcubes/src/config.cpp b/src/gdalcubes/src/config.cpp index fa59074..d4fc07c 100644 --- a/src/gdalcubes/src/config.cpp +++ b/src/gdalcubes/src/config.cpp @@ -1,7 +1,7 @@ /* MIT License - Copyright (c) 2020 Marius Appel + Copyright (c) 2020 Marius Appel Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/src/gdalcubes/src/config.h b/src/gdalcubes/src/config.h index cf05abd..5ba009a 100644 --- a/src/gdalcubes/src/config.h +++ b/src/gdalcubes/src/config.h @@ -1,7 +1,7 @@ /* MIT License - Copyright (c) 2020 Marius Appel + Copyright (c) 2020 Marius Appel Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/src/gdalcubes/src/coord_types.h b/src/gdalcubes/src/coord_types.h index 6eea265..122ac83 100644 --- a/src/gdalcubes/src/coord_types.h +++ b/src/gdalcubes/src/coord_types.h @@ -1,7 +1,7 @@ /* MIT License - Copyright (c) 2020 Marius Appel + Copyright (c) 2020 Marius Appel Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/src/gdalcubes/src/crop.h b/src/gdalcubes/src/crop.h index b3abe91..58be0c8 100644 --- a/src/gdalcubes/src/crop.h +++ b/src/gdalcubes/src/crop.h @@ -1,7 +1,7 @@ /* MIT License -Copyright (c) 2021 Marius Appel +Copyright (c) 2021 Marius Appel Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/src/gdalcubes/src/cube.cpp b/src/gdalcubes/src/cube.cpp index 61b6c0b..d0ddd62 100644 --- a/src/gdalcubes/src/cube.cpp +++ b/src/gdalcubes/src/cube.cpp @@ -1,7 +1,7 @@ /* MIT License -Copyright (c) 2019 Marius Appel +Copyright (c) 2019 Marius Appel Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/src/gdalcubes/src/cube.h b/src/gdalcubes/src/cube.h index 5b19f32..86164df 100644 --- a/src/gdalcubes/src/cube.h +++ b/src/gdalcubes/src/cube.h @@ -1,7 +1,7 @@ /* MIT License - Copyright (c) 2019 Marius Appel + Copyright (c) 2019 Marius Appel Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/src/gdalcubes/src/cube_factory.cpp b/src/gdalcubes/src/cube_factory.cpp index c0579c1..3badcf3 100644 --- a/src/gdalcubes/src/cube_factory.cpp +++ b/src/gdalcubes/src/cube_factory.cpp @@ -1,7 +1,7 @@ /* MIT License - Copyright (c) 2021 Marius Appel + Copyright (c) 2021 Marius Appel Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal @@ -397,4 +397,4 @@ void cube_factory::register_default() { })); } -} // namespace gdalcubes \ No newline at end of file +} // namespace gdalcubes diff --git a/src/gdalcubes/src/cube_factory.h b/src/gdalcubes/src/cube_factory.h index 5f69fba..d7f3602 100644 --- a/src/gdalcubes/src/cube_factory.h +++ b/src/gdalcubes/src/cube_factory.h @@ -1,7 +1,7 @@ /* MIT License - Copyright (c) 2019 Marius Appel + Copyright (c) 2019 Marius Appel Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/src/gdalcubes/src/datetime.cpp b/src/gdalcubes/src/datetime.cpp index 95b882d..7b86d4b 100644 --- a/src/gdalcubes/src/datetime.cpp +++ b/src/gdalcubes/src/datetime.cpp @@ -1,7 +1,7 @@ /* MIT License - Copyright (c) 2019 Marius Appel + Copyright (c) 2019 Marius Appel Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal @@ -363,4 +363,4 @@ std::string datetime::datetime_format_for_unit(gdalcubes::datetime_unit u) { return "%Y-%m-%dT%H:%M:%S"; } -} // namespace gdalcubes \ No newline at end of file +} // namespace gdalcubes diff --git a/src/gdalcubes/src/datetime.h b/src/gdalcubes/src/datetime.h index 1329dee..63f1432 100644 --- a/src/gdalcubes/src/datetime.h +++ b/src/gdalcubes/src/datetime.h @@ -1,7 +1,7 @@ /* MIT License - Copyright (c) 2021 Marius Appel + Copyright (c) 2021 Marius Appel Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/src/gdalcubes/src/dummy.cpp b/src/gdalcubes/src/dummy.cpp index 12df014..84b3191 100644 --- a/src/gdalcubes/src/dummy.cpp +++ b/src/gdalcubes/src/dummy.cpp @@ -1,7 +1,7 @@ /* MIT License - Copyright (c) 2019 Marius Appel + Copyright (c) 2019 Marius Appel Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal @@ -60,4 +60,4 @@ std::shared_ptr empty_cube::read_chunk(chunkid_t id) { return out; } -} // namespace gdalcubes \ No newline at end of file +} // namespace gdalcubes diff --git a/src/gdalcubes/src/dummy.h b/src/gdalcubes/src/dummy.h index 840f818..72f093b 100644 --- a/src/gdalcubes/src/dummy.h +++ b/src/gdalcubes/src/dummy.h @@ -1,7 +1,7 @@ /* MIT License - Copyright (c) 2019 Marius Appel + Copyright (c) 2019 Marius Appel Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/src/gdalcubes/src/error.cpp b/src/gdalcubes/src/error.cpp index 0306735..c1b3e46 100644 --- a/src/gdalcubes/src/error.cpp +++ b/src/gdalcubes/src/error.cpp @@ -1,7 +1,7 @@ /* MIT License - Copyright (c) 2019 Marius Appel + Copyright (c) 2019 Marius Appel Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal @@ -61,4 +61,4 @@ void logger::info(std::string msg, std::string where, int error_code) { _m.unlock(); } -} // namespace gdalcubes \ No newline at end of file +} // namespace gdalcubes diff --git a/src/gdalcubes/src/error.h b/src/gdalcubes/src/error.h index 252d0b5..fc2bafd 100644 --- a/src/gdalcubes/src/error.h +++ b/src/gdalcubes/src/error.h @@ -1,7 +1,7 @@ /* MIT License - Copyright (c) 2019 Marius Appel + Copyright (c) 2019 Marius Appel Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/src/gdalcubes/src/example.cpp b/src/gdalcubes/src/example.cpp index c5b4610..6e390dc 100644 --- a/src/gdalcubes/src/example.cpp +++ b/src/gdalcubes/src/example.cpp @@ -1,7 +1,7 @@ /* MIT License - Copyright (c) 2020 Marius Appel + Copyright (c) 2020 Marius Appel Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal @@ -589,4 +589,4 @@ int main(int argc, char* argv[]) { } config::instance()->gdalcubes_cleanup(); -} \ No newline at end of file +} diff --git a/src/gdalcubes/src/extract_geom.cpp b/src/gdalcubes/src/extract_geom.cpp index ef8a4a7..f9be63d 100644 --- a/src/gdalcubes/src/extract_geom.cpp +++ b/src/gdalcubes/src/extract_geom.cpp @@ -1,7 +1,7 @@ /* MIT License -Copyright (c) 2022 Marius Appel +Copyright (c) 2022 Marius Appel Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal @@ -519,4 +519,4 @@ std::shared_ptr extract_geom::read_chunk(chunkid_t id) { return out; } -} // namespace gdalcubes \ No newline at end of file +} // namespace gdalcubes diff --git a/src/gdalcubes/src/extract_geom.h b/src/gdalcubes/src/extract_geom.h index fe441fd..bdfa4f1 100644 --- a/src/gdalcubes/src/extract_geom.h +++ b/src/gdalcubes/src/extract_geom.h @@ -1,7 +1,7 @@ /* MIT License - Copyright (c) 2022 Marius Appel + Copyright (c) 2022 Marius Appel Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/src/gdalcubes/src/filesystem.cpp b/src/gdalcubes/src/filesystem.cpp index 2ee49cc..d73542b 100644 --- a/src/gdalcubes/src/filesystem.cpp +++ b/src/gdalcubes/src/filesystem.cpp @@ -1,7 +1,7 @@ /* MIT License - Copyright (c) 2019 Marius Appel + Copyright (c) 2019 Marius Appel Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/src/gdalcubes/src/filesystem.h b/src/gdalcubes/src/filesystem.h index 6a78e0c..6099f64 100644 --- a/src/gdalcubes/src/filesystem.h +++ b/src/gdalcubes/src/filesystem.h @@ -1,7 +1,7 @@ /* MIT License - Copyright (c) 2019 Marius Appel + Copyright (c) 2019 Marius Appel Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/src/gdalcubes/src/filter_geom.cpp b/src/gdalcubes/src/filter_geom.cpp index d5e92bf..7a85f8c 100644 --- a/src/gdalcubes/src/filter_geom.cpp +++ b/src/gdalcubes/src/filter_geom.cpp @@ -1,7 +1,7 @@ /* MIT License - Copyright (c) 2022 Marius Appel + Copyright (c) 2022 Marius Appel Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal @@ -297,4 +297,4 @@ std::shared_ptr filter_geom_cube::read_chunk(chunkid_t id) { return out; } -} // namespace gdalcubes \ No newline at end of file +} // namespace gdalcubes diff --git a/src/gdalcubes/src/filter_geom.h b/src/gdalcubes/src/filter_geom.h index 86775a0..5827f15 100644 --- a/src/gdalcubes/src/filter_geom.h +++ b/src/gdalcubes/src/filter_geom.h @@ -1,7 +1,7 @@ /* MIT License - Copyright (c) 2020 Marius Appel + Copyright (c) 2020 Marius Appel Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/src/gdalcubes/src/filter_pixel.cpp b/src/gdalcubes/src/filter_pixel.cpp index 1d828c7..d4013fb 100644 --- a/src/gdalcubes/src/filter_pixel.cpp +++ b/src/gdalcubes/src/filter_pixel.cpp @@ -1,7 +1,7 @@ /* MIT License - Copyright (c) 2019 Marius Appel + Copyright (c) 2019 Marius Appel Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/src/gdalcubes/src/filter_pixel.h b/src/gdalcubes/src/filter_pixel.h index 208494f..cfeb898 100644 --- a/src/gdalcubes/src/filter_pixel.h +++ b/src/gdalcubes/src/filter_pixel.h @@ -1,5 +1,5 @@ /* - Copyright 2018 Marius Appel + Copyright 2018 Marius Appel Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/src/gdalcubes/src/gdalcubes.cpp b/src/gdalcubes/src/gdalcubes.cpp index c5cace8..6996a06 100644 --- a/src/gdalcubes/src/gdalcubes.cpp +++ b/src/gdalcubes/src/gdalcubes.cpp @@ -1,7 +1,7 @@ /* MIT License - Copyright (c) 2019 Marius Appel + Copyright (c) 2019 Marius Appel Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/src/gdalcubes/src/gdalcubes.h b/src/gdalcubes/src/gdalcubes.h index b9f75e7..3670829 100644 --- a/src/gdalcubes/src/gdalcubes.h +++ b/src/gdalcubes/src/gdalcubes.h @@ -1,7 +1,7 @@ /* MIT License - Copyright (c) 2019 Marius Appel + Copyright (c) 2019 Marius Appel Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/src/gdalcubes/src/image_collection.cpp b/src/gdalcubes/src/image_collection.cpp index 1b9025d..1b4c896 100644 --- a/src/gdalcubes/src/image_collection.cpp +++ b/src/gdalcubes/src/image_collection.cpp @@ -1,7 +1,7 @@ /* MIT License - Copyright (c) 2019 Marius Appel + Copyright (c) 2019 Marius Appel Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal @@ -1748,4 +1748,4 @@ std::string image_collection::sqlite_escape_singlequotes(std::string s) { return s; } -} // namespace gdalcubes \ No newline at end of file +} // namespace gdalcubes diff --git a/src/gdalcubes/src/image_collection.h b/src/gdalcubes/src/image_collection.h index a43cbbe..eca51f4 100644 --- a/src/gdalcubes/src/image_collection.h +++ b/src/gdalcubes/src/image_collection.h @@ -1,7 +1,7 @@ /* MIT License - Copyright (c) 2019 Marius Appel + Copyright (c) 2019 Marius Appel Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/src/gdalcubes/src/image_collection_cube.cpp b/src/gdalcubes/src/image_collection_cube.cpp index 1f8c55c..4f0d435 100644 --- a/src/gdalcubes/src/image_collection_cube.cpp +++ b/src/gdalcubes/src/image_collection_cube.cpp @@ -1,7 +1,7 @@ /* MIT License - Copyright (c) 2020 Marius Appel + Copyright (c) 2020 Marius Appel Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal @@ -717,4 +717,4 @@ void image_collection_cube::select_bands(std::vector bands) { _bands = sel; } -} // namespace gdalcubes \ No newline at end of file +} // namespace gdalcubes diff --git a/src/gdalcubes/src/image_collection_cube.h b/src/gdalcubes/src/image_collection_cube.h index d5d6bc3..faed513 100644 --- a/src/gdalcubes/src/image_collection_cube.h +++ b/src/gdalcubes/src/image_collection_cube.h @@ -1,7 +1,7 @@ /* MIT License - Copyright (c) 2020 Marius Appel + Copyright (c) 2020 Marius Appel Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/src/gdalcubes/src/image_collection_ops.cpp b/src/gdalcubes/src/image_collection_ops.cpp index 1a30084..dd5d4b8 100644 --- a/src/gdalcubes/src/image_collection_ops.cpp +++ b/src/gdalcubes/src/image_collection_ops.cpp @@ -1,5 +1,5 @@ /* - Copyright 2019 Marius Appel + Copyright 2019 Marius Appel Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -245,4 +245,4 @@ void image_collection_ops::create_overviews(std::shared_ptr in prg->finalize(); } -} // namespace gdalcubes \ No newline at end of file +} // namespace gdalcubes diff --git a/src/gdalcubes/src/image_collection_ops.h b/src/gdalcubes/src/image_collection_ops.h index bbe0a69..a8f6678 100644 --- a/src/gdalcubes/src/image_collection_ops.h +++ b/src/gdalcubes/src/image_collection_ops.h @@ -1,5 +1,5 @@ /* - Copyright 2019 Marius Appel + Copyright 2019 Marius Appel Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. diff --git a/src/gdalcubes/src/join_bands.cpp b/src/gdalcubes/src/join_bands.cpp index 18d3025..378f7e0 100644 --- a/src/gdalcubes/src/join_bands.cpp +++ b/src/gdalcubes/src/join_bands.cpp @@ -1,7 +1,7 @@ /* MIT License - Copyright (c) 2019 Marius Appel + Copyright (c) 2019 Marius Appel Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal @@ -67,4 +67,4 @@ std::shared_ptr join_bands_cube::read_chunk(chunkid_t id) { return out; } -} // namespace gdalcubes \ No newline at end of file +} // namespace gdalcubes diff --git a/src/gdalcubes/src/join_bands.h b/src/gdalcubes/src/join_bands.h index e005636..0341540 100644 --- a/src/gdalcubes/src/join_bands.h +++ b/src/gdalcubes/src/join_bands.h @@ -1,7 +1,7 @@ /* MIT License - Copyright (c) 2019 Marius Appel + Copyright (c) 2019 Marius Appel Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/src/gdalcubes/src/ncdf_cube.cpp b/src/gdalcubes/src/ncdf_cube.cpp index 7e3e2fb..6ffd828 100644 --- a/src/gdalcubes/src/ncdf_cube.cpp +++ b/src/gdalcubes/src/ncdf_cube.cpp @@ -1,7 +1,7 @@ /* MIT License - Copyright (c) 2021 Marius Appel + Copyright (c) 2021 Marius Appel Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal @@ -532,4 +532,4 @@ std::shared_ptr ncdf_cube::read_chunk(chunkid_t id) { return out; } -} // namespace gdalcubes \ No newline at end of file +} // namespace gdalcubes diff --git a/src/gdalcubes/src/ncdf_cube.h b/src/gdalcubes/src/ncdf_cube.h index 8f7eec9..33327d0 100644 --- a/src/gdalcubes/src/ncdf_cube.h +++ b/src/gdalcubes/src/ncdf_cube.h @@ -1,7 +1,7 @@ /* MIT License - Copyright (c) 2021 Marius Appel + Copyright (c) 2021 Marius Appel Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/src/gdalcubes/src/progress.h b/src/gdalcubes/src/progress.h index 0298d60..2e47a54 100644 --- a/src/gdalcubes/src/progress.h +++ b/src/gdalcubes/src/progress.h @@ -1,7 +1,7 @@ /* MIT License - Copyright (c) 2019 Marius Appel + Copyright (c) 2019 Marius Appel Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/src/gdalcubes/src/reduce_space.cpp b/src/gdalcubes/src/reduce_space.cpp index 0bdb302..bca394a 100644 --- a/src/gdalcubes/src/reduce_space.cpp +++ b/src/gdalcubes/src/reduce_space.cpp @@ -1,7 +1,7 @@ /* MIT License - Copyright (c) 2019 Marius Appel + Copyright (c) 2019 Marius Appel Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal @@ -429,4 +429,4 @@ std::shared_ptr reduce_space_cube::read_chunk(chunkid_t id) { return out; } -} // namespace gdalcubes \ No newline at end of file +} // namespace gdalcubes diff --git a/src/gdalcubes/src/reduce_space.h b/src/gdalcubes/src/reduce_space.h index 43f806b..abd11c2 100644 --- a/src/gdalcubes/src/reduce_space.h +++ b/src/gdalcubes/src/reduce_space.h @@ -1,7 +1,7 @@ /* MIT License - Copyright (c) 2019 Marius Appel + Copyright (c) 2019 Marius Appel Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/src/gdalcubes/src/reduce_time.cpp b/src/gdalcubes/src/reduce_time.cpp index 1b98b2a..9d0dc53 100644 --- a/src/gdalcubes/src/reduce_time.cpp +++ b/src/gdalcubes/src/reduce_time.cpp @@ -1,7 +1,7 @@ /* MIT License - Copyright (c) 2019 Marius Appel + Copyright (c) 2019 Marius Appel Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal @@ -614,4 +614,4 @@ std::shared_ptr reduce_time_cube::read_chunk(chunkid_t id) { } -} // namespace gdalcubes \ No newline at end of file +} // namespace gdalcubes diff --git a/src/gdalcubes/src/reduce_time.h b/src/gdalcubes/src/reduce_time.h index 6a28f7c..548d70b 100644 --- a/src/gdalcubes/src/reduce_time.h +++ b/src/gdalcubes/src/reduce_time.h @@ -1,7 +1,7 @@ /* MIT License - Copyright (c) 2019 Marius Appel + Copyright (c) 2019 Marius Appel Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/src/gdalcubes/src/rename_bands.cpp b/src/gdalcubes/src/rename_bands.cpp index 3f7259f..cecba4c 100644 --- a/src/gdalcubes/src/rename_bands.cpp +++ b/src/gdalcubes/src/rename_bands.cpp @@ -1,7 +1,7 @@ /* MIT License - Copyright (c) 2021 Marius Appel + Copyright (c) 2021 Marius Appel Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal @@ -31,4 +31,4 @@ std::shared_ptr rename_bands_cube::read_chunk(chunkid_t id) { return _in_cube->read_chunk(id); } -} // namespace gdalcubes \ No newline at end of file +} // namespace gdalcubes diff --git a/src/gdalcubes/src/rename_bands.h b/src/gdalcubes/src/rename_bands.h index fcf96a9..04f0c41 100644 --- a/src/gdalcubes/src/rename_bands.h +++ b/src/gdalcubes/src/rename_bands.h @@ -1,7 +1,7 @@ /* MIT License - Copyright (c) 2021 Marius Appel + Copyright (c) 2021 Marius Appel Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal @@ -97,4 +97,4 @@ class rename_bands_cube : public cube { } // namespace gdalcubes -#endif //RENAME_BANDS_H \ No newline at end of file +#endif //RENAME_BANDS_H diff --git a/src/gdalcubes/src/select_bands.cpp b/src/gdalcubes/src/select_bands.cpp index 841e58b..9242165 100644 --- a/src/gdalcubes/src/select_bands.cpp +++ b/src/gdalcubes/src/select_bands.cpp @@ -1,7 +1,7 @@ /* MIT License - Copyright (c) 2019 Marius Appel + Copyright (c) 2019 Marius Appel Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal @@ -59,4 +59,4 @@ std::shared_ptr select_bands_cube::read_chunk(chunkid_t id) { return out; } -} // namespace gdalcubes \ No newline at end of file +} // namespace gdalcubes diff --git a/src/gdalcubes/src/select_bands.h b/src/gdalcubes/src/select_bands.h index df1e04f..11925ba 100644 --- a/src/gdalcubes/src/select_bands.h +++ b/src/gdalcubes/src/select_bands.h @@ -1,7 +1,7 @@ /* MIT License - Copyright (c) 2019 Marius Appel + Copyright (c) 2019 Marius Appel Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal @@ -151,4 +151,4 @@ class select_bands_cube : public cube { } // namespace gdalcubes -#endif //SELECT_BANDS_H \ No newline at end of file +#endif //SELECT_BANDS_H diff --git a/src/gdalcubes/src/server.cpp b/src/gdalcubes/src/server.cpp index 6990623..cdd6637 100644 --- a/src/gdalcubes/src/server.cpp +++ b/src/gdalcubes/src/server.cpp @@ -1,7 +1,7 @@ /* MIT License - Copyright (c) 2019 Marius Appel + Copyright (c) 2019 Marius Appel Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/src/gdalcubes/src/server.h b/src/gdalcubes/src/server.h index 72bebe5..2726219 100644 --- a/src/gdalcubes/src/server.h +++ b/src/gdalcubes/src/server.h @@ -1,7 +1,7 @@ /* MIT License - Copyright (c) 2019 Marius Appel + Copyright (c) 2019 Marius Appel Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/src/gdalcubes/src/simple_cube.cpp b/src/gdalcubes/src/simple_cube.cpp index 8a6cca5..d4c0056 100644 --- a/src/gdalcubes/src/simple_cube.cpp +++ b/src/gdalcubes/src/simple_cube.cpp @@ -1,7 +1,7 @@ /* MIT License - Copyright (c) 2021 Marius Appel + Copyright (c) 2021 Marius Appel Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal @@ -346,4 +346,4 @@ std::shared_ptr simple_cube::read_chunk(chunkid_t id) { return out; } -} // namespace gdalcubes \ No newline at end of file +} // namespace gdalcubes diff --git a/src/gdalcubes/src/simple_cube.h b/src/gdalcubes/src/simple_cube.h index 0f96871..a6429d3 100644 --- a/src/gdalcubes/src/simple_cube.h +++ b/src/gdalcubes/src/simple_cube.h @@ -1,7 +1,7 @@ /* MIT License - Copyright (c) 2021 Marius Appel + Copyright (c) 2021 Marius Appel Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/src/gdalcubes/src/slice_space.h b/src/gdalcubes/src/slice_space.h index 500c183..cd9c455 100644 --- a/src/gdalcubes/src/slice_space.h +++ b/src/gdalcubes/src/slice_space.h @@ -1,7 +1,7 @@ /* MIT License -Copyright (c) 2021 Marius Appel +Copyright (c) 2021 Marius Appel Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/src/gdalcubes/src/slice_time.h b/src/gdalcubes/src/slice_time.h index 4f888ca..ad395eb 100644 --- a/src/gdalcubes/src/slice_time.h +++ b/src/gdalcubes/src/slice_time.h @@ -1,7 +1,7 @@ /* MIT License -Copyright (c) 2021 Marius Appel +Copyright (c) 2021 Marius Appel Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/src/gdalcubes/src/stream.cpp b/src/gdalcubes/src/stream.cpp index 900fdce..6ad5537 100644 --- a/src/gdalcubes/src/stream.cpp +++ b/src/gdalcubes/src/stream.cpp @@ -1,7 +1,7 @@ /* MIT License - Copyright (c) 2019 Marius Appel + Copyright (c) 2019 Marius Appel Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal @@ -157,4 +157,4 @@ std::shared_ptr stream_cube::stream_chunk_file(std::shared_ptr + Copyright (c) 2019 Marius Appel Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/src/gdalcubes/src/swarm.cpp b/src/gdalcubes/src/swarm.cpp index ca8b22e..0397362 100644 --- a/src/gdalcubes/src/swarm.cpp +++ b/src/gdalcubes/src/swarm.cpp @@ -1,7 +1,7 @@ /* MIT License - Copyright (c) 2019 Marius Appel + Copyright (c) 2019 Marius Appel Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/src/gdalcubes/src/swarm.h b/src/gdalcubes/src/swarm.h index f2faec4..805aad6 100644 --- a/src/gdalcubes/src/swarm.h +++ b/src/gdalcubes/src/swarm.h @@ -1,7 +1,7 @@ /* MIT License - Copyright (c) 2019 Marius Appel + Copyright (c) 2019 Marius Appel Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal @@ -95,4 +95,4 @@ class gdalcubes_swarm : public chunk_processor { #endif //SWARM_H -#endif // GDALCUBES_NO_SWARM \ No newline at end of file +#endif // GDALCUBES_NO_SWARM diff --git a/src/gdalcubes/src/test/test_aggregate_time.cpp b/src/gdalcubes/src/test/test_aggregate_time.cpp index 376576d..34584fc 100644 --- a/src/gdalcubes/src/test/test_aggregate_time.cpp +++ b/src/gdalcubes/src/test/test_aggregate_time.cpp @@ -1,7 +1,7 @@ /* MIT License - Copyright (c) 2021 Marius Appel + Copyright (c) 2021 Marius Appel Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/src/gdalcubes/src/test/test_datetime.cpp b/src/gdalcubes/src/test/test_datetime.cpp index c2557d9..a56e077 100644 --- a/src/gdalcubes/src/test/test_datetime.cpp +++ b/src/gdalcubes/src/test/test_datetime.cpp @@ -1,7 +1,7 @@ /* MIT License - Copyright (c) 2019 Marius Appel + Copyright (c) 2019 Marius Appel Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal @@ -125,4 +125,4 @@ TEST_CASE("Datetime Access Functions", "[datetime]") { REQUIRE(xxx.month() == 4); REQUIRE(xxx.dayofmonth() == 30); -} \ No newline at end of file +} diff --git a/src/gdalcubes/src/test/test_filesystem.cpp b/src/gdalcubes/src/test/test_filesystem.cpp index d42f1c5..fe2eaaa 100644 --- a/src/gdalcubes/src/test/test_filesystem.cpp +++ b/src/gdalcubes/src/test/test_filesystem.cpp @@ -1,7 +1,7 @@ /* MIT License - Copyright (c) 2019 Marius Appel + Copyright (c) 2019 Marius Appel Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal @@ -48,4 +48,4 @@ TEST_CASE("Filesystem join, parent, stem, extension", "[filesystem]") { REQUIRE(filesystem::filename("/xyz.txt") == "xyz.txt"); REQUIRE(filesystem::filename("ddd/dsds/xyz.txt") == "xyz.txt"); REQUIRE(filesystem::filename("xyz.txt") == "xyz.txt"); -} \ No newline at end of file +} diff --git a/src/gdalcubes/src/test/test_main.cpp b/src/gdalcubes/src/test/test_main.cpp index 52f6e3a..04a816c 100644 --- a/src/gdalcubes/src/test/test_main.cpp +++ b/src/gdalcubes/src/test/test_main.cpp @@ -1,7 +1,7 @@ /* MIT License - Copyright (c) 2019 Marius Appel + Copyright (c) 2019 Marius Appel Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/src/gdalcubes/src/test/test_sampledata.cpp b/src/gdalcubes/src/test/test_sampledata.cpp index d9b1db8..4980a6d 100644 --- a/src/gdalcubes/src/test/test_sampledata.cpp +++ b/src/gdalcubes/src/test/test_sampledata.cpp @@ -1,7 +1,7 @@ /* MIT License - Copyright (c) 2019 Marius Appel + Copyright (c) 2019 Marius Appel Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/src/gdalcubes/src/test/test_view.cpp b/src/gdalcubes/src/test/test_view.cpp index e6507b5..cffc54e 100644 --- a/src/gdalcubes/src/test/test_view.cpp +++ b/src/gdalcubes/src/test/test_view.cpp @@ -1,7 +1,7 @@ /* MIT License - Copyright (c) 2019 Marius Appel + Copyright (c) 2019 Marius Appel Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/src/gdalcubes/src/timer.h b/src/gdalcubes/src/timer.h index 4ca5eb4..a2ffbb0 100644 --- a/src/gdalcubes/src/timer.h +++ b/src/gdalcubes/src/timer.h @@ -1,7 +1,7 @@ /* MIT License - Copyright (c) 2019 Marius Appel + Copyright (c) 2019 Marius Appel Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/src/gdalcubes/src/utils.cpp b/src/gdalcubes/src/utils.cpp index 32c2d5c..72b24d3 100644 --- a/src/gdalcubes/src/utils.cpp +++ b/src/gdalcubes/src/utils.cpp @@ -1,7 +1,7 @@ /* MIT License - Copyright (c) 2019 Marius Appel + Copyright (c) 2019 Marius Appel Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal @@ -171,4 +171,4 @@ std::string utils::env::to_string() { return out; } -} // namespace gdalcubes \ No newline at end of file +} // namespace gdalcubes diff --git a/src/gdalcubes/src/utils.h b/src/gdalcubes/src/utils.h index 54a5569..bb79d30 100644 --- a/src/gdalcubes/src/utils.h +++ b/src/gdalcubes/src/utils.h @@ -1,7 +1,7 @@ /* MIT License - Copyright (c) 2019 Marius Appel + Copyright (c) 2019 Marius Appel Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/src/gdalcubes/src/vector_queries.cpp b/src/gdalcubes/src/vector_queries.cpp index 631c07a..11e9759 100644 --- a/src/gdalcubes/src/vector_queries.cpp +++ b/src/gdalcubes/src/vector_queries.cpp @@ -1,7 +1,7 @@ /* MIT License - Copyright (c) 2019 Marius Appel + Copyright (c) 2019 Marius Appel Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal @@ -1167,4 +1167,4 @@ void vector_queries::zonal_statistics(std::shared_ptr cube, std::string og prg->finalize(); } -} // namespace gdalcubes \ No newline at end of file +} // namespace gdalcubes diff --git a/src/gdalcubes/src/vector_queries.h b/src/gdalcubes/src/vector_queries.h index 882c7cb..61c2f48 100644 --- a/src/gdalcubes/src/vector_queries.h +++ b/src/gdalcubes/src/vector_queries.h @@ -1,7 +1,7 @@ /* MIT License - Copyright (c) 2019 Marius Appel + Copyright (c) 2019 Marius Appel Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/src/gdalcubes/src/view.cpp b/src/gdalcubes/src/view.cpp index 8ab19a6..71c5513 100644 --- a/src/gdalcubes/src/view.cpp +++ b/src/gdalcubes/src/view.cpp @@ -1,7 +1,7 @@ /* MIT License - Copyright (c) 2019 Marius Appel + Copyright (c) 2019 Marius Appel Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal @@ -157,4 +157,4 @@ std::string cube_view::write_json_string() { return j.dump(); } -} // namespace gdalcubes \ No newline at end of file +} // namespace gdalcubes diff --git a/src/gdalcubes/src/view.h b/src/gdalcubes/src/view.h index 65dbcf3..5bdfeb3 100644 --- a/src/gdalcubes/src/view.h +++ b/src/gdalcubes/src/view.h @@ -1,7 +1,7 @@ /* MIT License - Copyright (c) 2019 Marius Appel + Copyright (c) 2019 Marius Appel Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/src/gdalcubes/src/warp.cpp b/src/gdalcubes/src/warp.cpp index 1ff40ac..7511674 100644 --- a/src/gdalcubes/src/warp.cpp +++ b/src/gdalcubes/src/warp.cpp @@ -1,7 +1,7 @@ /* MIT License - Copyright (c) 2020 Marius Appel + Copyright (c) 2020 Marius Appel Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal @@ -416,4 +416,4 @@ void gdalwarp_client::destroy_reprojection(gdalcubes_reprojection_info *reprojec } } -} // namespace gdalcubes \ No newline at end of file +} // namespace gdalcubes diff --git a/src/gdalcubes/src/warp.h b/src/gdalcubes/src/warp.h index 4627c4b..5404868 100644 --- a/src/gdalcubes/src/warp.h +++ b/src/gdalcubes/src/warp.h @@ -1,7 +1,7 @@ /* MIT License - Copyright (c) 2020 Marius Appel + Copyright (c) 2020 Marius Appel Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/src/gdalcubes/src/window_time.cpp b/src/gdalcubes/src/window_time.cpp index 5e399eb..2e13911 100644 --- a/src/gdalcubes/src/window_time.cpp +++ b/src/gdalcubes/src/window_time.cpp @@ -1,7 +1,7 @@ /* MIT License - Copyright (c) 2019 Marius Appel + Copyright (c) 2019 Marius Appel Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal @@ -255,4 +255,4 @@ std::shared_ptr window_time_cube::read_chunk(chunkid_t id) { return out; } -} // namespace gdalcubes \ No newline at end of file +} // namespace gdalcubes diff --git a/src/gdalcubes/src/window_time.h b/src/gdalcubes/src/window_time.h index f16d123..44ec8b2 100644 --- a/src/gdalcubes/src/window_time.h +++ b/src/gdalcubes/src/window_time.h @@ -1,7 +1,7 @@ /* MIT License - Copyright (c) 2019 Marius Appel + Copyright (c) 2019 Marius Appel Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/vignettes/gc01_MODIS.Rmd b/vignettes/gc01_MODIS.Rmd index 127caa8..ca440e5 100644 --- a/vignettes/gc01_MODIS.Rmd +++ b/vignettes/gc01_MODIS.Rmd @@ -35,7 +35,7 @@ We will use 8-daily land surface temperature from the MODIS product [MOD11A2](ht ```{r data_download, echo=TRUE, results='hide'} options(timeout = max(1800, getOption("timeout"))) dest_dir = tempdir() -download.file("https://uni-muenster.sciebo.de/s/eP9E6OIkQbXrmsY/download", destfile=file.path(dest_dir, "MOD11A2.zip"),mode = "wb") +download.file("https://hs-bochum.sciebo.de/s/8mKf1Ye1z9SRUr8/download", destfile=file.path(dest_dir, "MOD11A2.zip"),mode = "wb") unzip(file.path(dest_dir, "MOD11A2.zip"), exdir = file.path(dest_dir,"MOD11A2")) unlink(file.path(dest_dir, "MOD11A2.zip")) ``` @@ -112,13 +112,12 @@ Notice that no data is actually read until we call `plot()`, i.e. all operations Operations on data cubes are designed such that they can be used with the native pipe operator `|>` (or `%>%` from the `magrittr` package). The following code for example derives monthly differences of land surface temperature, from June to September 2018. The `window_time` function here applies the simple time series kernel difference filter $T_t - T_{t-1}$. ```{r, fig.dim=c(7,3.5),fig.align="center"} -library(magrittr) # get the pipe # update v by changing temporal extent only v1 = cube_view(view=v, extent=list(t0="2018-06", t1="2018-09")) -raster_cube(MODIS.collection, v1) %>% - select_bands(c("LST_DAY")) %>% - apply_pixel("LST_DAY * 0.02") %>% # apply scale - window_time(kernel=c(-1,1), window=c(1,0)) %>% +raster_cube(MODIS.collection, v1) |> + select_bands(c("LST_DAY")) |> + apply_pixel("LST_DAY * 0.02") |> # apply scale + window_time(kernel=c(-1,1), window=c(1,0)) |> plot(col=terrain.colors, key.pos=1, zlim=c(-25,25), t = 2:4, ncol = 3) ```