diff artifacts/src/main/java/org/dive4elements/river/artifacts/model/river/MainWstValuesCalculator.java @ 9506:8b7bf26b8782

Predefined artifact for standard vegetation zones. Some minor adaptions.
author gernotbelger
date Fri, 28 Sep 2018 13:44:12 +0200
parents 853f2dafc16e
children
line wrap: on
line diff
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/model/river/MainWstValuesCalculator.java	Fri Sep 28 10:16:12 2018 +0200
+++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/model/river/MainWstValuesCalculator.java	Fri Sep 28 13:44:12 2018 +0200
@@ -31,10 +31,11 @@
 
     private final Map<String, MainValueQPosition> positions;
 
-    private static class MainValueQPosition {
+    static class MainValueQPosition {
 
-        private final Map<Gauge, QPosition> gaugePositions = new HashMap<>();
-        private QPosition refGaugePositions = null;
+        public final Map<Gauge, QPosition> gaugePositions = new HashMap<>();
+
+        public QPosition refGaugePositions = null;
     }
 
     public static MainWstValuesCalculator forRiver(final CallContext context, final River river, final DoubleRange calcRange, final String... mainValueNames) {
@@ -93,7 +94,7 @@
 
     public boolean hasPosition(final String mainValueName) {
 
-        final MainValueQPosition position = this.positions.get(mainValueName);
+        final MainValueQPosition position = this.positions.get(mainValueName.toUpperCase());
         if (position == null)
             throw new IllegalArgumentException();
 

http://dive4elements.wald.intevation.org