Merge pull request #31 from lawinslow/master

fix zmax issues
GLEON · Jul 15, 2016 · 5a3d5c7 · 5a3d5c7
2 parents 5e2aa9f + 95da83f
commit 5a3d5c7
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 2 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,7 +1,7 @@
 Package: lakeattributes
 Type: Package
 Title: A collection of lake attribute data
-Version: 0.8.6
+Version: 0.8.7
 Date: 2015-05-18
 Author: Luke Winslow
 Maintainer: Luke Winslow <[email protected]>

diff --git a/R/get_zmax.R b/R/get_zmax.R
@@ -20,10 +20,18 @@
 get_zmax = function(id){
 	site_id = as.character(id)
 
+	bathy = get_bathy(id, cone_est=FALSE)
+	#quick short circuit. If we have a bathy file, 
+	#return max depth from that. 
+
+	if(!is.null(bathy)){
+		return(max(bathy$depths, na.rm=TRUE))
+	}
+
 	lake_zmax = subset(zmax, site_id == id)
 	if(nrow(lake_zmax) < 1){
 
-			return(max(get_bathy(site_id, cone_est=FALSE)$depth))
+			return(max(get_bathy(site_id, cone_est=FALSE)$depths))
 
 	}else{
 		if(nrow(lake_zmax) > 1){

diff --git a/R/wtemp.R b/R/wtemp.R
@@ -17,6 +17,8 @@
 #' 
 #' @docType data
 #' 
+#' 
+#' 
 #' @examples
 #' data(wtemp)
 #' head(wtemp)