Mercurial > dive4elements > river
comparison flys-backend/src/main/java/de/intevation/flys/importer/ImportRiver.java @ 5227:a981222b6260
ImportRiver: Preparing wst-based waterleveldifferences.
author | Felix Wolfsteller <felix.wolfsteller@intevation.de> |
---|---|
date | Mon, 11 Mar 2013 15:01:05 +0100 |
parents | 3b58bb0c55e3 |
children | 11b2a0c55318 |
comparison
equal
deleted
inserted
replaced
5226:a75acd0d5fee | 5227:a981222b6260 |
---|---|
128 | 128 |
129 protected List<ImportWst> floodWater; | 129 protected List<ImportWst> floodWater; |
130 | 130 |
131 protected List<ImportWst> floodProtection; | 131 protected List<ImportWst> floodProtection; |
132 | 132 |
133 /** Wst-structures from waterlevel-difference-csv files. */ | |
134 protected List<ImportWst> waterlevelDifferences; | |
135 | |
133 protected List<ImportBedHeight> bedHeightSingles; | 136 protected List<ImportBedHeight> bedHeightSingles; |
134 | 137 |
135 protected List<ImportBedHeight> bedHeightEpochs; | 138 protected List<ImportBedHeight> bedHeightEpochs; |
136 | 139 |
137 protected List<ImportSedimentDensity> sedimentDensities; | 140 protected List<ImportSedimentDensity> sedimentDensities; |
202 crossSections = new ArrayList<ImportCrossSection>(); | 205 crossSections = new ArrayList<ImportCrossSection>(); |
203 extraWsts = new ArrayList<ImportWst>(); | 206 extraWsts = new ArrayList<ImportWst>(); |
204 fixations = new ArrayList<ImportWst>(); | 207 fixations = new ArrayList<ImportWst>(); |
205 officialLines = new ArrayList<ImportWst>(); | 208 officialLines = new ArrayList<ImportWst>(); |
206 floodWater = new ArrayList<ImportWst>(); | 209 floodWater = new ArrayList<ImportWst>(); |
210 waterlevelDifferences = new ArrayList<ImportWst>(); | |
207 floodProtection = new ArrayList<ImportWst>(); | 211 floodProtection = new ArrayList<ImportWst>(); |
208 sedimentDensities = new ArrayList<ImportSedimentDensity>(); | 212 sedimentDensities = new ArrayList<ImportSedimentDensity>(); |
209 morphologicalWidths = new ArrayList<ImportMorphWidth>(); | 213 morphologicalWidths = new ArrayList<ImportMorphWidth>(); |
210 flowVelocityModels = new ArrayList<ImportFlowVelocityModel>(); | 214 flowVelocityModels = new ArrayList<ImportFlowVelocityModel>(); |
211 flowVelocityMeasurements = new ArrayList<ImportFlowVelocityMeasurement>(); | 215 flowVelocityMeasurements = new ArrayList<ImportFlowVelocityMeasurement>(); |
558 | 562 |
559 for (File file: files) { | 563 for (File file: files) { |
560 parser.parse(file); | 564 parser.parse(file); |
561 } | 565 } |
562 | 566 |
567 // TODO use own List<ImportWst> for waterlevels | |
563 // The parsed ImportWaterlevels are converted to | 568 // The parsed ImportWaterlevels are converted to |
564 // 'fixation'-wsts now. | 569 // 'fixation'-wsts now. |
565 for(ImportWst iw: parser.exportWsts()) { | 570 for(ImportWst iw: parser.exportWsts()) { |
566 //iw.setDescription("CSV" + iw.getDescription()); | 571 iw.setDescription("CSV/" + iw.getDescription()); |
567 fixations.add(iw); | 572 fixations.add(iw); |
568 } | 573 } |
569 } | 574 } |
570 | 575 |
571 protected void parseMeasurementStations() throws IOException { | 576 protected void parseMeasurementStations() throws IOException { |