Mercurial > dive4elements > river
diff artifacts/src/main/java/org/dive4elements/river/artifacts/states/MiddleBedHeight.java @ 8295:9ab967eb2c51
At least since rev eb052d759fcc, there are no bed height epochs anymore.
| author | "Tom Gottfried <tom@intevation.de>" |
|---|---|
| date | Thu, 18 Sep 2014 18:16:51 +0200 |
| parents | 86e532106abb |
| children | 0a5239a1e46e |
line wrap: on
line diff
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/states/MiddleBedHeight.java Wed Sep 17 19:46:19 2014 +0200 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/states/MiddleBedHeight.java Thu Sep 18 18:16:51 2014 +0200 @@ -71,56 +71,29 @@ int idx = 0; for (MiddleBedHeightData d: data) { - if (d.getStartYear() == d.getEndYear()) { - MiddleBedHeightFacet mf = new MiddleBedHeightFacet( - idx, - MIDDLE_BED_HEIGHT_SINGLE, - d.getDescription(), - ComputeType.ADVANCE, - id, - hash - ); - mf.addMetaData(Resources.getMsg( + MiddleBedHeightFacet mf = new MiddleBedHeightFacet( + idx, + MIDDLE_BED_HEIGHT_SINGLE, + d.getDescription(), + ComputeType.ADVANCE, + id, + hash + ); + mf.addMetaData(Resources.getMsg( context.getMeta(), "meta.bedheight.cur.elevation", "Current elevation model"), - d.getCurElevationModel()); - mf.addMetaData(Resources.getMsg( + d.getCurElevationModel()); + mf.addMetaData(Resources.getMsg( context.getMeta(), "meta.bedheight.old.elevation", "Old elevation model"), - d.getOldElevationModel()); - mf.addMetaData(Resources.getMsg( + d.getOldElevationModel()); + mf.addMetaData(Resources.getMsg( context.getMeta(), "meta.bedheight.river.elevation", "River elevation model"), u.getName()); - newFacets.add(mf); - } - else { - MiddleBedHeightFacet mf = new MiddleBedHeightFacet( - idx, - MIDDLE_BED_HEIGHT_EPOCH, - d.getDescription(), - ComputeType.ADVANCE, - id, - hash - ); - mf.addMetaData(Resources.getMsg( - context.getMeta(), - "meta.bedheight.cur.elevation", - "Current elevation model"), - d.getCurElevationModel()); - mf.addMetaData(Resources.getMsg( - context.getMeta(), - "meta.bedheight.old.elevation", - "Old elevation model"), - d.getOldElevationModel()); - mf.addMetaData(Resources.getMsg( - context.getMeta(), - "meta.bedheight.river.elevation", - "River elevation model"), u.getName()); - newFacets.add(mf); - } + newFacets.add(mf); idx++; }