Merge pull request #41 from DOI-USGS/narration-fixes

Narration fixes

Author: aaarcher-usgs

2_process.R

@@ -60,7 +60,7 @@ p2_targets <- list(
              join_and_filter_full_drought_record(df_1921 = p2_1921_2020_drought_prop_jd_7d,
                                                  df_1951 = p2_1951_2020_drought_prop_jd_7d,
                                                  df_1981 = p2_1981_2020_drought_prop_jd_7d,
-                                                 percentile = 2)
+                                                 percentile = 20)
   ),
 
   # determine the 2000 most severe droughts
@@ -70,6 +70,14 @@ p2_targets <- list(
                          n = 2000)
   ),
 
+  # identify specific drought events that happened during major events
+  tar_target(p2_2000_severe_2pct_droughts_joined,
+             p2_2000_severe_2pct_droughts |> 
+               filter(start >= p2_major_droughts_with1970$start,
+                      start <= p2_major_droughts_with1970$end) |>
+               mutate(drought_name = p2_major_droughts_with1970$major_drought_id),
+             pattern = map(p2_major_droughts_with1970)),
+  
   # Identify drought chunks
   tar_target(p2_drought_chunks,
              identify_drought_chunks(drought_prop = p2_2000_severe_2pct_droughts, 
@@ -104,6 +112,18 @@ p2_targets <- list(
                                "1992-10-31", "2015-09-30"))
              ) |>
                mutate(duration = as.duration(interval(start, end)) / ddays(1))),
+  # add 1970s drought for summaries for website
+  tar_target(p2_major_droughts_with1970,
+             tibble(
+               name = c("Dust Bowl", "1950s Drought", "1960s Drought", 
+                        "1980s Drought", "Turn-of-the-Century Drought", "1970s Drought"),
+               major_drought_id = c("1930", "1952", "1962", "1987", "1999", "1976"),
+               start = as.Date(c("1930-02-01", "1952-11-01", "1962-12-01",
+                                 "1987-05-01", "1999-09-01", "1976-01-01")),
+               end = as.Date(c("1941-08-31", "1957-08-31", "1968-10-31",
+                               "1992-10-31", "2015-09-30", "1978-03-01"))
+             ) |>
+               mutate(duration = as.duration(interval(start, end)) / ddays(1))),
 
   ## Expand to determine all days within drought
   tar_target(p2_major_droughts_expanded,

3_visualize/src/plot_stripswarm.R

@@ -14,9 +14,9 @@ event_swarm_plot_compressed_vertical <- function(swarm_data){
     theme_nothing() +
     # To check line-up of scales on website, uncomment out lines 17-19, comment
     # out line 21, and uncomment out line 22
-    # theme(axis.text.x = element_blank(),
-    #       axis.text.y = element_text(size = 14, color = 'blue', angle = 180),
-    #       panel.grid.major.y = element_line(color = 'blue', linetype = "dashed")) +
+    #theme(axis.text.x = element_blank(),
+    #      axis.text.y = element_text(size = 14, color = 'blue', angle = 180),
+    #      panel.grid.major.y = element_line(color = 'blue', linetype = "dashed")) +
     scale_y_date(breaks = scales::date_breaks(width = '1 years'),
                  labels = NULL,
                  #labels = scales::date_format('%Y'), # use to check line-up on website
@@ -57,7 +57,7 @@ event_violin_vertical <- function(drought_data, major_drought_periods,
              size = 2.5, angle = 180, hjust = 0, vjust = 0,
              family = supporting_font) +
     geom_violin(data = drought_data,
-                aes(x = threshold, y = date),
+                aes(x = 2, y = date),
                 color = NA, 
                 fill = color_scheme$drought_event_highlight,
                 scale = "count",

src/App.vue

@@ -75,8 +75,8 @@
 @import url('https://fonts.googleapis.com/css2?family=Source+Sans+Pro:wght@200;300;400;500;600;700;800&display=swap');
 $SourceSans: 'Source Sans Pro', sans-serif;
 $textcolor: #333534;
-@import url('https://fonts.googleapis.com/css2?family=Nanum+Pen+Script&display=swap');
-$writeFont: 'Nanum Pen Script', cursive;
+@import url('https://fonts.googleapis.com/css2?family=Edu+TAS+Beginner&display=swap');
+$writeFont: 'Edu TAS Beginner', cursive;
 // whole page except header fit within viewport - no scrolling
 #app {
   width: 100%;
@@ -168,7 +168,7 @@ a:active {
 }
 .droughtText.notesText{
   font-family: $writeFont;
-  font-size: 2.5rem;
+  font-size: 1.9rem;
 }
 input[type=button] {
         font-family: $SourceSans;