From 42b1d7ad7fd038b3e404307a7835bc6d1a812079 Mon Sep 17 00:00:00 2001 From: Jordan S Read Date: Fri, 3 Jun 2016 11:29:11 -0500 Subject: [PATCH 1/3] explicit arg name --- R/values-webgeom.R | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/R/values-webgeom.R b/R/values-webgeom.R index 22e0b5e..70c0afc 100644 --- a/R/values-webgeom.R +++ b/R/values-webgeom.R @@ -53,7 +53,7 @@ fetchGML_IDs <- function(.Object){ url <- sprintf('%s?service=WFS&version=%s&request=GetFeature&typename=%s&MAXFEATURES=5000&propertyname=%s', url(.Object), version(.Object), geom(.Object), .Object@attribute) ns_geom <- strsplit(geom(.Object), ":")[[1]][1] - response <- gGET(url) + response <- gGET(url=url) xml <- gcontent(response) value_path <- sprintf('//gml:featureMembers/%s/%s:%s', geom(.Object), ns_geom, .Object@attribute) value_names <- sapply(getNodeSet(xml,paste0(value_path, '/node()[1]')), From 7673cd18cab704aee77606b5699a91e758febfe4 Mon Sep 17 00:00:00 2001 From: Jordan S Read Date: Fri, 15 Jul 2016 14:23:54 -0500 Subject: [PATCH 2/3] using attribute local name in path for #289 --- R/query-webgeom.R | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/R/query-webgeom.R b/R/query-webgeom.R index 2ca5d38..0ac952b 100644 --- a/R/query-webgeom.R +++ b/R/query-webgeom.R @@ -21,7 +21,7 @@ setMethod(f = "query",signature("webgeom",'character'), } url <- sprintf('%s?service=WFS&version=%s&request=GetFeature&typename=%s&propertyname=%s', url(.Object), version(.Object), geom(.Object), .Object@attribute) - input_list[['key']] = geom(.Object) + input_list[['key']] <- sprintf("%s/*[local-name()='%s']", geom(.Object), .Object@attribute) } else { stop('field ', field, ' not supported.') } From b5d281e815f3e3e4bdb8d76c27cfd588b1c3e8db Mon Sep 17 00:00:00 2001 From: Jordan S Read Date: Fri, 15 Jul 2016 14:29:35 -0500 Subject: [PATCH 3/3] for changes to #289 --- DESCRIPTION | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/DESCRIPTION b/DESCRIPTION index 71bcc71..7574976 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,7 +1,7 @@ Package: geoknife Type: Package Title: Web-Processing of Large Gridded Datasets -Version: 1.3.3 +Version: 1.3.4 Date: 2016-06-09 Authors@R: c( person("Jordan", "Read", role = c("aut","cre"), email = "jread@usgs.gov"),