Mercurial > dive4elements > river
diff artifacts/src/main/java/org/dive4elements/river/artifacts/sinfo/collision/CollisionArtifact.java @ 9215:0fc9c82e744e
work on collison, flood_duration
author | gernotbelger |
---|---|
date | Tue, 03 Jul 2018 17:00:48 +0200 |
parents | b4402594213b |
children | c9a4eb3afa4a |
line wrap: on
line diff
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/sinfo/collision/CollisionArtifact.java Tue Jul 03 14:26:56 2018 +0200 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/sinfo/collision/CollisionArtifact.java Tue Jul 03 17:00:48 2018 +0200 @@ -24,7 +24,6 @@ import org.dive4elements.river.artifacts.AbstractStaticStateArtifact; import org.dive4elements.river.artifacts.D4EArtifact; import org.dive4elements.river.artifacts.model.FacetTypes; -import org.dive4elements.river.artifacts.sinfo.common.CollisionCountProcessor; import org.dive4elements.river.artifacts.states.StaticState; import org.w3c.dom.Document; @@ -90,21 +89,24 @@ else seriesName = "name?"; + // if different facet wanted, e.g. for each year use different facetIndex + // if multiple Result treated, get each Result from data createFacets(callMeta, code, seriesName, getDataAsString("year")); super.setup(identifier, factory, context, callMeta, data, loadFacets); } - private void createFacets(final CallMeta callMeta, final String code, final String seriesName, final String year) { + private void createFacets(final CallMeta callMeta, final String code, final String seriesName, final String yearForName) { if (code == null) return; + final String[] parts = code.split("-"); if (parts.length < 2) { log.error("Invalid datacage ID '" + code + "'"); return; } final ArrayList<Facet> facets = new ArrayList<>(1); - facets.add(CollisionCountProcessor.createFacet(callMeta, year)); + facets.add(CollisionCountProcessor.createFacet(0, callMeta, yearForName)); // facets.add(CollisionGaugeWProcessor.createFacet(callMeta, seriesName)); //REMARK gauge_w is the cm above gauge datum, // therefore only useful with transformation to NHN addFacets(STATIC_STATE_NAME, facets);