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

Merge branch 'sites' into 'main'

Location to Site

See merge request !428
parents 87c6d807 39ed7dc9
No related branches found
No related tags found
1 merge request!428Location to Site
Pipeline #506550 passed
......@@ -59,6 +59,23 @@ public final class Sites {
}
}
/**
* Convert a location to site with site data.
*
* @param loc of site
* @param siteData site specific data from model
* @param vs30 optional vs30 value used when running multiple site classes
*/
public static Site locationToSite(
Location loc,
SiteData siteData,
OptionalDouble vs30) {
Site.Builder site = initBuilder(loc, siteData);
vs30.ifPresent(site::vs30);
return site.build();
}
private static Site recordToSite(
Record record,
Set<String> keys,
......@@ -229,16 +246,6 @@ public final class Sites {
.collect(toUnmodifiableList());
}
private static Site locationToSite(
Location loc,
SiteData siteData,
OptionalDouble vs30) {
Site.Builder site = initBuilder(loc, siteData);
vs30.ifPresent(site::vs30);
return site.build();
}
private static final int TO_STRING_LIMIT = 5;
private static final String SITE_INDENT = LOG_INDENT + " ";
......
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