Mercurial > dive4elements > river

comparison artifacts/src/main/java/org/dive4elements/river/artifacts/states/minfo/DifferencesState.java @ 7830:d9791fa3c8ad minfo-opt

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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
comparison
equal deleted inserted replaced
7829:1aba75321441 7830:d9791fa3c8ad
51 51
52 public static final String I18N_FACET_BED_DIFF_YEAR = "facet.bedheight.diff.year"; 52 public static final String I18N_FACET_BED_DIFF_YEAR = "facet.bedheight.diff.year";
53 public static final String I18N_FACET_BED_DIFF_YEAR_RAW = "facet.bedheight.diff.year.raw"; 53 public static final String I18N_FACET_BED_DIFF_YEAR_RAW = "facet.bedheight.diff.year.raw";
54 public static final String I18N_FACET_BED_DIFF_ABSOLUTE = "facet.bedheight.diff.absolute"; 54 public static final String I18N_FACET_BED_DIFF_ABSOLUTE = "facet.bedheight.diff.absolute";
55 public static final String I18N_FACET_BED_DIFF_ABSOLUTE_RAW = "facet.bedheight.diff.absolute.raw"; 55 public static final String I18N_FACET_BED_DIFF_ABSOLUTE_RAW = "facet.bedheight.diff.absolute.raw";
56 public static final String I18N_FACET_BED_DIFF_MORPH = "facet.bedheight.diff.morph"; 56 public static final String I18N_FACET_BED_DIFF_SOUNDING = "facet.bedheight.diff.sounding";
57 public static final String I18N_FACET_BED_DIFF_MORPH1 = "facet.bedheight.diff.morph1";
58 public static final String I18N_FACET_BED_DIFF_MORPH2 = "facet.bedheight.diff.morph2";
57 public static final String I18N_FACET_BED_DIFF_EPOCH = "facet.bedheight.diff.epoch"; 59 public static final String I18N_FACET_BED_DIFF_EPOCH = "facet.bedheight.diff.epoch";
58 public static final String I18N_FACET_BED_DIFF_EPOCH_RAW = "facet.bedheight.diff.epoch.raw"; 60 public static final String I18N_FACET_BED_DIFF_EPOCH_RAW = "facet.bedheight.diff.epoch.raw";
59 public static final String I18N_FACET_BED_DIFF_HEIGHT1 = "facet.bedheight.diff.height1"; 61 public static final String I18N_FACET_BED_DIFF_HEIGHT1 = "facet.bedheight.diff.height1";
60 public static final String I18N_FACET_BED_DIFF_HEIGHT1_RAW = "facet.bedheight.diff.height1.raw"; 62 public static final String I18N_FACET_BED_DIFF_HEIGHT1_RAW = "facet.bedheight.diff.height1.raw";
61 public static final String I18N_FACET_BED_DIFF_HEIGHT2 = "facet.bedheight.diff.height2"; 63 public static final String I18N_FACET_BED_DIFF_HEIGHT2 = "facet.bedheight.diff.height2";
126 ComputeType.ADVANCE, 128 ComputeType.ADVANCE,
127 stateId, 129 stateId,
128 hash)); 130 hash));
129 newFacets.add(new BedDiffYearFacet( 131 newFacets.add(new BedDiffYearFacet(
130 idx, 132 idx,
131 BED_DIFFERENCE_MORPH_WIDTH, 133 BED_DIFFERENCE_SOUNDING_WIDTH,
132 createBedDiffMorphDescription(meta), 134 createBedDiffSoundingDescription(meta),
135 ComputeType.ADVANCE,
136 stateId,
137 hash));
138 newFacets.add(new BedDiffYearFacet(
139 idx,
140 BED_DIFFERENCE_MORPH_WIDTH1,
141 createBedDiffMorph1Description(meta),
142 ComputeType.ADVANCE,
143 stateId,
144 hash));
145 newFacets.add(new BedDiffYearFacet(
146 idx,
147 BED_DIFFERENCE_MORPH_WIDTH2,
148 createBedDiffMorph2Description(meta),
133 ComputeType.ADVANCE, 149 ComputeType.ADVANCE,
134 stateId, 150 stateId,
135 hash)); 151 hash));
136 newFacets.add(new BedDiffYearFacet( 152 newFacets.add(new BedDiffYearFacet(
137 idx, 153 idx,
339 i18n = I18N_FACET_BED_DIFF_YEAR_RAW; 355 i18n = I18N_FACET_BED_DIFF_YEAR_RAW;
340 } 356 }
341 return Resources.getMsg(meta, i18n, i18n, new Object[] { range }); 357 return Resources.getMsg(meta, i18n, i18n, new Object[] { range });
342 } 358 }
343 359
344 protected String createBedDiffMorphDescription( 360 protected String createBedDiffSoundingDescription(
345 CallMeta meta) { 361 CallMeta meta) {
346 return Resources.getMsg(meta, I18N_FACET_BED_DIFF_MORPH, 362 return Resources.getMsg(meta, I18N_FACET_BED_DIFF_SOUNDING,
347 I18N_FACET_BED_DIFF_MORPH); 363 I18N_FACET_BED_DIFF_SOUNDING);
364 }
365
366 protected String createBedDiffMorph1Description(
367 CallMeta meta) {
368 return Resources.getMsg(meta, I18N_FACET_BED_DIFF_MORPH1,
369 I18N_FACET_BED_DIFF_MORPH1);
370 }
371
372 protected String createBedDiffMorph2Description(
373 CallMeta meta) {
374 return Resources.getMsg(meta, I18N_FACET_BED_DIFF_MORPH2,
375 I18N_FACET_BED_DIFF_MORPH2);
348 } 376 }
349 377
350 protected String createBedDiffAbsoluteDescription( 378 protected String createBedDiffAbsoluteDescription(
351 CallMeta meta, 379 CallMeta meta,
352 BedDiffYearResult result, 380 BedDiffYearResult result,
401 name.equals(BED_DIFFERENCE_YEAR_HEIGHT2) || 429 name.equals(BED_DIFFERENCE_YEAR_HEIGHT2) ||
402 name.equals(BED_DIFFERENCE_YEAR_HEIGHT1_FILTERED) || 430 name.equals(BED_DIFFERENCE_YEAR_HEIGHT1_FILTERED) ||
403 name.equals(BED_DIFFERENCE_YEAR_HEIGHT2_FILTERED)){ 431 name.equals(BED_DIFFERENCE_YEAR_HEIGHT2_FILTERED)){
404 return Boolean.FALSE; 432 return Boolean.FALSE;
405 } 433 }
406 else if (name.equals(BED_DIFFERENCE_MORPH_WIDTH) || 434 else if (name.equals(BED_DIFFERENCE_SOUNDING_WIDTH) ||
407 name.equals(BED_DIFFERENCE_EPOCH_FILTERED) || 435 name.equals(BED_DIFFERENCE_EPOCH_FILTERED) ||
408 name.equals(BED_DIFFERENCE_HEIGHT_YEAR_FILTERED) || 436 name.equals(BED_DIFFERENCE_HEIGHT_YEAR_FILTERED) ||
409 name.equals(BED_DIFFERENCE_YEAR_FILTERED)) { 437 name.equals(BED_DIFFERENCE_YEAR_FILTERED)) {
410 return Boolean.TRUE; 438 return Boolean.TRUE;
411 } 439 }
http://dive4elements.wald.intevation.org