Mercurial > dive4elements > river
diff backend/src/main/java/org/dive4elements/river/importer/ImportRiver.java @ 8559:6d8d7425a6b5
Bed heights are just bed heights since a while ('single' is obsolete).
author | "Tom Gottfried <tom@intevation.de>" |
---|---|
date | Mon, 16 Feb 2015 11:08:33 +0100 |
parents | 29ab66ce06aa |
children | c851d1ea543a |
line wrap: on
line diff
--- a/backend/src/main/java/org/dive4elements/river/importer/ImportRiver.java Mon Feb 16 10:12:12 2015 +0100 +++ b/backend/src/main/java/org/dive4elements/river/importer/ImportRiver.java Mon Feb 16 11:08:33 2015 +0100 @@ -164,7 +164,7 @@ /** Wst-structures from waterlevel-difference-csv files. */ protected List<ImportWst> waterlevelDifferences; - protected List<ImportBedHeightSingle> bedHeightSingles; + protected List<ImportBedHeight> bedHeights; protected List<ImportSedimentDensity> sedimentDensities; @@ -456,12 +456,12 @@ File bedHeightDir = new File(minfoDir, BED_HEIGHT_DIR); File singlesDir = new File(bedHeightDir, BED_HEIGHT_SINGLE_DIR); - if (Config.INSTANCE.skipBedHeightSingle()) { + if (Config.INSTANCE.skipBedHeight()) { log.info("skip parsing bed height single."); } else { log.info("Parse bed height single."); - parseBedHeightSingles(singlesDir); + parseBedHeights(singlesDir); } } @@ -816,7 +816,7 @@ } - protected void parseBedHeightSingles(File dir) throws IOException { + protected void parseBedHeights(File dir) throws IOException { log.debug("Parse bed height singles"); File[] files = dir.listFiles(); @@ -832,7 +832,7 @@ parser.parse(file); } - bedHeightSingles = parser.getBedHeights(); + bedHeights = parser.getBedHeights(); } public void parseFloodWater() throws IOException { @@ -1440,29 +1440,24 @@ public void storeBedHeight() { - if (!Config.INSTANCE.skipBedHeightSingle()) { - log.info("store bed heights single"); - storeBedHeightSingle(); - } - } - - - private void storeBedHeightSingle() { - River river = getPeer(); + if (!Config.INSTANCE.skipBedHeight()) { + log.info("store bed heights"); + River river = getPeer(); - if (bedHeightSingles != null) { - for (ImportBedHeightSingle tmp: bedHeightSingles) { - ImportBedHeightSingle single = (ImportBedHeightSingle) tmp; - - String desc = single.getDescription(); + if (bedHeights != null) { + for (ImportBedHeight tmp: bedHeights) { + ImportBedHeight single = (ImportBedHeight) tmp; - log.debug("name: " + desc); + String desc = single.getDescription(); - single.storeDependencies(river); + log.debug("name: " + desc); + + single.storeDependencies(river); + } } - } - else { - log.info("No single bed heights to store."); + else { + log.info("No bed heights to store."); + } } }