Mercurial > gemma
changeset 4579:4c56682f83f7 iso-areas
Adjusted templating for iso areas.
| author | Sascha L. Teichmann <sascha.teichmann@intevation.de> |
|---|---|
| date | Tue, 08 Oct 2019 13:02:21 +0200 |
| parents | c657dec6b0fa |
| children | 02cf2b4be955 |
| files | pkg/controllers/system.go pkg/geoserver/templates.go schema/gemma.sql |
| diffstat | 3 files changed, 8 insertions(+), 14 deletions(-) [+] |
line wrap: on
line diff
--- a/pkg/controllers/system.go Tue Oct 08 12:10:55 2019 +0200 +++ b/pkg/controllers/system.go Tue Oct 08 13:02:21 2019 +0200 @@ -239,13 +239,14 @@ func(old sql.NullString, curr string) (func(*http.Request), error) { return reconfigureClassBreaks( old, curr, - "sounding_results_contour_lines_geoserver", + "sounding_results_areas_geoserver", func(req *http.Request) { if s, ok := auth.GetSession(req); ok { triggerSoundingResultsContoursRecalc(s.User, curr) } }) }) + /* FIXME! registerReconfigureFunc("morphology_classbreaks_compare", func(old sql.NullString, curr string) (func(*http.Request), error) { return reconfigureClassBreaks( @@ -253,6 +254,7 @@ "sounding_differences", func(*http.Request) { go deleteSoundingDiffs() }) }) + */ reconf := func(which string) func(sql.NullString, string) (func(*http.Request), error) { return func(old sql.NullString, curr string) (func(*http.Request), error) {
--- a/pkg/geoserver/templates.go Tue Oct 08 12:10:55 2019 +0200 +++ b/pkg/geoserver/templates.go Tue Oct 08 13:02:21 2019 +0200 @@ -35,11 +35,13 @@ func init() { RegisterStylePreprocessor( - "sounding_results_contour_lines_geoserver", + "sounding_results_areas_geoserver", templateContourLinesFunc("morphology_classbreaks")) + /* FIXME! RegisterStylePreprocessor( - "sounding_differences", - templateContourLinesFunc("morphology_classbreaks_compare")) + "sounding_differences", + templateContourLinesFunc("morphology_classbreaks_compare")) + */ RegisterStylePreprocessor( "distance_marks_geoserver", templateConfigValues)
--- a/schema/gemma.sql Tue Oct 08 12:10:55 2019 +0200 +++ b/schema/gemma.sql Tue Oct 08 13:02:21 2019 +0200 @@ -690,16 +690,6 @@ AFTER INSERT OR UPDATE ON sounding_results FOR EACH ROW EXECUTE FUNCTION check_sr_in_bn_area() - CREATE TABLE sounding_results_contour_lines ( - sounding_result_id int NOT NULL REFERENCES sounding_results - ON DELETE CASCADE, - height numeric NOT NULL, - lines geography(multilinestring, 4326) NOT NULL, - -- TODO: generate valid simple features and add constraint: - -- CHECK(ST_IsSimple(CAST(lines AS geometry))), - PRIMARY KEY (sounding_result_id, height) - ) - CREATE TABLE sounding_results_iso_areas ( sounding_result_id int NOT NULL REFERENCES sounding_results ON DELETE CASCADE,