Mercurial > dive4elements > river

comparison backend/src/main/java/org/dive4elements/river/model/BedHeightSingleValue.java @ 8554:3a0522f1a532

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 9d2e69f971f5
children
comparison
equal deleted inserted replaced
8553:17c476e90c07 8554:3a0522f1a532
9 package org.dive4elements.river.model; 9 package org.dive4elements.river.model;
10 10
11 import java.util.List; 11 import java.util.List;
12 12
13 import java.io.Serializable; 13 import java.io.Serializable;
14 //import java.math.BigDecimal;
15 14
16 import javax.persistence.Entity; 15 import javax.persistence.Entity;
17 import javax.persistence.Id; 16 import javax.persistence.Id;
18 import javax.persistence.Table; 17 import javax.persistence.Table;
19 import javax.persistence.GeneratedValue; 18 import javax.persistence.GeneratedValue;
46 private Double station; 45 private Double station;
47 private Double height; 46 private Double height;
48 private Double uncertainty; 47 private Double uncertainty;
49 private Double dataGap; 48 private Double dataGap;
50 private Double soundingWidth; 49 private Double soundingWidth;
51 private Double width;
52 50
53 51
54 public BedHeightSingleValue() { 52 public BedHeightSingleValue() {
55 } 53 }
56 54
58 BedHeightSingle bedHeight, 56 BedHeightSingle bedHeight,
59 Double station, 57 Double station,
60 Double height, 58 Double height,
61 Double uncertainty, 59 Double uncertainty,
62 Double dataGap, 60 Double dataGap,
63 Double soundingWidth, 61 Double soundingWidth
64 Double width
65 ) { 62 ) {
66 this.bedHeight = bedHeight; 63 this.bedHeight = bedHeight;
67 this.station = station; 64 this.station = station;
68 this.height = height; 65 this.height = height;
69 this.uncertainty = uncertainty; 66 this.uncertainty = uncertainty;
70 this.dataGap = dataGap; 67 this.dataGap = dataGap;
71 this.soundingWidth = soundingWidth; 68 this.soundingWidth = soundingWidth;
72 this.width = width;
73 } 69 }
74 70
75 @Id 71 @Id
76 @SequenceGenerator( 72 @SequenceGenerator(
77 name = "SEQUENCE_BED_SINGLE_VALUE_ID_SEQ", 73 name = "SEQUENCE_BED_SINGLE_VALUE_ID_SEQ",
134 public void setDataGap(Double dataGap) { 130 public void setDataGap(Double dataGap) {
135 this.dataGap = dataGap; 131 this.dataGap = dataGap;
136 } 132 }
137 133
138 @Column(name="sounding_width") 134 @Column(name="sounding_width")
139 // public BigDecimal getSoundingWidth() {
140 public Double getSoundingWidth() { 135 public Double getSoundingWidth() {
141 return soundingWidth; 136 return soundingWidth;
142 } 137 }
143 138
144 //public void setSoundingWidth(BigDecimal soundingWidth) {
145 public void setSoundingWidth(Double soundingWidth) { 139 public void setSoundingWidth(Double soundingWidth) {
146 this.soundingWidth = soundingWidth; 140 this.soundingWidth = soundingWidth;
147 }
148
149 @Column(name="width")
150 public Double getWidth() {
151 return width;
152 }
153
154 public void setWidth(Double width) {
155 this.width = width;
156 } 141 }
157 142
158 143
159 public static List<BedHeightSingleValue> getBedHeightSingleValues( 144 public static List<BedHeightSingleValue> getBedHeightSingleValues(
160 BedHeightSingle single, 145 BedHeightSingle single,
http://dive4elements.wald.intevation.org