changeset 4248:b83668bef692

Simplified WMS reconfiguration call if registered key was found.
author Sascha L. Teichmann <sascha.teichmann@intevation.de>
date Thu, 22 Aug 2019 14:55:52 +0200
parents 152b9eb5ca47
children 0f0628189cd7
files pkg/controllers/system.go
diffstat 1 files changed, 9 insertions(+), 14 deletions(-) [+]
line wrap: on
line diff
--- a/pkg/controllers/system.go	Thu Aug 22 14:34:53 2019 +0200
+++ b/pkg/controllers/system.go	Thu Aug 22 14:55:52 2019 +0200
@@ -250,27 +250,22 @@
 				func(*http.Request) { go deleteSoundingDiffs() })
 		})
 
-	dm := func(old sql.NullString, curr string) (func(*http.Request), error) {
-		return reconfigureWMSLayer(old, curr, "distance_marks_geoserver")
+	reconf := func(which string) func(sql.NullString, string) (func(*http.Request), error) {
+		return func(old sql.NullString, curr string) (func(*http.Request), error) {
+			return reconfigureWMSLayer(old, curr, which)
+		}
 	}
+
+	dm := reconf("distance_marks_geoserver")
 	registerReconfigureFunc("distance_marks_fill", dm)
 	registerReconfigureFunc("distance_marks_stroke", dm)
 
-	dma := func(old sql.NullString, curr string) (func(*http.Request), error) {
-		return reconfigureWMSLayer(old, curr, "distance_marks_ashore_geoserver")
-	}
+	dma := reconf("distance_marks_ashore_geoserver")
 	registerReconfigureFunc("distance_marks_ashore_fill", dma)
 	registerReconfigureFunc("distance_marks_ashore_stroke", dma)
 
-	wa := func(old sql.NullString, curr string) (func(*http.Request), error){
-		return reconfigureWMSLayer(old, curr, "waterway_area")
-	}
-	registerReconfigureFunc("waterway_area_stroke", wa)
-
-	wx := func(old sql.NullString, curr string) (func(*http.Request), error){
-		return reconfigureWMSLayer(old, curr, "waterway_axis")
-	}
-	registerReconfigureFunc("waterway_axis_stroke", wx)
+	registerReconfigureFunc("waterway_area_stroke", reconf("waterway_area"))
+	registerReconfigureFunc("waterway_axis_stroke", reconf("waterway_axis"))
 
 	// TODO: Add more layers.
 }