Mercurial > gemma
changeset 5585:7e8830c808ba surveysperbottleneckid
Fixed SR import for use of Bottleneck_Id instead of bottlenecks objnam.
| author | Sascha Wilde <wilde@sha-bang.de> |
|---|---|
| date | Fri, 01 Apr 2022 18:51:23 +0200 |
| parents | 7ed9e32706d0 |
| children | 215e6ba9651b |
| files | pkg/imports/sr.go pkg/models/sr.go |
| diffstat | 2 files changed, 7 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/pkg/imports/sr.go Fri Apr 01 16:47:53 2022 +0200 +++ b/pkg/imports/sr.go Fri Apr 01 18:51:23 2022 +0200 @@ -145,8 +145,8 @@ area, surtyp, zpg_exception -) SELECT - bottleneck_id, +) VALUES ( + $1, $2::date, $3, (SELECT @@ -157,8 +157,7 @@ END), $7, $8 -FROM waterway.bottlenecks -WHERE objnam = $1 AND validity @> CAST($2 AS timestamptz) +) RETURNING id, ST_X(ST_Centroid(area::geometry)), @@ -226,7 +225,7 @@ JOIN waterway.bottlenecks bns ON grwl.location = bns.gauge_location AND grwl.validity @> CAST($2 AS timestamptz) -WHERE bns.objnam = $1 +WHERE bns.bottleneck_id = $1 AND bns.validity @> CAST($2 AS timestamptz) AND grwl.depth_reference like 'LDC%' `
--- a/pkg/models/sr.go Fri Apr 01 16:47:53 2022 +0200 +++ b/pkg/models/sr.go Fri Apr 01 18:51:23 2022 +0200 @@ -67,16 +67,16 @@ ON bn.gauge_location = g.location AND $3::timestamptz <@ g.validity JOIN waterway.gauges_reference_water_levels rl ON g.location = rl.location AND g.validity = rl.validity - WHERE bn.objnam = $1 + WHERE bn.bottleneck_id = $1 AND rl.depth_reference = $2)` checkBottleneckSQL = ` -SELECT true FROM waterway.bottlenecks WHERE objnam = $1` +SELECT true FROM waterway.bottlenecks WHERE bottleneck_id = $1` checkBottleneckDateUniqueSQL = ` SELECT true FROM waterway.sounding_results sr JOIN waterway.bottlenecks bn ON sr.bottleneck_id = bn.bottleneck_id -WHERE bn.objnam = $1 AND sr.date_info = $2` +WHERE bn.bottleneck_id = $1 AND sr.date_info = $2` ) func (m *SoundingResultMeta) Decode(r io.Reader) error {