[PATCH] mean bed height -> mean bed LEVEL
Wald Commits
scm-commit at wald.intevation.org
Tue Nov 6 10:56:47 CET 2018
# HG changeset patch
# User gernotbelger
# Date 1541498182 -3600
# Node ID b9c87bbff6a45bd938ad4107de885d2c06b7a240
# Parent 0d0c8fd1b8c85c9e7499dd1b922362bb7aa7e287
mean bed height -> mean bed LEVEL
diff -r 0d0c8fd1b8c8 -r b9c87bbff6a4 artifacts/doc/conf/artifacts/chart.xml
--- a/artifacts/doc/conf/artifacts/chart.xml Mon Nov 05 18:30:24 2018 +0100
+++ b/artifacts/doc/conf/artifacts/chart.xml Tue Nov 06 10:56:22 2018 +0100
@@ -63,8 +63,8 @@
<facet name="heightmarks_points" description="facet.other.wkms.heightmarks_points"/>
<facet name="w_differences.manualpoints" description="Manuelle Punkte"/>
<facet name="longitudinal_section.annotations" description="facet.longitudinal_section.annotations"/>
- <facet name="bedheight_difference.year" description="A facet for bed height differences"/>
- <facet name="bedheight_difference.year.filtered" description="A facet for bed height differences"/>
+ <facet name="bedheight_difference.year" description="A facet for bed level differences"/>
+ <facet name="bedheight_difference.year.filtered" description="A facet for bed level differences"/>
<facet name="bedheight_difference.morph_width" description="A facet for morphologic width"/>
<facet name="bedheight_difference.year.height1" description="A facet for raw heights."/>
<facet name="bedheight_difference.year.height2" description="A facet for raw heights."/>
@@ -94,8 +94,8 @@
<facet name="longitudinal_section.w"/>
<facet name="longitudinal_section.q"/>
<facet name="longitudinal_section.manualpoints"/>
- <facet name="bedheight_difference.year" description="A facet for bed height differences"/>
- <facet name="bedheight_difference.year.filtered" description="A facet for bed height differences"/>
+ <facet name="bedheight_difference.year" description="A facet for bed level differences"/>
+ <facet name="bedheight_difference.year.filtered" description="A facet for bed level differences"/>
<facet name="bedheight_difference.morph_width" description="A facet for morphologic width"/>
<facet name="bedheight_difference.year.height1" description="A facet for raw heights."/>
<facet name="bedheight_difference.year.height2" description="A facet for raw heights."/>
diff -r 0d0c8fd1b8c8 -r b9c87bbff6a4 artifacts/doc/conf/artifacts/minfo.xml
--- a/artifacts/doc/conf/artifacts/minfo.xml Mon Nov 05 18:30:24 2018 +0100
+++ b/artifacts/doc/conf/artifacts/minfo.xml Tue Nov 06 10:56:22 2018 +0100
@@ -224,8 +224,8 @@
</outputmode>
<outputmode name="bed_difference_year" description="output.difference_year" mime-type="img/png" type="chart">
<facets>
- <facet name="bedheight_difference.year" description="A facet for bed height differences"/>
- <facet name="bedheight_difference.year.filtered" description="A facet for bed height differences"/>
+ <facet name="bedheight_difference.year" description="A facet for bed level differences"/>
+ <facet name="bedheight_difference.year.filtered" description="A facet for bed level differences"/>
<facet name="bedheight_difference.manualpoints" />
<facet name="bedheight_difference.sounding_width" description="A facet for morphologic width"/>
<facet name="bedheight_difference.morph_width1" description="A facet for morphologic width"/>
@@ -258,7 +258,7 @@
</outputmode>
<outputmode name="bed_difference_epoch" description="output.difference_epoch" mime-type="img/png" type="chart">
<facets>
- <facet name="bedheight_difference.epoch" description="A facet for bed height differences"/>
+ <facet name="bedheight_difference.epoch" description="A facet for bed level differences"/>
<facet name="bed_difference_epoch.manualpoints" />
<facet name="bedheight_difference.epoch.height1" description="A facet for raw heights."/>
<facet name="bedheight_difference.epoch.height2" description="A facet for raw heights."/>
@@ -621,9 +621,9 @@
<facet name="flow_velocity.mainchannel.filtered" description="A facet for main channels"/>
<facet name="bedheight_difference.height_year" description="A facet for absolute heights"/>
<facet name="bedheight_difference.height_year.filtered" description="A facet for absolute heights"/>
- <facet name="bedheight_difference.year" description="A facet for bed height differences"/>
- <facet name="bedheight_difference.year.filtered" description="A facet for bed height differences"/>
- <facet name="bedheight_difference.epoch" description="A facet for bed height differences"/>
+ <facet name="bedheight_difference.year" description="A facet for bed level differences"/>
+ <facet name="bedheight_difference.year.filtered" description="A facet for bed level differences"/>
+ <facet name="bedheight_difference.epoch" description="A facet for bed level differences"/>
<facet name="w_differences" description="facet.w_differences"/>
<facet name="w_differences.filtered" description="facet.w_differences"/>
<facet name="longitudinal_section.annotations" description="facet.longitudinal_section.annotations"/>
diff -r 0d0c8fd1b8c8 -r b9c87bbff6a4 artifacts/doc/conf/artifacts/sinfo.xml
--- a/artifacts/doc/conf/artifacts/sinfo.xml Mon Nov 05 18:30:24 2018 +0100
+++ b/artifacts/doc/conf/artifacts/sinfo.xml Tue Nov 06 10:56:22 2018 +0100
@@ -189,7 +189,7 @@
<facet name="sinfo_facet_flow_depth_development" description="flow depth development" />
<facet name="sinfo_facet_waterlevel_difference.filtered" description="waterlevel difference" />
- <facet name="sinfo_facet_bedheight_difference.filtered" description="bed Height difference" />
+ <facet name="sinfo_facet_bedheight_difference.filtered" description="bed level difference" />
<facet name="sinfo_facet_flow_depth_current.filtered" description="flow depth current" />
<facet name="sinfo_facet_flow_depth_current" description="flow depth current" />
diff -r 0d0c8fd1b8c8 -r b9c87bbff6a4 artifacts/doc/conf/artifacts/winfo.xml
--- a/artifacts/doc/conf/artifacts/winfo.xml Mon Nov 05 18:30:24 2018 +0100
+++ b/artifacts/doc/conf/artifacts/winfo.xml Tue Nov 06 10:56:22 2018 +0100
@@ -278,8 +278,8 @@
<facet name="heightmarks_points" description="facet.other.wkms.heightmarks_points"/>
<facet name="w_differences.manualpoints" description="Manuelle Punkte"/>
<facet name="longitudinal_section.annotations" description="facet.longitudinal_section.annotations"/>
- <facet name="bedheight_difference.year" description="A facet for bed height differences"/>
- <facet name="bedheight_difference.year.filtered" description="A facet for bed height differences"/>
+ <facet name="bedheight_difference.year" description="A facet for bed level differences"/>
+ <facet name="bedheight_difference.year.filtered" description="A facet for bed level differences"/>
<facet name="bedheight_difference.morph_width" description="A facet for morphologic width"/>
<facet name="bedheight_difference.year.height1" description="A facet for raw heights."/>
<facet name="bedheight_difference.year.height2" description="A facet for raw heights."/>
diff -r 0d0c8fd1b8c8 -r b9c87bbff6a4 artifacts/doc/conf/meta-data.xml
--- a/artifacts/doc/conf/meta-data.xml Mon Nov 05 18:30:24 2018 +0100
+++ b/artifacts/doc/conf/meta-data.xml Tue Nov 06 10:56:22 2018 +0100
@@ -2102,7 +2102,7 @@
</rastermap>
</dc:macro>
- <!-- bed heights -->
+ <!-- bed levels -->
<dc:macro name="minfo-heights-diff">
<dc:context>
<dc:statement>
@@ -2200,7 +2200,7 @@
</dc:for-each>
</dc:macro>
- <!-- Show only MW bed height and name it in a neutral way -->
+ <!-- Show only MW bed level and name it in a neutral way -->
<dc:macro name="bed-heights-factory_MW">
<dc:for-each>
<dc:if test="$bedh_height_count > 0">
@@ -2225,7 +2225,7 @@
</single>
</dc:macro>
- <!-- Show bed heights that have MW values with a neutral name -->
+ <!-- Show bed levels that have MW values with a neutral name -->
<dc:macro name="bed-heights-single-MW">
<single>
<dc:context>
@@ -2243,7 +2243,7 @@
</single>
</dc:macro>
- <!-- Show bed heights that have KL and TW values with a neutral name -->
+ <!-- Show bed levels that have KL and TW values with a neutral name -->
<dc:macro name="bed-heights-single-KL_TW">
<single>
<dc:context>
diff -r 0d0c8fd1b8c8 -r b9c87bbff6a4 artifacts/doc/conf/themes/default.xml
--- a/artifacts/doc/conf/themes/default.xml Mon Nov 05 18:30:24 2018 +0100
+++ b/artifacts/doc/conf/themes/default.xml Tue Nov 06 10:56:22 2018 +0100
@@ -738,7 +738,7 @@
</fields>
</theme>
- <!-- MIDDLE BED HEIGHT -->
+ <!-- MEAN BED LEVEL -->
<theme name="MiddleBedHeightSingle">
<inherits>
<inherit from="Lines"/>
diff -r 0d0c8fd1b8c8 -r b9c87bbff6a4 artifacts/doc/conf/themes/second.xml
--- a/artifacts/doc/conf/themes/second.xml Mon Nov 05 18:30:24 2018 +0100
+++ b/artifacts/doc/conf/themes/second.xml Tue Nov 06 10:56:22 2018 +0100
@@ -738,7 +738,7 @@
</fields>
</theme>
- <!-- MIDDLE BED HEIGHT -->
+ <!-- MEAN BED LEVEL -->
<theme name="MiddleBedHeightSingle">
<inherits>
<inherit from="Lines"/>
diff -r 0d0c8fd1b8c8 -r b9c87bbff6a4 artifacts/src/main/java/org/dive4elements/river/artifacts/bundu/BunduResultType.java
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/bundu/BunduResultType.java Mon Nov 05 18:30:24 2018 +0100
+++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/bundu/BunduResultType.java Tue Nov 06 10:56:22 2018 +0100
@@ -336,7 +336,7 @@
};
/**
- * List of bed height values of the 10 fields of a cross section
+ * List of bed level values of the 10 fields of a cross section
*/
public static final BunduResultType bedHeightFields = new BunduResultType(null, null) {
diff -r 0d0c8fd1b8c8 -r b9c87bbff6a4 artifacts/src/main/java/org/dive4elements/river/artifacts/bundu/bezugswst/BezugswstCalculation.java
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/bundu/bezugswst/BezugswstCalculation.java Mon Nov 05 18:30:24 2018 +0100
+++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/bundu/bezugswst/BezugswstCalculation.java Tue Nov 06 10:56:22 2018 +0100
@@ -107,7 +107,7 @@
final RiverInfoProvider riverInfoProvider2 = riverInfoProvider.forWaterlevel(waterlevel);
final WstInfo wstInfo = new WstInfo(wqkms.getName(), 0, riverInfoProvider2.getReferenceGauge(), true);
- // Fetch the bed heights of the selected sounding
+ // Fetch the bed levels of the selected sounding
final Integer bedHeightId = access.getBedHeightID();
final BedHeightsFinder bedHeightsFinder = (bedHeightId != null) ? BedHeightsFinder.forId(problems, bedHeightId, access.getRange())
: BedHeightsFinder.NullFinder();
@@ -354,7 +354,7 @@
}
/**
- * Computes the missing area and volume of the mean bed height of a km row
+ * Computes the missing area and volume of the mean bed level of a km row
*/
private double[] computeMeanBedMissingAreaAndVolume(final int current, final int first, final int last) {
@@ -374,7 +374,7 @@
}
/**
- * Gets the missing area of the mean bed height and a row if in range, otherwise 0.0
+ * Gets the missing area of the mean bed level and a row if in range, otherwise 0.0
*/
private double meanBedMissingArea(final int rowIndex, final int first, final int last) {
if ((first <= rowIndex) && (rowIndex <= last)) {
diff -r 0d0c8fd1b8c8 -r b9c87bbff6a4 artifacts/src/main/java/org/dive4elements/river/artifacts/sinfo/tkhstate/BedHeightsFinder.java
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/sinfo/tkhstate/BedHeightsFinder.java Mon Nov 05 18:30:24 2018 +0100
+++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/sinfo/tkhstate/BedHeightsFinder.java Tue Nov 06 10:56:22 2018 +0100
@@ -28,7 +28,7 @@
import org.dive4elements.river.utils.RiverUtils;
/**
- * Provides bed heights for various calculations.
+ * Provides bed levels for various calculations.
*
* @author Gernot Belger
*/
@@ -45,7 +45,7 @@
private final boolean isNull;
/**
- * Create bed height finders from a collection of bed heights.
+ * Create bed level finders from a collection of bed levels.
*/
public static Collection<BedHeightsFinder> createTkhBedHeights(final Calculation problems, final DoubleRange range,
final Collection<BedHeight> bedHeights) {
@@ -102,7 +102,7 @@
/**
* Creates a {@link BedHeightsFinder} for a dataset from the database, specified by its id.
*
- * @return <code>null</code> if no bed height with the given id exists.
+ * @return <code>null</code> if no bed level with the given id exists.
*/
public static BedHeightsFinder forId(final Calculation problems, final int id, final DoubleRange range) {
@@ -122,7 +122,7 @@
}
/**
- * Create a finder for a given bed height.
+ * Create a finder for a given bed level.
*
*/
private static BedHeightsFinder createBedHeights(final Calculation problems, final BedHeight bedHeight, final DoubleRange range) {
@@ -154,7 +154,7 @@
/**
* Whether this is a null (always NaN) finder.
- *
+ *
* @return
*/
public boolean isNull() {
@@ -196,8 +196,7 @@
}
private double interpolateBedHeights(final double km, final BedHeightValueType type) {
- if (this.values.containsKey(km))
- {
+ if (this.values.containsKey(km)) {
final Double value = type.getValue(this.values.get(km));
return value == null ? Double.NaN : value.doubleValue();
}
diff -r 0d0c8fd1b8c8 -r b9c87bbff6a4 artifacts/src/main/java/org/dive4elements/river/artifacts/sinfo/tkhstate/BedHeightsUtils.java
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/sinfo/tkhstate/BedHeightsUtils.java Mon Nov 05 18:30:24 2018 +0100
+++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/sinfo/tkhstate/BedHeightsUtils.java Tue Nov 06 10:56:22 2018 +0100
@@ -16,12 +16,12 @@
import org.apache.commons.lang.math.DoubleRange;
/**
- * Helper functions for bed height calculations
+ * Helper functions for bed level calculations
*/
public final class BedHeightsUtils {
/**
- * Get a union of all stations in a collection of bed heights
+ * Get a union of all stations in a collection of bed levels
*/
public static double[] extractStations(final Collection<BedHeightsFinder> bedHeightFinders) {
@@ -29,7 +29,7 @@
}
/**
- * Get a union of all stations in a collection of bed heights
+ * Get a union of all stations in a collection of bed levels
*/
public static double[] extractStations(final Collection<BedHeightsFinder> bedHeightFinders, final boolean minMaxAware) {
@@ -38,7 +38,7 @@
}
/**
- * Get a union of all stations in a collection of bed heights
+ * Get a union of all stations in a collection of bed levels
*/
public static Collection<Double> extractStationCollection(final Collection<BedHeightsFinder> bedHeightFinders, final boolean minMaxAware) {
@@ -57,7 +57,7 @@
}
/**
- * Get a union of all stations in a collection of bed heights
+ * Get a union of all stations in a collection of bed levels
*/
public static Collection<Double> extractStationCollection(final Collection<BedHeightsFinder> bedHeights) {
@@ -70,7 +70,7 @@
}
/**
- * Intersects all km ranges of a collection of bed heights
+ * Intersects all km ranges of a collection of bed levels
*/
public static DoubleRange extractMinimumStationRange(final Collection<BedHeightsFinder> bedHeightFinders) {
DoubleRange kmRange = null;
diff -r 0d0c8fd1b8c8 -r b9c87bbff6a4 artifacts/src/main/java/org/dive4elements/river/artifacts/sinfo/tkhstate/DefaultBedHeights.java
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/sinfo/tkhstate/DefaultBedHeights.java Mon Nov 05 18:30:24 2018 +0100
+++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/sinfo/tkhstate/DefaultBedHeights.java Tue Nov 06 10:56:22 2018 +0100
@@ -22,7 +22,7 @@
import org.dive4elements.river.model.River;
/**
- * This class knows how to find the default bed heights defined for tkh and other calculations
+ * This class knows how to find the default bed levels defined for tkh and other calculations
*
* @author Gernot Belger
*/
@@ -43,7 +43,7 @@
return Collections.emptyList();
}
- /* check for overlapping ranges, N2-search, but we expect only have small numbers of bed heights */
+ /* check for overlapping ranges, N2-search, but we expect only have small numbers of bed levels */
final List<BedHeight> result = new ArrayList<>(defaultBedHeights.size());
for (int i = 0; i < defaultBedHeights.size(); i++) {
@@ -74,7 +74,6 @@
return result;
}
-
private static List<BedHeight> loadBedHeightsByName(final River river, final Collection<DefaultBedHeight> defaults, final Calculation problems) {
final List<BedHeight> bedHeights = new ArrayList<>(defaults.size());
diff -r 0d0c8fd1b8c8 -r b9c87bbff6a4 artifacts/src/main/java/org/dive4elements/river/artifacts/sinfo/tkhstate/TkhCalculation.java
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/sinfo/tkhstate/TkhCalculation.java Mon Nov 05 18:30:24 2018 +0100
+++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/sinfo/tkhstate/TkhCalculation.java Tue Nov 06 10:56:22 2018 +0100
@@ -177,7 +177,7 @@
final double station = stationDbl;
- /* find the right calculator (i.e. bed height) depending on station, there should only be one maximal */
+ /* find the right calculator (i.e. bed level) depending on station, there should only be one maximal */
final TkhCalculator tkhCalculator = findCalculator(calculatorsByRanges, station);
if (tkhCalculator == null)
continue;
@@ -198,7 +198,7 @@
private TkhCalculator findCalculator(final Map<NumberRange, TkhCalculator> calculators, final double station) {
- // REMAKR: linear search at this point, put we expect the number of bed heights to be very small (1-2 items)
+ // REMAKR: linear search at this point, put we expect the number of bed levels to be very small (1-2 items)
final Set<Entry<NumberRange, TkhCalculator>> x = calculators.entrySet();
for (final Entry<NumberRange, TkhCalculator> entry : x) {
final NumberRange range = entry.getKey();
diff -r 0d0c8fd1b8c8 -r b9c87bbff6a4 artifacts/src/main/java/org/dive4elements/river/artifacts/sinfo/util/BedHeightInfo.java
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/sinfo/util/BedHeightInfo.java Mon Nov 05 18:30:24 2018 +0100
+++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/sinfo/util/BedHeightInfo.java Tue Nov 06 10:56:22 2018 +0100
@@ -48,7 +48,7 @@
private BedHeightInfo(final BedHeight bedHeight) {
final Integer bhYear = bedHeight.getYear();
if (bhYear == null) {
- // REMARK: this should never happen, as we do not allow the user to select bed heights without a year information
+ // REMARK: this should never happen, as we do not allow the user to select bed levels without a year information
throw new IllegalArgumentException("bedHeight has no year");
}
diff -r 0d0c8fd1b8c8 -r b9c87bbff6a4 artifacts/src/main/java/org/dive4elements/river/artifacts/uinfo/salix/SalixLineCalculation.java
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/uinfo/salix/SalixLineCalculation.java Mon Nov 05 18:30:24 2018 +0100
+++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/uinfo/salix/SalixLineCalculation.java Tue Nov 06 10:56:22 2018 +0100
@@ -145,7 +145,7 @@
}
/**
- * Fetches historical and reference bed heights and fills a map of delta-MSHs for all fetched stations in the calc range
+ * Fetches historical and reference bed levels and fills a map of delta-MSHs for all fetched stations in the calc range
*/
private void fillRangeScenarios(final NavigableMap<Double, List<Double>> rangeScenarios, final RangeAccess calcRange, final double partFrom,
final double partTo, final int historicalBedHeightId) {
@@ -182,7 +182,7 @@
}
/**
- * Gets the difference of a historical bed height against a current one for a station
+ * Gets the difference of a historical bed level against a current one for a station
*/
private double bedHeightDifference(final double station, final Collection<BedHeightsFinder> currentFinders, final BedHeightsFinder historicalFinder) {
double currentMSH = Double.NaN;
diff -r 0d0c8fd1b8c8 -r b9c87bbff6a4 artifacts/src/main/java/org/dive4elements/river/utils/Formatter.java
--- a/artifacts/src/main/java/org/dive4elements/river/utils/Formatter.java Mon Nov 05 18:30:24 2018 +0100
+++ b/artifacts/src/main/java/org/dive4elements/river/utils/Formatter.java Tue Nov 06 10:56:22 2018 +0100
@@ -61,7 +61,7 @@
public static final int FLOW_VELOCITY_Q_MIN_DIGITS = 0;
public static final int FLOW_VELOCITY_Q_MAX_DIGITS = 2;
- // MIDDLE BED HEIGHT FORMATTER CONSTANTS
+ // MEAN BED LEVEL FORMATTER CONSTANTS
public static final int MIDDLE_BED_HEIGHT_KM_MIN_DIGITS = 3;
public static final int MIDDLE_BED_HEIGHT_KM_MAX_DIGITS = 3;
public static final int MIDDLE_BED_HEIGHT_HEIGHT_MIN_DIGITS = 3;
diff -r 0d0c8fd1b8c8 -r b9c87bbff6a4 artifacts/src/main/resources/messages.properties
--- a/artifacts/src/main/resources/messages.properties Mon Nov 05 18:30:24 2018 +0100
+++ b/artifacts/src/main/resources/messages.properties Tue Nov 06 10:56:22 2018 +0100
@@ -126,8 +126,8 @@
calc.reference.curve = Reference Curve
calc.extreme.curve = Extreme Curves
calc.fixation.default = Fixation
-calc.bed.middle = Mean Bed Height
-calc.bed.diff = Bed Height Difference
+calc.bed.middle = Mean Bed Level
+calc.bed.diff = Bed Level Difference
calc.bed.quality = Bed Quality
calc.sediment.load = Sediment Load
calc.flow.velocity = Flow Velocity
@@ -249,8 +249,8 @@
chart.bedquality.yaxis.label.porosity=Porosity [%]
chart.bedquality.yaxis.label.density=Density [t/m\u00b3]
-chart.bedheight_middle.section.title=Mean Bed Height
-chart.bedheight_middle.section.yaxis.label=Mean Bed Height [{0}]
+chart.bedheight_middle.section.title=Mean Bed Level
+chart.bedheight_middle.section.yaxis.label=Mean Bed Level [{0}]
chart.bedheight_middle.sounding.yaxis.label=Sounding Width [m]
meta.bedheight.year = Year
@@ -339,8 +339,8 @@
facet.flow_velocity.tauchannel.raw = Bottom Shear Stress Mainchannel at {0} (raw)
facet.flow_velocity.velocity = V {0}
facet.flow_velocity.waterlevel = Waterlevel {0}
-facet.bedheight_middle.single = Bed Height {0,number,####}
-facet.bedheight_middle.epoch = Bed Height Epoch {0,number,####} - {1,number,####}
+facet.bedheight_middle.single = Bed Level {0,number,####}
+facet.bedheight_middle.epoch = Bed Level Epoch {0,number,####} - {1,number,####}
facet.bedquality.bed.porosity.toplayer = Porosity ({0,date} - {1,date}) ({2})
facet.bedquality.bed.porosity.sublayer = Porosity ({0,date} - {1,date}) ({2})
facet.bedquality.bed.density.toplayer = Density ({0,date} - {1,date}) ({2})
@@ -457,7 +457,7 @@
export.flow_velocity.csv.header.locations = Location
export.bedheight_middle.csv.header.km = River-km
export.bedheight_middle.csv.header.sounding = Sounding/Epoch
-export.bedheight_middle.csv.header.height = Mean Bed Height [{0}]
+export.bedheight_middle.csv.header.height = Mean Bed Level [{0}]
export.bedheight_middle.csv.header.uncertainty = Uncertainty [m]
export.bedheight_middle.csv.header.datagap = Data Gap
export.bedheight_middle.csv.header.soundingwidth = Sounding Width [m]
@@ -799,13 +799,13 @@
sinfo_calc_flow_depth.warning.waterlevel_discretisation = Waterlevel {0}: Spatial resolution is greater than 1000m
sinfo_calc_flow_depth.warning.year_difference = {0}: The used difference pair is a waterlevel from the year {1} and a sounding from the year {2}. This may lead to implausible values.
-sinfo.bedheightsfinder.nobedheightsforriver = No default bed heights for river {0}
-sinfo.bedheightsfinder.badrange = Invalid range for bed heights {0}.
-sinfo.bedheightsfinder.overlappingrange = Range of bed height {0} overlaps with other ranges.
-sinfo.bedheightsfinder.missingdescription = River {0} has no bed heights with description {1}
+sinfo.bedheightsfinder.nobedheightsforriver = No default bed levels for river {0}
+sinfo.bedheightsfinder.badrange = Invalid range for bed levels {0}.
+sinfo.bedheightsfinder.overlappingrange = Range of bed level {0} overlaps with other ranges.
+sinfo.bedheightsfinder.missingdescription = River {0} has no bed levels with description {1}
sinfo.bedheightsfinder.configfile.loaderror = Failed to load config file ''{0}'': {1}
sinfo.bedheightsfinder.notfound = Failed to access sounding with id ''{0}''
-sinfo.bedheightsfinder.empty = The bed heights do not contain any values for the selected calculation stretch
+sinfo.bedheightsfinder.empty = The bed levels do not contain any values for the selected calculation stretch
sinfo.bedqualityd50config.configfile.loaderror = Failed to read config file ''{0}'' which contains period specs for D50 bed diameter calculation: {1}
sinfo_calc_flow_depth_development=Flow Depth Development
@@ -916,7 +916,7 @@
bundu.export.csv.title.bezugswst.result2 = Shoal Volume Calculation 2
bundu.export.csv.title.bezugswst.result3 = Shoal Volume Summary
-bundu.export.bezugswst.csv.header.mean_bed_height = Mean Bed Height
+bundu.export.bezugswst.csv.header.mean_bed_height = Mean Bed Level
bundu.export.bezugswst.csv.meta.miss.density = Bulk Density [t/m\u00b3]
bundu.export.bezugswst.pdf.meta.miss.density = Bulk Density [t/m\u00b3]
bundu.export.bezugswst.csv.meta.miss.channel.width = Navigation Channel Width [m]
@@ -942,10 +942,10 @@
bundu.export.bezugswst.csv.meta.miss.flowdepth.field = Field {0} Flow Depth [m]
bundu.export.bezugswst.csv.meta.miss.mass.field = Field {0} Shoal Mass [t]
bundu.export.bezugswst.csv.meta.miss.volume.field = Field {0} Shoal Volume [m\u00b3]
-bundu.export.bezugswst.csv.meta.miss.height.mean_bed = Mean Bed Height Geodetic Altitude
-bundu.export.bezugswst.csv.meta.miss.flowdepth.mean_bed = Mean Bed Height Flow Depth [m]
-bundu.export.bezugswst.csv.meta.miss.mass.mean_bed = Mean Bed Height Shoal Mass [t]
-bundu.export.bezugswst.csv.meta.miss.volume.mean_bed = Mean Bed Height Shoal Volume [m\u00b3]
+bundu.export.bezugswst.csv.meta.miss.height.mean_bed = Mean Bed Level Geodetic Altitude
+bundu.export.bezugswst.csv.meta.miss.flowdepth.mean_bed = Mean Bed Level Flow Depth [m]
+bundu.export.bezugswst.csv.meta.miss.mass.mean_bed = Mean Bed Level Shoal Mass [t]
+bundu.export.bezugswst.csv.meta.miss.volume.mean_bed = Mean Bed Level Shoal Volume [m\u00b3]
bundu.export.bezugswst.csv.meta.miss.km_from = River-km From
bundu.export.bezugswst.csv.meta.miss.km_to = River-km To
@@ -959,7 +959,7 @@
sinfo.export.collision.csv.header.discharge_long = Discharge
common.export.csv.header.mainvalue_label = Description
common.export.csv.header.gauge = Reference Gauge
-sinfo.export.flow_depth.csv.header.mean_bed_height = Mean Bed Height
+sinfo.export.flow_depth.csv.header.mean_bed_height = Mean Bed Level
sinfo.export.flow_depth.csv.header.mean_bed_height.short = Mean Bed-
sinfo.export.flow_depth.csv.header.sounding = Sounding/Epoch
common.export.csv.header.location = Location
@@ -1213,7 +1213,7 @@
uinfo_salix_calc.warning.missing_mq = MQ (MW) missing at reference gauge, no calculation possible
uinfo_salix_calc.warning.missing_mhq = MHQ (MHW) missing at reference gauge, no salix calculation possible
uinfo_salix_calc.warning.missing_mnq = MNQ (MNW) missing at reference gauge, no (MW-MNW) calculation possible
-uinfo_salix_calc.warning.missing_bedheights = missing bed height values in the scenario range
+uinfo_salix_calc.warning.missing_bedheights = missing bed level values in the scenario range
uinfo_facet_salix_line_cross_section_water_line_description = Iota
uinfo_facet_salix_waterlevel_mnw_cross_section_water_line_description = W(MNQ)
uinfo_facet_salix_waterlevel_mw_cross_section_water_line_description = W(MQ)
@@ -1336,9 +1336,9 @@
bundu.wst.gauge_no_ud_calc_available = No calculation of DNE available.
bundu.chart.wspl.section.title = REFWL-Longitudinal Section
-bundu_facet_bedheight.description = Mean Bed Height ({0})
+bundu_facet_bedheight.description = Mean Bed Level ({0})
bundu_facet_channelmin.description = Bed (Design)
-bundu_facet_field_bedheight.description = Bed Height Field {0}
+bundu_facet_field_bedheight.description = Bed Level Field {0}
bundu.chart.depth.section.title = \u0394h-L\u00e4ngsschnitt
bundu_facet_flowdepth.filtered.description = \u0394h (BZWS, {0})
bundu_facet_channeldepth.description = \u0394h (design depth)
diff -r 0d0c8fd1b8c8 -r b9c87bbff6a4 gwt-client/src/main/java/org/dive4elements/river/client/client/FLYSConstants.properties
--- a/gwt-client/src/main/java/org/dive4elements/river/client/client/FLYSConstants.properties Mon Nov 05 18:30:24 2018 +0100
+++ b/gwt-client/src/main/java/org/dive4elements/river/client/client/FLYSConstants.properties Tue Nov 06 10:56:22 2018 +0100
@@ -233,8 +233,8 @@
flow_velocity = Flow Velocity
flow_velocities = Flow Velocities
flow_velocity_export = Flow Velocity Export
-bedheight_middle = Mean Bed Height
-bedheight_middle_export = Mean Bed Height Export
+bedheight_middle = Mean Bed Level
+bedheight_middle_export = Mean Bed Level Export
bed_longitudinal_section = Bed Quality
bed_longitudinal_section_export = Bed Quality Export
sq_relation_a = A Fraction of fines
@@ -243,7 +243,7 @@
sq_relation_d = D Fine/middle
sq_relation_e = E Coarse
sq_relation_f = F Bed load total
-sq_relation_g = G Bed load total (bed height-relevant)
+sq_relation_g = G Bed load total (bed level-relevant)
sq_relation_export = SQ Export
cross_section = Cross Section
More information about the Dive4Elements-commits
mailing list