Mercurial > dive4elements > river
comparison artifacts/src/main/java/org/dive4elements/river/artifacts/services/DynamicMainValuesTimeRangeDeterminationService.java @ 9410:52314c4ab3be
Fixed: computing of min and max date
| author | mschaefer |
|---|---|
| date | Thu, 16 Aug 2018 09:43:55 +0200 |
| parents | 38201f5b0dd9 |
| children | b534a4f4e4f6 |
comparison
equal
deleted
inserted
replaced
| 9409:38201f5b0dd9 | 9410:52314c4ab3be |
|---|---|
| 97 if (globalErrorMsg.isEmpty()) | 97 if (globalErrorMsg.isEmpty()) |
| 98 globalErrorMsg = msg; | 98 globalErrorMsg = msg; |
| 99 continue; | 99 continue; |
| 100 } | 100 } |
| 101 | 101 |
| 102 if (gaugeDates[0].getTime() > startTime.getTime()) | 102 if (gaugeDates[0].getTime() > min.getTime()) |
| 103 min = gaugeDates[0]; | 103 min = gaugeDates[0]; |
| 104 | 104 |
| 105 if (gaugeDates[1].getTime() < endTime.getTime()) | 105 if (gaugeDates[1].getTime() < max.getTime()) |
| 106 max = gaugeDates[1]; | 106 max = gaugeDates[1]; |
| 107 | 107 |
| 108 String errormsg = null; | 108 String errormsg = null; |
| 109 if ((gaugeDates[1].getTime() < endTime.getTime()) || (gaugeDates[0].getTime() > startTime.getTime())) | 109 if ((gaugeDates[1].getTime() < endTime.getTime()) || (gaugeDates[0].getTime() > startTime.getTime())) |
| 110 errormsg = makeDoesNotCoverErrorMsg(gaugeDates[0], gaugeDates[1], meta); | 110 errormsg = makeDoesNotCoverErrorMsg(gaugeDates[0], gaugeDates[1], meta); |
| 111 | 111 |
| 112 gaugeResults.add(new GaugeInfoResult.GaugeInfo(errormsg, gauge, min, max)); | 112 gaugeResults.add(new GaugeInfoResult.GaugeInfo(errormsg, gauge, gaugeDates[0], gaugeDates[1])); |
| 113 } | 113 } |
| 114 | 114 |
| 115 // common Range and correct errorMsg | 115 // common Range and correct errorMsg |
| 116 final List<GaugeInfoResult.GaugeInfo> gaugeResultsSecondTurn = new ArrayList<>(); | 116 final List<GaugeInfoResult.GaugeInfo> gaugeResultsSecondTurn = new ArrayList<>(); |
| 117 for (final GaugeInfoResult.GaugeInfo gi : gaugeResults) { | 117 for (final GaugeInfoResult.GaugeInfo gi : gaugeResults) { |