Mercurial > dive4elements > river
diff artifacts/src/main/java/org/dive4elements/river/artifacts/model/minfo/SedimentLoadDataFactory.java @ 8259:1fc453fbc5df
Measurement stations without range should not be used in calculation and we assume the beginning of the range is the station.
| author | Tom Gottfried <tom@intevation.de> |
|---|---|
| date | Thu, 11 Sep 2014 16:12:39 +0200 |
| parents | 25c3a62863d2 |
| children | 17db08570637 |
line wrap: on
line diff
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/model/minfo/SedimentLoadDataFactory.java Thu Sep 11 14:45:17 2014 +0200 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/model/minfo/SedimentLoadDataFactory.java Thu Sep 11 16:12:39 2014 +0200 @@ -55,10 +55,11 @@ "slv.value AS slv_value, " + "gf.name AS gf_name, " + "ms.id AS ms_id, " + - "ms.station AS ms_station, " + + "rs.a AS ms_station, " + "ms.measurement_type AS ms_type " + "FROM load_at_river sl " + "CROSS JOIN measurement_station ms " + + "JOIN ranges rs ON ms.range_id = rs.id " + "JOIN time_intervals ti ON sl.time_interval_id = ti.id " + "LEFT JOIN time_intervals sqti ON sl.sq_time_interval_id = sqti.id " + "JOIN grain_fraction gf ON sl.grain_fraction_id = gf.id " +