add section_id and section_name to output table

Author: daniel-wicke

R/qsim_prepare.R

@@ -70,12 +70,15 @@ QSIM_prepare <-function(
     df_in[[flow_column_name]]
   }
 
+  section <- if(is.null(section_column_name)){
+    rep("", nrow(df_in))
+  } else {
+    df_in[[section_column_name]]
+  }
+
   df_in <- data.frame(
     "ID" = df_in[[id_column_name]],
-    "section" = ifelse(
-      is.null(section_column_name),
-      yes = rep("", nrow(df_in)),
-      no = df_in[[section_column_name]]),
+    "section" = section,
     "km" = df_in[[km_column_name]],
     "date" = df_in[[date_column_name]],
     "para" = df_in[[parameter_name]],

R/site_info_qsim_ID.R

@@ -18,7 +18,7 @@ site_info_from_qsimID<- function(qsim_id){
   s2 <- strsplit(s1[2], "\\.")[[1]]
   list("river_name" = s1[1],
        "section_id" = s2[1],
-       "section_name" = s2[2],
+       "section_name" = paste(s2[2:length(s2)], collapse = " "),
        "km" = as.numeric(s1[3]))
 }