fix merge conflicts

queries.R

@@ -56,6 +56,7 @@ view.simplified_county_geom <- tbl(con, "simplified_county_geom")
 view.all_loss_storms_tracks <- tbl(con, "all_loss_storms_tracks")
 view.all_conus_landfalls <- tbl(con, "all_conus_landfalls")
 view.hurdat_ids <- tbl(con, "hurdat_ids")
+view.all_lf_type_landfalls <- tbl(con, "all_lf_type_landfalls")
 
 #qry <- econ.storm_base_loss %>%
 #  left_join(view.hurdat_track, by = c("storm_basin", "storm_year", "storm_name"))
@@ -111,6 +112,7 @@ get_all_loss_storms <- function() {
   return(result)
 }
 
+# returns a list of all stored hurdat ids
 get_all_hurdat_ids <- function() {
   query <- view.hurdat_ids
 
@@ -444,3 +446,12 @@ get_normalized_metric_growth <- function(storm, full_lf_id) {
 
   return(result)
 }
+
+# returns all lf type landfalls
+get_all_lf_type_landfalls <- function() {
+  query <- view.all_lf_type_landfalls
+
+  result <- query %>% collect()
+
+  return(result)
+}