diff artifacts/src/main/java/org/dive4elements/river/artifacts/sinfo/common/CollisionCalcProcessor.java @ 9195:a4121ec450d6

'ca.'-issue ExportContextCSV+PDF separated uinfo.inundationduration url export
author gernotbelger
date Fri, 29 Jun 2018 14:52:54 +0200
parents f9bb5d0a6ff3
children 6393e05a9610
line wrap: on
line diff
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/sinfo/common/CollisionCalcProcessor.java	Thu Jun 28 15:57:40 2018 +0200
+++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/sinfo/common/CollisionCalcProcessor.java	Fri Jun 29 14:52:54 2018 +0200
@@ -19,9 +19,9 @@
 import org.dive4elements.artifacts.Artifact;
 import org.dive4elements.artifacts.CallContext;
 import org.dive4elements.river.artifacts.common.AbstractCalculationResult;
+import org.dive4elements.river.artifacts.common.IResultType;
 import org.dive4elements.river.artifacts.resources.Resources;
 import org.dive4elements.river.artifacts.sinfo.collision.CollisionCalcFacet;
-import org.dive4elements.river.artifacts.sinfo.collision.CollisionCalcOverviewResult;
 import org.dive4elements.river.artifacts.states.DefaultState.ComputeType;
 import org.dive4elements.river.exports.DiagramGenerator;
 import org.dive4elements.river.exports.StyledSeriesBuilder;
@@ -55,6 +55,12 @@
     @Override
     protected String generateSeries(final DiagramGenerator generator, final ArtifactAndFacet bundle, final ThemeDocument theme, final boolean visible) {
 
+        return buildSeriesForType(generator, bundle, theme, visible, SInfoResultType.collisionCount);
+    }
+
+    // FIXME: move to super classs and use in many implementations
+    protected final String buildSeriesForType(final DiagramGenerator generator, final ArtifactAndFacet bundle, final ThemeDocument theme, final boolean visible,
+            final IResultType resultType) {
         final CallContext context = generator.getContext();
         final Map<String, String> metaData = bundle.getFacet().getMetaData();
 
@@ -65,14 +71,14 @@
 
         final String facetName = bundle.getFacetName();
 
-        final CollisionCalcOverviewResult data = (CollisionCalcOverviewResult) bundle.getData(context);
+        final AbstractCalculationResult data = (AbstractCalculationResult) bundle.getData(context);
         if (data == null) {
             // Check has been here before so we keep it for security reasons
             // this should never happen though.
             throw new IllegalStateException("Data is null for facet: " + facetName);
         }
 
-        final double[][] points = data.getStationPoints(SInfoResultType.collisionCount);
+        final double[][] points = data.getStationPoints(resultType);
 
         StyledSeriesBuilder.addPoints(series, points, true);
         generator.addAxisSeries(series, getAxisName(), visible);

http://dive4elements.wald.intevation.org