Merge pull request #148 from RSGInc/fix_triprate_join

Fix triprate join
RSGInc · Mar 20, 2024 · 08c24df · 08c24df
2 parents 7822767 + 15eac1b
commit 08c24df
Show file tree

Hide file tree

Showing 49 changed files with 84 additions and 76 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,6 +1,6 @@
 Package: travelSurveyTools
 Title: travelSurveyTools
-Version: 2.3.8
+Version: 2.3.9
 Authors@R: c(
     person("RSG", "Inc.", , "[email protected]", role = c("aut", "cre")),
     person("Ashley", "Asmus", , "[email protected]", role = "aut"),

diff --git a/NEWS.md b/NEWS.md
@@ -1,5 +1,9 @@
 # travelSurveyTools 2.3.8
 
+- Fix join in  `hts_prep_triprate` to properly count days when summarize_by is trip variable. 
+
+# travelSurveyTools 2.3.8
+
 - Add column in `hts_prep_triprate` for weighted trip count. 
 
 

diff --git a/R/hts_prep_triprate.R b/R/hts_prep_triprate.R
@@ -156,7 +156,7 @@ if (length(summarize_by) > 0) {
 
   merge_cols = names(byvar_dt)[names(byvar_dt) %in% names(trip_control)]
 
-  triprate_dt = merge(trip_control, byvar_dt, by = merge_cols)
+  triprate_dt = merge(trip_control, byvar_dt, by = merge_cols, all.x = TRUE)
 
   triprate_cols = intersect(names(triprate_dt), c(ids, wts))
 

diff --git a/docs/404.html b/docs/404.html
diff --git a/docs/CONTRIBUTING.html b/docs/CONTRIBUTING.html
diff --git a/docs/LICENSE.html b/docs/LICENSE.html
diff --git a/docs/PULL_REQUEST_TEMPLATE.html b/docs/PULL_REQUEST_TEMPLATE.html
diff --git a/docs/articles/a01_getting_started.html b/docs/articles/a01_getting_started.html
diff --git a/docs/articles/a02_geographic_summaries.html b/docs/articles/a02_geographic_summaries.html
diff --git a/docs/articles/a03_trip_rates.html b/docs/articles/a03_trip_rates.html
diff --git a/docs/articles/a03_trip_rates_files/figure-html/trip_rate_race_ethnicity-1.png b/docs/articles/a03_trip_rates_files/figure-html/trip_rate_race_ethnicity-1.png
diff --git a/docs/articles/index.html b/docs/articles/index.html
diff --git a/docs/authors.html b/docs/authors.html
diff --git a/docs/index.html b/docs/index.html
diff --git a/docs/news/index.html b/docs/news/index.html
diff --git a/docs/pkgdown.yml b/docs/pkgdown.yml
@@ -5,7 +5,7 @@ articles:
   a01_getting_started: a01_getting_started.html
   a02_geographic_summaries: a02_geographic_summaries.html
   a03_trip_rates: a03_trip_rates.html
-last_built: 2024-03-12T15:51Z
+last_built: 2024-03-20T18:01Z
 urls:
   reference: https://rsginc.github.io/travelSurveyTools/reference
   article: https://rsginc.github.io/travelSurveyTools/articles

diff --git a/docs/reference/day.html b/docs/reference/day.html
diff --git a/docs/reference/factorize_column.html b/docs/reference/factorize_column.html
diff --git a/docs/reference/factorize_df.html b/docs/reference/factorize_df.html
diff --git a/docs/reference/get_distance_meters.html b/docs/reference/get_distance_meters.html
diff --git a/docs/reference/hh.html b/docs/reference/hh.html
diff --git a/docs/reference/hts_bin_var.html b/docs/reference/hts_bin_var.html
diff --git a/docs/reference/hts_calculate_vmt.html b/docs/reference/hts_calculate_vmt.html
diff --git a/docs/reference/hts_cbind_var.html b/docs/reference/hts_cbind_var.html
diff --git a/docs/reference/hts_filter_data.html b/docs/reference/hts_filter_data.html
diff --git a/docs/reference/hts_find_var.html b/docs/reference/hts_find_var.html
diff --git a/docs/reference/hts_get_ns.html b/docs/reference/hts_get_ns.html
diff --git a/docs/reference/hts_melt_vars.html b/docs/reference/hts_melt_vars.html
diff --git a/docs/reference/hts_prep_byvar.html b/docs/reference/hts_prep_byvar.html
diff --git a/docs/reference/hts_prep_triprate.html b/docs/reference/hts_prep_triprate.html
diff --git a/docs/reference/hts_prep_variable.html b/docs/reference/hts_prep_variable.html
diff --git a/docs/reference/hts_remove_missing_data.html b/docs/reference/hts_remove_missing_data.html
diff --git a/docs/reference/hts_remove_outliers.html b/docs/reference/hts_remove_outliers.html
diff --git a/docs/reference/hts_summary.html b/docs/reference/hts_summary.html
diff --git a/docs/reference/hts_summary_cat.html b/docs/reference/hts_summary_cat.html
diff --git a/docs/reference/hts_summary_num.html b/docs/reference/hts_summary_num.html
diff --git a/docs/reference/hts_to_so.html b/docs/reference/hts_to_so.html