Mercurial > gemma
changeset 5425:345515bc4548 marking-single-beam
Make GeoServer layer sounding_results_marking_points_geoserver working.
| author | Sascha L. Teichmann <sascha.teichmann@intevation.de> |
|---|---|
| date | Fri, 09 Jul 2021 22:03:44 +0200 |
| parents | 2f3fd2d0486b |
| children | 67ffa7517888 |
| files | pkg/geoserver/boot.go schema/default_sysconfig.sql schema/gemma.sql schema/updates/1462/01.refine_marking_view.sql schema/version.sql |
| diffstat | 5 files changed, 28 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- 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{}
--- 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
--- 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) )
--- /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';