diff artifacts/src/main/java/org/dive4elements/river/artifacts/sinfo/flowdepth/FlowDepthExporter.java @ 8884:7a8c12706834

Work on SINFO-FlowDepth
author gernotbelger
date Tue, 13 Feb 2018 14:53:23 +0100
parents f762fadc5313
children a66f2a7c4f84
line wrap: on
line diff
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/sinfo/flowdepth/FlowDepthExporter.java	Fri Feb 09 18:07:22 2018 +0100
+++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/sinfo/flowdepth/FlowDepthExporter.java	Tue Feb 13 14:53:23 2018 +0100
@@ -100,7 +100,6 @@
 
     private static final String CSV_META_HEADER_WATERLEVEL_NAME = "sinfo.export.flow_depth.csv.meta.header.waterlevel.name";
 
-
     private static final String CSV_META_HEADER_WATERLEVEL_GAUGE = "sinfo.export.flow_depth.csv.meta.header.waterlevel.gauge";
 
     private static final String CSV_META_HEADER_WATERLEVEL_YEAR = "sinfo.export.flow_depth.csv.meta.header.waterlevel.year";
@@ -163,8 +162,7 @@
         }
     }
 
-    private void writeCSVFlowDepthResult(final CSVWriter writer, final FlowDepthCalculationResult result,
-            final boolean useTkh) {
+    private void writeCSVFlowDepthResult(final CSVWriter writer, final FlowDepthCalculationResult result, final boolean useTkh) {
 
         /* first some specific metadata */
         final BedHeightInfo sounding = result.getSounding();
@@ -184,8 +182,7 @@
         // "# Höhensystem: "
         writeCSVMetaEntry(writer, CSV_META_HEADER_SOUNDING_ELEVATIOIN_MODEL, sounding.getCurElevationModelUnit());
         // "# ursprüngliches Höhensystem: "
-        writeCSVMetaEntry(writer, CSV_META_HEADER_SOUNDING_ELEVATIOIN_MODEL_ORIGINAL,
-                sounding.getOldElevationModelUnit());
+        writeCSVMetaEntry(writer, CSV_META_HEADER_SOUNDING_ELEVATIOIN_MODEL_ORIGINAL, sounding.getOldElevationModelUnit());
 
         // "##METADATEN WASSERSPIEGELLAGE"
         writeCSVMetaEntry(writer, CSV_META_HEADER_WATERLEVEL);
@@ -208,8 +205,7 @@
 
         final String calcModeLabel = results.getCalcModeLabel();
         final River river = results.getRiver();
-        writeCSVMetaEntry(writer, CSV_META_HEADER_RESULT, msg(CSV_META_HEADER_RESULT_LABEL), river.getName(),
-                calcModeLabel);
+        writeCSVMetaEntry(writer, CSV_META_HEADER_RESULT, msg(CSV_META_HEADER_RESULT_LABEL), river.getName(), calcModeLabel);
 
         // "# FLYS-Version: "
         writeCSVMetaEntry(writer, CSV_META_VERSION, msg(CSV_META_VERSION_LABEL), FLYS.VERSION);
@@ -302,10 +298,9 @@
 
         // Q [m³/s]
         final double discharge = row.getDischarge();
-        if( Double.isNaN(discharge))
+        if (Double.isNaN(discharge))
             lines.add(StringUtils.EMPTY);
-        else
-        {
+        else {
             final double roundedDischarge = RiverUtils.roundQ(discharge);
             lines.add(getQFormatter().format(roundedDischarge));
         }
@@ -402,8 +397,7 @@
         source.addMetaData("river_label", msg(CSV_META_RIVER_LABEL));
         source.addMetaData("river", river.getName());
 
-        final String rangeValue = String.format("%s - %s", getKmFormatter().format(results.getFrom()),
-                getKmFormatter().format(results.getTo()));
+        final String rangeValue = String.format("%s - %s", getKmFormatter().format(results.getFrom()), getKmFormatter().format(results.getTo()));
         source.addMetaData("range_label", msg(CSV_META_RANGE_LABEL));
         source.addMetaData("range", rangeValue);
 
@@ -422,8 +416,7 @@
         source.addMetaData("location_header", msg(CSV_LOCATION_HEADER));
     }
 
-    private void addJRTableData(final MetaAndTableJRDataSource source, final FlowDepthCalculationResult result,
-            final boolean useTkh) {
+    private void addJRTableData(final MetaAndTableJRDataSource source, final FlowDepthCalculationResult result, final boolean useTkh) {
 
         final Collection<FlowDepthRow> rows = result.getRows();
 

http://dive4elements.wald.intevation.org