From 8c577e1ef9652cffbe682707ca8b781e11558a28 Mon Sep 17 00:00:00 2001
From: Peter Powers <pmpowers@usgs.gov>
Date: Tue, 8 Feb 2022 07:31:36 -0700
Subject: [PATCH] doc and comment cleanup
---
.../java/gov/usgs/earthquake/nshmp/HazardMaps.java | 8 +++++---
.../usgs/earthquake/nshmp/site/CybershakeSite.java | 3 ---
.../usgs/earthquake/nshmp/site/NshmpSiteFiles.java | 2 +-
.../gov/usgs/earthquake/nshmp/www/meta/Metadata.java | 12 ------------
.../earthquake/nshmp/www/services/RateService.java | 2 --
5 files changed, 6 insertions(+), 21 deletions(-)
diff --git a/src/main/java/gov/usgs/earthquake/nshmp/HazardMaps.java b/src/main/java/gov/usgs/earthquake/nshmp/HazardMaps.java
index 74cca8223..976bebc16 100644
--- a/src/main/java/gov/usgs/earthquake/nshmp/HazardMaps.java
+++ b/src/main/java/gov/usgs/earthquake/nshmp/HazardMaps.java
@@ -53,9 +53,11 @@ public class HazardMaps {
*/
public static void main(String[] args) {
if (args.length < 1) {
- System.out.println("Usage: Supply a path to a file of hazard curve results and");
- System.out.println(" optionally a space separated list of return periods (in yr)");
- System.out.println(" default return periods: 475 975 2475");
+ System.out.println("Usage: Supply a path to a file of or directory containing hazard");
+ System.out.println(" curve results and optionally a space separated list of return");
+ System.out.println(" periods (in yr). If a directory is specified, nested curve");
+ System.out.println(" files are expected to be named 'curves.csv'.");
+ System.out.println(" Default return periods: 475 975 2475");
return;
}
diff --git a/src/main/java/gov/usgs/earthquake/nshmp/site/CybershakeSite.java b/src/main/java/gov/usgs/earthquake/nshmp/site/CybershakeSite.java
index 712fb6fc6..381332a46 100644
--- a/src/main/java/gov/usgs/earthquake/nshmp/site/CybershakeSite.java
+++ b/src/main/java/gov/usgs/earthquake/nshmp/site/CybershakeSite.java
@@ -17,9 +17,6 @@ public enum CybershakeSite implements NamedLocation {
* that there are scattered inconsistencies between the Wills and CVM vs30
* values (e.g. LAPD) Sites beginning with lowercase s have been capitalized.
*
- * CVM vs30 values for [S603, S684], [S474, S476], [S644, S646], and [S688,
- * S689] are identical; waiting on reponse from Callahan or Milner.
- *
* Site S603 is repeated (and commented out) in Inland Empire group.
*/
diff --git a/src/main/java/gov/usgs/earthquake/nshmp/site/NshmpSiteFiles.java b/src/main/java/gov/usgs/earthquake/nshmp/site/NshmpSiteFiles.java
index cb633b94f..07badfde4 100644
--- a/src/main/java/gov/usgs/earthquake/nshmp/site/NshmpSiteFiles.java
+++ b/src/main/java/gov/usgs/earthquake/nshmp/site/NshmpSiteFiles.java
@@ -82,7 +82,7 @@ final class NshmpSiteFiles {
/*
* Currently, we're exporting map regions as polygons. Although the GeoJSON
- * spec supports polygons with holes (and hence 3-dimensional arrays, we only
+ * spec supports polygons with holes (and hence 3-dimensional arrays), we only
* support singular polygons. Polygons render better than PointStrings in any
* event.
*/
diff --git a/src/main/java/gov/usgs/earthquake/nshmp/www/meta/Metadata.java b/src/main/java/gov/usgs/earthquake/nshmp/www/meta/Metadata.java
index 84227bdce..0f2d40b1d 100644
--- a/src/main/java/gov/usgs/earthquake/nshmp/www/meta/Metadata.java
+++ b/src/main/java/gov/usgs/earthquake/nshmp/www/meta/Metadata.java
@@ -35,23 +35,11 @@ public final class Metadata {
public static class DefaultParameters {
- // final EnumParameter<Edition> edition;
- // final EnumParameter<Region> region;
final DoubleParameter longitude;
final DoubleParameter latitude;
public DefaultParameters() {
- // edition = new EnumParameter<>(
- // "Model edition",
- // ParamType.STRING,
- // EnumSet.allOf(Edition.class));
- //
- // region = new EnumParameter<>(
- // "Model region",
- // ParamType.STRING,
- // EnumSet.allOf(Region.class));
-
longitude = new DoubleParameter(
"Longitude",
"°",
diff --git a/src/main/java/gov/usgs/earthquake/nshmp/www/services/RateService.java b/src/main/java/gov/usgs/earthquake/nshmp/www/services/RateService.java
index 8cf9684d7..c0bcb47fd 100644
--- a/src/main/java/gov/usgs/earthquake/nshmp/www/services/RateService.java
+++ b/src/main/java/gov/usgs/earthquake/nshmp/www/services/RateService.java
@@ -139,11 +139,9 @@ public final class RateService {
* probability service has been called.
*/
- // for (var model : ServletUtil.hazardModels()) {
var model = ServletUtil.model();
var rate = process(service, model, site, data.distance, data.timespan);
futureRates.add(rate);
- // }
var rates = futureRates.stream()
.map((future) -> {
--
GitLab