Mercurial > dive4elements > river
comparison artifacts/src/main/java/org/dive4elements/river/artifacts/model/minfo/SedimentLoadFactory.java @ 6965:69bf96202df4
SedimentLoadFactory: Minor simplification.
| author | Felix Wolfsteller <felix.wolfsteller@intevation.de> |
|---|---|
| date | Thu, 05 Sep 2013 15:27:56 +0200 |
| parents | 5a348e3df0f8 |
| children | 328854c0467f |
comparison
equal
deleted
inserted
replaced
| 6964:5a348e3df0f8 | 6965:69bf96202df4 |
|---|---|
| 493 MeasurementStation station = stations.get(km); | 493 MeasurementStation station = stations.get(km); |
| 494 MeasurementStation nextStation = null; | 494 MeasurementStation nextStation = null; |
| 495 if (stations.ceilingEntry(km + 0.1d) != null) { | 495 if (stations.ceilingEntry(km + 0.1d) != null) { |
| 496 nextStation = stations.ceilingEntry(km + 0.1d).getValue(); | 496 nextStation = stations.ceilingEntry(km + 0.1d).getValue(); |
| 497 } | 497 } |
| 498 Range range = null; | |
| 499 if (station == null) { | 498 if (station == null) { |
| 500 return null; | 499 return null; |
| 501 } | 500 } |
| 502 else { | 501 else { |
| 503 if (nextStation != null) | 502 if (nextStation != null) |
| 504 range = new Range(station.getRange().getA().doubleValue(), | 503 return new Range(station.getRange().getA().doubleValue(), |
| 505 nextStation.getRange().getA().doubleValue()); | 504 nextStation.getRange().getA().doubleValue()); |
| 506 else { | 505 else { |
| 507 // TODO end-of-river instead of B. | 506 // TODO end-of-river instead of B. |
| 508 range = new Range(station.getRange().getA().doubleValue(), | 507 return new Range(station.getRange().getA().doubleValue(), |
| 509 station.getRange().getB().doubleValue()); | 508 station.getRange().getB().doubleValue()); |
| 510 } | 509 } |
| 511 } | 510 } |
| 512 return range; | |
| 513 } | 511 } |
| 514 | 512 |
| 515 /** | 513 /** |
| 516 * Run query with grain parameter set to fraction, feed result into | 514 * Run query with grain parameter set to fraction, feed result into |
| 517 * load. Create load if null. | 515 * load. Create load if null. |