Mercurial > dive4elements > river
diff artifacts/src/main/java/org/dive4elements/river/artifacts/model/minfo/SedimentLoadDataFacet.java @ 8174:4b2b7593815c
Make sedimentload loadable as old calculation.
author | Tom Gottfried <tom@intevation.de> |
---|---|
date | Tue, 02 Sep 2014 14:46:20 +0200 |
parents | f2bbe09e516e |
children | e4606eae8ea5 |
line wrap: on
line diff
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/model/minfo/SedimentLoadDataFacet.java Mon Sep 01 17:50:22 2014 +0200 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/model/minfo/SedimentLoadDataFacet.java Tue Sep 02 14:46:20 2014 +0200 @@ -92,7 +92,6 @@ @Override public Object getData(Artifact artifact, CallContext context) { - logger.debug("Get data for sediment load with fraction: " + fraction); D4EArtifact flys = (D4EArtifact) artifact; @@ -105,21 +104,15 @@ SedimentLoadDataResult sdResult = (SedimentLoadDataResult) payload; - List<Fraction> fractions = sdResult.getFractionsByNameAndPeriod( - fraction, period - ); - if (fractions == null) { - logger.warn("No result for fraction '" + fraction + + List<Fraction> fractions = sdResult.getFractions(); + + if (fractions.size() < index + 1) { + logger.error("No result for fraction '" + fraction + "' and period '" + period + "'"); return null; } - if (fractions.size() > 1) { - logger.error("Multiple results for fraction '" + fraction + - "' and period '" + period + "'"); - } - - return fractions.get(0).getData(); + return fractions.get(index).getData(); /* Are gaps neccessary now? for (int x = 0; x < values[0].length-1; x++) {