Mercurial > dive4elements > river
comparison artifacts/src/main/java/org/dive4elements/river/utils/RiverUtils.java @ 6841:ddb0ed040209
(Issue1357) Pull river name into getReferenceGauge
This fixes the timerange state on rivers with multiple gauges of
the same id
| author | Andre Heinecke <aheinecke@intevation.de> |
|---|---|
| date | Thu, 15 Aug 2013 16:26:50 +0200 |
| parents | da0249ddcba7 |
| children | d322da01d862 |
comparison
equal
deleted
inserted
replaced
| 6840:233a1b04fb8a | 6841:ddb0ed040209 |
|---|---|
| 489 } | 489 } |
| 490 | 490 |
| 491 | 491 |
| 492 public static Gauge getReferenceGauge(D4EArtifact flys) { | 492 public static Gauge getReferenceGauge(D4EArtifact flys) { |
| 493 Long officialNumber = flys.getDataAsLong("reference_gauge"); | 493 Long officialNumber = flys.getDataAsLong("reference_gauge"); |
| 494 | 494 String river = getRivername(flys); |
| 495 return officialNumber != null | 495 |
| 496 ? Gauge.getGaugeByOfficialNumber(officialNumber) | 496 if (officialNumber != null && river != null) { |
| 497 : null; | 497 return Gauge.getGaugeByOfficialNumber(officialNumber, river); |
| 498 } else if (officialNumber != null) { | |
| 499 return Gauge.getGaugeByOfficialNumber(officialNumber); | |
| 500 } | |
| 501 return null; | |
| 498 } | 502 } |
| 499 | 503 |
| 500 | 504 |
| 501 public static String getReferenceGaugeName(D4EArtifact flys) { | 505 public static String getReferenceGaugeName(D4EArtifact flys) { |
| 502 Gauge refGauge = getReferenceGauge(flys); | 506 Gauge refGauge = getReferenceGauge(flys); |