Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
N
nshmp-ws-static
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
ghsc
National Seismic Hazard Model Project
nshmp-ws-static
Merge requests
!135
Resolves - Map Endpoint
Code
Review changes
Check out branch
Download
Patches
Plain diff
Merged
Resolves - Map Endpoint
ghsc/users/bclayton/nshmp/nshmp-ws-static:map
into
main
Overview
0
Commits
5
Pipelines
0
Changes
4
Merged
Clayton, Brandon Scott
requested to merge
ghsc/users/bclayton/nshmp/nshmp-ws-static:map
into
main
2 years ago
Overview
0
Commits
5
Pipelines
0
Changes
4
Expand
Resolves
#68 (closed)
0
0
Merge request reports
Compare
main
version 1
ff6ac494
2 years ago
main (base)
and
latest version
latest version
ce089d66
5 commits,
2 years ago
version 1
ff6ac494
4 commits,
2 years ago
4 files
+
111
−
17
Inline
Compare changes
Side-by-side
Inline
Show whitespace changes
Show one file at a time
Files
4
Search (e.g. *.vue) (Ctrl+P)
src/hazard/src/main/java/gov/usgs/earthquake/nshmp/netcdf/www/
TestSites
Service.java
→
src/hazard/src/main/java/gov/usgs/earthquake/nshmp/netcdf/www/
FeatureCollection
Service.java
+
10
−
9
Options
@@ -3,7 +3,6 @@ package gov.usgs.earthquake.nshmp.netcdf.www;
import
com.google.gson.JsonElement
;
import
gov.usgs.earthquake.nshmp.geo.json.FeatureCollection
;
import
gov.usgs.earthquake.nshmp.netcdf.NetcdfHazardCurves
;
import
gov.usgs.earthquake.nshmp.netcdf.NetcdfVersion
;
import
gov.usgs.earthquake.nshmp.www.ResponseBody
;
import
gov.usgs.earthquake.nshmp.www.ResponseMetadata
;
@@ -12,27 +11,29 @@ import io.micronaut.http.HttpRequest;
import
jakarta.inject.Singleton
;
/**
*
Test sites h
andle
r
f
or {@link TestSitesController}
.
*
H
andle f
eature collection services
.
*
* @author U.S. Geological Survey
*/
@Singleton
public
class
TestSitesService
{
static
final
String
NAME
=
"Test Sites"
;
public
class
FeatureCollectionService
{
static
String
handleSites
(
HttpRequest
<?>
http
,
NetcdfHazardCurves
netcdf
,
Boolean
raw
)
{
static
String
handleFeatureCollection
(
HttpRequest
<?>
http
,
String
name
,
FeatureCollection
fc
,
Boolean
raw
)
{
RequestData
requestData
=
new
RequestData
(
raw
);
FeatureCollection
sites
=
netcdf
.
netcdfData
().
sites
();
if
(
requestData
.
raw
)
{
return
sites
.
toJson
();
return
fc
.
toJson
();
}
else
{
var
response
=
ResponseBody
.<
RequestData
,
JsonElement
>
success
()
.
name
(
NAME
)
.
name
(
name
)
.
url
(
http
.
getUri
().
toString
())
.
metadata
(
new
ResponseMetadata
(
NetcdfVersion
.
appVersions
()))
.
request
(
requestData
)
.
response
(
sites
.
toJsonTree
())
.
response
(
fc
.
toJsonTree
())
.
build
();
return
NetcdfWsUtils
.
GSON
.
toJson
(
response
);
Loading