Mercurial > dive4elements > river
comparison artifacts/src/main/java/org/dive4elements/river/artifacts/sinfo/predefinedtkh/PredefinedTkhFacet.java @ 9195:a4121ec450d6
'ca.'-issue
ExportContextCSV+PDF separated
uinfo.inundationduration url export
author | gernotbelger |
---|---|
date | Fri, 29 Jun 2018 14:52:54 +0200 |
parents | 384eee4b4135 |
children | d1ce60b760bd |
comparison
equal
deleted
inserted
replaced
9191:f692f5a0536a | 9195:a4121ec450d6 |
---|---|
15 import java.util.List; | 15 import java.util.List; |
16 | 16 |
17 import org.dive4elements.artifacts.Artifact; | 17 import org.dive4elements.artifacts.Artifact; |
18 import org.dive4elements.artifacts.CallContext; | 18 import org.dive4elements.artifacts.CallContext; |
19 import org.dive4elements.river.artifacts.D4EArtifact; | 19 import org.dive4elements.river.artifacts.D4EArtifact; |
20 import org.dive4elements.river.artifacts.common.DefaultCalculationResult; | |
20 import org.dive4elements.river.artifacts.common.GeneralResultType; | 21 import org.dive4elements.river.artifacts.common.GeneralResultType; |
21 import org.dive4elements.river.artifacts.common.ResultRow; | 22 import org.dive4elements.river.artifacts.common.ResultRow; |
22 import org.dive4elements.river.artifacts.model.BlackboardDataFacet; | 23 import org.dive4elements.river.artifacts.model.BlackboardDataFacet; |
23 import org.dive4elements.river.artifacts.model.Calculation; | 24 import org.dive4elements.river.artifacts.model.Calculation; |
24 import org.dive4elements.river.artifacts.model.FacetTypes; | 25 import org.dive4elements.river.artifacts.model.FacetTypes; |
70 final ResultRow row = ResultRow.create(); | 71 final ResultRow row = ResultRow.create(); |
71 row.putValue(GeneralResultType.station, tkhValue.getStation()); | 72 row.putValue(GeneralResultType.station, tkhValue.getStation()); |
72 if (soilKindFinder != null) { | 73 if (soilKindFinder != null) { |
73 bedMobility = soilKindFinder.findSoilKind(tkhValue.getStation().doubleValue()); | 74 bedMobility = soilKindFinder.findSoilKind(tkhValue.getStation().doubleValue()); |
74 row.putValue(SInfoResultType.soilkind, bedMobility); | 75 row.putValue(SInfoResultType.soilkind, bedMobility); |
75 } | 76 } else |
76 else | |
77 row.putValue(SInfoResultType.soilkind, null); | 77 row.putValue(SInfoResultType.soilkind, null); |
78 row.putValue(SInfoResultType.tkh, tkhValue.getTkhCm()); | 78 row.putValue(SInfoResultType.tkh, tkhValue.getTkhCm()); |
79 row.putValue(SInfoResultType.tkhup, tkhValue.getTkhUpCm(bedMobility == SoilKind.mobil)); | 79 row.putValue(SInfoResultType.tkhup, tkhValue.getTkhUpCm(bedMobility == SoilKind.mobil)); |
80 row.putValue(SInfoResultType.tkhdown, tkhValue.getTkhDownCm(bedMobility == SoilKind.mobil)); | 80 row.putValue(SInfoResultType.tkhdown, tkhValue.getTkhDownCm(bedMobility == SoilKind.mobil)); |
81 rows.add(row); | 81 rows.add(row); |
82 } | 82 } |
83 return new PredefinedTkhQueryCalculationResult(series.getName(), rows); | 83 return new DefaultCalculationResult(series.getName(), rows);// new PredefinedTkhQueryCalculationResult(series.getName(), rows); |
84 } | 84 } |
85 | 85 |
86 /** | 86 /** |
87 * Create a deep copy of this Facet. | 87 * Create a deep copy of this Facet. |
88 * | 88 * |