Mercurial > dive4elements > river
comparison artifacts/src/main/java/org/dive4elements/river/artifacts/model/minfo/SedimentLoadFactory.java @ 6412:c74261e05a62
issue1235: revert some changes, use correct Schwebstoff/Geschiebe-measurement-stations.
author | Felix Wolfsteller <felix.wolfsteller@intevation.de> |
---|---|
date | Tue, 25 Jun 2013 08:05:36 +0200 |
parents | 24b4819ef514 |
children | d1502b8dd091 |
comparison
equal
deleted
inserted
replaced
6411:a21f7a3e4be5 | 6412:c74261e05a62 |
---|---|
353 (String) row[4]); | 353 (String) row[4]); |
354 getValues("coarse", sqlQuery, load, floatStations); | 354 getValues("coarse", sqlQuery, load, floatStations); |
355 getValues("fine_middle", sqlQuery, load, floatStations); | 355 getValues("fine_middle", sqlQuery, load, floatStations); |
356 getValues("sand", sqlQuery, load, floatStations); | 356 getValues("sand", sqlQuery, load, floatStations); |
357 getValues("suspended_sediment", sqlQuery, load, suspStations); | 357 getValues("suspended_sediment", sqlQuery, load, suspStations); |
358 getValues("susp_sand_bed", sqlQuery, load, suspStations); | 358 getValues("susp_sand_bed", sqlQuery, load, floatStations); |
359 getValues("susp_sand", sqlQuery, load, suspStations); | 359 getValues("susp_sand", sqlQuery, load, floatStations); |
360 | 360 |
361 return load; | 361 return load; |
362 } | 362 } |
363 else if (type.equals("off_epoch")) { | 363 else if (type.equals("off_epoch")) { |
364 Calendar toStart = Calendar.getInstance(); | 364 Calendar toStart = Calendar.getInstance(); |
400 } | 400 } |
401 getValues("coarse", sqlQuery, load, floatStations); | 401 getValues("coarse", sqlQuery, load, floatStations); |
402 getValues("fine_middle", sqlQuery, load, floatStations); | 402 getValues("fine_middle", sqlQuery, load, floatStations); |
403 getValues("sand", sqlQuery, load, floatStations); | 403 getValues("sand", sqlQuery, load, floatStations); |
404 getValues("suspended_sediment", sqlQuery, load, suspStations); | 404 getValues("suspended_sediment", sqlQuery, load, suspStations); |
405 getValues("susp_sand_bed", sqlQuery, load, suspStations); | 405 getValues("susp_sand_bed", sqlQuery, load, floatStations); |
406 getValues("susp_sand", sqlQuery, load, suspStations); | 406 getValues("susp_sand", sqlQuery, load, floatStations); |
407 return load; | 407 return load; |
408 } | 408 } |
409 return new SedimentLoad(); | 409 return new SedimentLoad(); |
410 } | 410 } |
411 | 411 |