Mercurial > dive4elements > river
comparison flys-artifacts/src/main/java/de/intevation/flys/exports/WaterlevelExporter.java @ 5133:8e52b4829cd1
Fix flys/issue1228: Units in tabular calculation output.
| author | Felix Wolfsteller <felix.wolfsteller@intevation.de> |
|---|---|
| date | Thu, 28 Feb 2013 12:37:07 +0100 |
| parents | 42bae65c116b |
| children | 05eeedc5b156 |
comparison
equal
deleted
inserted
replaced
| 5132:c2b377bcc025 | 5133:8e52b4829cd1 |
|---|---|
| 424 boolean atGauge, | 424 boolean atGauge, |
| 425 boolean isQ | 425 boolean isQ |
| 426 ) { | 426 ) { |
| 427 logger.info("WaterlevelExporter.writeCSVHeader"); | 427 logger.info("WaterlevelExporter.writeCSVHeader"); |
| 428 | 428 |
| 429 String unit = FLYSUtils.getRiver((FLYSArtifact) master).getWstUnit().getName(); | |
| 430 | |
| 429 if (atGauge) { | 431 if (atGauge) { |
| 430 writer.writeNext(new String[] { | 432 writer.writeNext(new String[] { |
| 431 msg(CSV_KM_HEADER, DEFAULT_CSV_KM_HEADER), | 433 msg(CSV_KM_HEADER, DEFAULT_CSV_KM_HEADER), |
| 432 msg(CSV_W_HEADER, DEFAULT_CSV_W_HEADER), | 434 msg(CSV_W_HEADER, DEFAULT_CSV_W_HEADER, new Object[] { unit }), |
| 433 msg(CSV_Q_HEADER, DEFAULT_CSV_Q_HEADER), | 435 msg(CSV_Q_HEADER, DEFAULT_CSV_Q_HEADER), |
| 434 (isQ | 436 (isQ |
| 435 ? msg(CSV_Q_DESC_HEADER, DEFAULT_CSV_Q_DESC_HEADER) | 437 ? msg(CSV_Q_DESC_HEADER, DEFAULT_CSV_Q_DESC_HEADER) |
| 436 : msg(CSV_W_DESC_HEADER, DEFAULT_CSV_W_DESC_HEADER)), | 438 : msg(CSV_W_DESC_HEADER, DEFAULT_CSV_W_DESC_HEADER)), |
| 437 msg(CSV_LOCATION_HEADER, DEFAULT_CSV_LOCATION_HEADER), | 439 msg(CSV_LOCATION_HEADER, DEFAULT_CSV_LOCATION_HEADER), |
| 439 }); | 441 }); |
| 440 } | 442 } |
| 441 else { | 443 else { |
| 442 writer.writeNext(new String[] { | 444 writer.writeNext(new String[] { |
| 443 msg(CSV_KM_HEADER, DEFAULT_CSV_KM_HEADER), | 445 msg(CSV_KM_HEADER, DEFAULT_CSV_KM_HEADER), |
| 444 msg(CSV_W_HEADER, DEFAULT_CSV_W_HEADER), | 446 // TODO flys/issue1128 (unit per river) |
| 447 msg(CSV_W_HEADER, DEFAULT_CSV_W_HEADER, new Object[] { unit }), | |
| 445 msg(CSV_Q_HEADER, DEFAULT_CSV_Q_HEADER), | 448 msg(CSV_Q_HEADER, DEFAULT_CSV_Q_HEADER), |
| 446 msg(CSV_LOCATION_HEADER, DEFAULT_CSV_LOCATION_HEADER) | 449 msg(CSV_LOCATION_HEADER, DEFAULT_CSV_LOCATION_HEADER) |
| 447 }); | 450 }); |
| 448 } | 451 } |
| 449 } | 452 } |