Mercurial > gemma
changeset 5212:6c316a4d3386 new-fwa
Pull breaks from the request parameters.
| author | Sascha L. Teichmann <sascha.teichmann@intevation.de> |
|---|---|
| date | Mon, 11 May 2020 16:24:04 +0200 |
| parents | 8d582b5ff71e |
| children | de417840dfee |
| files | pkg/controllers/fwa.go |
| diffstat | 1 files changed, 12 insertions(+), 9 deletions(-) [+] |
line wrap: on
line diff
--- a/pkg/controllers/fwa.go Mon May 11 16:18:23 2020 +0200 +++ b/pkg/controllers/fwa.go Mon May 11 16:24:04 2020 +0200 @@ -251,25 +251,28 @@ } // separate breaks for depth and width - depthbreaks := parseBreaks("depthbreaks") - widthbreaks := parseBreaks("widthbreaks") + var ( + breaks = parseBreaks(req.FormValue("breaks")) + depthBreaks = parseBreaks(req.FormValue("depthbreaks")) + widthBreaks = parseBreaks(req.FormValue("widthbreaks")) + useDepth = bottlenecks.hasLimiting(limitingDepth, from, to) + useWidth = bottlenecks.hasLimiting(limitingWidth, from, to) + ) - useDepth := bottlenecks.hasLimiting(limitingDepth, from, to) - useWidth := bottlenecks.hasLimiting(limitingWidth, from, to) - - if useDepth && useWidth && len(widthbreaks) != len(depthbreaks) { + if useDepth && useWidth && len(widthBreaks) != len(depthBreaks) { http.Error( rw, fmt.Sprintf("class breaks lengths differ: %d != %d", - len(widthbreaks), len(depthbreaks)), + len(widthBreaks), len(depthBreaks)), http.StatusBadRequest, ) return } // TODO: use these. - _ = depthbreaks - _ = widthbreaks + _ = breaks + _ = depthBreaks + _ = widthBreaks // For every day on every bottleneck we need to find out if this day is valid. validities := make([]func(time.Time, time.Time) *limitingValidity, len(bottlenecks))