--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/bundu/BunduResultType.java	Mon Aug 20 09:42:32 2018 +0200
+++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/bundu/BunduResultType.java	Mon Aug 20 09:46:02 2018 +0200
@@ -33,8 +33,8 @@
     private static final long serialVersionUID = 1L;
 
     public static final BunduResultType bezugswst = new BunduResultType(I18NStrings.UNIT_NONE, "bundu.wst.export.csv.meta.header.bezugswst",
-            "bundu.wst.export.pdf.meta.header.bezugswst") { // Unit
-                                                            // dynamic
+            "bundu.wst.export.pdf.meta.header.bezugswst") { // Unit dynamic
+
         private static final long serialVersionUID = 1L;
 
         @Override
@@ -45,11 +45,12 @@
 
         @Override
         protected NumberFormat createFormatter(final CallContext context) {
-            return Formatter.getWaterlevelQ(context); // Richtiges Format? TODO check!
+            return Formatter.getFlowDepth(context); // REMARK same as SInfoResultType.waterlevel
         }
     };
 
     public static final BunduResultType sounding = new BunduResultType(I18NStrings.UNIT_NONE, "bundu.export.bezugswst.csv.meta.miss.sounding") {
+
         private static final long serialVersionUID = 1L;
 
         @Override
@@ -65,6 +66,7 @@
 
     public static final BunduResultType channelLowerEdge = new BunduResultType(I18NStrings.UNIT_NONE, "bundu.export.bezugswst.csv.meta.miss.channel.lower_edge",
             "bundu.export.bezugswst.pdf.meta.miss.channel.lower_edge") { // Unit dynamic
+
         private static final long serialVersionUID = 1L;
 
         @Override
@@ -75,12 +77,13 @@
 
         @Override
         protected NumberFormat createFormatter(final CallContext context) {
-            return Formatter.getWaterlevelQ(context); // Richtiges Format? TODO check!
+            return Formatter.getFlowDepth(context); // REMARK same as SInfoResultType.waterlevel
         }
     };
 
-    public static final BunduResultType channelMinDepth = new BunduResultType(I18NStrings.UNIT_M, "bundu.export.bezugswst.csv.meta.miss.channel.min_depth",
+    public static final BunduResultType channelDepth = new BunduResultType(I18NStrings.UNIT_M, "bundu.export.bezugswst.csv.meta.miss.channel.min_depth",
             "bundu.export.bezugswst.pdf.meta.miss.channel.min_depth") {
+
         private static final long serialVersionUID = 1L;
 
         @Override
@@ -109,7 +112,7 @@
             throw new UnsupportedOperationException();
         }
     };
-    public static final BunduResultType missVolume = new BunduResultType(I18NStrings.UNIT_CUBIC_M, "bundu.export.bezugswst.csv.meta.miss.volume") {
+    public static final BunduResultType missVolumeTotal = new BunduResultType(I18NStrings.UNIT_CUBIC_M, "bundu.export.bezugswst.csv.meta.miss.volume.total") {
         private static final long serialVersionUID = 1L;
 
         @Override
@@ -120,11 +123,11 @@
 
         @Override
         protected NumberFormat createFormatter(final CallContext context) {
-            return Formatter.getWaterlevelQ(context); // Richtiges Format? TODO check!
+            return Formatter.getIntegerFormatter(context);
         }
     };
 
-    public static final BunduResultType missMass = new BunduResultType(I18NStrings.UNIT_TON, "bundu.export.bezugswst.csv.meta.miss.mass",
+    public static final BunduResultType missMassTotal = new BunduResultType(I18NStrings.UNIT_TON, "bundu.export.bezugswst.csv.meta.miss.mass.total",
             "bundu.export.bezugswst.csv.meta.miss.mass") {
         private static final long serialVersionUID = 1L;
 
@@ -136,7 +139,7 @@
 
         @Override
         protected NumberFormat createFormatter(final CallContext context) {
-            return Formatter.getWaterlevelQ(context); // Richtiges Format? TODO check!
+            return Formatter.getMassFormat(context);
         }
     };
 
@@ -152,7 +155,7 @@
 
         @Override
         protected NumberFormat createFormatter(final CallContext context) {
-            return Formatter.getWaterlevelQ(context); // Richtiges Format? TODO check!
+            return Formatter.getIntegerFormatter(context);
         }
     };
 
@@ -168,7 +171,7 @@
 
         @Override
         protected NumberFormat createFormatter(final CallContext context) {
-            return Formatter.getWaterlevelQ(context); // Richtiges Format? TODO check!
+            return Formatter.getCurrencyFormat(context);
         }
     };
 
@@ -184,7 +187,7 @@
 
         @Override
         protected NumberFormat createFormatter(final CallContext context) {
-            return Formatter.getWaterlevelQ(context); // Richtiges Format? TODO check!
+            return Formatter.getChannelWidth(context);
         }
     };
 
@@ -200,13 +203,76 @@
 
         @Override
         protected NumberFormat createFormatter(final CallContext context) {
-            return Formatter.getWaterlevelQ(context); // Richtiges Format? TODO check!
+            return Formatter.getDensityFormat(context);
         }
     };
 
-    public static final BunduResultType meanBedheight = new BunduResultType(I18NStrings.UNIT_NONE, "bundu.export.bezugswst.csv.meta.miss.mean_bedheight") {
-        private static final long serialVersionUID = 1L; // unit steht in der zelle jedesmal: z.B. 1125 [m³] / 1912.5 [t] (Dezimaltrennzeichen bwt)
+    public static final BunduResultType missVolumeMeanBed = new BunduResultType(I18NStrings.UNIT_NONE, "bundu.export.bezugswst.csv.meta.miss.volume.mean_bed") {
 
+        private static final long serialVersionUID = 1L;
+
+        @Override
+        public String exportValue(final CallContext context, final Object value) {
+            final double doubleValue = asDouble(value);
+            return exportDoubleValue(context, doubleValue);
+        }
+
+        @Override
+        protected NumberFormat createFormatter(final CallContext context) {
+            return Formatter.getIntegerFormatter(context);
+        }
+    };
+
+    public static final BunduResultType missMassMeanBed = new BunduResultType(I18NStrings.UNIT_NONE, "bundu.export.bezugswst.csv.meta.miss.mass.mean_bed") {
+
+        private static final long serialVersionUID = 1L;
+
+        @Override
+        public String exportValue(final CallContext context, final Object value) {
+            final double doubleValue = asDouble(value);
+            return exportDoubleValue(context, doubleValue);
+        }
+
+        @Override
+        protected NumberFormat createFormatter(final CallContext context) {
+            return Formatter.getIntegerFormatter(context);
+        }
+    };
+
+    // RESULT TYPE FIELDS
+    public static final BunduResultType missVolumeFields = new BunduResultType(I18NStrings.UNIT_NONE, "bundu.export.bezugswst.csv.meta.miss.volume.field") {
+
+        private static final long serialVersionUID = 1L;
+
+        @Override
+        public String exportValue(final CallContext context, final Object value) {
+            final double doubleValue = asDouble(value);
+            return exportDoubleValue(context, doubleValue);
+        }
+
+        @Override
+        protected NumberFormat createFormatter(final CallContext context) {
+            return Formatter.getMassFormat(context);
+        }
+    };
+
+    public static final BunduResultType missMassfields = new BunduResultType(I18NStrings.UNIT_NONE, "bundu.export.bezugswst.csv.meta.miss.mass.field") {
+
+        private static final long serialVersionUID = 1L;
+
+        @Override
+        public String exportValue(final CallContext context, final Object value) {
+            final double doubleValue = asDouble(value);
+            return exportDoubleValue(context, doubleValue);
+        }
+
+        @Override
+        protected NumberFormat createFormatter(final CallContext context) {
+            return Formatter.getMassFormat(context);
+        }
+    };
+
+    public static final BunduResultType missStationRange = new BunduResultType(I18NStrings.UNIT_KM, I18NStrings.CSV_KM_HEADER) {
         @Override
         public String exportValue(final CallContext context, final Object value) {
             return exportStringValue(value);
@@ -218,31 +284,4 @@
         }
     };
 
-    // RESULT TYPE FIELDS
-    public static final BunduResultType fields = new BunduResultType(I18NStrings.UNIT_NONE, "bundu.export.bezugswst.csv.meta.miss.field") {
-        private static final long serialVersionUID = 1L; // unit steht in der zelle jedesmal: z.B. 1125 [m³] / 1912.5 [t] (Dezimaltrennzeichen bwt)
-
-        @Override
-        public String exportValue(final CallContext context, final Object value) {
-            return exportStringValue(value);
-        }
-
-        @Override
-        protected NumberFormat createFormatter(final CallContext context) {
-            throw new UnsupportedOperationException();
-        }
-    };
-
-    public static final BunduResultType stationForMiss = new BunduResultType(I18NStrings.UNIT_KM, I18NStrings.CSV_KM_HEADER) {
-        @Override
-        public String exportValue(final CallContext context, final Object value) {
-            return exportStringValue(value); // leider doof...
-        }
-
-        @Override
-        protected NumberFormat createFormatter(final CallContext context) {
-            throw new UnsupportedOperationException();
-        }
-    };
-
 }
\ No newline at end of file