Mercurial > dive4elements > river
comparison backend/src/main/java/org/dive4elements/river/importer/parsers/SQRelationParser.java @ 8692:67e53dbe05d2
(issue1750) Consistently attach parameters of suspended respectively bedload material to measurement station of respective type.
| author | Tom Gottfried <tom@intevation.de> |
|---|---|
| date | Fri, 17 Apr 2015 15:04:16 +0200 |
| parents | 11c88a2f695a |
| children | 5e38e2924c07 |
comparison
equal
deleted
inserted
replaced
| 8691:bfca77cbf353 | 8692:67e53dbe05d2 |
|---|---|
| 144 + line); | 144 + line); |
| 145 } | 145 } |
| 146 return; | 146 return; |
| 147 } | 147 } |
| 148 | 148 |
| 149 List<MeasurementStation> ms = | 149 MeasurementStation mStation = ImporterSession.getInstance() |
| 150 ImporterSession.getInstance().getMeasurementStations( | 150 .getMeasurementStation( |
| 151 river, km); | 151 river, |
| 152 | 152 km, |
| 153 if (ms != null && !ms.isEmpty()) { | 153 parameter.equals("A") || parameter.equals("B") |
| 154 current.addValue(new ImportSQRelationValue( | 154 ? MeasurementStation.MEASUREMENT_TYPE_SUSP |
| 155 cols[1], | 155 : MeasurementStation.MEASUREMENT_TYPE_BEDLOAD); |
| 156 ms.get(0), | 156 |
| 157 a, | 157 if (mStation == null) { |
| 158 b, | 158 log.warn("No measurement station fitting parameter " + |
| 159 qMax, | 159 parameter + " at km " + km + ". Line ignored."); |
| 160 rSq, | 160 return; |
| 161 nTot, | 161 } |
| 162 nOutlier, | 162 |
| 163 cFer, | 163 current.addValue(new ImportSQRelationValue( |
| 164 cDuan | 164 parameter, |
| 165 )); | 165 mStation, |
| 166 } | 166 a, |
| 167 b, | |
| 168 qMax, | |
| 169 rSq, | |
| 170 nTot, | |
| 171 nOutlier, | |
| 172 cFer, | |
| 173 cDuan | |
| 174 )); | |
| 167 } | 175 } |
| 168 | 176 |
| 169 private Double parseDouble(String[] values, int idx) { | 177 private Double parseDouble(String[] values, int idx) { |
| 170 if (idx >= 0 && idx < values.length && !values[idx].isEmpty()) { | 178 if (idx >= 0 && idx < values.length && !values[idx].isEmpty()) { |
| 171 try { | 179 try { |