diff artifacts/src/main/java/org/dive4elements/river/exports/MiddleBedHeightExporter.java @ 8295:9ab967eb2c51

At least since rev eb052d759fcc, there are no bed height epochs anymore.
author "Tom Gottfried <tom@intevation.de>"
date Thu, 18 Sep 2014 18:16:51 +0200
parents 99912f51468d
children df5838cc7ecc
line wrap: on
line diff
--- a/artifacts/src/main/java/org/dive4elements/river/exports/MiddleBedHeightExporter.java	Wed Sep 17 19:46:19 2014 +0200
+++ b/artifacts/src/main/java/org/dive4elements/river/exports/MiddleBedHeightExporter.java	Thu Sep 18 18:16:51 2014 +0200
@@ -167,17 +167,13 @@
         }
 
         for (int i: kmIndexMap.values()) {
-            int start = data.getStartYear();
-            int end   = data.getEndYear();
-
-            if (start == end) {
-                String uncert = !Double.isNaN(data.getUncertainty(i)) ?
-                    uncertF.format(data.getUncertainty(i)) : "";
-                String gap = !Double.isNaN(data.getDataGap(i)) ?
-                    gapF.format(data.getDataGap(i)) + "%" : "";
-                String sound = !Double.isNaN(data.getSoundingWidth(i)) ?
-                    soundF.format(data.getSoundingWidth(i)) : "";
-                writer.writeNext(new String[] {
+            String uncert = !Double.isNaN(data.getUncertainty(i)) ?
+                uncertF.format(data.getUncertainty(i)) : "";
+            String gap = !Double.isNaN(data.getDataGap(i)) ?
+                gapF.format(data.getDataGap(i)) + "%" : "";
+            String sound = !Double.isNaN(data.getSoundingWidth(i)) ?
+                soundF.format(data.getSoundingWidth(i)) : "";
+            writer.writeNext(new String[] {
                     kmF.format(data.getKM(i)),
                     data.getDescription(),
                     heightF.format(data.getMiddleHeight(i)),
@@ -187,20 +183,6 @@
                     widthF.format(data.getWidth(i)),
                     RiverUtils.getLocationDescription(flys, data.getKM(i)),
                 });
-            }
-            else {
-                writer.writeNext(new String[] {
-                    kmF.format(data.getKM(i)),
-                    data.getDescription(),
-                    heightF.format(data.getMiddleHeight(i)),
-                    "",
-                    "",
-                    "",
-                    "",
-                    RiverUtils.getLocationDescription(flys, data.getKM(i)),
-                });
-            }
-
         }
     }
 
@@ -208,8 +190,8 @@
     private void writeMetaData(CSVWriter writer, MiddleBedHeightData data) {
          writer.writeNext(new String[]{"#"});
          String year = "";
-         if (data.getStartYear() != 0) {
-             year = String.valueOf(data.getStartYear());
+         if (data.getYear() != 0) {
+             year = String.valueOf(data.getYear());
          }
          writer.writeNext(new String[]{"# " + msg(CSV_META_YEAR) +
              ": " + year});

http://dive4elements.wald.intevation.org