resolve merge conflict storm_details master

queries.R

@@ -75,6 +75,12 @@ view.all_conus_landfalls <- tbl(con, "all_conus_landfalls")
 #  lf_id = 1
 #)
 
+agnes <- list(
+  storm_basin = "AL",
+  storm_year = 1972,
+  storm_name = "AGNES"
+)
+
 # helper functions
 
 # disconnect db connection
@@ -197,6 +203,25 @@ ORDER BY year;")
     xts(order.by = result$year)
 
   return(result_ts)
+  
+# returns normalized mmh/mmp indexes and costs over time by storm
+get_all_normalized_cost_index <- function(storm) {
+  query <- view.yearly_normalized_losses %>% 
+    filter(
+      storm_basin == storm$storm_basin,
+      storm_year == storm$storm_year,
+      storm_name == storm$storm_name
+    ) %>% 
+    mutate(
+      full_lf_id = paste0(lf_type, lf_id)
+    ) %>% 
+    select(
+      normalization_year, mmh_index, mmp_index, mmh_loss = mmh, mmp_loss = mmp, full_lf_id
+    )
+  
+  result <- query %>% collect()
+  
+  return(result)
 }
 
 # returns landfalls and data at landfall from HURDAT
@@ -359,4 +384,4 @@ get_normalized_metric_growth <- function(storm, full_lf_id) {
   result <- query %>% collect()
   
   return(result)
-}
+}