Mercurial > dive4elements > river
comparison artifacts/src/main/java/org/dive4elements/river/artifacts/services/SedimentLoadInfoService.java @ 8711:02162b60cf9c
(issue1448) Also filter epoch values in sq_time_interval mode
| author | Andre Heinecke <andre.heinecke@intevation.de> |
|---|---|
| date | Fri, 24 Apr 2015 17:17:56 +0200 |
| parents | f8ea1a7ecde6 |
| children | b5cff23bf308 |
comparison
equal
deleted
inserted
replaced
| 8710:093146703b98 | 8711:02162b60cf9c |
|---|---|
| 89 } else if (type.equals("sq_time_intervals")) { | 89 } else if (type.equals("sq_time_intervals")) { |
| 90 loads = allLoadData.findUniqueTimeIntervalLoads(fromD, toD); | 90 loads = allLoadData.findUniqueTimeIntervalLoads(fromD, toD); |
| 91 | 91 |
| 92 for (Iterator<Load> it = loads.iterator(); it.hasNext();) { | 92 for (Iterator<Load> it = loads.iterator(); it.hasNext();) { |
| 93 /* Skip loads without time interval for this info type. */ | 93 /* Skip loads without time interval for this info type. */ |
| 94 if (it.next().getSQRelationTimeIntervalId() == null) { | 94 Load cur = it.next(); |
| 95 if (cur.getSQRelationTimeIntervalId() == null) { | |
| 96 it.remove(); | |
| 97 } else if (cur.isEpoch()) { | |
| 95 it.remove(); | 98 it.remove(); |
| 96 } | 99 } |
| 97 } | 100 } |
| 98 } else { | 101 } else { |
| 99 if (!sq_ti_id.isEmpty()) { | 102 if (!sq_ti_id.isEmpty()) { |