[PATCH 3 of 9] Add river elevation model to middle bed height csv export
Wald Commits
scm-commit at wald.intevation.org
Thu Jul 3 12:31:31 CEST 2014
# HG changeset patch
# User Raimund Renkert <rrenkert at intevation.de>
# Date 1404379886 -7200
# Branch facet-metadata
# Node ID 3bdb9f99b4a0610cb7f9616d813eda96999dcc94
# Parent 92c57cdbd94b997e529ae9caefbc61216b949876
Add river elevation model to middle bed height csv export.
diff -r 92c57cdbd94b -r 3bdb9f99b4a0 artifacts/src/main/java/org/dive4elements/river/artifacts/model/minfo/MiddleBedHeightCalculation.java
--- 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());
diff -r 92c57cdbd94b -r 3bdb9f99b4a0 artifacts/src/main/java/org/dive4elements/river/artifacts/model/minfo/MiddleBedHeightData.java
--- 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;
}
diff -r 92c57cdbd94b -r 3bdb9f99b4a0 artifacts/src/main/java/org/dive4elements/river/exports/MiddleBedHeightExporter.java
--- 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) +
More information about the Dive4Elements-commits
mailing list