Mercurial > dive4elements > river
diff artifacts/src/main/java/org/dive4elements/river/artifacts/model/minfo/BedHeightFactory.java @ 8554:3a0522f1a532
Morphological width imported and stored with heights is redundant to table morphologic_width.
| author | "Tom Gottfried <tom@intevation.de>" |
|---|---|
| date | Mon, 16 Feb 2015 09:00:08 +0100 |
| parents | 76113b975829 |
| children | 078b07a94023 |
line wrap: on
line diff
--- a/artifacts/src/main/java/org/dive4elements/river/artifacts/model/minfo/BedHeightFactory.java Mon Feb 16 08:39:06 2015 +0100 +++ b/artifacts/src/main/java/org/dive4elements/river/artifacts/model/minfo/BedHeightFactory.java Mon Feb 16 09:00:08 2015 +0100 @@ -30,8 +30,8 @@ /** Query to get km and ws for wst_id and column_pos. */ public static final String SQL_SELECT_SINGLE = - "SELECT bhsv.height, bhsv.station, bhsv.data_gap, bhsv.sounding_width," + - " bhs.year, bhsv.width" + + "SELECT bhsv.height, bhsv.station, bhsv.data_gap," + + " bhsv.sounding_width, bhs.year" + " FROM bed_height_single bhs" + " JOIN bed_height_single_values bhsv on bhsv.bed_height_single_id = bhs.id"; @@ -157,7 +157,6 @@ .addScalar("station", StandardBasicTypes.DOUBLE) .addScalar("data_gap", StandardBasicTypes.DOUBLE) .addScalar("sounding_width", StandardBasicTypes.DOUBLE) - .addScalar("width", StandardBasicTypes.DOUBLE) .addScalar("year", StandardBasicTypes.INTEGER); sqlQuery.setInteger("height_id", height_id); if (!Double.isNaN(from) && !Double.isNaN(to)) { @@ -172,8 +171,7 @@ Double row1 = row[1] != null ? (Double)row[1] : Double.NaN; Double row2 = row[2] != null ? (Double)row[2] : Double.NaN; Double row3 = row[3] != null ? (Double)row[3] : Double.NaN; - Double row4 = row[4] != null ? (Double)row[4] : Double.NaN; - height.add(row0, row1, row2, row3, row4, (Integer) row[5]); + height.add(row0, row1, row2, row3, (Integer) row[4]); } return height; }