Skip to content
Snippets Groups Projects

siteInfo bug fixed in large WQP calls.

Merged Laura A DeCicco requested to merge ldecicco-USGS:master into master
8 files
+ 101
43
Compare changes
  • Side-by-side
  • Inline
Files
8
+ 1
31
@@ -121,37 +121,7 @@ importWQP <- function(url, zip=FALSE, tz=""){
@@ -121,37 +121,7 @@ importWQP <- function(url, zip=FALSE, tz=""){
if(all(is.na(retval$ActivityEndDateTime))){
if(all(is.na(retval$ActivityEndDateTime))){
retval$ActivityEndDateTime <- NULL
retval$ActivityEndDateTime <- NULL
}
}
siteInfo <- whatWQPsites(siteid=paste(unique(retval$MonitoringLocationIdentifier),collapse=","))
siteInfoCommon <- data.frame(station_nm=siteInfo$MonitoringLocationName,
agency_cd=siteInfo$OrganizationIdentifier,
site_no=siteInfo$MonitoringLocationIdentifier,
dec_lat_va=siteInfo$LatitudeMeasure,
dec_lon_va=siteInfo$LongitudeMeasure,
hucCd=siteInfo$HUCEightDigitCode,
stringsAsFactors=FALSE)
siteInfo <- cbind(siteInfoCommon, siteInfo)
variableInfo <- data.frame(characteristicName=retval$CharacteristicName,
parameterCd=retval$USGSPCode,
param_units=retval$ResultMeasure.MeasureUnitCode,
valueType=retval$ResultSampleFractionText,
stringsAsFactors=FALSE)
variableInfo <- unique(variableInfo)
if(any(!is.na(variableInfo$parameterCd))){
pCodeToName <- pCodeToName
varExtras <- pCodeToName[pCodeToName$parm_cd %in% unique(variableInfo$parameterCd[!is.na(variableInfo$parameterCd)]),]
names(varExtras)[names(varExtras) == "parm_cd"] <- "parameterCd"
variableInfo <- merge(variableInfo, varExtras, by="parameterCd")
}
attr(retval, "siteInfo") <- siteInfo
attr(retval, "variableInfo") <- variableInfo
return(retval)
return(retval)
} else {
} else {
Loading