Update backed and CLI to use v2.0 (#15)

* remove pre-release; add v20 (v2.0) * pull from v2.0
lynker-spatial · Nov 3, 2023 · 038b029 · 038b029 · mikejohnson51 · Nov 27, 2023
1 parent 8c086be
commit 038b029
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/cli/main.go b/cli/main.go
@@ -42,7 +42,7 @@ Usage:
 Examples:
   hfsubset -l divides,nexus        \
            -o ./divides_nexus.gpkg \
-           -r "pre-release"        \
+           -r "v20"                 \
            -t hl_uri                   \
            "Gages-06752260"
 
@@ -106,7 +106,8 @@ func (opts *SubsetRequest) MarshalJSON() ([]byte, error) {
 
 	jsonmap["layers"] = opts.Layers()
 	jsonmap[key] = opts.IDs()
-	jsonmap["version"] = "pre-release"
+    // TODO: use opts.version
+	jsonmap["version"] = "v20" // v20 is v2.0
 	return json.Marshal(jsonmap)
 }
 

diff --git a/runtime.R b/runtime.R
@@ -29,7 +29,7 @@ subset <- function(
     nldi    = NULL,
     loc     = NULL,
     layers  = c("divides", "nexus", "flowpaths", "network", "hydrolocations"),
-    version = c("pre-release", "v1.0", "v1.1", "v1.2")
+    version = c("v1.0", "v1.1", "v1.2", "v20")
 ) {
     version <- match.arg(version)
     s3_uri  <- paste0("s3://lynker-spatial/", version, "/")