Mercurial > dive4elements > river
comparison backend/src/main/java/org/dive4elements/river/model/River.java @ 5880:1f52b2bff737
Another part of flys/issue1247: Now the main values are determined right if the gauge limits are in abitrary order.
| author | Sascha L. Teichmann <teichmann@intevation.de> |
|---|---|
| date | Mon, 29 Apr 2013 17:23:12 +0200 |
| parents | a7b56219b362 |
| children | 4c3ccf2b0304 |
comparison
equal
deleted
inserted
replaced
| 5879:895b80728095 | 5880:1f52b2bff737 |
|---|---|
| 173 | 173 |
| 174 if (a > b) { double t = a; a = b; b = t; } | 174 if (a > b) { double t = a; a = b; b = t; } |
| 175 | 175 |
| 176 Query query = session.createQuery( | 176 Query query = session.createQuery( |
| 177 "from Gauge where river=:river " + | 177 "from Gauge where river=:river " + |
| 178 "and not (range.a > :b or range.b < :a) order by a"); | 178 "and not " + |
| 179 "((:b < least(range.a, range.b)) or" + | |
| 180 " (:a > greatest(range.a, range.b)))" + | |
| 181 "order by a"); | |
| 179 query.setParameter("river", this); | 182 query.setParameter("river", this); |
| 180 query.setParameter("a", new BigDecimal(a, PRECISION)); | 183 query.setParameter("a", new BigDecimal(a, PRECISION)); |
| 181 query.setParameter("b", new BigDecimal(b, PRECISION)); | 184 query.setParameter("b", new BigDecimal(b, PRECISION)); |
| 182 | 185 |
| 183 return query.list(); | 186 return query.list(); |