Merge branch 'glatos_otn_animals' of github.com:ocean-tracking-network/surimi into glatos_otn_animals

Author: jackVanish

R/ato_ani_from_glatos.R

@@ -1,8 +1,8 @@
 ato_ani_from_glatos <- function(glatos_file) {
-  #Load the data file we've been given- probably detections data since published glatos data will only have detections and receivers. 
+  # Load the data file we've been given- probably detections data since published glatos data will only have detections and receivers.
   glatos_data <- load_file(glatos_file)
-  
-  #We don't really have the option here to get this from an 'animal metadata' file so we're always going to be deriving. 
+
+  # We don't really have the option here to get this from an 'animal metadata' file so we're always going to be deriving.
   ani <- make_ani(
     animal = as.character(glatos_data$animal_id),
     capture_location = as.character(glatos_data$capture_location),
@@ -14,7 +14,7 @@ ato_ani_from_glatos <- function(glatos_file) {
     release_lat = glatos_data$release_latitude,
     release_lon = glatos_data$release_longitude,
     tz = "UTC"
-  ) 
-  
-  return (ani)
-}
+  )
+
+  return(ani)
+}

R/glatos_to_ato.R

@@ -48,10 +48,10 @@ glatos_to_ato <- function(glatos_detections, glatos_receivers = "") {
 
   GLATOS_ATO <- add(GLATOS_ATO, dep)
 
-  # Tag information is not part of what's distributed in glatos publications so we can neither load it nor meaningfully derive it. 
-  
+  # Tag information is not part of what's distributed in glatos publications so we can neither load it nor meaningfully derive it.
+
   ani <- ato_ani_from_glatos(glatos_detections)
-  
+
   GLATOS_ATO <- add(GLATOS_ATO, ani)
 
   return(GLATOS_ATO)