From d551093a32f034afd8332dd4f3ba47a62e05b51a Mon Sep 17 00:00:00 2001
From: Brandon Clayton <bclayton@usgs.gov>
Date: Thu, 5 May 2022 11:33:49 -0600
Subject: [PATCH] lat first in interface, lon first in call
---
.../nshmp/netcdf/www/NetcdfController.java | 16 ++++++++--------
.../nshmp/netcdf/www/SwaggerController.java | 16 ++++++++--------
.../nshmp/netcdf/www/NetcdfController.java | 4 ++--
3 files changed, 18 insertions(+), 18 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 da5c6c9..69f2563 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
@@ -74,7 +74,7 @@ public class NetcdfController {
"### Service call pattern\n" +
"This service call is slashed delimited with pattern: " +
- "`/spectra/{latitude}/{longitude}/{siteClass}`\n" +
+ "`/spectra/{longitude}/{latitude}/{siteClass}`\n" +
"<br><br>" +
"Example: `/spectra/-118/34/A`",
operationId = "aashto-slash")
@@ -84,11 +84,11 @@ public class NetcdfController {
content = @Content(
mediaType = MediaType.APPLICATION_JSON,
schema = @Schema(implementation = Response.class)))
- @Get(uri = "/{latitude}/{longitude}/{siteClass}", produces = MediaType.APPLICATION_JSON)
+ @Get(uri = "/{longitude}/{latitude}/{siteClass}", produces = MediaType.APPLICATION_JSON)
public HttpResponse<String> doGetSlashBySite(
HttpRequest<?> request,
- @Schema(required = true) @PathVariable @Nullable Double longitude,
@Schema(required = true) @PathVariable @Nullable Double latitude,
+ @Schema(required = true) @PathVariable @Nullable Double longitude,
@Schema(required = true) @PathVariable @Nullable NehrpSiteClass siteClass) {
var query = new Query(longitude, latitude, siteClass);
return service.handleServiceCall(request, query);
@@ -112,9 +112,9 @@ public class NetcdfController {
"### Service call pattern\n" +
"This service call is query based with pattern: " +
- "`/spectra?latitude={number}&longitude={number}&siteClass={string}`\n" +
+ "`/spectra?longitude={number}&latitude={number}&siteClass={string}`\n" +
"<br><br>" +
- "Example: `/spectra?latitude=34&longitude=-118&siteClass=A`",
+ "Example: `/spectra?longitude=-118&latitude=34&siteClass=A`",
operationId = "aashto-query")
@ApiResponse(
description = "Spatially interpolates data from https://doi.org/10.5066/P9Z206HY",
@@ -122,11 +122,11 @@ public class NetcdfController {
content = @Content(
mediaType = MediaType.APPLICATION_JSON,
schema = @Schema(implementation = Response.class)))
- @Get(uri = "{?latitude,longitude,siteClass}", produces = MediaType.APPLICATION_JSON)
+ @Get(uri = "{?longitude,latitude,siteClass}", produces = MediaType.APPLICATION_JSON)
public HttpResponse<String> doGet(
HttpRequest<?> request,
- @Schema(required = true) @QueryValue @Nullable Double longitude,
@Schema(required = true) @QueryValue @Nullable Double latitude,
+ @Schema(required = true) @QueryValue @Nullable Double longitude,
@QueryValue @Nullable NehrpSiteClass siteClass) {
var query = new Query(longitude, latitude, siteClass);
return service.handleServiceCall(request, query);
@@ -140,7 +140,7 @@ public class NetcdfController {
* @param latitude Latitude of the site
*/
@Hidden
- @Get(uri = "/{latitude}/{longitude}", produces = MediaType.APPLICATION_JSON)
+ @Get(uri = "/{longitude}/{latitude}", produces = MediaType.APPLICATION_JSON)
public HttpResponse<String> doGetSlash(
HttpRequest<?> request,
@Schema(required = true) @PathVariable @Nullable Double longitude,
diff --git a/src/aashto/src/main/java/gov/usgs/earthquake/nshmp/netcdf/www/SwaggerController.java b/src/aashto/src/main/java/gov/usgs/earthquake/nshmp/netcdf/www/SwaggerController.java
index c56272f..5bd776c 100644
--- a/src/aashto/src/main/java/gov/usgs/earthquake/nshmp/netcdf/www/SwaggerController.java
+++ b/src/aashto/src/main/java/gov/usgs/earthquake/nshmp/netcdf/www/SwaggerController.java
@@ -75,14 +75,14 @@ public class SwaggerController {
"The query based service call is in the form of:\n" +
"```text\n" +
- url + "/spectra?latitude={number}&longitude={number}\n" +
- url + "/spectra?latitude={number}&longitude={number}&siteClass={string}\n" +
+ url + "/spectra?longitude={number}&latitude={number}\n" +
+ url + "/spectra?longitude={number}&latitude={number}&siteClass={string}\n" +
"````\n" +
"Example:\n" +
"```text\n" +
- url + "/spectra?latitude=34&longitude=-118\n" +
- url + "/spectra?latitude=34&longitude=-118&siteClass=BC\n" +
+ url + "/spectra?longitude=-118&latitude=34\n" +
+ url + "/spectra?longitude=-118&latitude=34&siteClass=BC\n" +
"```\n")
.append(
"### Slash Pattern\n" +
@@ -90,15 +90,15 @@ public class SwaggerController {
"The slash based service call is in the form of:\n" +
"```text\n" +
- url + "/spectra/{latitude}/{longitude}\n" +
- url + "/spectra/{latitude}/{longitude}/{siteClass}\n" +
+ url + "/spectra/{longitude}/{latitude}\n" +
+ url + "/spectra/{longitude}/{latitude}/{siteClass}\n" +
"```\n" +
"Example:\n" +
"```text\n" +
- url + "/spectra/34/-118\n" +
- url + "/spectra/34/-118/BC\n" +
+ url + "/spectra/-118/34\n" +
+ url + "/spectra/-118/34/BC\n" +
"```\n")
.append("</details>")
.toString();
diff --git a/src/hazard/src/main/java/gov/usgs/earthquake/nshmp/netcdf/www/NetcdfController.java b/src/hazard/src/main/java/gov/usgs/earthquake/nshmp/netcdf/www/NetcdfController.java
index 4d62342..ea2eea3 100644
--- a/src/hazard/src/main/java/gov/usgs/earthquake/nshmp/netcdf/www/NetcdfController.java
+++ b/src/hazard/src/main/java/gov/usgs/earthquake/nshmp/netcdf/www/NetcdfController.java
@@ -89,8 +89,8 @@ public class NetcdfController {
@Get(uri = "/{longitude}/{latitude}/{siteClass}/{imt}", produces = MediaType.APPLICATION_JSON)
public HttpResponse<String> doGetSlashByImt(
HttpRequest<?> request,
- @Schema(required = true) @PathVariable @Nullable Double longitude,
@Schema(required = true) @PathVariable @Nullable Double latitude,
+ @Schema(required = true) @PathVariable @Nullable Double longitude,
@Schema(required = true) @PathVariable @Nullable NehrpSiteClass siteClass,
@Schema(required = true) @PathVariable @Nullable Imt imt) {
return doGet(request, longitude, latitude, siteClass, imt);
@@ -125,8 +125,8 @@ public class NetcdfController {
@Get(uri = "/{longitude}/{latitude}/{siteClass}", produces = MediaType.APPLICATION_JSON)
public HttpResponse<String> doGetSlashBySite(
HttpRequest<?> request,
- @Schema(required = true) @PathVariable @Nullable Double longitude,
@Schema(required = true) @PathVariable @Nullable Double latitude,
+ @Schema(required = true) @PathVariable @Nullable Double longitude,
@Schema(required = true) @PathVariable @Nullable NehrpSiteClass siteClass) {
return doGet(request, longitude, latitude, siteClass, null);
}
--
GitLab