Mercurial > dive4elements > river
diff artifacts/src/main/java/org/dive4elements/river/artifacts/states/minfo/DifferencesState.java @ 7830:d9791fa3c8ad minfo-opt
Add new facet for morph active width to bed height difference calculation.
author | Raimund Renkert <rrenkert@intevation.de> |
---|---|
date | Fri, 28 Mar 2014 11:21:49 +0100 |
parents | 6f6a63ab3ced |
children | 868f55932fe6 |
line wrap: on
line diff
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/states/minfo/DifferencesState.java Fri Mar 28 11:20:49 2014 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/states/minfo/DifferencesState.java Fri Mar 28 11:21:49 2014 +0100 @@ -53,7 +53,9 @@ public static final String I18N_FACET_BED_DIFF_YEAR_RAW = "facet.bedheight.diff.year.raw"; public static final String I18N_FACET_BED_DIFF_ABSOLUTE = "facet.bedheight.diff.absolute"; public static final String I18N_FACET_BED_DIFF_ABSOLUTE_RAW = "facet.bedheight.diff.absolute.raw"; - public static final String I18N_FACET_BED_DIFF_MORPH = "facet.bedheight.diff.morph"; + public static final String I18N_FACET_BED_DIFF_SOUNDING = "facet.bedheight.diff.sounding"; + public static final String I18N_FACET_BED_DIFF_MORPH1 = "facet.bedheight.diff.morph1"; + public static final String I18N_FACET_BED_DIFF_MORPH2 = "facet.bedheight.diff.morph2"; public static final String I18N_FACET_BED_DIFF_EPOCH = "facet.bedheight.diff.epoch"; public static final String I18N_FACET_BED_DIFF_EPOCH_RAW = "facet.bedheight.diff.epoch.raw"; public static final String I18N_FACET_BED_DIFF_HEIGHT1 = "facet.bedheight.diff.height1"; @@ -128,8 +130,22 @@ hash)); newFacets.add(new BedDiffYearFacet( idx, - BED_DIFFERENCE_MORPH_WIDTH, - createBedDiffMorphDescription(meta), + BED_DIFFERENCE_SOUNDING_WIDTH, + createBedDiffSoundingDescription(meta), + ComputeType.ADVANCE, + stateId, + hash)); + newFacets.add(new BedDiffYearFacet( + idx, + BED_DIFFERENCE_MORPH_WIDTH1, + createBedDiffMorph1Description(meta), + ComputeType.ADVANCE, + stateId, + hash)); + newFacets.add(new BedDiffYearFacet( + idx, + BED_DIFFERENCE_MORPH_WIDTH2, + createBedDiffMorph2Description(meta), ComputeType.ADVANCE, stateId, hash)); @@ -341,10 +357,22 @@ return Resources.getMsg(meta, i18n, i18n, new Object[] { range }); } - protected String createBedDiffMorphDescription( + protected String createBedDiffSoundingDescription( CallMeta meta) { - return Resources.getMsg(meta, I18N_FACET_BED_DIFF_MORPH, - I18N_FACET_BED_DIFF_MORPH); + return Resources.getMsg(meta, I18N_FACET_BED_DIFF_SOUNDING, + I18N_FACET_BED_DIFF_SOUNDING); + } + + protected String createBedDiffMorph1Description( + CallMeta meta) { + return Resources.getMsg(meta, I18N_FACET_BED_DIFF_MORPH1, + I18N_FACET_BED_DIFF_MORPH1); + } + + protected String createBedDiffMorph2Description( + CallMeta meta) { + return Resources.getMsg(meta, I18N_FACET_BED_DIFF_MORPH2, + I18N_FACET_BED_DIFF_MORPH2); } protected String createBedDiffAbsoluteDescription( @@ -403,7 +431,7 @@ name.equals(BED_DIFFERENCE_YEAR_HEIGHT2_FILTERED)){ return Boolean.FALSE; } - else if (name.equals(BED_DIFFERENCE_MORPH_WIDTH) || + else if (name.equals(BED_DIFFERENCE_SOUNDING_WIDTH) || name.equals(BED_DIFFERENCE_EPOCH_FILTERED) || name.equals(BED_DIFFERENCE_HEIGHT_YEAR_FILTERED) || name.equals(BED_DIFFERENCE_YEAR_FILTERED)) {