Mercurial > dive4elements > river
comparison artifacts/src/main/java/org/dive4elements/river/artifacts/sinfo/tkhstate/TkhCalculation.java @ 9362:392745cccede
Fixed: waterlevels from database should not get the "Bezugspegel" column in the result output.
| author | gernotbelger |
|---|---|
| date | Wed, 01 Aug 2018 18:40:57 +0200 |
| parents | 7dc238bd062c |
| children | 853f2dafc16e |
comparison
equal
deleted
inserted
replaced
| 9361:2aec052d4088 | 9362:392745cccede |
|---|---|
| 151 | 151 |
| 152 // We have no wst year as the wst is created by a calculation; we do not need it though | 152 // We have no wst year as the wst is created by a calculation; we do not need it though |
| 153 final int wspYear = -1; | 153 final int wspYear = -1; |
| 154 // Remark: showAllGauges only true for Fixierungsanalyse, false for WInfo, so false here as well | 154 // Remark: showAllGauges only true for Fixierungsanalyse, false for WInfo, so false here as well |
| 155 final boolean showAllGauges = false; | 155 final boolean showAllGauges = false; |
| 156 final WaterlevelData waterlevel = new WaterlevelData(wkms, wspYear, showAllGauges); | 156 final WaterlevelData waterlevel = new WaterlevelData(wkms, wspYear, showAllGauges, true); |
| 157 | 157 |
| 158 final RiverInfoProvider riverInfoProvider = riverInfo.forWaterlevel(waterlevel); | 158 final RiverInfoProvider riverInfoProvider = riverInfo.forWaterlevel(waterlevel); |
| 159 | 159 |
| 160 final String waterlevelLabel = descBuilder.getDesc(wkms); | 160 final String waterlevelLabel = descBuilder.getDesc(wkms); |
| 161 | 161 |
| 162 final WstInfo wstInfo = new WstInfo(waterlevelLabel, wspYear, riverInfoProvider.getReferenceGauge()); | 162 final WstInfo wstInfo = new WstInfo(waterlevelLabel, wspYear, riverInfoProvider.getReferenceGauge(), true); |
| 163 | 163 |
| 164 /* build tkh calculators per bedheight */ | 164 /* build tkh calculators per bedheight */ |
| 165 final Map<NumberRange, TkhCalculator> calculatorsByRanges = buildCalculators(calcRange, wkms, bedHeights, problems, riverInfoProvider, waterlevelLabel); | 165 final Map<NumberRange, TkhCalculator> calculatorsByRanges = buildCalculators(calcRange, wkms, bedHeights, problems, riverInfoProvider, waterlevelLabel); |
| 166 if (calculatorsByRanges.isEmpty()) { | 166 if (calculatorsByRanges.isEmpty()) { |
| 167 /* there should already be some problems, so just abort */ | 167 /* there should already be some problems, so just abort */ |