Mercurial > gemma

changeset 5213:de417840dfee new-fwa

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Made breaks defaults more sensible
author Sascha L. Teichmann <sascha.teichmann@intevation.de>
date Mon, 11 May 2020 16:42:36 +0200
parents 6c316a4d3386
children ebcf33d79d2e
files pkg/controllers/bottlenecks.go pkg/controllers/fwa.go
diffstat 2 files changed, 7 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- a/pkg/controllers/bottlenecks.go	Mon May 11 16:24:04 2020 +0200
+++ b/pkg/controllers/bottlenecks.go	Mon May 11 16:42:36 2020 +0200
@@ -249,7 +249,7 @@
 		return
 	}
 
-	breaks := parseBreaks(req.FormValue("breaks"))
+	breaks := parseBreaks(req.FormValue("breaks"), afdRefs)
 
 	log.Printf("info: time interval: (%v - %v)\n", from, to)
 
@@ -400,7 +400,7 @@
 		return
 	}
 
-	breaks := parseBreaks(req.FormValue("breaks"))
+	breaks := parseBreaks(req.FormValue("breaks"), afdRefs)
 
 	rw.Header().Add("Content-Type", "text/csv")
 
--- a/pkg/controllers/fwa.go	Mon May 11 16:24:04 2020 +0200
+++ b/pkg/controllers/fwa.go	Mon May 11 16:42:36 2020 +0200
@@ -252,9 +252,9 @@
 
 	// separate breaks for depth and width
 	var (
-		breaks      = parseBreaks(req.FormValue("breaks"))
-		depthBreaks = parseBreaks(req.FormValue("depthbreaks"))
-		widthBreaks = parseBreaks(req.FormValue("widthbreaks"))
+		breaks      = parseBreaks(req.FormValue("breaks"), afdRefs)
+		depthBreaks = parseBreaks(req.FormValue("depthbreaks"), breaks)
+		widthBreaks = parseBreaks(req.FormValue("widthbreaks"), breaks)
 		useDepth    = bottlenecks.hasLimiting(limitingDepth, from, to)
 		useWidth    = bottlenecks.hasLimiting(limitingWidth, from, to)
 	)
@@ -397,11 +397,11 @@
 	return common.DedupFloat64s(values)
 }
 
-func parseBreaks(breaks string) []float64 {
+func parseBreaks(breaks string, defaults []float64) []float64 {
 	if breaks != "" {
 		return breaksToReferenceValue(breaks)
 	}
-	return afdRefs
+	return defaults
 }
 
 func (tr *timeRange) intersects(from, to time.Time) bool {