Mercurial > gemma
changeset 4519:665c4d3fb9a4
Merged
author | Sascha Wilde <wilde@intevation.de> |
---|---|
date | Fri, 04 Oct 2019 17:53:47 +0200 |
parents | 7465b6244d5e (diff) 0b68958f2be1 (current diff) |
children | aeb2aedd3abd 459d682e39b5 |
files | .hgtags |
diffstat | 2 files changed, 11 insertions(+), 12 deletions(-) [+] |
line wrap: on
line diff
--- a/.hgtags Fri Oct 04 17:50:48 2019 +0200 +++ b/.hgtags Fri Oct 04 17:53:47 2019 +0200 @@ -14,4 +14,5 @@ 5396581cf20334cbc5e69280e5d9b192640d96b9 v4-preview20190717 aececbc3d04798d905e65196ac0870d081776ca2 v4-preview20190726 b5619087e3e909645eeab9e3f198667692895382 v4-preview20190918 +8a6c410f6f03ca8f50022c11f17d0bb2b86215f5 v4-preview20190930 a92239475590146dc6ad99fc4a3f4ced857c73f6 v4
--- a/pkg/imports/fa.go Fri Oct 04 17:50:48 2019 +0200 +++ b/pkg/imports/fa.go Fri Oct 04 17:53:47 2019 +0200 @@ -292,6 +292,14 @@ return &summary, nil } +// defaultLOS defaults to LOS3 when no expicit LOS is given. +func defaultLOS(los *ifaf.LosEnum) ifaf.LosEnum { + if los == nil { + return ifaf.LosEnumLOS3 + } + return *los +} + func doForFAs( ctx context.Context, bnIds bottlenecks, @@ -300,8 +308,6 @@ feedback Feedback, ) ([]string, error) { - default_los := ifaf.LosEnumLOS3 - insertFAStmt, err := tx.PrepareContext(ctx, insertFASQL) if err != nil { return nil, err @@ -373,10 +379,6 @@ if faRes.Effective_fairway_availability != nil { efaCount := 0 for _, efa := range faRes.Effective_fairway_availability.EffectiveFairwayAvailability { - los := &default_los - if efa.Level_of_Service != nil { - los = efa.Level_of_Service - } fgt := efa.Forecast_generation_time if efa.Forecast_generation_time.Status == pgtype.Undefined { fgt = pgtype.Timestamp{ @@ -387,7 +389,7 @@ ctx, faID, efa.Measure_date, - string(*los), + string(defaultLOS(efa.Level_of_Service)), efa.Available_depth_value, efa.Available_width_value, efa.Water_level_value, @@ -412,14 +414,10 @@ if faRes.Reference_values != nil { rvCount := 0 for _, fav := range faRes.Reference_values.ReferenceValue { - los := &default_los - if fav.Level_of_Service != nil { - los = fav.Level_of_Service - } res, err := insertFAVStmt.ExecContext( ctx, faID, - los, + string(defaultLOS(fav.Level_of_Service)), fav.Fairway_depth, fav.Fairway_width, fav.Fairway_radius,