Merge branch 'main' into 'production'

Production Release | nshmp-haz See merge request !644

Merge branch 'main' into 'production'
c2707293 · Clayton, Brandon Scott · 0f66cadc · e882b8e6 · c2707293 · c2707293
Commit c2707293 authored 2 years ago by Clayton, Brandon Scott
--- a/CODE_OF_CONDUCT.md
+++ b/CODE_OF_CONDUCT.md
@@ -3,4 +3,4 @@
 All contributions to and interactions surrounding this project will abide by
 the [USGS Code of Scientific Conduct][1].

-[1]: https://www.usgs.gov/about/organization/science-support/office-science-quality-and-integrity/code-scientific-conduct
+[1]: https://www.usgs.gov/office-of-science-quality-and-integrity/fundamental-science-practices
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -11,5 +11,5 @@ into the project you can [fork this repository][2] and
 [submit a merge request][3] for review.

 [1]: https://code.usgs.gov/ghsc/nshmp/nshmp-haz/-/issues
-[2]: https://docs.gitlab.com/ee/gitlab-basics/fork-project.html
-[3]: https://docs.gitlab.com/ee/gitlab-basics/add-merge-request.html
+[2]: https://docs.gitlab.com/ee/user/project/repository/forking_workflow.html#creating-a-fork
+[3]: https://docs.gitlab.com/ee/user/project/merge_requests/creating_merge_requests.html
--- a/build.gradle
+++ b/build.gradle
-/*
- * In order to build and run services locally,
- * one needs to include the following directorie(s) in the root project (they
- * are ignored by git):
- *
- *    models/
- *       ak/
- *          2007/
- *       wus/
- *          2008/
- *          2014/
- *          2014b/
- *          2018/
- *       ceus/
- *          2008/
- *          2014/
- *          2018/
- *
- * ...with each 'year' directory being an alias to the corresponding
- * git repository. One only needs to include the model they will run in the services.
- *
- * Then build the JAR file: ./gradlew assemble
- *
- * One can then specify the model to run in the services:
- *    java -jar build/libs/nshmp-haz.jar --models=/path/to/models
- *
- * Where <MODEL> is one of the model enums in nshmp.www.Model
- */
-
 plugins {
  id "application"
  id "com.diffplug.spotless" version "${spotlessVersion}"

--- a/etc/nshm/wus-ceus-attenuation-boundary-2023.geojson
+++ b/etc/nshm/wus-ceus-attenuation-boundary-2023.geojson
+{
+  "type": "Feature",
+  "geometry": {
+    "type": "LineString",
+    "coordinates": [
+      [-113.348, 48.997],
+      [-112.200, 47.550],
+      [-110.600, 46.850],
+      [-110.500, 46.450],
+      [-110.350, 45.750],
+      [-110.000, 45.500],
+      [-109.900, 44.900],
+      [-110.050, 44.150],
+      [-110.500, 43.000],
+      [-110.500, 42.180],
+      [-110.750, 41.000],
+      [-110.200, 40.000],
+      [-111.350, 39.550],
+      [-112.250, 38.000],
+      [-112.450, 37.000],
+      [-112.300, 36.200],
+      [-112.300, 35.700],
+      [-112.300, 35.250],
+      [-111.000, 34.500],
+      [-110.000, 34.400],
+      [-109.000, 34.250],
+      [-108.000, 34.600],
+      [-107.450, 35.000],
+      [-107.450, 36.500],
+      [-108.200, 37.000],
+      [-108.250, 38.000],
+      [-108.200, 38.750],
+      [-108.000, 39.100],
+      [-107.500, 39.550],
+      [-107.000, 39.650],
+      [-106.500, 39.800],
+      [-106.000, 39.850],
+      [-105.400, 39.800],
+      [-104.800, 38.450],
+      [-105.100, 37.900],
+      [-104.500, 37.100],
+      [-104.600, 36.950],
+      [-105.120, 36.810],
+      [-105.170, 36.590],
+      [-105.300, 35.950],
+      [-105.250, 34.450],
+      [-105.550, 33.850],
+      [-105.350, 33.250],
+      [-104.500, 31.700],
+      [-102.361, 29.828]
+    ]
+  },
+  "properties": {
+    "stroke": "#FC4445",
+    "title": "WUS-CEUS Attenuation Boundary (2023)"
+  }
+}
--- a/etc/peer/models/Set1-Case1/model-info.json
+++ b/etc/peer/models/Set1-Case1/model-info.json
 {
  "name": "PEER Set1-Case1",
-  "site-class-vs30": { "BC": 760 }
+  "site-class-vs30": { "BC": 760 },
+  "bounds":  {
+    "min-latitude": 36.0,
+    "min-longitude": -124.0,
+    "max-latitude": 40.0,
+    "max-longitude": -118.0
+  }
 }
--- a/etc/peer/models/Set1-Case10-fast/model-info.json
+++ b/etc/peer/models/Set1-Case10-fast/model-info.json
 {
  "name": "PEER Set1-Case10-fast",
-  "site-class-vs30": { "BC": 760 }
+  "site-class-vs30": { "BC": 760 },
+  "bounds":  {
+    "min-latitude": 36.0,
+    "min-longitude": -124.0,
+    "max-latitude": 40.0,
+    "max-longitude": -118.0
+  }
 }
--- a/etc/peer/models/Set1-Case10/model-info.json
+++ b/etc/peer/models/Set1-Case10/model-info.json
 {
  "name": "PEER Set1-Case10",
-  "site-class-vs30": { "BC": 760 }
+  "site-class-vs30": { "BC": 760 },
+  "bounds":  {
+    "min-latitude": 36.0,
+    "min-longitude": -124.0,
+    "max-latitude": 40.0,
+    "max-longitude": -118.0
+  }
 }
--- a/etc/peer/models/Set1-Case11-fast/model-info.json
+++ b/etc/peer/models/Set1-Case11-fast/model-info.json
 {
  "name": "PEER Set1-Case11-fast",
-  "site-class-vs30": { "BC": 760 }
+  "site-class-vs30": { "BC": 760 },
+  "bounds":  {
+    "min-latitude": 36.0,
+    "min-longitude": -124.0,
+    "max-latitude": 40.0,
+    "max-longitude": -118.0
+  }
 }
--- a/etc/peer/models/Set1-Case11/model-info.json
+++ b/etc/peer/models/Set1-Case11/model-info.json
 {
  "name": "PEER Set1-Case11",
-  "site-class-vs30": { "BC": 760 }
+  "site-class-vs30": { "BC": 760 },
+  "bounds":  {
+    "min-latitude": 36.0,
+    "min-longitude": -124.0,
+    "max-latitude": 40.0,
+    "max-longitude": -118.0
+  }
 }
--- a/etc/peer/models/Set1-Case2-fast/model-info.json
+++ b/etc/peer/models/Set1-Case2-fast/model-info.json
 {
  "name": "PEER Set1-Case2-fast",
-  "site-class-vs30": { "BC": 760 }
+  "site-class-vs30": { "BC": 760 },
+  "bounds":  {
+    "min-latitude": 36.0,
+    "min-longitude": -124.0,
+    "max-latitude": 40.0,
+    "max-longitude": -118.0
+  }
 }
--- a/etc/peer/models/Set1-Case2/model-info.json
+++ b/etc/peer/models/Set1-Case2/model-info.json
 {
  "name": "PEER Set1-Case2",
-  "site-class-vs30": { "BC": 760 }
+  "site-class-vs30": { "BC": 760 },
+  "bounds":  {
+    "min-latitude": 36.0,
+    "min-longitude": -124.0,
+    "max-latitude": 40.0,
+    "max-longitude": -118.0
+  }
 }
--- a/etc/peer/models/Set1-Case3-fast/model-info.json
+++ b/etc/peer/models/Set1-Case3-fast/model-info.json
 {
  "name": "PEER Set1-Case3-fast",
-  "site-class-vs30": { "BC": 760 }
+  "site-class-vs30": { "BC": 760 },
+  "bounds":  {
+    "min-latitude": 36.0,
+    "min-longitude": -124.0,
+    "max-latitude": 40.0,
+    "max-longitude": -118.0
+  }
 }
--- a/etc/peer/models/Set1-Case3/model-info.json
+++ b/etc/peer/models/Set1-Case3/model-info.json
 {
  "name": "PEER Set1-Case3-fast",
-  "site-class-vs30": { "BC": 760 }
+  "site-class-vs30": { "BC": 760 },
+  "bounds":  {
+    "min-latitude": 36.0,
+    "min-longitude": -124.0,
+    "max-latitude": 40.0,
+    "max-longitude": -118.0
+  }
 }
--- a/etc/peer/models/Set1-Case4-fast/model-info.json
+++ b/etc/peer/models/Set1-Case4-fast/model-info.json
 {
  "name": "PEER Set1-Case4-fast",
-  "site-class-vs30": { "BC": 760 }
+  "site-class-vs30": { "BC": 760 },
+  "bounds":  {
+    "min-latitude": 36.0,
+    "min-longitude": -124.0,
+    "max-latitude": 40.0,
+    "max-longitude": -118.0
+  }
 }
--- a/etc/peer/models/Set1-Case4/model-info.json
+++ b/etc/peer/models/Set1-Case4/model-info.json
 {
  "name": "PEER Set1-Case4",
-  "site-class-vs30": { "BC": 760 }
+  "site-class-vs30": { "BC": 760 },
+  "bounds":  {
+    "min-latitude": 36.0,
+    "min-longitude": -124.0,
+    "max-latitude": 40.0,
+    "max-longitude": -118.0
+  }
 }
--- a/etc/peer/models/Set1-Case5-fast/model-info.json
+++ b/etc/peer/models/Set1-Case5-fast/model-info.json
 {
  "name": "PEER Set1-Case5-fast",
-  "site-class-vs30": { "BC": 760 }
+  "site-class-vs30": { "BC": 760 },
+  "bounds":  {
+    "min-latitude": 36.0,
+    "min-longitude": -124.0,
+    "max-latitude": 40.0,
+    "max-longitude": -118.0
+  }
 }
--- a/etc/peer/models/Set1-Case5/model-info.json
+++ b/etc/peer/models/Set1-Case5/model-info.json
 {
  "name": "PEER Set1-Case5-fast",
-  "site-class-vs30": { "BC": 760 }
+  "site-class-vs30": { "BC": 760 },
+  "bounds":  {
+    "min-latitude": 36.0,
+    "min-longitude": -124.0,
+    "max-latitude": 40.0,
+    "max-longitude": -118.0
+  }
 }
--- a/etc/peer/models/Set1-Case6-fast/model-info.json
+++ b/etc/peer/models/Set1-Case6-fast/model-info.json
 {
  "name": "PEER Set1-Case6-fast",
-  "site-class-vs30": { "BC": 760 }
+  "site-class-vs30": { "BC": 760 },
+  "bounds":  {
+    "min-latitude": 36.0,
+    "min-longitude": -124.0,
+    "max-latitude": 40.0,
+    "max-longitude": -118.0
+  }
 }
--- a/etc/peer/models/Set1-Case6/model-info.json
+++ b/etc/peer/models/Set1-Case6/model-info.json
 {
  "name": "PEER Set1-Case6-fast",
-  "site-class-vs30": { "BC": 760 }
+  "site-class-vs30": { "BC": 760 },
+  "bounds":  {
+    "min-latitude": 36.0,
+    "min-longitude": -124.0,
+    "max-latitude": 40.0,
+    "max-longitude": -118.0
+  }
 }
--- a/etc/peer/models/Set1-Case7-fast/model-info.json
+++ b/etc/peer/models/Set1-Case7-fast/model-info.json
 {
  "name": "PEER Set1-Case7-fast",
-  "site-class-vs30": { "BC": 760 }
+  "site-class-vs30": { "BC": 760 },
+  "bounds":  {
+    "min-latitude": 36.0,
+    "min-longitude": -124.0,
+    "max-latitude": 40.0,
+    "max-longitude": -118.0
+  }
 }