Mercurial > dive4elements > river
comparison backend/src/main/java/org/dive4elements/river/model/MeasurementStation.java @ 8602:0860e4f642c4
(issue1753) Use epsilon comparator to compare range km's
| author | Andre Heinecke <andre.heinecke@intevation.de> |
|---|---|
| date | Fri, 20 Mar 2015 16:32:44 +0100 |
| parents | 724d8dfb628a |
| children | 8fbc0649da13 |
comparison
equal
deleted
inserted
replaced
| 8601:5b568f7f18bc | 8602:0860e4f642c4 |
|---|---|
| 231 Double b = st.getRange().getB() == null | 231 Double b = st.getRange().getB() == null |
| 232 ? null | 232 ? null |
| 233 : st.getRange().getB().doubleValue(); | 233 : st.getRange().getB().doubleValue(); |
| 234 | 234 |
| 235 // In case river is km_up, station is at larger value of range | 235 // In case river is km_up, station is at larger value of range |
| 236 if (river.getKmUp() && b != null && b == river_km | 236 if (river.getKmUp() && b != null && CMP.compare(b, river_km) == 0 |
| 237 || !river.getKmUp() && a == river_km | 237 || !river.getKmUp() && CMP.compare(a, river_km) == 0 |
| 238 || b == null && a == river_km // no end km given | 238 || b == null && CMP.compare(a, river_km) == 0 // no end km given |
| 239 ) { | 239 ) { |
| 240 result.add(st); | 240 result.add(st); |
| 241 } | 241 } |
| 242 } | 242 } |
| 243 return result; | 243 return result; |