From 206864028d02f2d1371b2ff68bf5612eede68bd9 Mon Sep 17 00:00:00 2001
From: Brandon Clayton <bclayton@usgs.gov>
Date: Wed, 15 Jan 2025 16:50:18 -0700
Subject: [PATCH] clean
---
gradle.properties | 2 +-
gradle/dependencies.gradle | 2 +-
.../usgs/earthquake/nshmp/www/hazard/HazardService.java | 9 +++++----
3 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/gradle.properties b/gradle.properties
index 53d386c1..b2126d4f 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,4 +1,4 @@
-awsVersion = 2.29.52
+awsSsmVersion = 2.29.52
githooksVersion = 1.2.0
gitVersionVersion = 0.15.0
grgitVersion = 4.1.1
diff --git a/gradle/dependencies.gradle b/gradle/dependencies.gradle
index b02ef3ff..b1a32d9e 100644
--- a/gradle/dependencies.gradle
+++ b/gradle/dependencies.gradle
@@ -12,7 +12,7 @@ dependencies {
implementation "org.eclipse.jgit:org.eclipse.jgit:${jgitVersion}"
// AWS
- implementation "software.amazon.awssdk:ssm:${awsVersion}"
+ implementation "software.amazon.awssdk:ssm:${awsSsmVersion}"
// Micronaut
annotationProcessor("io.micronaut:micronaut-http-validation")
diff --git a/src/main/java/gov/usgs/earthquake/nshmp/www/hazard/HazardService.java b/src/main/java/gov/usgs/earthquake/nshmp/www/hazard/HazardService.java
index 1696f487..f36cd798 100644
--- a/src/main/java/gov/usgs/earthquake/nshmp/www/hazard/HazardService.java
+++ b/src/main/java/gov/usgs/earthquake/nshmp/www/hazard/HazardService.java
@@ -64,16 +64,14 @@ public final class HazardService {
public static HttpResponse<String> getMetadata(HttpRequest<?> request) {
var url = request.getUri().getPath();
- var model = ServletUtil.model();
-
+ var usage = new Metadata(ServletUtil.model());
var body = ResponseBody.usage()
.name(NAME)
.url(url)
.metadata(new ResponseMetadata(HazVersion.appVersions(ServletUtil.model().root())))
.request(url)
- .response(new Metadata(model))
+ .response(usage)
.build();
-
var json = ServletUtil.GSON2.toJson(body);
return HttpResponse.ok(json);
}
@@ -138,16 +136,19 @@ public final class HazardService {
Metadata(HazardModel model) {
this.model = new SourceModel(model);
+
longitude = new DoubleParameter(
"Longitude",
"°",
model.bounds().min.longitude,
model.bounds().max.longitude);
+
latitude = new DoubleParameter(
"Latitude",
"°",
model.bounds().min.latitude,
model.bounds().max.latitude);
+
vs30 = new DoubleParameter(
"Vs30",
"m/s",
--
GitLab