From 6d39244a16ade3ba1867ee011055a6a6c7800dbb Mon Sep 17 00:00:00 2001 From: Corson-Dosch Date: Fri, 13 Jan 2023 13:20:11 -0600 Subject: [PATCH 1/6] Update viz dates for calendar year 2022 --- 0_config.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/0_config.yml b/0_config.yml index f1f674b..21645fe 100644 --- a/0_config.yml +++ b/0_config.yml @@ -43,9 +43,9 @@ targets: ##-- Fetch configs --## viz_start_date: - command: as.Date(I('2021-10-01')) + command: as.Date(I('2022-01-01')) viz_end_date: - command: as.Date(I('2022-09-30')) + command: as.Date(I('2022-12-31')) # Use bounding box in case we want to do this regionally someday # Start with CONUS only # I don't think this is being used any more ... From c6dbe27f04aec40afd68a7e8169b1a233c4c5c9a Mon Sep 17 00:00:00 2001 From: Corson-Dosch Date: Fri, 13 Jan 2023 13:21:22 -0600 Subject: [PATCH 2/6] Upload copies to dev of all time-period specific files, not just timeseries --- 3_visualize.yml | 37 +++++++++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) diff --git a/3_visualize.yml b/3_visualize.yml index 3141c5a..e8f5b42 100644 --- a/3_visualize.yml +++ b/3_visualize.yml @@ -27,6 +27,10 @@ targets: - visualizations/data/gw-conditions-daily-proportions.csv.ind - src/assets/gw-conditions-peaks-map.svg # Currently a temporary fix! - 3_visualize/out/gw-conditions-peaks-timeseries-s3copy.ind + - 3_visualize/out/gw-conditions-daily-proportions-s3copy.ind + - 3_visualize/out/gw-conditions-site-coords-s3copy.ind + - 3_visualize/out/gw-conditions-time-labels-s3copy.ind + 3_visualize/out/gw-conditions-peaks-map.svg: command: build_peaks_svg( @@ -85,6 +89,39 @@ targets: local_file = '3_visualize/out/gw-conditions-peaks-timeseries.csv', s3_file = gw_conditions_peaks_timeseries_s3copy_fname, config_file = I('lib/cfg/s3_config.yml')) + + gw_conditions_daily_proportions_s3copy_fname: + command: sprintf( + I('gw-conditions/viz-previous-peak-data/gw-conditions-daily-proportions-%s_%s.csv'), + viz_start_date, viz_end_date) + 3_visualize/out/gw-conditions-daily-proportions-s3copy.ind: + command: push_s3( + upload_ind = target_name, + local_file = '3_visualize/out/gw-conditions-daily-proportions.csv', + s3_file = gw_conditions_daily_proportions_s3copy_fname, + config_file = I('lib/cfg/s3_config.yml')) + + gw_conditions_site_coords_s3copy_fname: + command: sprintf( + I('gw-conditions/viz-previous-peak-data/gw-conditions-site-coords-%s_%s.csv'), + viz_start_date, viz_end_date) + 3_visualize/out/gw-conditions-site-coords-s3copy.ind: + command: push_s3( + upload_ind = target_name, + local_file = '3_visualize/out/gw-conditions-site-coords.csv', + s3_file = gw_conditions_site_coords_s3copy_fname, + config_file = I('lib/cfg/s3_config.yml')) + + gw_conditions_time_labels_s3copy_fname: + command: sprintf( + I('gw-conditions/viz-previous-peak-data/gw-conditions-time-labels-%s_%s.csv'), + viz_start_date, viz_end_date) + 3_visualize/out/gw-conditions-time-labels-s3copy.ind: + command: push_s3( + upload_ind = target_name, + local_file = '2_process/out/gw-conditions-time-labels.csv', + s3_file = gw_conditions_time_labels_s3copy_fname, + config_file = I('lib/cfg/s3_config.yml')) # TEMPORARY FIX # # Currently, we can't inject SVG directly from a URL. So, From 4dfd2f6fd6ca3c0df3dd30d78a5c6bbfc573e239 Mon Sep 17 00:00:00 2001 From: Corson-Dosch Date: Fri, 13 Jan 2023 13:22:20 -0600 Subject: [PATCH 3/6] initial upload of cy22 data before filename change --- .../data/gw-conditions-daily-proportions-cy22.csv.ind | 2 ++ .../data/gw-conditions-daily-proportions-wy22.csv.ind | 2 ++ visualizations/data/gw-conditions-peaks-timeseries-cy22.csv.ind | 2 ++ visualizations/data/gw-conditions-peaks-timeseries-wy22.csv.ind | 2 ++ 4 files changed, 8 insertions(+) create mode 100644 visualizations/data/gw-conditions-daily-proportions-cy22.csv.ind create mode 100644 visualizations/data/gw-conditions-daily-proportions-wy22.csv.ind create mode 100644 visualizations/data/gw-conditions-peaks-timeseries-cy22.csv.ind create mode 100644 visualizations/data/gw-conditions-peaks-timeseries-wy22.csv.ind diff --git a/visualizations/data/gw-conditions-daily-proportions-cy22.csv.ind b/visualizations/data/gw-conditions-daily-proportions-cy22.csv.ind new file mode 100644 index 0000000..95e9b36 --- /dev/null +++ b/visualizations/data/gw-conditions-daily-proportions-cy22.csv.ind @@ -0,0 +1,2 @@ +hash: 4dbbfa5e2ecb775788530aa799885e4a + diff --git a/visualizations/data/gw-conditions-daily-proportions-wy22.csv.ind b/visualizations/data/gw-conditions-daily-proportions-wy22.csv.ind new file mode 100644 index 0000000..c81ac56 --- /dev/null +++ b/visualizations/data/gw-conditions-daily-proportions-wy22.csv.ind @@ -0,0 +1,2 @@ +hash: aea0d19f97a9074b5503eae96a67738b + diff --git a/visualizations/data/gw-conditions-peaks-timeseries-cy22.csv.ind b/visualizations/data/gw-conditions-peaks-timeseries-cy22.csv.ind new file mode 100644 index 0000000..e801b50 --- /dev/null +++ b/visualizations/data/gw-conditions-peaks-timeseries-cy22.csv.ind @@ -0,0 +1,2 @@ +hash: a1d1ba80ff6d63058fbdd44e3e02c21f + diff --git a/visualizations/data/gw-conditions-peaks-timeseries-wy22.csv.ind b/visualizations/data/gw-conditions-peaks-timeseries-wy22.csv.ind new file mode 100644 index 0000000..d070bfa --- /dev/null +++ b/visualizations/data/gw-conditions-peaks-timeseries-wy22.csv.ind @@ -0,0 +1,2 @@ +hash: d61ba692aad93452088af885f79f9b36 + From bc495344e12be24f5a43c45622e12414ff1882dc Mon Sep 17 00:00:00 2001 From: Corson-Dosch Date: Fri, 13 Jan 2023 13:22:58 -0600 Subject: [PATCH 4/6] s3 copy indicator files --- 3_visualize/out/gw-conditions-daily-proportions-s3copy.ind | 2 ++ 3_visualize/out/gw-conditions-peaks-timeseries-s3copy.ind | 2 +- 3_visualize/out/gw-conditions-site-coords-s3copy.ind | 2 ++ 3_visualize/out/gw-conditions-time-labels-s3copy.ind | 2 ++ 4 files changed, 7 insertions(+), 1 deletion(-) create mode 100644 3_visualize/out/gw-conditions-daily-proportions-s3copy.ind create mode 100644 3_visualize/out/gw-conditions-site-coords-s3copy.ind create mode 100644 3_visualize/out/gw-conditions-time-labels-s3copy.ind diff --git a/3_visualize/out/gw-conditions-daily-proportions-s3copy.ind b/3_visualize/out/gw-conditions-daily-proportions-s3copy.ind new file mode 100644 index 0000000..95e9b36 --- /dev/null +++ b/3_visualize/out/gw-conditions-daily-proportions-s3copy.ind @@ -0,0 +1,2 @@ +hash: 4dbbfa5e2ecb775788530aa799885e4a + diff --git a/3_visualize/out/gw-conditions-peaks-timeseries-s3copy.ind b/3_visualize/out/gw-conditions-peaks-timeseries-s3copy.ind index d070bfa..e801b50 100644 --- a/3_visualize/out/gw-conditions-peaks-timeseries-s3copy.ind +++ b/3_visualize/out/gw-conditions-peaks-timeseries-s3copy.ind @@ -1,2 +1,2 @@ -hash: d61ba692aad93452088af885f79f9b36 +hash: a1d1ba80ff6d63058fbdd44e3e02c21f diff --git a/3_visualize/out/gw-conditions-site-coords-s3copy.ind b/3_visualize/out/gw-conditions-site-coords-s3copy.ind new file mode 100644 index 0000000..8c4190d --- /dev/null +++ b/3_visualize/out/gw-conditions-site-coords-s3copy.ind @@ -0,0 +1,2 @@ +hash: 5c330a701c80681e587e4f1afe1f0139 + diff --git a/3_visualize/out/gw-conditions-time-labels-s3copy.ind b/3_visualize/out/gw-conditions-time-labels-s3copy.ind new file mode 100644 index 0000000..4efda5b --- /dev/null +++ b/3_visualize/out/gw-conditions-time-labels-s3copy.ind @@ -0,0 +1,2 @@ +hash: 8286962579ff4062969e873cc574bdd9 + From 6a0fd7b9bf2928607f3245f400def017b6644b81 Mon Sep 17 00:00:00 2001 From: Corson-Dosch Date: Fri, 13 Jan 2023 13:23:42 -0600 Subject: [PATCH 5/6] Add manual targets that upload 'live' versions of files to be used in site --- 3_visualize.yml | 14 ++++++++++++++ .../gw-conditions-daily-proportions-live.csv.ind | 2 ++ .../data/gw-conditions-daily-proportions.csv.ind | 2 +- .../gw-conditions-peaks-timeseries-live.csv.ind | 2 ++ .../data/gw-conditions-peaks-timeseries.csv.ind | 2 +- .../data/gw-conditions-site-coords-live.csv.ind | 2 ++ .../data/gw-conditions-site-coords.csv.ind | 2 +- .../data/gw-conditions-time-labels-live.csv.ind | 2 ++ .../data/gw-conditions-time-labels.csv.ind | 2 +- 9 files changed, 26 insertions(+), 4 deletions(-) create mode 100644 visualizations/data/gw-conditions-daily-proportions-live.csv.ind create mode 100644 visualizations/data/gw-conditions-peaks-timeseries-live.csv.ind create mode 100644 visualizations/data/gw-conditions-site-coords-live.csv.ind create mode 100644 visualizations/data/gw-conditions-time-labels-live.csv.ind diff --git a/3_visualize.yml b/3_visualize.yml index e8f5b42..077d11c 100644 --- a/3_visualize.yml +++ b/3_visualize.yml @@ -75,6 +75,20 @@ targets: visualizations/data/gw-conditions-daily-proportions.csv.ind: command: s3_put(target_name, '3_visualize/out/gw-conditions-daily-proportions.csv', config_file = I('lib/cfg/s3_config_viz.yml')) + # MUST BE RUN MANUALLY, AS UPLOADING FILES UPDATES THE LIVE SITE + # Upload to Prod a copy of the timeseries, daily proportions, site coords, and time labels to use on the live site + visualizations/data/gw-conditions-peaks-timeseries-live.csv.ind: + command: s3_put(target_name, '3_visualize/out/gw-conditions-peaks-timeseries.csv', config_file = I('lib/cfg/s3_config_viz.yml')) + + visualizations/data/gw-conditions-daily-proportions-live.csv.ind: + command: s3_put(target_name, '3_visualize/out/gw-conditions-daily-proportions.csv', config_file = I('lib/cfg/s3_config_viz.yml')) + + visualizations/data/gw-conditions-site-coords-live.csv.ind: + command: s3_put(target_name, '3_visualize/out/gw-conditions-site-coords.csv', config_file = I('lib/cfg/s3_config_viz.yml')) + + visualizations/data/gw-conditions-time-labels-live.csv.ind: + command: s3_put(target_name, '2_process/out/gw-conditions-time-labels.csv', config_file = I('lib/cfg/s3_config_viz.yml')) + # We want to keep a copy of each time window we use, but don't want to have to keep changing the # filename that is used by the Vue code manually. So, we are uploading a copy of the data for # the current viz time window and naming based on the dates. diff --git a/visualizations/data/gw-conditions-daily-proportions-live.csv.ind b/visualizations/data/gw-conditions-daily-proportions-live.csv.ind new file mode 100644 index 0000000..95e9b36 --- /dev/null +++ b/visualizations/data/gw-conditions-daily-proportions-live.csv.ind @@ -0,0 +1,2 @@ +hash: 4dbbfa5e2ecb775788530aa799885e4a + diff --git a/visualizations/data/gw-conditions-daily-proportions.csv.ind b/visualizations/data/gw-conditions-daily-proportions.csv.ind index c81ac56..95e9b36 100644 --- a/visualizations/data/gw-conditions-daily-proportions.csv.ind +++ b/visualizations/data/gw-conditions-daily-proportions.csv.ind @@ -1,2 +1,2 @@ -hash: aea0d19f97a9074b5503eae96a67738b +hash: 4dbbfa5e2ecb775788530aa799885e4a diff --git a/visualizations/data/gw-conditions-peaks-timeseries-live.csv.ind b/visualizations/data/gw-conditions-peaks-timeseries-live.csv.ind new file mode 100644 index 0000000..e801b50 --- /dev/null +++ b/visualizations/data/gw-conditions-peaks-timeseries-live.csv.ind @@ -0,0 +1,2 @@ +hash: a1d1ba80ff6d63058fbdd44e3e02c21f + diff --git a/visualizations/data/gw-conditions-peaks-timeseries.csv.ind b/visualizations/data/gw-conditions-peaks-timeseries.csv.ind index d070bfa..e801b50 100644 --- a/visualizations/data/gw-conditions-peaks-timeseries.csv.ind +++ b/visualizations/data/gw-conditions-peaks-timeseries.csv.ind @@ -1,2 +1,2 @@ -hash: d61ba692aad93452088af885f79f9b36 +hash: a1d1ba80ff6d63058fbdd44e3e02c21f diff --git a/visualizations/data/gw-conditions-site-coords-live.csv.ind b/visualizations/data/gw-conditions-site-coords-live.csv.ind new file mode 100644 index 0000000..8c4190d --- /dev/null +++ b/visualizations/data/gw-conditions-site-coords-live.csv.ind @@ -0,0 +1,2 @@ +hash: 5c330a701c80681e587e4f1afe1f0139 + diff --git a/visualizations/data/gw-conditions-site-coords.csv.ind b/visualizations/data/gw-conditions-site-coords.csv.ind index 68dd8d5..8c4190d 100644 --- a/visualizations/data/gw-conditions-site-coords.csv.ind +++ b/visualizations/data/gw-conditions-site-coords.csv.ind @@ -1,2 +1,2 @@ -hash: 5687ccdd47a58ae7e3445f4f39b8a0dc +hash: 5c330a701c80681e587e4f1afe1f0139 diff --git a/visualizations/data/gw-conditions-time-labels-live.csv.ind b/visualizations/data/gw-conditions-time-labels-live.csv.ind new file mode 100644 index 0000000..4efda5b --- /dev/null +++ b/visualizations/data/gw-conditions-time-labels-live.csv.ind @@ -0,0 +1,2 @@ +hash: 8286962579ff4062969e873cc574bdd9 + diff --git a/visualizations/data/gw-conditions-time-labels.csv.ind b/visualizations/data/gw-conditions-time-labels.csv.ind index 126cf6c..4efda5b 100644 --- a/visualizations/data/gw-conditions-time-labels.csv.ind +++ b/visualizations/data/gw-conditions-time-labels.csv.ind @@ -1,2 +1,2 @@ -hash: d171203f4553505d599287a95a120338 +hash: 8286962579ff4062969e873cc574bdd9 From 0292da07d1704a0a27300fc456783385286bded0 Mon Sep 17 00:00:00 2001 From: Corson-Dosch Date: Fri, 13 Jan 2023 13:24:04 -0600 Subject: [PATCH 6/6] Use files with -live suffix in site --- src/components/GWL.vue | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/components/GWL.vue b/src/components/GWL.vue index f8aaa21..bb5e659 100644 --- a/src/components/GWL.vue +++ b/src/components/GWL.vue @@ -229,10 +229,10 @@ export default { // read in data let promises = [ self.d3.csv(self.publicPath + "quant_peaks.csv", this.d3.autotype), // used to draw legend shapes - color palette needs to be pulled out - self.d3.csv("https://labs.waterdata.usgs.gov/visualizations/data/gw-conditions-peaks-timeseries-wy22.csv", this.d3.autotype), - self.d3.csv("https://labs.waterdata.usgs.gov/visualizations/data/gw-conditions-site-coords.csv", this.d3.autotype), - self.d3.csv("https://labs.waterdata.usgs.gov/visualizations/data/gw-conditions-daily-proportions-wy22.csv", this.d3.autotype), - self.d3.csv("https://labs.waterdata.usgs.gov/visualizations/data/gw-conditions-time-labels.csv", this.d3.autotype), + self.d3.csv("https://labs.waterdata.usgs.gov/visualizations/data/gw-conditions-peaks-timeseries-live.csv", this.d3.autotype), + self.d3.csv("https://labs.waterdata.usgs.gov/visualizations/data/gw-conditions-site-coords-live.csv", this.d3.autotype), + self.d3.csv("https://labs.waterdata.usgs.gov/visualizations/data/gw-conditions-daily-proportions-live.csv", this.d3.autotype), + self.d3.csv("https://labs.waterdata.usgs.gov/visualizations/data/gw-conditions-time-labels-live.csv", this.d3.autotype), ]; Promise.all(promises).then(self.callback); // once it's loaded },