master #4 - fix wfs data download

openfigis · Nov 20, 2013 · af283d6 · af283d6
1 parent 4d01757
commit af283d6
Showing 1 changed file with 7 additions and 4 deletions.
diff --git a/R/FigisGeoUtils.R b/R/FigisGeoUtils.R
@@ -17,12 +17,15 @@
 # Notes:
 # - only supported for GML2 for now
 #
-readWFS <- function(url, outputFormat = "GML2", p4s = NULL, gmlIdAttributeName="gml_id"){
+readWFS <- function(url, outputFormat = "GML", p4s = NULL, gmlIdAttributeName="gml_id"){
 
  #request
- wfsRequest <- paste(url, "&outputFormat=", outputFormat, sep="")
-
- if(outputFormat == "GML2"){
+ wfsRequest <- url
+ if(outputFormat != "GML") {
+ wfsRequest <- paste(url, "&outputFormat=", outputFormat, sep="")
+ }
+
+ if(outputFormat == "GML") {
 
  # download the data
  tempf = tempfile()