From 62c8d08a9f7694ebdd0782304249363e7d733bcf Mon Sep 17 00:00:00 2001 From: Jesse Ross Date: Fri, 7 Apr 2023 16:52:44 -0700 Subject: [PATCH 1/4] Created necessary files for DGEC migration --- CODE_OF_CONDUCT.md | 9 ++++++ CONTRIBUTING.md | 18 +++++++++++ DISCLAIMER.md | 11 +++++++ code.json | 75 ++++++++++++++++++++++++++++++++++++++++++++++ 4 files changed, 113 insertions(+) create mode 100644 CODE_OF_CONDUCT.md create mode 100644 CONTRIBUTING.md create mode 100644 DISCLAIMER.md create mode 100644 code.json diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md new file mode 100644 index 0000000..11ba4c9 --- /dev/null +++ b/CODE_OF_CONDUCT.md @@ -0,0 +1,9 @@ +Code of Conduct +=============== + +All contributions to - and interactions surrounding - this project will abide by +the [USGS Code of Scientific Conduct][1]. + + + +[1]: https://www.usgs.gov/office-of-science-quality-and-integrity/fundamental-science-practices diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md new file mode 100644 index 0000000..727fa53 --- /dev/null +++ b/CONTRIBUTING.md @@ -0,0 +1,18 @@ +Contributing +============ + +Contributions are welcome from the community. Questions can be asked on the +[issues page][1]. Before creating a new issue, please take a moment to search +and make sure a similar issue does not already exist. If one does exist, you +can comment (most simply even with just a `:+1:`) to show your support for that +issue. + +If you have direct contributions you would like considered for incorporation +into the project you can [fork this repository][2] and +[submit a pull request][3] for review. + + + +[1]: https://github.com/USGS-VIZLAB/gw-conditions/issues +[2]: https://help.github.com/articles/fork-a-repo/ +[3]: https://help.github.com/articles/about-pull-requests/ diff --git a/DISCLAIMER.md b/DISCLAIMER.md new file mode 100644 index 0000000..e951aaf --- /dev/null +++ b/DISCLAIMER.md @@ -0,0 +1,11 @@ +Disclaimer +========== + +This software is preliminary or provisional and is subject to revision. It is +being provided to meet the need for timely best science. The software has not +received final approval by the U.S. Geological Survey (USGS). No warranty, +expressed or implied, is made by the USGS or the U.S. Government as to the +functionality of the software and related material nor shall the fact of release +constitute any such warranty. The software is provided on the condition that +neither the USGS nor the U.S. Government shall be held liable for any damages +resulting from the authorized or unauthorized use of the software. diff --git a/code.json b/code.json new file mode 100644 index 0000000..1483e51 --- /dev/null +++ b/code.json @@ -0,0 +1,75 @@ +[ + { + "name": "gw-conditions", + "organization": "U.S. Geological Survey", + "description": "Similar to gage-conditions-gif but for groundwater!", + "version": "main", + "status": "Development", + "permissions": { + "usageType": "openSource", + "licenses": [ + { + "name": "Public Domain, CC0-1.0", + "URL": "https://github.com/USGS-VIZLAB/gw-conditions/blob/main/LICENSE.md" + } + ] + }, + "homepageURL": "https://github.com/USGS-VIZLAB/gw-conditions/", + "downloadURL": "https://github.com/USGS-VIZLAB/gw-conditions/archive/refs/heads/main.zip", + "disclaimerURL": "https://github.com/USGS-VIZLAB/gw-conditions/blob/main/DISCLAIMER.md", + "repositoryURL": "https://github.com/USGS-VIZLAB/gw-conditions.git", + "vcs": "git", + "laborHours": -1, + "tags": [ + "R", + "USGS" + ], + "languages": [ + "R", + "Vue" + ], + "contact": { + "name": "ceenell", + "email": "FILL ME IN" + }, + "date": { + "metadataLastUpdated": "2023-04-07" + } + }, + { + "name": "", + "organization": "U.S. Geological Survey", + "description": "", + "version": "v0.0.0", + "status": "Ideation", + "permissions": { + "usageType": "openSource", + "licenses": [ + { + "name": "Public Domain, CC0-1.0", + "URL": "LICENSE.md" + } + ] + }, + "homepageURL": "", + "downloadURL": "", + "disclaimerURL": "", + "repositoryURL": "", + "vcs": "git", + "laborHours": 1, + "tags": [ + "R", + "USGS" + ], + "languages": [ + "R" + ], + "contact": { + "name": "", + "email": "" + }, + "date": { + "metadataLastUpdated": "2022-10-16" + } + } +] \ No newline at end of file From 6db082c5b0fbaf38ad0231621641c54bac47f6ae Mon Sep 17 00:00:00 2001 From: "Althea A. Archer" Date: Fri, 5 May 2023 08:42:33 -0500 Subject: [PATCH 2/4] Update README.md --- README.md | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) diff --git a/README.md b/README.md index b8ccce6..d14bc28 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,8 @@ # gw-conditions -A visualization showing groundwater conditions as little peaks above or below their normal values. This visualization is built using an R-based pipeline for data processing, and Vue.js + D3.js to create an animated site. The R-based pipeline (1) calculates daily percentiles for each well based on the historic record at each site, and (2) writes an svg map for the base of the animation. The R-based pipeline also pushes the data up to a public S3 bucket. This pipeline leverages an internal package, `library(scipiper)` to automate the workflow. You do not need to run the pipeline to be able to build the app locally, since the app points to data in the S3 bucket. +A visualization showing groundwater conditions as little peaks above or below their normal values. The final website can be found here: https://labs.waterdata.usgs.gov/visualizations/gw-conditions/index.html#/ + +This visualization is built using an R-based pipeline for data processing, and Vue.js + D3.js to create an animated site. The R-based pipeline (1) calculates daily percentiles for each well based on the historic record at each site, and (2) writes an svg map for the base of the animation. The R-based pipeline also pushes the data up to a public S3 bucket. This pipeline leverages an internal package, `library(scipiper)` to automate the workflow. You do not need to run the pipeline to be able to build the app locally, since the app points to data in the S3 bucket. ## Build the visualization locally @@ -43,15 +45,3 @@ Follow the two steps below in order to retain a copy of the current visualizatio 1. Authenticate to AWS using the Dev VPC. Use `saml2aws login` in your regular command line, and then make sure you choose the `gs-chs-wma-dev` account when prompted. If you are still authenticated to the Prod VPC, try running `saml2aws login --force` in order to force a new login. 1. Then run `scmake('3_visualize/out/gw-conditions-peaks-timeseries-s3copy.ind')` to push a copy of the `3_visualize/out/gw-conditions-peaks-timeseries.csv` file to the `vizlab-data` bucket on the Dev VPC. The file will be automatically given a new name based on the `viz_start_date` and `viz_end_date` target values, using this pattern: `gw-conditions/viz-previous-peak-data/gw-conditions-peaks-timeseries-[viz_start_date]_[viz_end_date].csv`. -## Disclaimer - -This software is in the public domain because it contains materials that originally came from the U.S. Geological Survey, an agency of the United States Department of Interior. For more information, see the official USGS copyright policy at [http://www.usgs.gov/visual-id/credit_usgs.html#copyright](http://www.usgs.gov/visual-id/credit_usgs.html#copyright) - -This information is preliminary or provisional and is subject to revision. It is being provided to meet the need for timely best science. The information has not received final approval by the U.S. Geological Survey (USGS) and is provided on the condition that neither the USGS nor the U.S. Government shall be held liable for any damages resulting from the authorized or unauthorized use of the information. Although this software program has been used by the USGS, no warranty, expressed or implied, is made by the USGS or the U.S. Government as to the accuracy and functioning of the program and related program material nor shall the fact of distribution constitute any such warranty, and no responsibility is assumed by the USGS in connection therewith. - -This software is provided "AS IS." - - -[ - ![CC0](http://i.creativecommons.org/p/zero/1.0/88x31.png) -](http://creativecommons.org/publicdomain/zero/1.0/) From 15d676273d39b29a854731a8cafb8323c68ebc04 Mon Sep 17 00:00:00 2001 From: "Althea A. Archer" Date: Fri, 5 May 2023 08:43:08 -0500 Subject: [PATCH 3/4] Update code.json --- code.json | 38 +------------------------------------- 1 file changed, 1 insertion(+), 37 deletions(-) diff --git a/code.json b/code.json index 1483e51..3fde1fb 100644 --- a/code.json +++ b/code.json @@ -35,41 +35,5 @@ "date": { "metadataLastUpdated": "2023-04-07" } - }, - { - "name": "", - "organization": "U.S. Geological Survey", - "description": "", - "version": "v0.0.0", - "status": "Ideation", - "permissions": { - "usageType": "openSource", - "licenses": [ - { - "name": "Public Domain, CC0-1.0", - "URL": "LICENSE.md" - } - ] - }, - "homepageURL": "", - "downloadURL": "", - "disclaimerURL": "", - "repositoryURL": "", - "vcs": "git", - "laborHours": 1, - "tags": [ - "R", - "USGS" - ], - "languages": [ - "R" - ], - "contact": { - "name": "", - "email": "" - }, - "date": { - "metadataLastUpdated": "2022-10-16" - } } -] \ No newline at end of file +] From f2f0583add0149980ececec8b124a57bf7f62e27 Mon Sep 17 00:00:00 2001 From: "Althea A. Archer" Date: Fri, 5 May 2023 08:43:50 -0500 Subject: [PATCH 4/4] Apply suggestions from code review --- code.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/code.json b/code.json index 3fde1fb..38309e8 100644 --- a/code.json +++ b/code.json @@ -4,7 +4,7 @@ "organization": "U.S. Geological Survey", "description": "Similar to gage-conditions-gif but for groundwater!", "version": "main", - "status": "Development", + "status": "Production", "permissions": { "usageType": "openSource", "licenses": [ @@ -19,7 +19,7 @@ "disclaimerURL": "https://github.com/USGS-VIZLAB/gw-conditions/blob/main/DISCLAIMER.md", "repositoryURL": "https://github.com/USGS-VIZLAB/gw-conditions.git", "vcs": "git", - "laborHours": -1, + "laborHours": 80, "tags": [ "R", "USGS" @@ -29,11 +29,11 @@ "Vue" ], "contact": { - "name": "ceenell", - "email": "FILL ME IN" + "name": "Cee Nell", + "email": "cnell@usgs.gov" }, "date": { - "metadataLastUpdated": "2023-04-07" + "metadataLastUpdated": "2023-05-04" } } ]