changeset 7999:3bdb9f99b4a0 facet-metadata

Add river elevation model to middle bed height csv export.
author Raimund Renkert <rrenkert@intevation.de>
date Thu, 03 Jul 2014 11:31:26 +0200
parents 92c57cdbd94b
children 928891df0173
files artifacts/src/main/java/org/dive4elements/river/artifacts/model/minfo/MiddleBedHeightCalculation.java artifacts/src/main/java/org/dive4elements/river/artifacts/model/minfo/MiddleBedHeightData.java artifacts/src/main/java/org/dive4elements/river/exports/MiddleBedHeightExporter.java
diffstat 3 files changed, 14 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/model/minfo/MiddleBedHeightCalculation.java	Thu Jul 03 11:30:19 2014 +0200
+++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/model/minfo/MiddleBedHeightCalculation.java	Thu Jul 03 11:31:26 2014 +0200
@@ -116,6 +116,7 @@
             single.getDescription(),
             single.getCurElevationModel().getName(),
             single.getOldElevationModel().getName(),
+            single.getRiver().getWstUnit().getName(),
             single.getType().getName(),
             single.getLocationSystem().getName(),
             single.getSoundingWidth());
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/model/minfo/MiddleBedHeightData.java	Thu Jul 03 11:30:19 2014 +0200
+++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/model/minfo/MiddleBedHeightData.java	Thu Jul 03 11:31:26 2014 +0200
@@ -46,11 +46,13 @@
     private Integer soundWidth;
     private String oldElevationModel;
     private String curElevationModel;
+    private String riverElevationModel;
     private ArrayList empty;
 
 
     protected MiddleBedHeightData(int start, int end, String eval, String desc,
-        String curElevationModel, String oldElevationModel, String type,
+        String curElevationModel, String oldElevationModel,
+        String riverElevationModel, String type,
         String locationSystem, Integer soundingWidth) {
         this.startYear   = start;
         this.endYear     = end;
@@ -58,6 +60,7 @@
         this.description = desc;
         this.curElevationModel = curElevationModel;
         this.oldElevationModel = oldElevationModel;
+        this.riverElevationModel = riverElevationModel;
         this.type = type;
         this.locationSystem = locationSystem;
         this.soundWidth = soundingWidth;
@@ -107,6 +110,10 @@
         return this.oldElevationModel;
     }
 
+    public String getRiverElevationModel() {
+        return this.riverElevationModel;
+    }
+
     public String getType() {
         return this.type;
     }
--- a/artifacts/src/main/java/org/dive4elements/river/exports/MiddleBedHeightExporter.java	Thu Jul 03 11:30:19 2014 +0200
+++ b/artifacts/src/main/java/org/dive4elements/river/exports/MiddleBedHeightExporter.java	Thu Jul 03 11:31:26 2014 +0200
@@ -75,6 +75,9 @@
     public static final String CSV_META_OLD_ELEV_MODEL =
         "export.bedheight_middle.csv.header.old.elevation";
 
+    public static final String CSV_META_RIVER_ELEV_MODEL =
+        "export.bedheight_middle.csv.header.river.elevation";
+
     public static final String CSV_META_SOUNDING_WIDTH =
         "export.bedheight_middle.csv.header.sounding.width";
 
@@ -214,6 +217,8 @@
              ": " + data.getCurElevationModel()});
          writer.writeNext(new String[]{"# " + msg(CSV_META_OLD_ELEV_MODEL) +
              ": " + data.getOldElevationModel()});
+         writer.writeNext(new String[]{"# " + msg(CSV_META_RIVER_ELEV_MODEL) +
+             ": " + data.getRiverElevationModel()});
          writer.writeNext(new String[]{"# " + msg(CSV_META_SOUNDING_WIDTH) +
              ": " + data.getSoundingWidth()});
          writer.writeNext(new String[]{"# " + msg(CSV_META_RANGE) +

http://dive4elements.wald.intevation.org