Mercurial > dive4elements > river

comparison artifacts/src/main/java/org/dive4elements/river/artifacts/states/minfo/DifferencesState.java @ 7919:868f55932fe6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Removed serverside path for bed height epochs.
author Raimund Renkert <rrenkert@intevation.de>
date Fri, 06 Jun 2014 16:59:16 +0200
parents d9791fa3c8ad
children 10debf4b82be
comparison
equal deleted inserted replaced
7918:5813c206ff64 7919:868f55932fe6
23 import org.dive4elements.river.artifacts.access.BedDifferencesAccess; 23 import org.dive4elements.river.artifacts.access.BedDifferencesAccess;
24 import org.dive4elements.river.artifacts.model.CalculationResult; 24 import org.dive4elements.river.artifacts.model.CalculationResult;
25 import org.dive4elements.river.artifacts.model.DataFacet; 25 import org.dive4elements.river.artifacts.model.DataFacet;
26 import org.dive4elements.river.artifacts.model.FacetTypes; 26 import org.dive4elements.river.artifacts.model.FacetTypes;
27 import org.dive4elements.river.artifacts.model.minfo.BedDiffCalculation; 27 import org.dive4elements.river.artifacts.model.minfo.BedDiffCalculation;
28 import org.dive4elements.river.artifacts.model.minfo.BedDiffEpochFacet;
29 import org.dive4elements.river.artifacts.model.minfo.BedDiffEpochFilterFacet;
30 import org.dive4elements.river.artifacts.model.minfo.BedDiffEpochResult;
31 import org.dive4elements.river.artifacts.model.minfo.BedDiffYearFacet; 28 import org.dive4elements.river.artifacts.model.minfo.BedDiffYearFacet;
32 import org.dive4elements.river.artifacts.model.minfo.BedDiffYearFilterFacet; 29 import org.dive4elements.river.artifacts.model.minfo.BedDiffYearFilterFacet;
33 import org.dive4elements.river.artifacts.model.minfo.BedDiffYearResult; 30 import org.dive4elements.river.artifacts.model.minfo.BedDiffYearResult;
34 import org.dive4elements.river.artifacts.model.minfo.BedDifferencesResult; 31 import org.dive4elements.river.artifacts.model.minfo.BedDifferencesResult;
35 import org.dive4elements.river.artifacts.resources.Resources; 32 import org.dive4elements.river.artifacts.resources.Resources;
45 implements FacetTypes 42 implements FacetTypes
46 { 43 {
47 /** The logger used in this class. */ 44 /** The logger used in this class. */
48 private static Logger logger = Logger.getLogger(DifferencesState.class); 45 private static Logger logger = Logger.getLogger(DifferencesState.class);
49 public static final String I18N_DIFF_YEAR = "beddifference.year"; 46 public static final String I18N_DIFF_YEAR = "beddifference.year";
50 public static final String I18N_DIFF_EPOCH = "beddifference.epoch";
51 47
52 public static final String I18N_FACET_BED_DIFF_YEAR = "facet.bedheight.diff.year"; 48 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"; 49 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"; 50 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"; 51 public static final String I18N_FACET_BED_DIFF_ABSOLUTE_RAW = "facet.bedheight.diff.absolute.raw";
56 public static final String I18N_FACET_BED_DIFF_SOUNDING = "facet.bedheight.diff.sounding"; 52 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"; 53 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"; 54 public static final String I18N_FACET_BED_DIFF_MORPH2 = "facet.bedheight.diff.morph2";
59 public static final String I18N_FACET_BED_DIFF_EPOCH = "facet.bedheight.diff.epoch";
60 public static final String I18N_FACET_BED_DIFF_EPOCH_RAW = "facet.bedheight.diff.epoch.raw";
61 public static final String I18N_FACET_BED_DIFF_HEIGHT1 = "facet.bedheight.diff.height1"; 55 public static final String I18N_FACET_BED_DIFF_HEIGHT1 = "facet.bedheight.diff.height1";
62 public static final String I18N_FACET_BED_DIFF_HEIGHT1_RAW = "facet.bedheight.diff.height1.raw"; 56 public static final String I18N_FACET_BED_DIFF_HEIGHT1_RAW = "facet.bedheight.diff.height1.raw";
63 public static final String I18N_FACET_BED_DIFF_HEIGHT2 = "facet.bedheight.diff.height2"; 57 public static final String I18N_FACET_BED_DIFF_HEIGHT2 = "facet.bedheight.diff.height2";
64 public static final String I18N_FACET_BED_DIFF_HEIGHT2_RAW = "facet.bedheight.diff.height2.raw"; 58 public static final String I18N_FACET_BED_DIFF_HEIGHT2_RAW = "facet.bedheight.diff.height2.raw";
65 59
222 false), 216 false),
223 ComputeType.ADVANCE, 217 ComputeType.ADVANCE,
224 stateId, 218 stateId,
225 hash)); 219 hash));
226 } 220 }
227 if (results[idx] instanceof BedDiffEpochResult) {
228 newFacets.add(new BedDiffEpochFacet(
229 idx,
230 BED_DIFFERENCE_EPOCH,
231 createBedDiffEpochDescription(
232 meta,
233 (BedDiffEpochResult)results[idx],
234 true),
235 ComputeType.ADVANCE,
236 stateId,
237 hash));
238 newFacets.add(new BedDiffEpochFacet(
239 idx,
240 BED_DIFFERENCE_EPOCH_HEIGHT1,
241 createBedDiffHeightEpochDescription(
242 meta,
243 (BedDiffEpochResult)results[idx],
244 0,
245 true),
246 ComputeType.ADVANCE,
247 stateId,
248 hash));
249 newFacets.add(new BedDiffEpochFacet(
250 idx,
251 BED_DIFFERENCE_EPOCH_HEIGHT2,
252 createBedDiffHeightEpochDescription(
253 meta,
254 (BedDiffEpochResult)results[idx],
255 1,
256 true),
257 ComputeType.ADVANCE,
258 stateId,
259 hash));
260 newFacets.add(new BedDiffEpochFilterFacet(
261 idx,
262 BED_DIFFERENCE_EPOCH_FILTERED,
263 createBedDiffEpochDescription(
264 meta,
265 (BedDiffEpochResult)results[idx],
266 false),
267 ComputeType.ADVANCE,
268 stateId,
269 hash));
270 newFacets.add(new BedDiffEpochFilterFacet(
271 idx,
272 BED_DIFFERENCE_EPOCH_HEIGHT1_FILTERED,
273 createBedDiffHeightEpochDescription(
274 meta,
275 (BedDiffEpochResult)results[idx],
276 0,
277 false),
278 ComputeType.ADVANCE,
279 stateId,
280 hash));
281 newFacets.add(new BedDiffEpochFilterFacet(
282 idx,
283 BED_DIFFERENCE_EPOCH_HEIGHT2_FILTERED,
284 createBedDiffHeightEpochDescription(
285 meta,
286 (BedDiffEpochResult)results[idx],
287 1,
288 false),
289 ComputeType.ADVANCE,
290 stateId,
291 hash));
292 }
293 } 221 }
294 } 222 }
295 223
296 private String createBedDiffHeightDescription( 224 private String createBedDiffHeightDescription(
297 CallMeta meta, 225 CallMeta meta,
313 else { 241 else {
314 return result.getNameSecond(); 242 return result.getNameSecond();
315 } 243 }
316 } 244 }
317 245
318 private String createBedDiffHeightEpochDescription(
319 CallMeta meta,
320 BedDiffEpochResult result,
321 int ndx,
322 boolean raw
323 ) {
324 DateFormat df = Formatter.getDateFormatter(meta, "yyyy");
325 String range =
326 df.format(result.getStart())
327 + " - " +
328 df.format(result.getEnd());
329
330 String i18nHeight1 = I18N_FACET_BED_DIFF_HEIGHT1;
331 String i18nHeight2 = I18N_FACET_BED_DIFF_HEIGHT2;
332 if (raw) {
333 i18nHeight1 = I18N_FACET_BED_DIFF_HEIGHT1_RAW;
334 i18nHeight2 = I18N_FACET_BED_DIFF_HEIGHT2_RAW;
335 }
336 if (ndx == 0) {
337 return Resources.getMsg(meta, i18nHeight1,
338 i18nHeight1, new Object[] { range });
339 }
340 else {
341 return Resources.getMsg(meta, i18nHeight2,
342 i18nHeight2, new Object[] {range});
343 }
344 }
345
346 protected String createBedDiffYearDescription( 246 protected String createBedDiffYearDescription(
347 CallMeta meta, 247 CallMeta meta,
348 BedDiffYearResult result, 248 BedDiffYearResult result,
349 boolean raw 249 boolean raw
350 ) { 250 ) {
383 String range = result.getStart() + " - " + result.getEnd(); 283 String range = result.getStart() + " - " + result.getEnd();
384 284
385 String i18n = I18N_FACET_BED_DIFF_ABSOLUTE; 285 String i18n = I18N_FACET_BED_DIFF_ABSOLUTE;
386 if (raw) { 286 if (raw) {
387 i18n = I18N_FACET_BED_DIFF_ABSOLUTE_RAW; 287 i18n = I18N_FACET_BED_DIFF_ABSOLUTE_RAW;
388 }
389 return Resources.getMsg(meta, i18n, i18n, new Object[] { range });
390 }
391
392 protected String createBedDiffEpochDescription(
393 CallMeta meta,
394 BedDiffEpochResult result,
395 boolean raw) {
396 DateFormat df = Formatter.getDateFormatter(meta, "yyyy");
397 String range =
398 df.format(result.getStart())
399 + " - " +
400 df.format(result.getEnd());
401
402 String i18n = I18N_FACET_BED_DIFF_EPOCH;
403 if (raw) {
404 i18n = I18N_FACET_BED_DIFF_EPOCH_RAW;
405 } 288 }
406 return Resources.getMsg(meta, i18n, i18n, new Object[] { range }); 289 return Resources.getMsg(meta, i18n, i18n, new Object[] { range });
407 } 290 }
408 291
409 static { 292 static {
416 Artifact artifact, 299 Artifact artifact,
417 Facet facet, 300 Facet facet,
418 String output 301 String output
419 ) { 302 ) {
420 String name = facet.getName(); 303 String name = facet.getName();
421 if (name.equals(BED_DIFFERENCE_EPOCH) || 304 if (name.equals(BED_DIFFERENCE_HEIGHT_YEAR) ||
422 name.equals(BED_DIFFERENCE_EPOCH_HEIGHT1) ||
423 name.equals(BED_DIFFERENCE_EPOCH_HEIGHT2) ||
424 name.equals(BED_DIFFERENCE_EPOCH_HEIGHT1_FILTERED) ||
425 name.equals(BED_DIFFERENCE_EPOCH_HEIGHT2_FILTERED) ||
426 name.equals(BED_DIFFERENCE_HEIGHT_YEAR) ||
427 name.equals(BED_DIFFERENCE_YEAR) || 305 name.equals(BED_DIFFERENCE_YEAR) ||
428 name.equals(BED_DIFFERENCE_YEAR_HEIGHT1) || 306 name.equals(BED_DIFFERENCE_YEAR_HEIGHT1) ||
429 name.equals(BED_DIFFERENCE_YEAR_HEIGHT2) || 307 name.equals(BED_DIFFERENCE_YEAR_HEIGHT2) ||
430 name.equals(BED_DIFFERENCE_YEAR_HEIGHT1_FILTERED) || 308 name.equals(BED_DIFFERENCE_YEAR_HEIGHT1_FILTERED) ||
431 name.equals(BED_DIFFERENCE_YEAR_HEIGHT2_FILTERED)){ 309 name.equals(BED_DIFFERENCE_YEAR_HEIGHT2_FILTERED)){
432 return Boolean.FALSE; 310 return Boolean.FALSE;
433 } 311 }
434 else if (name.equals(BED_DIFFERENCE_SOUNDING_WIDTH) || 312 else if (name.equals(BED_DIFFERENCE_SOUNDING_WIDTH) ||
435 name.equals(BED_DIFFERENCE_EPOCH_FILTERED) ||
436 name.equals(BED_DIFFERENCE_HEIGHT_YEAR_FILTERED) || 313 name.equals(BED_DIFFERENCE_HEIGHT_YEAR_FILTERED) ||
437 name.equals(BED_DIFFERENCE_YEAR_FILTERED)) { 314 name.equals(BED_DIFFERENCE_YEAR_FILTERED)) {
438 return Boolean.TRUE; 315 return Boolean.TRUE;
439 } 316 }
440 else { 317 else {
http://dive4elements.wald.intevation.org