diff artifacts/src/main/java/org/dive4elements/river/exports/minfo/BedDifferenceExporter.java @ 7916:c0843a658474

Adapted bed differences PDF export to CSV export and some cleanup of field names.
author Tom Gottfried <tom@intevation.de>
date Wed, 04 Jun 2014 18:22:14 +0200
parents 931dffefc3dd
children 6fef38a526c7
line wrap: on
line diff
--- a/artifacts/src/main/java/org/dive4elements/river/exports/minfo/BedDifferenceExporter.java	Wed Jun 04 15:34:22 2014 +0200
+++ b/artifacts/src/main/java/org/dive4elements/river/exports/minfo/BedDifferenceExporter.java	Wed Jun 04 18:22:14 2014 +0200
@@ -160,9 +160,15 @@
         source.addMetaData("differences", StringUtils.join(
                 access.getDifferenceArtifactNamePairs(), "\n"));
 
-        source.addMetaData("unit", msg(CSV_HEADER_DIFF, "cm"));
+        source.addMetaData("kmheader",
+                msg(CSV_HEADER_KM, "km"));
         source.addMetaData("diffpairheader",
                 msg(CSV_HEADER_DIFF_PAIR, "Difference pair"));
+        source.addMetaData("diffheader", msg(CSV_HEADER_DIFF, "cm"));
+        source.addMetaData("morph1header", 
+                msg(CSV_HEADER_MORPH1, "Morph. active width minuend"));
+        source.addMetaData("morph2header", 
+                msg(CSV_HEADER_MORPH2, "Morph. active width subtrahend"));
     }
 
 
@@ -190,13 +196,19 @@
         NumberFormat kmf = Formatter.getCalculationKm(context.getMeta());
         NumberFormat mf = Formatter.getMeterFormat(context);
         for (BedDifferencesResult result: results) {
+            BedDiffYearResult yResult = (BedDiffYearResult) result;
             double[][] kms = result.getDifferencesData();
             String desc = result.getDiffDescription();
+            double[][] morph1 = yResult.getMorphWidth1Data();
+            double[][] morph2 = yResult.getMorphWidth2Data();
             for (int j = 0; j < kms[0].length; j++) {
                 source.addData(new String[] {
                     kmf.format(kms[0][j]),
+                    desc,
                     mf.format(kms[1][j]),
-                    desc });
+                    mf.format(morph1[1][j]),
+                    mf.format(morph2[1][j])
+                    });
             }
         }
         return source;

http://dive4elements.wald.intevation.org