Mercurial > dive4elements > river
diff artifacts/src/main/java/org/dive4elements/river/exports/FixWaterlevelExporter.java @ 9554:33ce8eba9806
waterlevel export W/am Pegel / "Bezeichnung" fixes
author | gernotbelger |
---|---|
date | Mon, 22 Oct 2018 18:26:05 +0200 |
parents | ce13a2f07290 |
children |
line wrap: on
line diff
--- a/artifacts/src/main/java/org/dive4elements/river/exports/FixWaterlevelExporter.java Mon Oct 22 16:33:10 2018 +0200 +++ b/artifacts/src/main/java/org/dive4elements/river/exports/FixWaterlevelExporter.java Mon Oct 22 18:26:05 2018 +0200 @@ -47,17 +47,15 @@ /** Write an csv-row at gauge location. */ @Override protected void writeRow6(final CSVWriter writer, final double wqkm[], final String wOrQDesc, final D4EArtifact flys, final String gaugeName, - final Gauge gauge, final boolean isQ) { + final String wAtGauge, final boolean isQ) { if (!isQ) { - super.writeRow6(writer, wqkm, wOrQDesc, flys, gaugeName, gauge, isQ); + super.writeRow6(writer, wqkm, wOrQDesc, flys, gaugeName, wAtGauge, isQ); } else { final NumberFormat kmf = getKmFormatter(); final NumberFormat wf = getWFormatter(); final NumberFormat qf = getQFormatter(); - final String waterlevel = getWaterlevel(wqkm[1], gauge); - - writer.writeNext(new String[] { kmf.format(wqkm[2]), wf.format(wqkm[0]), waterlevel, qf.format(RiverUtils.roundQ(wqkm[1])), wOrQDesc, + writer.writeNext(new String[] { kmf.format(wqkm[2]), wf.format(wqkm[0]), wAtGauge, qf.format(RiverUtils.roundQ(wqkm[1])), wOrQDesc, RiverUtils.getLocationDescription(flys, wqkm[2]), gaugeName }); } }