# HG changeset patch # User Sascha L. Teichmann # Date 1566478552 -7200 # Node ID b83668bef69282aaa97f577331f6143501a3f8e3 # Parent 152b9eb5ca47a4e529c7f5c0c3a00a016a95e4bd Simplified WMS reconfiguration call if registered key was found. diff -r 152b9eb5ca47 -r b83668bef692 pkg/controllers/system.go --- 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. }