Merge pull request #23 from lifemapper/open_tree_update

Open tree update
lifemapper · Oct 26, 2021 · 0ced60c · 0ced60c
2 parents 0f8ce33 + 9514146
commit 0ced60c
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 7 deletions.
diff --git a/source/Encoder.elm b/source/Encoder.elm
@@ -40,8 +40,8 @@ encodeBiotaphyPointsPost (BiotaphyPointsPost taxonIds) =
 
 
 encodeOpenTreePOST : OpenTreePOST -> Value
-encodeOpenTreePOST (OpenTreePOST taxonIds) =
-    taxonIds |> List.map int |> list
+encodeOpenTreePOST (OpenTreePOST taxonNames) =
+    taxonNames |> List.map string |> list
 
 
 encodeOccurrenceMetadata : OccurrenceMetadata -> Value

diff --git a/source/OccurrenceFromTaxonomy.elm b/source/OccurrenceFromTaxonomy.elm
@@ -461,7 +461,7 @@ requestTree flags matches =
         , url = flags.apiRoot ++ "opentree"
         , body =
             matches
-                |> List.filterMap (\(TaxonomyListItem { taxon_key }) -> String.toInt taxon_key |> Result.toMaybe)
+                |> List.map (\(TaxonomyListItem { scientific_name }) -> scientific_name)
                 |> Decoder.OpenTreePOST
                 |> Encoder.encodeOpenTreePOST
                 |> Http.jsonBody

diff --git a/source/OccurrenceSetTaxonList.elm b/source/OccurrenceSetTaxonList.elm
@@ -330,7 +330,7 @@ requestTree flags matches =
         , url = flags.apiRoot ++ "opentree"
         , body =
             matches
-                |> List.filterMap .taxonId
+                |> List.filterMap .acceptedName
                 |> Decoder.OpenTreePOST
                 |> Encoder.encodeOpenTreePOST
                 |> Http.jsonBody

diff --git a/swagger.json b/swagger.json
@@ -7,7 +7,6 @@
   },
   "host": "svc.lifemapper.org",
   "schemes": [
-    "http",
     "https"
   ],
   "basePath": "/api/v2",
@@ -1567,7 +1566,7 @@
           {
             "name": "body",
             "in": "body",
-            "description": "A list of GBIF Taxon IDs to get a tree for",
+            "description": "A list of GBIF taxon names to get a tree for",
             "required": true,
             "schema": {
               "$ref": "#/definitions/OpenTreePOST"
@@ -3254,7 +3253,7 @@
     "OpenTreePOST": {
       "type": "array",
       "items": {
-        "type": "integer"
+        "type": "string"
       }
     },
     "OpenTreePOSTresponse": {