Update bugFixes

Merge branch 'master' of https://github.com/SPATIAL-Lab/isoWater

# Conflicts:
#	DESCRIPTION
#	NEWS.md

Author: bumbanian

DESCRIPTION

@@ -1,7 +1,7 @@
 Package: isoWater
 Type: Package
 Title: Discovery, Retrieval, and Analysis of Water Isotope Data 
-Version: 1.1.0
+Version: 1.1.0.9000
 Authors@R: person("Gabe", "Bowen", email = "gabe.bowen@utah.edu",
                   role = c("aut", "cre"))
 Maintainer: Gabe Bowen <gabe.bowen@utah.edu>
@@ -26,4 +26,3 @@ License: GPL-3
 Language: en-US
 Encoding: UTF-8
 LazyData: true
-RoxygenNote: 7.1.2

NEWS.md

@@ -1,5 +1,9 @@
 # isoWater news
 
+## isoWater 1.1.0.9000
+* iso function now checks for and removes data with missing values
+* Bug fixes
+
 ## isoWater 1.1.0
 * Add dex function
 * Bug and spelling fixes

R/constructors.R

@@ -8,6 +8,10 @@ iso = function(H, O, Hsd, Osd, HOc = 0){
   if(any(v$HOc > v$Hsd * v$Osd)){
     stop("Inconsistent SD and COV values")
   }
+  if(any(rowSums(is.na(v)) > 0)){
+    v = v[rowSums((is.na(v))) == 0,]
+    warning("One or more samples include misisng values and were dropped")
+  }
   class(v)[2] = "iso"
   return(v)
 }

R/watercomp.R

@@ -15,7 +15,6 @@ mwlSource = function(obs, MWL = NULL, slope, stype = 1, ngens=1e4, ncores = 1){
   if(MWL[6] == 80672 & stype == 2){
     warning("Using stype=2 and GMWL is inappropriate for most applications; see man")
   }
-  
   if(!inherits(obs, "iso")){
     warning("Expecting iso object for obs, this argument may be formatted incorrectly")
   }
@@ -37,7 +36,7 @@ mwlSource = function(obs, MWL = NULL, slope, stype = 1, ngens=1e4, ncores = 1){
 
   #establish credible range for source water d18O
   #center calculated as intersection of EL and MWL
-  o_cent = (MWL[2] - (obs$H - slope[1] * obs$O) ) / (slope[1]-MWL[1])
+  o_cent = (MWL[2] - (mean(obs$H) - slope[1] * mean(obs$O)) ) / (slope[1]-MWL[1])
 
   #large range of d18O values to evaluate
   o_eval = seq(o_cent - 25, o_cent + 25, by = 0.001)

R/wiDBfunctions.R

@@ -193,6 +193,11 @@ wiDB_data = function(minLat = NULL, maxLat = NULL, minLong = NULL, maxLong = NUL
     return(NULL)
   }  
 
+  if(g$headers$`content-length` == 0){
+    message("Content-length zero")
+    return(NULL)
+  }
+  
   fn = g$headers$`content-disposition`
   fn = strsplit(fn, "=")[[1]][2]
   writeBin(g$content, paste0(tmpdir, "/", fn))