Merge pull request #42 from DOI-USGS/patch

patches wrt MC's internal review

Author: aaarcher-usgs

2_process.R

@@ -127,7 +127,7 @@ p2_targets <- list(
 
   ## Expand to determine all days within drought
   tar_target(p2_major_droughts_expanded,
-             expand_drought_prop(drought_prop = p2_major_droughts)),
+             expand_drought_prop(drought_prop = p2_major_droughts_with1970)),
 
   ## Expand for plotting geom ribbons (shading on regional plots)
   # here, these produce a row for each degree from 0 to 380 (n = 381)

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=Edu+TAS+Beginner&display=swap');
-$writeFont: 'Edu TAS Beginner', cursive;
+@import url('https://fonts.googleapis.com/css2?family=Neucha&display=swap');
+$writeFont: 'Neucha', cursive;
 // whole page except header fit within viewport - no scrolling
 #app {
   width: 100%;

src/assets/images/drought_explainer.png

@@ -3,39 +3,39 @@ export default {
       {
         id: '285',
         date: '1922-06-01',
-        text: 'The drought at this streamgage was 285 days long',
+        text: 'Each bar shows the duration of drought at a single gage. The taller and darker the bar, the longer the drought event was.',
         desktop_x_offset_per: 58,
         desktop_text_anchor: 'start',
         desktop_text_width: 250
       },
-       {
-        id: 'map',
-        date: '1921-06-01',
-        text: 'Map of streamgages that had one of the 2000 most severe droughts.',
-        desktop_x_offset_per: 60,
-        desktop_text_anchor: 'start',
-        desktop_text_width: 250
-      }    ,
-      {
-       id: 'redmap',
-       date: '1929-03-01',
-       text: 'Streamgage locations in each major drought period are highlighted on the map in red.',
-       desktop_x_offset_per: 60,
-       desktop_text_anchor: 'start',
-       desktop_text_width: 250
-     }    ,
       {
         id: 'yaxis',
         date: '1921-08-01',
-        text: 'Time',
+        text: 'Scroll through time',
         desktop_x_offset_per: 22,
         desktop_text_anchor: 'start',
         desktop_text_width: 250
       },
+      {
+        id: 'map',
+        date: '1925-11-01',
+        text: 'The drought at this streamgage was 1,154 days long.',
+        desktop_x_offset_per: 58,
+        desktop_text_anchor: 'start',
+        desktop_text_width: 250
+      },
+      {
+        id: '1920s-gages',
+        date: '1927-01-01',
+        text: 'From 1920 to 1951, the data comprises 313 streamgages (see Methods).',
+        desktop_x_offset_per: 63,
+        desktop_text_anchor: 'start',
+        desktop_text_width: 250
+      },
       {
         id: 'xaxis',
         date: '1925-05-01',
-        text: 'Wider = more simultaneous droughts',
+        text: 'Number of gages in drought',
         desktop_x_offset_per: 55,
         desktop_text_anchor: 'start',
         desktop_text_width: 275
@@ -48,6 +48,14 @@ export default {
         desktop_text_anchor: 'start',
         desktop_text_width: 250
       },
+      {
+        id: '1950s-gages',
+        date: '1950-01-01',
+        text: 'From 1950 to 1980, the data comprises 1,912 streamgages (see Methods).',
+        desktop_x_offset_per: 63,
+        desktop_text_anchor: 'start',
+        desktop_text_width: 250
+      },
       {
         id: '1950s',
         date: '1958-06-01',
@@ -73,6 +81,14 @@ export default {
         desktop_text_width: 250
       },
 
+      {
+        id: '1980s-gages',
+        date: '1980-01-01',
+        text: 'From 1981 to 2020, the data comprises 3,198 streamgages (see Methods).',
+        desktop_x_offset_per: 63,
+        desktop_text_anchor: 'start',
+        desktop_text_width: 250
+      },
       {
         id: '1980s-fact',
         date: '1987-07-01',
@@ -84,7 +100,7 @@ export default {
       {
         id: '2000s-fact1',
         date: '2000-06-01',
-        text: 'Over 31% of the 2000 most severe droughts happened during this period',
+        text: 'Over 31% of the 2,000 most severe droughts happened during this period',
         desktop_x_offset_per: 62,
         desktop_text_anchor: 'start',
         desktop_text_width: 250
@@ -100,7 +116,7 @@ export default {
       {
         id: '2000s',
         date: '2009-01-01',
-        text: 'The longest drought of all was near Tampa, Florida, and lasted over 6 years!',
+        text: 'The longest drought of all was near Tampa, FL, and lasted over 6 years!',
         desktop_x_offset_per: 62,
         desktop_text_anchor: 'start',
         desktop_text_width: 250

src/assets/images/drought_period_stations_1976.png

@@ -50,7 +50,7 @@ export default {
       {
         id: 'dustbowl_1',
         date: '1930-03-01',
-        text: 'Dust Bowl: Drought hit most of the U.S. in the 1930s, but the farmers and ranchers of the Great Plains were hit hardest. Not enough rain combined with too much farming and grazing made the top layer of soil loose and dry. Heavy winds blew the dry soil into massive dust storms, which is why we call this period in history the “dust bowl.”',
+        text: 'Dust Bowl: Drought hit much of the U.S. in the 1930s, bringing great hardship to the farmers and ranchers of the Great Plains. Not enough rain combined with too much farming and grazing made the top layer of soil loose and dry. Heavy winds blew the dry soil into massive dust storms, which is why we call this period in history the “dust bowl.”',
         mobile_x_offset_per: 24
       },
       {