Skip to content

Commit

Permalink
Merge pull request #97 from DOI-USGS/wy_2024
Browse files Browse the repository at this point in the history
Wy 2024
  • Loading branch information
hcorson-dosch-usgs authored Nov 26, 2024
2 parents f9f5a01 + 62b1a06 commit 88d9097
Show file tree
Hide file tree
Showing 23 changed files with 27 additions and 26 deletions.
4 changes: 2 additions & 2 deletions 0_config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -43,9 +43,9 @@ targets:
##-- Fetch configs --##

viz_start_date:
command: as.Date(I('2023-01-01'))
command: as.Date(I('2023-10-01'))
viz_end_date:
command: as.Date(I('2023-12-31'))
command: as.Date(I('2024-09-30'))
# 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 ...
Expand Down
3 changes: 2 additions & 1 deletion 2_process.yml
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,7 @@ targets:
tmp_dir = I('2_process/tmp'))

##-- Now push the data needed by Vue to S3 --##

# These data end up on the Prod VPC with `us-west-2`
# You must login separately using `ssologin.sh
visualizations/data/gw-conditions-time-labels.csv.ind:
command: s3_put(target_name, '2_process/out/gw-conditions-time-labels.csv', config_file = I('lib/cfg/s3_config_viz.yml'))
4 changes: 2 additions & 2 deletions 3_visualize.yml
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ targets:
##-- Now push the data needed by Vue to S3 --##

# These data end up on the Prod VPC with `us-west-2`
# You must login separately using `saml2aws login`
# You must login separately using `ssologin.sh`

visualizations/data/gw-conditions-peaks-map.svg.ind:
command: s3_put(target_name, '3_visualize/out/gw-conditions-peaks-map.svg', config_file = I('lib/cfg/s3_config_viz.yml'))
Expand Down Expand Up @@ -106,7 +106,7 @@ targets:
# 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.
# This data ends up on the Dev VPC with `us-west-2`; you must login separately using `saml2aws login`
# This data ends up on the Dev VPC with `us-west-2`; you must login separately using `ssologin.sh`
gw_conditions_peaks_timeseries_s3copy_fname:
command: sprintf(
I('gw-conditions/viz-previous-peak-data/gw-conditions-peaks-timeseries-%s_%s.csv'),
Expand Down
2 changes: 1 addition & 1 deletion 3_visualize/out/gw-conditions-daily-proportions-s3copy.ind
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
hash: 5d9d05238386e4f818f4d6f1ca051bc7
hash: 0e4d3a861e516f3da5a725b001308a0b

2 changes: 1 addition & 1 deletion 3_visualize/out/gw-conditions-peaks-timeseries-s3copy.ind
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
hash: 15f470784c897971afd9c7a7f63366b2
hash: 96dd18b3f4dcbb8f40ad313d31cc557e

2 changes: 1 addition & 1 deletion 3_visualize/out/gw-conditions-site-coords-s3copy.ind
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
hash: e2694c1d4d74f9e2ffd76c2f2c11f955
hash: c7ff8cde36e85a4628db2b115a7702df

2 changes: 1 addition & 1 deletion 3_visualize/out/gw-conditions-time-labels-s3copy.ind
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
hash: d28ab3ba24b2f8f26b0eb7d27eb657ea
hash: b39453520230b7444384d48eb1261b70

2 changes: 1 addition & 1 deletion lib/cfg/s3_config.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
profile: 'default'
profile: 'wma-developer-dev'

bucket: 'vizlab-data'
2 changes: 1 addition & 1 deletion lib/cfg/s3_config_viz.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
profile: 'default'
profile: 'wma-developer-prod'

bucket: 'water-visualizations-prod-website'
2 changes: 1 addition & 1 deletion lib/cfg/s3_config_viz_beta.yml
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
profile: 'default'
profile: 'wma-developer-prod'

bucket: 'water-visualizations-beta-website'
4 changes: 2 additions & 2 deletions src/components/GWL.vue
Original file line number Diff line number Diff line change
Expand Up @@ -169,7 +169,7 @@ export default {
days: null, // used to index days in sequence
peak_grp: null,
day_length: 10, // frame duration in milliseconds
day_length: 75, // frame duration in milliseconds
current_time: 0, // tracking animation timing
n_days: null,
n_sites: {},
Expand Down Expand Up @@ -395,7 +395,7 @@ export default {
self.day_length = 300;
self.button_text_speed = "Faster";
} else {
self.day_length = 10
self.day_length = 75;
self.button_text_speed = "Slower";
}
})
Expand Down
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
hash: 5d9d05238386e4f818f4d6f1ca051bc7
hash: 0e4d3a861e516f3da5a725b001308a0b

Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
hash: 5d9d05238386e4f818f4d6f1ca051bc7
hash: 0e4d3a861e516f3da5a725b001308a0b

Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
hash: 5d9d05238386e4f818f4d6f1ca051bc7
hash: 0e4d3a861e516f3da5a725b001308a0b

Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
hash: 15f470784c897971afd9c7a7f63366b2
hash: 96dd18b3f4dcbb8f40ad313d31cc557e

Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
hash: 15f470784c897971afd9c7a7f63366b2
hash: 96dd18b3f4dcbb8f40ad313d31cc557e

2 changes: 1 addition & 1 deletion visualizations/data/gw-conditions-peaks-timeseries.csv.ind
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
hash: 15f470784c897971afd9c7a7f63366b2
hash: 96dd18b3f4dcbb8f40ad313d31cc557e

2 changes: 1 addition & 1 deletion visualizations/data/gw-conditions-site-coords-beta.csv.ind
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
hash: e2694c1d4d74f9e2ffd76c2f2c11f955
hash: c7ff8cde36e85a4628db2b115a7702df

2 changes: 1 addition & 1 deletion visualizations/data/gw-conditions-site-coords-live.csv.ind
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
hash: e2694c1d4d74f9e2ffd76c2f2c11f955
hash: c7ff8cde36e85a4628db2b115a7702df

2 changes: 1 addition & 1 deletion visualizations/data/gw-conditions-site-coords.csv.ind
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
hash: e2694c1d4d74f9e2ffd76c2f2c11f955
hash: c7ff8cde36e85a4628db2b115a7702df

2 changes: 1 addition & 1 deletion visualizations/data/gw-conditions-time-labels-beta.csv.ind
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
hash: d28ab3ba24b2f8f26b0eb7d27eb657ea
hash: b39453520230b7444384d48eb1261b70

2 changes: 1 addition & 1 deletion visualizations/data/gw-conditions-time-labels-live.csv.ind
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
hash: d28ab3ba24b2f8f26b0eb7d27eb657ea
hash: b39453520230b7444384d48eb1261b70

2 changes: 1 addition & 1 deletion visualizations/data/gw-conditions-time-labels.csv.ind
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
hash: d28ab3ba24b2f8f26b0eb7d27eb657ea
hash: b39453520230b7444384d48eb1261b70

0 comments on commit 88d9097

Please sign in to comment.