diff artifacts/src/main/java/org/dive4elements/river/artifacts/model/minfo/BedHeightMinMaxFacet.java @ 8964:45f1ad66560e

Code cleanup concerning calculations: improved error handling; improved interpolation; bed heights are now always used for spatial discretisation
author gernotbelger
date Thu, 29 Mar 2018 15:48:17 +0200
parents 8a1c6e2ad48b
children
line wrap: on
line diff
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/model/minfo/BedHeightMinMaxFacet.java	Wed Mar 28 17:04:20 2018 +0200
+++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/model/minfo/BedHeightMinMaxFacet.java	Thu Mar 29 15:48:17 2018 +0200
@@ -19,6 +19,7 @@
 import org.dive4elements.river.artifacts.resources.Resources;
 import org.dive4elements.river.model.BedHeight;
 import org.dive4elements.river.model.BedHeightValue;
+import org.dive4elements.river.model.BedHeightValueType;
 
 import gnu.trove.TDoubleArrayList;
 
@@ -32,29 +33,6 @@
 
     private static final long serialVersionUID = 1L;
 
-    public static enum BedHeightValueType {
-        min {
-            @Override
-            public Double getValue(final BedHeightValue bedheightValue) {
-                return bedheightValue.getMinHeight();
-            }
-        },
-        max {
-            @Override
-            public Double getValue(final BedHeightValue bedheightValue) {
-                return bedheightValue.getMaxHeight();
-            }
-        },
-        value {
-            @Override
-            public Double getValue(final BedHeightValue bedheightValue) {
-                return bedheightValue.getHeight();
-            }
-        };
-
-        public abstract Double getValue(final BedHeightValue bedheightValue);
-    }
-
     private final BedHeightValueType valueType;
 
     public BedHeightMinMaxFacet(final String name, final String description, final BedHeightValueType valueType) {

http://dive4elements.wald.intevation.org