Mercurial > dive4elements > river
comparison artifacts/src/main/java/org/dive4elements/river/exports/DischargeCurveGenerator.java @ 6939:765cf5fe26c3
DischargeCurveGenerator: Prevent NPE when no gauge can be found.
No gauge happens e.g. at Rhein Vollmer-curve-calculations with
default values.
| author | Felix Wolfsteller <felix.wolfsteller@intevation.de> |
|---|---|
| date | Thu, 29 Aug 2013 09:14:53 +0200 |
| parents | 1b35b2ddfc28 |
| children | 2fed93751ecb |
comparison
equal
deleted
inserted
replaced
| 6938:4c0222d94055 | 6939:765cf5fe26c3 |
|---|---|
| 80 public static double getCurrentGaugeDatum(double km, D4EArtifact artifact, double tolerance) { | 80 public static double getCurrentGaugeDatum(double km, D4EArtifact artifact, double tolerance) { |
| 81 // Look if there is a gauge at chosen km: | 81 // Look if there is a gauge at chosen km: |
| 82 // Get gauge which is defined for km | 82 // Get gauge which is defined for km |
| 83 Gauge gauge = | 83 Gauge gauge = |
| 84 RiverUtils.getRiver(artifact).determineGauge(km-0.1d, km+0.1d); | 84 RiverUtils.getRiver(artifact).determineGauge(km-0.1d, km+0.1d); |
| 85 if (gauge == null) { | |
| 86 logger.error("No Gauge could be found at station " + km + "!"); | |
| 87 return 0d; | |
| 88 } | |
| 85 double subtractPNP = 0d; | 89 double subtractPNP = 0d; |
| 86 // Compare to km. | 90 // Compare to km. |
| 87 if (Math.abs(km - gauge.getStation().doubleValue()) < tolerance) { | 91 if (Math.abs(km - gauge.getStation().doubleValue()) < tolerance) { |
| 88 subtractPNP = gauge.getDatum().doubleValue(); | 92 subtractPNP = gauge.getDatum().doubleValue(); |
| 89 } | 93 } |