[PATCH 1 of 2] issue1416: exporter for sedimentload and i18n

[Wald Commits]

# HG changeset patch
# User Felix Wolfsteller <felix.wolfsteller at intevation.de>
# Date 1375801005 -7200
# Node ID 6eb2b8087cfad401869901faf06d56a04a6f3194
# Parent  67182bde34cd17f6ef623ee0d100a99456e164c8
issue1416: exporter for sedimentload and i18n.

diff -r 67182bde34cd -r 6eb2b8087cfa artifacts/src/main/java/org/dive4elements/river/exports/minfo/SedimentLoadExporter.java
--- a/artifacts/src/main/java/org/dive4elements/river/exports/minfo/SedimentLoadExporter.java	Tue Aug 06 16:39:41 2013 +0200
+++ b/artifacts/src/main/java/org/dive4elements/river/exports/minfo/SedimentLoadExporter.java	Tue Aug 06 16:56:45 2013 +0200
@@ -35,7 +35,8 @@
 import au.com.bytecode.opencsv.CSVWriter;
 
 
-/** Do CSV export for sediment load calculations (will also be shown in
+/**
+ * Do CSV export for sediment load calculations (will also be shown in
  * client). */
 public class SedimentLoadExporter
 extends      AbstractExporter
@@ -62,6 +63,9 @@
     public static final String CSV_SUSP_SAND =
         "export.sedimentload_ls.csv.header.suspsand";
 
+    public static final String CSV_SUSP_SAND_BB =
+        "export.sedimentload_ls.csv.header.suspsandbb";
+
     public static final String CSV_SUSP_SEDIMENT =
         "export.sedimentload_ls.csv.header.suspsediment";
 
@@ -109,13 +113,13 @@
         writer.writeNext(new String[] {
             kmf.format(km),
             years,
-            valf.format(fraction.getTotal()),
+            valf.format(fraction.getSuspSediment()),
+            valf.format(fraction.getSuspSand()),
+            valf.format(fraction.getSuspSandBed()),
             valf.format(fraction.getSand()),
             valf.format(fraction.getFineMiddle()),
             valf.format(fraction.getCoarse()),
-            valf.format(fraction.getSuspSand()),
-            //valf.format(fraction.getSuspSandBed()),
-            valf.format(fraction.getSuspSediment())
+            valf.format(fraction.getTotal())
         });
     }
 
@@ -125,15 +129,15 @@
 
         List<String> header = new LinkedList<String>();
         if (results != null)  {
-            header.add(msg(CSV_KM, "km"));
-            header.add(msg(CSV_YEAR, "Jahr"));
-            header.add(msg(CSV_TOTAL, "Gesamt"));
-            header.add(msg(CSV_SAND, "Sand"));
-            header.add(msg(CSV_FINEMIDDLE,"Fein"));
-            header.add(msg(CSV_COARSE,    "Grob"));
-            header.add(msg(CSV_SUSP_SAND, "Su.Sand"));
+            header.add(msg(CSV_KM,          "km"));
+            header.add(msg(CSV_YEAR,        "Jahr"));
             header.add(msg(CSV_SUSP_SEDIMENT, "Schwebst."));
-            //header.add("Susp.Sand Bett");
+            header.add(msg(CSV_SUSP_SAND,   "Susp.Sand"));
+            header.add(msg(CSV_SUSP_SAND_BB, "Susp.Sand(BB)"));
+            header.add(msg(CSV_SAND,        "Sand"));
+            header.add(msg(CSV_FINEMIDDLE,  "Kies(f+m)"));
+            header.add(msg(CSV_COARSE,      "Kies(g)"));
+            header.add(msg(CSV_TOTAL,       "Gesamt"));
         }
         writer.writeNext(header.toArray(new String[header.size()]));
     }
diff -r 67182bde34cd -r 6eb2b8087cfa artifacts/src/main/resources/messages_de.properties
--- a/artifacts/src/main/resources/messages_de.properties	Tue Aug 06 16:39:41 2013 +0200
+++ b/artifacts/src/main/resources/messages_de.properties	Tue Aug 06 16:56:45 2013 +0200
@@ -386,12 +386,13 @@
 export.bedheight_middle.csv.header.locations = Streckendaten
 export.sedimentload_ls.csv.header.km = km
 export.sedimentload_ls.csv.header.year = Jahr
-export.sedimentload_ls.csv.header.coarse = Grob
-export.sedimentload_ls.csv.header.finemiddle = Fein
+export.sedimentload_ls.csv.header.coarse = Kies(g)
+export.sedimentload_ls.csv.header.finemiddle = Kies(f+m)
 export.sedimentload_ls.csv.header.sand = Sand
-export.sedimentload_ls.csv.header.suspsand = susp. Sand
-export.sedimentload_ls.csv.header.suspsediment = susp. Sediment
-export.sedimentload_ls.csv.header.total = Total
+export.sedimentload_ls.csv.header.suspsand = susp.Sand
+export.sedimentload_ls.csv.header.suspsandbb = susp.Sand(BB)
+export.sedimentload_ls.csv.header.suspsediment = Schwebst.
+export.sedimentload_ls.csv.header.total = Gesamt
 export.sqrelation.csv.header.parameter = Parameter
 export.sqrelation.csv.header.station = Station
 export.sqrelation.csv.header.km = Fluss-Km
diff -r 67182bde34cd -r 6eb2b8087cfa artifacts/src/main/resources/messages_de_DE.properties
--- a/artifacts/src/main/resources/messages_de_DE.properties	Tue Aug 06 16:39:41 2013 +0200
+++ b/artifacts/src/main/resources/messages_de_DE.properties	Tue Aug 06 16:56:45 2013 +0200
@@ -383,12 +383,13 @@
 export.bedheight_middle.csv.header.locations = Streckendaten
 export.sedimentload_ls.csv.header.km = km
 export.sedimentload_ls.csv.header.year = Jahr
-export.sedimentload_ls.csv.header.coarse = Grob
-export.sedimentload_ls.csv.header.finemiddle = Fein
+export.sedimentload_ls.csv.header.coarse = Kies(g)
+export.sedimentload_ls.csv.header.finemiddle = Kies(f+m)
 export.sedimentload_ls.csv.header.sand = Sand
-export.sedimentload_ls.csv.header.suspsand = susp. Sand
-export.sedimentload_ls.csv.header.suspsediment = susp. Sediment
-export.sedimentload_ls.csv.header.total = Total
+export.sedimentload_ls.csv.header.suspsand = susp.Sand
+export.sedimentload_ls.csv.header.suspsandbb = susp.Sand(BB)
+export.sedimentload_ls.csv.header.suspsediment = Schwebst.
+export.sedimentload_ls.csv.header.total = Gesamt
 export.sqrelation.csv.header.parameter = Parameter
 export.sqrelation.csv.header.station = Station
 export.sqrelation.csv.header.km = Fluss-Km