Mercurial > dive4elements > river
diff artifacts/src/main/java/org/dive4elements/river/artifacts/bundu/bezugswst/BezugswstCalculation.java @ 9588:c57caff9b00b
Punkt 10.6 CSV-Ausgabe Abflusszeitreihenlänge
author | gernotbelger |
---|---|
date | Thu, 10 Jan 2019 11:56:39 +0100 |
parents | b9c87bbff6a4 |
children | 17414e70746e |
line wrap: on
line diff
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/bundu/bezugswst/BezugswstCalculation.java Thu Jan 10 09:07:16 2019 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/bundu/bezugswst/BezugswstCalculation.java Thu Jan 10 11:56:39 2019 +0100 @@ -29,6 +29,8 @@ import org.dive4elements.river.artifacts.model.fixings.FixRealizingResult; import org.dive4elements.river.artifacts.model.river.RiverInfoProvider; import org.dive4elements.river.artifacts.resources.Resources; +import org.dive4elements.river.artifacts.services.DynamicMainValuesTimeRangeDeterminationService; +import org.dive4elements.river.artifacts.services.DynamicMainValuesTimeRangeDeterminationService.GaugeInfoResult; import org.dive4elements.river.artifacts.sinfo.tkhstate.BedHeightsFinder; import org.dive4elements.river.artifacts.sinfo.tkhstate.WinfoArtifactWrapper; import org.dive4elements.river.artifacts.sinfo.util.CalculationUtils; @@ -85,6 +87,11 @@ this.missKmFrom = access.getMissingVolFrom(); this.missKmTo = access.getMissingVolTo(); + final GaugeInfoResult gi = DynamicMainValuesTimeRangeDeterminationService + .getCommonTimeRangeForGauges(river.determineGauges(access.getLowerKm(), access.getUpperKm()), startYear, endYear, this.context.getMeta()); + final int globalAdjustedEndYear = gi.getGlobalEndYear(); + final int globalAdjustedStartYear = gi.getGlobalStartYear(); + final BezugswstCalculationResults results = new BezugswstCalculationResults(calcModeLabel, user, riverInfo, access.getRange(), access.isCalculateMissingVolume()); @@ -135,7 +142,7 @@ final WaterlevelDescriptionBuilder descBuilder = new WaterlevelDescriptionBuilder(winfo, this.context); final String qtext = descBuilder.getMetadataQ(); final BezugswstMainCalculationResult result = new BezugswstMainCalculationResult("bundu-bzws", this.rows, bedHeightsFinder.getInfo(), wstInfo, - access.getFunction(), preprocessing, startYear, endYear, ud, qtext, wqkms, this.missKmFrom, this.missKmTo); + access.getFunction(), preprocessing, globalAdjustedStartYear, globalAdjustedEndYear, ud, qtext, wqkms, this.missKmFrom, this.missKmTo); results.addResult(result, problems); // Create the missing volume results