Mercurial > dive4elements > river
comparison artifacts/src/main/java/org/dive4elements/river/artifacts/sinfo/flowdepthdev/FlowDepthDevelopmentCalculation.java @ 9040:5294114b1df4
Fixed/changed some FIXMEs/TODOs
| author | gernotbelger |
|---|---|
| date | Wed, 02 May 2018 12:19:31 +0200 |
| parents | d5802f22e4f5 |
| children | 740d65e4aa14 |
comparison
equal
deleted
inserted
replaced
| 9039:13b5b515c61f | 9040:5294114b1df4 |
|---|---|
| 94 | 94 |
| 95 final BedHeightsFinder historicalSounding = loadBedHeight(histPair, calcRange, problems); | 95 final BedHeightsFinder historicalSounding = loadBedHeight(histPair, calcRange, problems); |
| 96 if (historicalSounding == null) | 96 if (historicalSounding == null) |
| 97 return null; | 97 return null; |
| 98 | 98 |
| 99 // FIXME: check current/hist wst have same discharge... | |
| 100 // FIXME: what means 'same discharge' | |
| 101 | |
| 102 final BedHeightInfo currentSoundingInfo = currentSounding.getInfo(); | 99 final BedHeightInfo currentSoundingInfo = currentSounding.getInfo(); |
| 103 final BedHeightInfo historicalSoundingInfo = historicalSounding.getInfo(); | 100 final BedHeightInfo historicalSoundingInfo = historicalSounding.getInfo(); |
| 104 | 101 |
| 105 final int currentWstYear = currentWaterlevel.getYear(); | 102 final int currentWstYear = currentWaterlevel.getYear(); |
| 106 final int historicalWstYear = historicalWaterlevel.getYear(); | 103 final int historicalWstYear = historicalWaterlevel.getYear(); |
| 115 if (historicalWstYear < 0) { | 112 if (historicalWstYear < 0) { |
| 116 problems.addProblem("flowdepthdevelopmentcalculation.missingHistoricalYear", historicalWaterlevel.getName()); | 113 problems.addProblem("flowdepthdevelopmentcalculation.missingHistoricalYear", historicalWaterlevel.getName()); |
| 117 return null; | 114 return null; |
| 118 } | 115 } |
| 119 | 116 |
| 120 // FIXME: distinguish error messages | |
| 121 FlowDepthUtils.checkYearDifference(Resources.getMsg(this.context.getMeta(), "flowdepthdevelopmentcalculation.yearDifferenceCurrent"), currentWstYear, | 117 FlowDepthUtils.checkYearDifference(Resources.getMsg(this.context.getMeta(), "flowdepthdevelopmentcalculation.yearDifferenceCurrent"), currentWstYear, |
| 122 currentSoundingYear, problems); | 118 currentSoundingYear, problems); |
| 123 FlowDepthUtils.checkYearDifference(Resources.getMsg(this.context.getMeta(), "flowdepthdevelopmentcalculation.yearDifferenceHistorical"), | 119 FlowDepthUtils.checkYearDifference(Resources.getMsg(this.context.getMeta(), "flowdepthdevelopmentcalculation.yearDifferenceHistorical"), |
| 124 historicalWstYear, | 120 historicalWstYear, |
| 125 historicalSoundingYear, problems); | 121 historicalSoundingYear, problems); |