diff artifacts/src/main/java/org/dive4elements/river/artifacts/states/WaterlevelData.java @ 8883:a536e1aacf0f

Further work on SINFO-FlowDepth
author gernotbelger
date Fri, 09 Feb 2018 18:07:22 +0100
parents 6b93a2498e06
children d9dbf0b74bc2
line wrap: on
line diff
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/states/WaterlevelData.java	Fri Feb 09 16:11:47 2018 +0100
+++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/states/WaterlevelData.java	Fri Feb 09 18:07:22 2018 +0100
@@ -23,20 +23,23 @@
 
     private final String name;
 
+    private final int year;
+
     /** 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) {
-        this(wkms, false);
+    public WaterlevelData(final WKms wkms, final int year) {
+        this(wkms, year, false);
     }
 
-    public WaterlevelData(final WKms wkms, final boolean showAllGauges) {
-        this(null, wkms, showAllGauges);
+    public WaterlevelData(final WKms wkms, final int year, final boolean showAllGauges) {
+        this(null, wkms, year, showAllGauges);
     }
 
-    public WaterlevelData(final String name, final WKms wkms, final boolean showAllGauges) {
+    private WaterlevelData(final String name, final WKms wkms, final int year, final boolean showAllGauges) {
         this.name = name;
         this.wkms = wkms;
+        this.year = year;
         this.showAllGauges = showAllGauges;
     }
 
@@ -46,11 +49,11 @@
         }
 
         final WKms filteredWkms = this.wkms.filteredKms(from, to);
-        return new WaterlevelData(filteredWkms);
+        return new WaterlevelData(this.name, filteredWkms, this.year, this.showAllGauges);
     }
 
     public WaterlevelData withName(final String nameToSet) {
-        return new WaterlevelData(nameToSet, this.wkms, this.showAllGauges);
+        return new WaterlevelData(nameToSet, this.wkms, this.year, this.showAllGauges);
     }
 
     public String getName() {
@@ -81,4 +84,8 @@
 
         return new double[] { from, to };
     }
+
+    public int getYear() {
+        return this.year;
+    }
 }

http://dive4elements.wald.intevation.org