Mercurial > dive4elements > river
diff artifacts/src/main/java/org/dive4elements/river/artifacts/services/SedimentLoadInfoService.java @ 8768:ef0ec2498dd0
issue1841 Only include loads where value != NaN in info service
| author | Andre Heinecke <andre.heinecke@intevation.de> |
|---|---|
| date | Thu, 20 Aug 2015 19:14:56 +0200 |
| parents | 69b0a71b4845 |
| children | 5e38e2924c07 |
line wrap: on
line diff
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/services/SedimentLoadInfoService.java Thu Aug 20 14:21:54 2015 +0200 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/services/SedimentLoadInfoService.java Thu Aug 20 19:14:56 2015 +0200 @@ -85,7 +85,7 @@ log.debug("Requested type: " + type + " with sq_ti_id: " + sq_ti_id); Collection <Load> loads; if (type.equals("sq_time_intervals")) { - loads = allLoadData.findDistinctSQTimeIntervalNonEpochLoads(fromD, toD); + loads = allLoadData.findDistinctSQTimeIntervalNonEpochLoadsWithValue(fromD, toD); for (Iterator<Load> it = loads.iterator(); it.hasNext();) { /* Skip loads without time interval for this info type. */ @@ -97,9 +97,9 @@ } else { if (!sq_ti_id.isEmpty()) { Integer id = Integer.parseInt(sq_ti_id); - loads = allLoadData.findLoads(fromD, toD, id); + loads = allLoadData.findLoadsWithValue(fromD, toD, id); } else { - loads = allLoadData.findLoads(fromD, toD); + loads = allLoadData.findLoadsWithValue(fromD, toD); } for (Iterator<Load> it = loads.iterator(); it.hasNext();) { /* Skip epochs . */