Mercurial > dive4elements > river
diff artifacts/src/main/java/org/dive4elements/river/artifacts/states/HistoricalDischargeComputeState.java @ 8462:1127dbe95083
Remove obsolete historical discharge curve implementations.
author | Tom Gottfried <tom@intevation.de> |
---|---|
date | Thu, 30 Oct 2014 15:03:55 +0100 |
parents | e4606eae8ea5 |
children | 07df414d5d88 |
line wrap: on
line diff
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/states/HistoricalDischargeComputeState.java Thu Oct 30 14:20:28 2014 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/states/HistoricalDischargeComputeState.java Thu Oct 30 15:03:55 2014 +0100 @@ -31,12 +31,10 @@ import org.dive4elements.river.artifacts.model.CalculationResult; import org.dive4elements.river.artifacts.model.DataFacet; import org.dive4elements.river.artifacts.model.FacetTypes; -import org.dive4elements.river.artifacts.model.HistoricalDischargeCurveFacet; import org.dive4elements.river.artifacts.model.HistoricalDischargeData; import org.dive4elements.river.artifacts.model.HistoricalDischargeDifferenceFacet; import org.dive4elements.river.artifacts.model.HistoricalDischargeFacet; import org.dive4elements.river.artifacts.model.HistoricalDischargeWQFacet; -import org.dive4elements.river.artifacts.model.HistoricalWQKms; import org.dive4elements.river.artifacts.model.HistoricalWQTimerange; import org.dive4elements.river.artifacts.model.ReportFacet; import org.dive4elements.river.artifacts.model.WQKms; @@ -61,8 +59,6 @@ .getLogger(HistoricalDischargeComputeState.class); public static final String DEFAULT_UNIT = "cm"; - public static final String I18N_WQ_CURVE_FACET_RANGE = "historical_discharge.wq.curve_range"; - public static final String I18N_WQ_CURVE_FACET_SINCE = "historical_discharge.wq.curve_since"; @Override protected void appendItems(Artifact artifact, ElementCreator creator, @@ -103,10 +99,7 @@ prepareFacets(facets, wqts, access); } - WQKms[] wqs = (WQKms[]) data.getWQs(); - if (wqs != null && wqs.length > 0) { - prepareWQFacets(context, facets, wqs, access, hash); - } + prepareWQFacets(context, facets, access, hash); return res; } @@ -154,7 +147,7 @@ } protected void prepareWQFacets(CallContext cc, List<Facet> facets, - WQKms[] wqs, HistoricalDischargeAccess access, String hash) { + HistoricalDischargeAccess access, String hash) { double[] ws = access.getWs(); double[] qs = access.getQs(); @@ -171,41 +164,8 @@ HISTORICAL_DISCHARGE_WQ_Q, "Q=" + format.format(qs[k]), ComputeType.ADVANCE, hash, getID(), qs[k])); } - - int idx = 0; - for (WQKms wqkms : wqs) { - String title = null; - if (wqkms instanceof HistoricalWQKms) { - title = createDischargeCurveTitle(cc, (HistoricalWQKms) wqkms); - } - else { - title = wqkms.getName(); - } - - facets.add(new HistoricalDischargeCurveFacet(idx, - HISTORICAL_DISCHARGE_WQ_CURVE, title, ComputeType.ADVANCE, - getID(), hash)); - idx++; - } } - /** Create title for a Discharge-curve, including date. */ - protected String createDischargeCurveTitle(CallContext cc, - HistoricalWQKms wqkms) { - TimeInterval timeInterval = wqkms.getTimeInterval(); - - if (timeInterval.getStopTime() != null) { - return Resources.format(cc.getMeta(), I18N_WQ_CURVE_FACET_RANGE, - I18N_WQ_CURVE_FACET_RANGE, timeInterval.getStartTime(), - timeInterval.getStopTime()); - } - else { - return Resources.format(cc.getMeta(), I18N_WQ_CURVE_FACET_SINCE, - I18N_WQ_CURVE_FACET_SINCE, timeInterval.getStartTime()); - } - } - - /** Create string for facets name/description. */ protected String createFacetTitle(WQTimerange wqt) { String name = wqt.getName();