Mercurial > dive4elements > river
comparison backend/src/main/java/org/dive4elements/river/model/BedHeight.java @ 9219:8642a76f22be
Fixed getBedHeights (removed the obsolete km filtering loop)
| author | mschaefer |
|---|---|
| date | Wed, 04 Jul 2018 10:46:37 +0200 |
| parents | 13b764afb536 |
| children | f5cff8708531 |
comparison
equal
deleted
inserted
replaced
| 9218:13b764afb536 | 9219:8642a76f22be |
|---|---|
| 7 */ | 7 */ |
| 8 | 8 |
| 9 package org.dive4elements.river.model; | 9 package org.dive4elements.river.model; |
| 10 | 10 |
| 11 import java.io.Serializable; | 11 import java.io.Serializable; |
| 12 import java.util.ArrayList; | |
| 13 import java.util.List; | 12 import java.util.List; |
| 14 | 13 |
| 15 import javax.persistence.Column; | 14 import javax.persistence.Column; |
| 16 import javax.persistence.Entity; | 15 import javax.persistence.Entity; |
| 17 import javax.persistence.GeneratedValue; | 16 import javax.persistence.GeneratedValue; |
| 217 query.setParameter("river", river); | 216 query.setParameter("river", river); |
| 218 query.setParameter("kmfrom", kmLo); | 217 query.setParameter("kmfrom", kmLo); |
| 219 query.setParameter("kmto", kmHi); | 218 query.setParameter("kmto", kmHi); |
| 220 | 219 |
| 221 final List<BedHeight> singles = query.list(); | 220 final List<BedHeight> singles = query.list(); |
| 222 final List<BedHeight> good = new ArrayList<>(); | 221 |
| 223 | 222 return singles; |
| 224 for (final BedHeight s : singles) { | |
| 225 for (final BedHeightValue value : s.getValues()) { | |
| 226 final double station = value.getStation().doubleValue(); | |
| 227 | |
| 228 if (station >= kmLo && station <= kmHi) { | |
| 229 good.add(s); | |
| 230 break; | |
| 231 } | |
| 232 } | |
| 233 } | |
| 234 | |
| 235 return good; | |
| 236 } | 223 } |
| 237 | 224 |
| 238 public static BedHeight getBedHeightById(final int id) { | 225 public static BedHeight getBedHeightById(final int id) { |
| 239 final Session session = SessionHolder.HOLDER.get(); | 226 final Session session = SessionHolder.HOLDER.get(); |
| 240 | 227 |