update email, affiliation, and data URLs; drop magrittr suggests

appelmar · Dec 8, 2023 · 45921e6 · 45921e6
1 parent f93d22e
commit 45921e6
Show file tree

Hide file tree

Showing 87 changed files with 134 additions and 133 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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 <marius.appel@uni-muenster.de>.
+# Report bugs to <marius.appel@hs-bochum.de>.
 #
 #
 # 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 <marius.appel@uni-muenster.de>.
+Report bugs to <marius.appel@hs-bochum.de>.
 _ACEOF
 ac_status=$?
 fi
@@ -4429,7 +4429,7 @@ Usage: $0 [OPTION]... [TAG]...
 Configuration files:
 $config_files
 
-Report bugs to <marius.appel@uni-muenster.de>."
+Report bugs to <marius.appel@hs-bochum.de>."
 
 _ACEOF
 ac_cs_config=`printf "%s\n" "$ac_configure_args" | sed "$ac_safe_unquote"`

diff --git 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
@@ -1,7 +1,7 @@
 /*
     MIT License
 
-    Copyright (c) 2022 Marius Appel <marius.appel@uni-muenster.de>
+    Copyright (c) 2022 Marius Appel <marius.appel@hs-bochum.de>
 
     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<chunk_data> aggregate_space_cube::read_chunk(chunkid_t id) {
     }
     return out;
 }
-}  // namespace gdalcubes
+}  // namespace gdalcubes
diff --git 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 <marius.appel@uni-muenster.de>
+    Copyright (c) 2022 Marius Appel <marius.appel@hs-bochum.de>
 
     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
@@ -1,7 +1,7 @@
 /*
     MIT License
 
-    Copyright (c) 2021 Marius Appel <marius.appel@uni-muenster.de>
+    Copyright (c) 2021 Marius Appel <marius.appel@hs-bochum.de>
 
     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<chunk_data> aggregate_time_cube::read_chunk(chunkid_t id) {
     }
     return out;
 }
-}  // namespace gdalcubes
+}  // namespace gdalcubes
diff --git 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 <marius.appel@uni-muenster.de>
+    Copyright (c) 2021 Marius Appel <marius.appel@hs-bochum.de>
 
     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
@@ -1,7 +1,7 @@
 /*
  MIT License
 
- Copyright (c) 2019 Marius Appel <marius.appel@uni-muenster.de>
+ Copyright (c) 2019 Marius Appel <marius.appel@hs-bochum.de>
 
  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
+}  // namespace gdalcubes
diff --git 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 <marius.appel@uni-muenster.de>
+    Copyright (c) 2019 Marius Appel <marius.appel@hs-bochum.de>
 
     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
@@ -1,7 +1,7 @@
 /*
     MIT License
 
-    Copyright (c) 2019 Marius Appel <marius.appel@uni-muenster.de>
+    Copyright (c) 2019 Marius Appel <marius.appel@hs-bochum.de>
 
     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
+}  // namespace gdalcubes
diff --git 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 <marius.appel@uni-muenster.de>
+    Copyright (c) 2019 Marius Appel <marius.appel@hs-bochum.de>
 
     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
@@ -1,7 +1,7 @@
 /*
     MIT License
 
-    Copyright (c) 2020 Marius Appel <marius.appel@uni-muenster.de>
+    Copyright (c) 2020 Marius Appel <marius.appel@hs-bochum.de>
 
     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
@@ -1,7 +1,7 @@
 /*
     MIT License
 
-    Copyright (c) 2020 Marius Appel <marius.appel@uni-muenster.de>
+    Copyright (c) 2020 Marius Appel <marius.appel@hs-bochum.de>
 
     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
@@ -1,7 +1,7 @@
 /*
     MIT License
 
-    Copyright (c) 2020 Marius Appel <marius.appel@uni-muenster.de>
+    Copyright (c) 2020 Marius Appel <marius.appel@hs-bochum.de>
 
     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
@@ -1,7 +1,7 @@
 /*
 MIT License
 
-Copyright (c) 2021 Marius Appel <marius.appel@uni-muenster.de>
+Copyright (c) 2021 Marius Appel <marius.appel@hs-bochum.de>
 
 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
@@ -1,7 +1,7 @@
 /*
  MIT License
 
-Copyright (c) 2019 Marius Appel <marius.appel@uni-muenster.de>
+Copyright (c) 2019 Marius Appel <marius.appel@hs-bochum.de>
 
 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
@@ -1,7 +1,7 @@
 /*
     MIT License
 
-    Copyright (c) 2019 Marius Appel <marius.appel@uni-muenster.de>
+    Copyright (c) 2019 Marius Appel <marius.appel@hs-bochum.de>
 
     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
@@ -1,7 +1,7 @@
 /*
     MIT License
 
-    Copyright (c) 2021 Marius Appel <marius.appel@uni-muenster.de>
+    Copyright (c) 2021 Marius Appel <marius.appel@hs-bochum.de>
 
     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
+}  // namespace gdalcubes
diff --git 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 <marius.appel@uni-muenster.de>
+    Copyright (c) 2019 Marius Appel <marius.appel@hs-bochum.de>
 
     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
@@ -1,7 +1,7 @@
 /*
     MIT License
 
-    Copyright (c) 2019 Marius Appel <marius.appel@uni-muenster.de>
+    Copyright (c) 2019 Marius Appel <marius.appel@hs-bochum.de>
 
     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
+}  // namespace gdalcubes
diff --git a/src/gdalcubes/src/datetime.h b/src/gdalcubes/src/datetime.h
@@ -1,7 +1,7 @@
 /*
     MIT License
 
-    Copyright (c) 2021 Marius Appel <marius.appel@uni-muenster.de>
+    Copyright (c) 2021 Marius Appel <marius.appel@hs-bochum.de>
 
     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
@@ -1,7 +1,7 @@
 /*
     MIT License
 
-    Copyright (c) 2019 Marius Appel <marius.appel@uni-muenster.de>
+    Copyright (c) 2019 Marius Appel <marius.appel@hs-bochum.de>
 
     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<chunk_data> empty_cube::read_chunk(chunkid_t id) {
     return out;
 }
 
-}  // namespace gdalcubes
+}  // namespace gdalcubes
diff --git a/src/gdalcubes/src/dummy.h b/src/gdalcubes/src/dummy.h
@@ -1,7 +1,7 @@
 /*
     MIT License
 
-    Copyright (c) 2019 Marius Appel <marius.appel@uni-muenster.de>
+    Copyright (c) 2019 Marius Appel <marius.appel@hs-bochum.de>
 
     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
@@ -1,7 +1,7 @@
 /*
     MIT License
 
-    Copyright (c) 2019 Marius Appel <marius.appel@uni-muenster.de>
+    Copyright (c) 2019 Marius Appel <marius.appel@hs-bochum.de>
 
     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
+}  // namespace gdalcubes
diff --git a/src/gdalcubes/src/error.h b/src/gdalcubes/src/error.h
@@ -1,7 +1,7 @@
 /*
     MIT License
 
-    Copyright (c) 2019 Marius Appel <marius.appel@uni-muenster.de>
+    Copyright (c) 2019 Marius Appel <marius.appel@hs-bochum.de>
 
     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
@@ -1,7 +1,7 @@
 /*
     MIT License
 
-    Copyright (c) 2020 Marius Appel <marius.appel@uni-muenster.de>
+    Copyright (c) 2020 Marius Appel <marius.appel@hs-bochum.de>
 
     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();
-}
+}