From 66f078cf5840f18d372a818d9516b6fb0d65bd34 Mon Sep 17 00:00:00 2001
From: Brandon Clayton <bclayton@usgs.gov>
Date: Thu, 10 Mar 2022 15:53:58 -0700
Subject: [PATCH] Fix call
---
.../earthquake/nshmp/netcdf/www/NetcdfController.java | 11 ++++++-----
1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/src/aashto/src/main/java/gov/usgs/earthquake/nshmp/netcdf/www/NetcdfController.java b/src/aashto/src/main/java/gov/usgs/earthquake/nshmp/netcdf/www/NetcdfController.java
index 8bc51ef..1934308 100644
--- a/src/aashto/src/main/java/gov/usgs/earthquake/nshmp/netcdf/www/NetcdfController.java
+++ b/src/aashto/src/main/java/gov/usgs/earthquake/nshmp/netcdf/www/NetcdfController.java
@@ -87,8 +87,8 @@ public class NetcdfController {
@Get(uri = "/{latitude}/{longitude}/{siteClass}", produces = MediaType.APPLICATION_JSON)
public HttpResponse<String> doGetSlashBySite(
HttpRequest<?> request,
- @Schema(required = true) @PathVariable @Nullable Double latitude,
@Schema(required = true) @PathVariable @Nullable Double longitude,
+ @Schema(required = true) @PathVariable @Nullable Double latitude,
@Schema(required = true) @PathVariable @Nullable NehrpSiteClass siteClass) {
var query = new Query(longitude, latitude, siteClass);
return service.handleServiceCall(request, query);
@@ -125,8 +125,8 @@ public class NetcdfController {
@Get(uri = "{?latitude,longitude,siteClass}", produces = MediaType.APPLICATION_JSON)
public HttpResponse<String> doGet(
HttpRequest<?> request,
- @Schema(required = true) @QueryValue @Nullable Double latitude,
@Schema(required = true) @QueryValue @Nullable Double longitude,
+ @Schema(required = true) @QueryValue @Nullable Double latitude,
@QueryValue @Nullable NehrpSiteClass siteClass) {
var query = new Query(longitude, latitude, siteClass);
return service.handleServiceCall(request, query);
@@ -143,9 +143,10 @@ public class NetcdfController {
@Get(uri = "/{latitude}/{longitude}", produces = MediaType.APPLICATION_JSON)
public HttpResponse<String> doGetSlash(
HttpRequest<?> request,
- @Schema(required = true) @PathVariable @Nullable Double latitude,
- @Schema(required = true) @PathVariable @Nullable Double longitude) {
- return doGet(request, longitude, latitude, null);
+ @Schema(required = true) @PathVariable @Nullable Double longitude,
+ @Schema(required = true) @PathVariable @Nullable Double latitude) {
+ var query = new Query(longitude, latitude, null);
+ return service.handleServiceCall(request, query);
}
// For Swagger schema
--
GitLab