# HG changeset patch # User Sascha L. Teichmann # Date 1625861024 -7200 # Node ID 345515bc4548317823a4606210393192a67082ba # Parent 2f3fd2d0486b34a7d10bb2ea25350d9a269a02ce Make GeoServer layer sounding_results_marking_points_geoserver working. diff -r 2f3fd2d0486b -r 345515bc4548 pkg/geoserver/boot.go --- a/pkg/geoserver/boot.go Fri Jul 09 01:35:04 2021 +0200 +++ b/pkg/geoserver/boot.go Fri Jul 09 22:03:44 2021 +0200 @@ -308,6 +308,18 @@ } if srs := tables[i].SRS; srs != nil { ft["srs"] = *srs + // A bit of a hack! + if *srs == "EPSG:4326" { + box := map[string]interface{}{ + "minx": -180, + "maxx": +180, + "miny": -90, + "maxy": +90, + "crs": "EPSG:4326", + } + ft["nativeBoundingBox"] = box + ft["latLonBoundingBox"] = box + } } var entries []map[string]interface{} diff -r 2f3fd2d0486b -r 345515bc4548 schema/default_sysconfig.sql --- a/schema/default_sysconfig.sql Fri Jul 09 01:35:04 2021 +0200 +++ b/schema/default_sysconfig.sql Fri Jul 09 22:03:44 2021 +0200 @@ -222,7 +222,7 @@ SELECT bottleneck_id, to_char(date_info, 'YYYY-MM-DD') AS date_info, height, - points, + points::geometry(MULTIPOINTZ, 4326), surtyp, zpg_exception FROM waterway.sounding_results_marking_points mp diff -r 2f3fd2d0486b -r 345515bc4548 schema/gemma.sql --- a/schema/gemma.sql Fri Jul 09 01:35:04 2021 +0200 +++ b/schema/gemma.sql Fri Jul 09 22:03:44 2021 +0200 @@ -833,6 +833,9 @@ sounding_result_id int NOT NULL REFERENCES sounding_results ON DELETE CASCADE, height numeric NOT NULL, + -- XXX: GeoServer does not like geography(MULTIPOINTZ) + -- We need to track this down. Maybe with + -- GeoServer upstream. points geography(MULTIPOINTZ, 4326) NOT NULL, PRIMARY KEY (sounding_result_id, height) ) diff -r 2f3fd2d0486b -r 345515bc4548 schema/updates/1462/01.refine_marking_view.sql --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/schema/updates/1462/01.refine_marking_view.sql Fri Jul 09 22:03:44 2021 +0200 @@ -0,0 +1,11 @@ +UPDATE sys_admin.published_services SET view_def = $$ +SELECT bottleneck_id, + to_char(date_info, 'YYYY-MM-DD') AS date_info, + height, + points::geometry(multipointz, 4326) as points, + surtyp, + zpg_exception +FROM waterway.sounding_results_marking_points mp + JOIN waterway.sounding_results sr ON sr.id = mp.sounding_result_id +$$ +WHERE name = 'sounding_results_marking_points_geoserver'; diff -r 2f3fd2d0486b -r 345515bc4548 schema/version.sql --- a/schema/version.sql Fri Jul 09 01:35:04 2021 +0200 +++ b/schema/version.sql Fri Jul 09 22:03:44 2021 +0200 @@ -1,1 +1,1 @@ -INSERT INTO gemma_schema_version(version) VALUES (1461); +INSERT INTO gemma_schema_version(version) VALUES (1462);