fdetsch · fdetsch · Feb 14, 2023 · Feb 14, 2023 · Feb 14, 2023 · Feb 20, 2023
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,6 +1,6 @@
 Package: MODIS
 Title: Acquisition and Processing of MODIS Products
-Version: 1.2.11
+Version: 1.2.11.9000
 URL: https://github.com/fdetsch/MODIS
 BugReports: https://github.com/fdetsch/MODIS/issues
 Authors@R: c(

diff --git a/NEWS b/NEWS
@@ -1,3 +1,14 @@
+MODIS 1.2.11.9000 (2023-02-14)
+
+features and improvements
+
+bug fixes
+
+documentation etc
+
+miscellaneous
+
+
 MODIS 1.2.11 (2023-01-06)
 
 features and improvements

diff --git a/NEWS.md b/NEWS.md
@@ -1,3 +1,17 @@
+# MODIS 1.2.11.9000 (2023-02-14)
+
+#### ✨ features and improvements
+
+#### 🐛 bug fixes
+
+  * `checkEarthdataLogin()` no longer takes 'MODISserverOrder' as argument when 
+    running `MODISoptions()` with missing or incorrect credentials
+
+#### 💬 documentation etc
+
+#### 🍬 miscellaneous
+
+
 # MODIS 1.2.11 (2023-01-06)
 
 #### ✨ features and improvements

diff --git a/R/MODISoptions.R b/R/MODISoptions.R
@@ -328,7 +328,6 @@ MODISoptions <- function(localArcPath, outDirPath, pixelSize, outProj,
   ) {
     opt$EarthdataLogin = checkEarthdataLogin(
       opt$dlmethod
-      , opt$MODISserverOrder
     )
   }
 

diff --git a/R/downloadUtils.R b/R/downloadUtils.R
@@ -152,7 +152,7 @@ downloadFileCurl = function(
     , connecttimeout = 60L
   )
 
-  if (srv != "LAADS") {
+  if (srv == "LPDAAC") {
     args$httpauth = NULL
   }
 

diff --git a/R/getSds.R b/R/getSds.R
@@ -33,8 +33,7 @@
 #'   , SDSstring = 1
 #' )
 #' 
-#' @export getSds
-#' @name getSds
+#' @export
 getSds = function(
   HdfName
   , SDSstring = NULL

diff --git a/README.md b/README.md
@@ -1,8 +1,8 @@
 ## **MODIS**: Acquisition and Processing of MODIS Products
 
 [![CRAN_version](http://www.r-pkg.org/badges/version/MODIS)](https://cran.r-project.org/package=MODIS)
-[![GitHub](https://img.shields.io/github/license/mashape/apistatus.svg)](https://opensource.org/licenses/MIT)
-[![Join the chat at https://gitter.im/r-modis/Lobby](https://badges.gitter.im/r-modis/Lobby.svg)](https://gitter.im/r-modis/Lobby?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
+[![GitHub](https://img.shields.io/github/license/mashape/apistatus.svg)](https://opensource.org/license/mit/)
+[![Join the chat at https://gitter.im/r-modis/Lobby](https://app.gitter.im/#/room/#r-modis_Lobby:gitter.im?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
 
 
 ====

diff --git a/exec/exec-modis_dl.R b/exec/exec-modis_dl.R
@@ -8,9 +8,12 @@ library(sf)
 
 lap = file.path(
   tempdir()
-  , "MODIS"
+  , "MODIS_ARC"
 )
 
+wrn = getOption("warn")
+options(warn = 2L)
+
 MODISoptions(
   localArcPath = lap
   , outDirPath = file.path(
@@ -21,6 +24,8 @@ MODISoptions(
   , save = FALSE
 )
 
+options(warn = wrn)
+
 
 ### aoi ----
 
@@ -46,7 +51,7 @@ kili = st_buffer(
 #   )
 #   , col.regions = "cornflowerblue"
 #   , alpha.regions = 0.4
-#   , map.types = mapviewGetOption(
+#   , map.types = mapview::mapviewGetOption(
 #     "basemaps"
 #   )[
 #     c(4, 1:3, 5)
@@ -55,9 +60,10 @@ kili = st_buffer(
 # )
 
 
-### download ----
+## DOWNLOAD ====
+
+### lpdaac ----
 
-## lpdaac
 product = "MOD13A1"
 
 clc = getCollection(
@@ -70,16 +76,16 @@ tifs = runGdal(
   , collection = clc
   , extent = kili
   , begin = "2021-03-01"
-  , end = "2021-05-31"
+  , end = "2021-04-30"
   , SDSstring = "1"
   , job = "mod13a1_kili"
   , MODISserverOrder = "LPDAAC"
   , quiet = FALSE
 )
 
 
+### laads ----
 
-## LAADS
 hdfs1 = getHdf(
   product
   , collection = clc
@@ -91,6 +97,9 @@ hdfs1 = getHdf(
   , quiet = FALSE
 )
 
+
+### nsidc ----
+
 product2 = "MOD10A1"
 
 clc2 = getCollection(
-Original file line number
+Diff line change
@@ Expand Up @@
       ) {
         opt$EarthdataLogin = checkEarthdataLogin(
           opt$dlmethod
-          , opt$MODISserverOrder
         )
       }
@@ Expand Down @@