Skip to content
Snippets Groups Projects
Commit b3d8d2b7 authored by Clayton, Brandon Scott's avatar Clayton, Brandon Scott
Browse files

add map and sites

parent a5add086
No related branches found
No related tags found
2 merge requests!133Production Release | nshmp-ws-static,!132Resolves - Add Map and SItes to Usage
...@@ -4,6 +4,7 @@ import static com.google.common.base.Preconditions.checkState; ...@@ -4,6 +4,7 @@ import static com.google.common.base.Preconditions.checkState;
import java.util.Map; import java.util.Map;
import gov.usgs.earthquake.nshmp.geo.json.FeatureCollection;
import gov.usgs.earthquake.nshmp.gmm.Imt; import gov.usgs.earthquake.nshmp.gmm.Imt;
/** /**
...@@ -14,11 +15,19 @@ import gov.usgs.earthquake.nshmp.gmm.Imt; ...@@ -14,11 +15,19 @@ import gov.usgs.earthquake.nshmp.gmm.Imt;
public class NetcdfDataHazardCurves extends NetcdfData { public class NetcdfDataHazardCurves extends NetcdfData {
private final Map<Imt, double[]> imls; private final Map<Imt, double[]> imls;
private final FeatureCollection map;
private final FeatureCollection sites;
public NetcdfDataHazardCurves(NetcdfData netcdfData, Map<Imt, double[]> imls) { public NetcdfDataHazardCurves(
NetcdfData netcdfData,
Map<Imt, double[]> imls,
FeatureCollection map,
FeatureCollection sites) {
super(NetcdfData.Builder.copyOf(netcdfData)); super(NetcdfData.Builder.copyOf(netcdfData));
checkState(!imls.isEmpty(), "Must add imls"); checkState(!imls.isEmpty(), "Must add imls");
this.imls = imls; this.imls = imls;
this.map = map;
this.sites = sites;
} }
/** /**
...@@ -28,6 +37,13 @@ public class NetcdfDataHazardCurves extends NetcdfData { ...@@ -28,6 +37,13 @@ public class NetcdfDataHazardCurves extends NetcdfData {
return imls; return imls;
} }
/**
* Returns the map boundary feature collection.
*/
public FeatureCollection map() {
return map;
}
/** /**
* Returns the number of Imls * Returns the number of Imls
*/ */
...@@ -35,6 +51,13 @@ public class NetcdfDataHazardCurves extends NetcdfData { ...@@ -35,6 +51,13 @@ public class NetcdfDataHazardCurves extends NetcdfData {
return imls.values().iterator().next().length; return imls.values().iterator().next().length;
} }
/**
* Returns the test sites feature collection.
*/
public FeatureCollection sites() {
return sites;
}
public static Builder builder() { public static Builder builder() {
return new Builder(); return new Builder();
} }
......
...@@ -3,6 +3,8 @@ package gov.usgs.earthquake.nshmp.netcdf.www; ...@@ -3,6 +3,8 @@ package gov.usgs.earthquake.nshmp.netcdf.www;
import java.util.List; import java.util.List;
import java.util.stream.Collectors; import java.util.stream.Collectors;
import com.google.gson.JsonElement;
import gov.usgs.earthquake.nshmp.data.XySequence; import gov.usgs.earthquake.nshmp.data.XySequence;
import gov.usgs.earthquake.nshmp.geo.Location; import gov.usgs.earthquake.nshmp.geo.Location;
import gov.usgs.earthquake.nshmp.gmm.Imt; import gov.usgs.earthquake.nshmp.gmm.Imt;
...@@ -218,10 +220,14 @@ public class NetcdfServiceHazardCurves extends ...@@ -218,10 +220,14 @@ public class NetcdfServiceHazardCurves extends
static class HazardSourceModel extends SourceModel { static class HazardSourceModel extends SourceModel {
public final List<Imt> imts; public final List<Imt> imts;
public final JsonElement map;
public final JsonElement sites;
HazardSourceModel(NetcdfHazardCurves netcdf) { HazardSourceModel(NetcdfHazardCurves netcdf) {
super(netcdf); super(netcdf);
imts = netcdf.netcdfData().imts().stream().sorted().collect(Collectors.toList()); imts = netcdf.netcdfData().imts().stream().sorted().collect(Collectors.toList());
map = netcdf.netcdfData().map().toJsonTree();
sites = netcdf.netcdfData().sites().toJsonTree();
} }
} }
} }
...@@ -216,9 +216,11 @@ public class NetcdfUtils { ...@@ -216,9 +216,11 @@ public class NetcdfUtils {
public static final String IMT = "imt"; public static final String IMT = "imt";
public static final String LAT = "lat"; public static final String LAT = "lat";
public static final String LON = "lon"; public static final String LON = "lon";
public static final String MAP = "map";
public static final String REGION = "region"; public static final String REGION = "region";
public static final String SCIENCE_BASE_INFO = "scienceBaseInfo"; public static final String SCIENCE_BASE_INFO = "scienceBaseInfo";
public static final String SITE_CLASS = "siteClass"; public static final String SITE_CLASS = "siteClass";
public static final String SITES = "sites";
public static final String VS30 = "vs30"; public static final String VS30 = "vs30";
public static final String YEAR = "year"; public static final String YEAR = "year";
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment