diff artifacts/src/main/java/org/dive4elements/river/artifacts/states/WaterlevelData.java @ 9362:392745cccede

Fixed: waterlevels from database should not get the "Bezugspegel" column in the result output.
author gernotbelger
date Wed, 01 Aug 2018 18:40:57 +0200
parents 45f1ad66560e
children ba1e2e8f05d1
line wrap: on
line diff
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/states/WaterlevelData.java	Wed Aug 01 18:01:11 2018 +0200
+++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/states/WaterlevelData.java	Wed Aug 01 18:40:57 2018 +0200
@@ -29,19 +29,18 @@
     /** If <code>true</code>, tabular export will show gauges for every station, else only for the first gauge */
     private final boolean showAllGauges;
 
-    public WaterlevelData(final WKms wkms, final int year) {
-        this(wkms, year, false);
+    private boolean showRefGauges;
+
+    public WaterlevelData(final WKms wkms, final int year, final boolean showAllGauges, boolean showRefGauges) {
+        this(wkms.getName(), wkms, year, showAllGauges, showRefGauges);
     }
 
-    public WaterlevelData(final WKms wkms, final int year, final boolean showAllGauges) {
-        this(wkms.getName(), wkms, year, showAllGauges);
-    }
-
-    private WaterlevelData(final String name, final WKms wkms, final int year, final boolean showAllGauges) {
+    private WaterlevelData(final String name, final WKms wkms, final int year, final boolean showAllGauges, boolean showRefGauges) {
         this.name = name;
         this.wkms = wkms;
         this.year = year;
         this.showAllGauges = showAllGauges;
+        this.showRefGauges = showRefGauges;
     }
 
     public WaterlevelData filterByRange(final double from, final double to) {
@@ -50,11 +49,11 @@
         }
 
         final WKms filteredWkms = this.wkms.filteredKms(from, to);
-        return new WaterlevelData(this.name, filteredWkms, this.year, this.showAllGauges);
+        return new WaterlevelData(this.name, filteredWkms, this.year, this.showAllGauges ,showRefGauges);
     }
 
     public WaterlevelData withName(final String nameToSet) {
-        return new WaterlevelData(nameToSet, this.wkms, this.year, this.showAllGauges);
+        return new WaterlevelData(nameToSet, this.wkms, this.year, this.showAllGauges, showRefGauges);
     }
 
     public String getName() {
@@ -68,6 +67,10 @@
     public boolean isShowAllGauges() {
         return this.showAllGauges;
     }
+    
+    public boolean isShowRefGauges() {
+        return this.showRefGauges;
+    }
 
     public int getYear() {
         return this.year;

http://dive4elements.wald.intevation.org