From 2c6762230bf21754db7a3a5f57109579023e53a4 Mon Sep 17 00:00:00 2001 From: Brandon Clayton <bclayton@usgs.gov> Date: Thu, 10 Mar 2022 14:28:42 -0700 Subject: [PATCH] switch lat and lon --- .../nshmp/netcdf/www/NetcdfController.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 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 2aec415..8bc51ef 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/{longitude}/{latitude}/{siteClass}`\n" + + "`/spectra/{latitude}/{longitude}/{siteClass}`\n" + "<br><br>" + "Example: `/spectra/-118/34/A`", operationId = "aashto-slash") @@ -84,7 +84,7 @@ public class NetcdfController { content = @Content( mediaType = MediaType.APPLICATION_JSON, schema = @Schema(implementation = Response.class))) - @Get(uri = "/{longitude}/{latitude}/{siteClass}", produces = MediaType.APPLICATION_JSON) + @Get(uri = "/{latitude}/{longitude}/{siteClass}", produces = MediaType.APPLICATION_JSON) public HttpResponse<String> doGetSlashBySite( HttpRequest<?> request, @Schema(required = true) @PathVariable @Nullable Double latitude, @@ -112,9 +112,9 @@ public class NetcdfController { "### Service call pattern\n" + "This service call is query based with pattern: " + - "`/spectra?longitude={number}&latitude={number}&siteClass={string}`\n" + + "`/spectra?latitude={number}&longitude={number}&siteClass={string}`\n" + "<br><br>" + - "Example: `/spectra?longitude=-118&latitude=34&siteClass=A`", + "Example: `/spectra?latitude=34&longitude=-118&siteClass=A`", operationId = "aashto-query") @ApiResponse( description = "Spatially interpolates data from https://doi.org/10.5066/P9Z206HY", @@ -122,7 +122,7 @@ public class NetcdfController { content = @Content( mediaType = MediaType.APPLICATION_JSON, schema = @Schema(implementation = Response.class))) - @Get(uri = "{?longitude,latitude,siteClass}", produces = MediaType.APPLICATION_JSON) + @Get(uri = "{?latitude,longitude,siteClass}", produces = MediaType.APPLICATION_JSON) public HttpResponse<String> doGet( HttpRequest<?> request, @Schema(required = true) @QueryValue @Nullable Double latitude, @@ -140,7 +140,7 @@ public class NetcdfController { * @param latitude Latitude of the site */ @Hidden - @Get(uri = "/{longitude}/{latitude}", produces = MediaType.APPLICATION_JSON) + @Get(uri = "/{latitude}/{longitude}", produces = MediaType.APPLICATION_JSON) public HttpResponse<String> doGetSlash( HttpRequest<?> request, @Schema(required = true) @PathVariable @Nullable Double latitude, -- GitLab