Mercurial > dive4elements > river

changeset 9583:2a67d05a1af0

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Punkt 10.4 Sohlhöhe (rechts)/(links)
author gernotbelger
date Wed, 09 Jan 2019 14:48:53 +0100
parents 8b457ca70512
children 1a7cfeb1ff89
files artifacts/src/main/java/org/dive4elements/river/artifacts/bundu/bezugswst/BezugswstHeightProcessor.java artifacts/src/main/resources/messages.properties artifacts/src/main/resources/messages_de.properties
diffstat 3 files changed, 31 insertions(+), 24 deletions(-) [+]
line wrap: on
line diff
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/bundu/bezugswst/BezugswstHeightProcessor.java	Wed Jan 09 14:47:21 2019 +0100
+++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/bundu/bezugswst/BezugswstHeightProcessor.java	Wed Jan 09 14:48:53 2019 +0100
@@ -33,7 +33,6 @@
  */
 public final class BezugswstHeightProcessor extends AbstractProcessor {
 
-
     private static final String FACET_CHANNELMIN = "bundu_facet_channelmin";
 
     private static final String FACET_CHANNELMIN_DESCRIPTION = "bundu_facet_channelmin.description";
@@ -63,24 +62,26 @@
         super(AXIS_LABEL, HANDLED_FACET_TYPES);
     }
 
-    public static Facet createChannelminFacet(final CallContext context, final String hash, final String id, final int facetIndex,
-            final int resultIndex) {
+    public static Facet createChannelminFacet(final CallContext context, final String hash, final String id, final int facetIndex, final int resultIndex) {
 
         final String description = Resources.getMsg(context.getMeta(), FACET_CHANNELMIN_DESCRIPTION, FACET_CHANNELMIN_DESCRIPTION);
         return new BezugswstResultFacet(facetIndex, resultIndex, FACET_CHANNELMIN, description, AXIS_LABEL, id, hash);
     }
 
-    public static Facet createBedheightFacet(final CallContext context, final String hash, final String id, final int facetIndex,
-            final int resultIndex, final String seriesName) {
+    public static Facet createBedheightFacet(final CallContext context, final String hash, final String id, final int facetIndex, final int resultIndex,
+            final String seriesName) {
 
         final String description = Resources.getMsg(context.getMeta(), FACET_BEDHEIGHT_DESCRIPTION, FACET_BEDHEIGHT_DESCRIPTION, seriesName);
         return new BezugswstResultFacet(facetIndex, resultIndex, FACET_BEDHEIGHT, description, AXIS_LABEL, id, hash);
     }
 
-    public static Facet createFieldBedheightFacet(final CallContext context, final String hash, final String id, final int facetIndex,
-            final int resultIndex, final int fieldIndex) {
+    public static Facet createFieldBedheightFacet(final CallContext context, final String hash, final String id, final int facetIndex, final int resultIndex,
+            final int fieldIndex) {
+        final String leftRightAppendixKey = BedHeightValueType.field(fieldIndex).getLeftRightStringAppendix();
+        final String leftRightAppendix = Resources.getMsg(context.getMeta(), leftRightAppendixKey, leftRightAppendixKey);
+        final String description = Resources.getMsg(context.getMeta(), FACET_FIELD_BEDHEIGHT_DESCRIPTION, FACET_FIELD_BEDHEIGHT_DESCRIPTION, fieldIndex,
+                leftRightAppendix);
 
-        final String description = Resources.getMsg(context.getMeta(), FACET_FIELD_BEDHEIGHT_DESCRIPTION, FACET_FIELD_BEDHEIGHT_DESCRIPTION, fieldIndex);
         final String facetName = String.format(FACET_FIELD_BEDHEIGHT_FORMAT, fieldIndex);
         return new BezugswstResultFacet(facetIndex, resultIndex, facetName, description, AXIS_LABEL, id, hash);
     }
--- a/artifacts/src/main/resources/messages.properties	Wed Jan 09 14:47:21 2019 +0100
+++ b/artifacts/src/main/resources/messages.properties	Wed Jan 09 14:48:53 2019 +0100
@@ -991,9 +991,9 @@
 sinfo.facet.flow_depth_max.filtered.description = h-max ({0})
 sinfo.facet.flow_depth_max.raw.description = h-max ({0}) (raw)
 
-sinfo.chart.tkh.section.title=Dune Heights
-sinfo.chart.tkh.section.yaxis.label = Dune Heights [cm]
-sinfo.chart.tkh.yaxis.label = Dune Heights [cm]
+sinfo.chart.tkh.section.title=Dune Height
+sinfo.chart.tkh.section.yaxis.label = Dune Height [cm]
+sinfo.chart.tkh.yaxis.label = Dune Height [cm]
 sinfo.facet.tkh.description = \u0394d ({0})
 
 sinfo.export.tkh.calculation.formula = # Calculation Basis: GILL Equation (1971)
@@ -1238,6 +1238,7 @@
 collision.count.title = Contact with River Bed {0}
 chart.collision_count.section.yaxis.label = Frequency
 sinfo.export.csv.header.collision.gaugew = Gauge Level
+sinfo.export.pdf.header.collision.gaugew.with_unit = Gauge Level [cm]
 collision.gaugew.title = W at Gauge {0}
 sinfo.export.csv.header.discharge.zone = Discharge State
 
@@ -1338,11 +1339,13 @@
 bundu.chart.wspl.section.title = REFWL-Longitudinal Section
 bundu_facet_bedheight.description = Mean Bed Level ({0})
 bundu_facet_channelmin.description = Bed (Design)
-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)
-bundu_facet_field_depth.description = \u0394h Field {0}
+bundu_facet_field_bedheight.description = Bed Level Field {0} {1}
+bundu_facet_field_bedheight.description.appendix.left = (left)
+bundu_facet_field_bedheight.description.appendix.right = (right)
+bundu.chart.depth.section.title = h-L\u00e4ngsschnitt
+bundu_facet_flowdepth.filtered.description = h (BZWS, {0})
+bundu_facet_channeldepth.description = h (design depth)
+bundu_facet_field_depth.description = h Field {0}
 bundu.channelfinder.empty = The database does not contain any values for the river and the reference year
 bundu.channelfinder.missing = no navigation channel data available
 
--- a/artifacts/src/main/resources/messages_de.properties	Wed Jan 09 14:47:21 2019 +0100
+++ b/artifacts/src/main/resources/messages_de.properties	Wed Jan 09 14:48:53 2019 +0100
@@ -991,9 +991,9 @@
 sinfo.facet.flow_depth_max.filtered.description = h-max ({0})
 sinfo.facet.flow_depth_max.raw.description = h-max ({0}) (Rohdaten)
 
-sinfo.chart.tkh.section.title=Transportk\u00f6rperh\u00f6hen
-sinfo.chart.tkh.section.yaxis.label = Transportk\u00f6rperh\u00f6hen [cm]
-sinfo.chart.tkh.yaxis.label = Transportk\u00f6rperh\u00f6hen [cm]
+sinfo.chart.tkh.section.title=Transportk\u00f6rperh\u00f6he
+sinfo.chart.tkh.section.yaxis.label = Transportk\u00f6rperh\u00f6he [cm]
+sinfo.chart.tkh.yaxis.label = Transportk\u00f6rperh\u00f6he [cm]
 sinfo.facet.tkh.description = \u0394d ({0})
 
 sinfo.export.tkh.calculation.formula = # Berechnungsgrundlage: Gleichung nach GILL (1971)
@@ -1238,6 +1238,7 @@
 collision.count.title = Grundber\u00fchrungen {0}
 chart.collision_count.section.yaxis.label = H\u00e4ufigkeit
 sinfo.export.csv.header.collision.gaugew = Pegelstand
+sinfo.export.pdf.header.collision.gaugew.with_unit = Pegelstand [cm]
 collision.gaugew.title = W am Pegel {0}
 sinfo.export.csv.header.discharge.zone = Abflusszustand
 
@@ -1338,11 +1339,13 @@
 bundu.chart.wspl.section.title = BZWS-L\u00e4ngsschnitt
 bundu_facet_bedheight.description = Mittlere Sohlh\u00f6he ({0})
 bundu_facet_channelmin.description = Sohle (Sollzustand)
-bundu_facet_field_bedheight.description = Sohlh\u00f6he Feld {0}
-bundu.chart.depth.section.title = \u0394h-L\u00e4ngsschnitt
-bundu_facet_flowdepth.filtered.description = \u0394h (BZWS, {0})
-bundu_facet_channeldepth.description = \u0394h (Solltiefe)
-bundu_facet_field_depth.description = \u0394h Feld {0}
+bundu_facet_field_bedheight.description = Sohlh\u00f6he Feld {0} {1}
+bundu_facet_field_bedheight.description.appendix.left = (links)
+bundu_facet_field_bedheight.description.appendix.right = (rechts)
+bundu.chart.depth.section.title = h-L\u00e4ngsschnitt
+bundu_facet_flowdepth.filtered.description = h (BZWS, {0})
+bundu_facet_channeldepth.description = h (Solltiefe)
+bundu_facet_field_depth.description = h Feld {0}
 bundu.channelfinder.empty = Die Datenbank enth\u00e4lt keine Fahrrinnedaten f\u00fcr das Gew\u00e4sser und das Bezugsjahr
 bundu.channelfinder.missing = keine Fahrrinnedaten vorhanden
http://dive4elements.wald.intevation.org