Mercurial > dive4elements > river
changeset 9154:cd24db77f044
little bugfix on soundings
| author | gernotbelger |
|---|---|
| date | Thu, 14 Jun 2018 17:51:30 +0200 |
| parents | 910334e2eadd |
| children | 9b4f5e61c02e |
| files | artifacts/src/main/java/org/dive4elements/river/artifacts/common/ExportContextCSV.java |
| diffstat | 1 files changed, 18 insertions(+), 20 deletions(-) [+] |
line wrap: on
line diff
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/common/ExportContextCSV.java Thu Jun 14 17:03:53 2018 +0200 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/common/ExportContextCSV.java Thu Jun 14 17:51:30 2018 +0200 @@ -86,27 +86,9 @@ // *** CUSTOM STUFF that is used multiple times ***/// - public final void writeCSVSoundingMetadata2(final BedHeightInfo sounding, final String mainLabel) { - // "##METADATEN PEILUNG" - writeCSVMetaEntry(mainLabel); - - // "# Jahr der Peilung: " - writeCSVMetaEntry(CSV_META_HEADER_SOUNDING_YEAR, Integer.toString(sounding.getYear())); - // "# Aufnahmeart: " - writeCSVMetaEntry(CSV_META_HEADER_SOUNDING_TYPE, sounding.getType()); - // "# Auswerter: " - writeCSVMetaEntry(CSV_META_HEADER_EVALUATOR, sounding.getEvaluationBy()); - // "# Lagesystem: " - writeCSVMetaEntry(CSV_META_HEADER_SOUNDING_PRJ, sounding.getLocationSystem()); - // "# Höhensystem: " - writeCSVMetaEntry(CSV_META_HEADER_SOUNDING_ELEVATIOIN_MODEL, sounding.getCurElevationModelUnit()); - // "# ursprüngliches Höhensystem: " - writeCSVMetaEntry(CSV_META_HEADER_SOUNDING_ELEVATIOIN_MODEL_ORIGINAL, sounding.getOldElevationModelUnit()); - } - public final void writeCSVSoundingMetadata(final BedHeightInfo sounding) { // "##METADATEN PEILUNG" - writeCSVMetaEntry(CSV_META_HEADER_SOUNDING); + writeCSVSoundingMetadata(sounding, CSV_META_HEADER_SOUNDING); } @@ -219,7 +201,23 @@ return String.format("%s [%s]", msg, unit); } - public void writeCSVSoundingMetadata(final BedHeightInfo currentSounding, final String csvMetaHeaderSoundingCurrent) { + public void writeCSVSoundingMetadata(final BedHeightInfo sounding, final String label) { + + // "##METADATEN PEILUNG" + writeCSVMetaEntry(label); + + // "# Jahr der Peilung: " + writeCSVMetaEntry(CSV_META_HEADER_SOUNDING_YEAR, Integer.toString(sounding.getYear())); + // "# Aufnahmeart: " + writeCSVMetaEntry(CSV_META_HEADER_SOUNDING_TYPE, sounding.getType()); + // "# Auswerter: " + writeCSVMetaEntry(CSV_META_HEADER_EVALUATOR, sounding.getEvaluationBy()); + // "# Lagesystem: " + writeCSVMetaEntry(CSV_META_HEADER_SOUNDING_PRJ, sounding.getLocationSystem()); + // "# Höhensystem: " + writeCSVMetaEntry(CSV_META_HEADER_SOUNDING_ELEVATIOIN_MODEL, sounding.getCurElevationModelUnit()); + // "# ursprüngliches Höhensystem: " + writeCSVMetaEntry(CSV_META_HEADER_SOUNDING_ELEVATIOIN_MODEL_ORIGINAL, sounding.getOldElevationModelUnit()); }