Mercurial > dive4elements > river
comparison artifacts/src/main/java/org/dive4elements/river/artifacts/uinfo/vegetationzones/VegetationZonesCalculation.java @ 9070:611a523fc42f
VegetationZoneAccessHelper, VegetationTablePanels verbessert
author | gernotbelger |
---|---|
date | Tue, 15 May 2018 18:04:36 +0200 |
parents | 1ffd38826175 |
children | 41f4bc83aa7a |
comparison
equal
deleted
inserted
replaced
9069:1ffd38826175 | 9070:611a523fc42f |
---|---|
9 */ | 9 */ |
10 package org.dive4elements.river.artifacts.uinfo.vegetationzones; | 10 package org.dive4elements.river.artifacts.uinfo.vegetationzones; |
11 | 11 |
12 import java.util.ArrayList; | 12 import java.util.ArrayList; |
13 import java.util.Collection; | 13 import java.util.Collection; |
14 import java.util.List; | |
14 | 15 |
15 import org.apache.commons.lang.math.DoubleRange; | 16 import org.apache.commons.lang.math.DoubleRange; |
16 import org.dive4elements.artifacts.CallContext; | 17 import org.dive4elements.artifacts.CallContext; |
17 import org.dive4elements.river.artifacts.access.RiverAccess; | 18 import org.dive4elements.river.artifacts.access.RiverAccess; |
18 import org.dive4elements.river.artifacts.common.ResultRow; | 19 import org.dive4elements.river.artifacts.common.ResultRow; |
41 final Calculation problems = new Calculation(); | 42 final Calculation problems = new Calculation(); |
42 | 43 |
43 final String calcModeLabel = Resources.getMsg(this.context.getMeta(), uinfo.getCalculationMode().name()); | 44 final String calcModeLabel = Resources.getMsg(this.context.getMeta(), uinfo.getCalculationMode().name()); |
44 final String user = CalculationUtils.findArtifactUser(this.context, uinfo); | 45 final String user = CalculationUtils.findArtifactUser(this.context, uinfo); |
45 | 46 |
47 // FIXME: remove, check other states as well | |
46 final RiverAccess access = new RiverAccess(uinfo); | 48 final RiverAccess access = new RiverAccess(uinfo); |
47 final River river = access.getRiver(); | 49 final River river = access.getRiver(); |
48 final DoubleRange calcRange = null; | 50 final DoubleRange calcRange = null; |
49 final RiverInfo riverInfo = new RiverInfo(river); | 51 final RiverInfo riverInfo = new RiverInfo(river); |
50 | 52 |
51 final VegetationzonesAccess vAccess = new VegetationzonesAccess(uinfo); | 53 final VegetationzonesAccess vAccess = new VegetationzonesAccess(uinfo); |
52 final ArrayList<String[]> zones = vAccess.getVegZones(); | 54 final String zonesRaw = vAccess.getVegZones(); |
53 | 55 final List<VegetationZoneAccessHelper> helpers = VegetationZoneAccessHelper.parse(zonesRaw); |
54 final VegetationZonesCalculationResults results = new VegetationZonesCalculationResults(calcModeLabel, user, riverInfo, calcRange); | 56 final VegetationZonesCalculationResults results = new VegetationZonesCalculationResults(calcModeLabel, user, riverInfo, calcRange); |
55 | 57 |
56 final Collection<ResultRow> rows = new ArrayList<>(); | 58 final Collection<ResultRow> rows = new ArrayList<>(); |
57 for (final String[] zone : zones) { | 59 for (final VegetationZoneAccessHelper zone : helpers) { |
58 final ResultRow row2 = ResultRow.create().// | 60 final ResultRow row2 = ResultRow.create().// |
59 putValue(UInfoResultType.vegname, zone[0]).// | 61 putValue(UInfoResultType.vegname, zone.getZoneName()).// |
60 putValue(UInfoResultType.vegdauervon, zone[1]).// | 62 putValue(UInfoResultType.vegdauervon, zone.getMin_day_overflow()).// |
61 putValue(UInfoResultType.vegdauerbis, zone[2]); | 63 putValue(UInfoResultType.vegdauerbis, zone.getMax_day_overflow()); |
62 rows.add(row2); | 64 rows.add(row2); |
63 } | 65 } |
64 | 66 |
65 final VegetationZonesCalculationResult result = new VegetationZonesCalculationResult("Ergebnis 1", rows); | 67 final VegetationZonesCalculationResult result = new VegetationZonesCalculationResult("Ergebnis 1", rows); |
66 | 68 |