Mercurial > gemma
diff schema/updates/1300/02.views_to_geoservers.sql @ 4623:30bb2d819d57 geoserver_sql_views
Merge default into geoserver_sql_views
author | Tom Gottfried <tom@intevation.de> |
---|---|
date | Wed, 09 Oct 2019 16:40:18 +0200 |
parents | b03aa1502736 |
children |
line wrap: on
line diff
--- a/schema/updates/1300/02.views_to_geoservers.sql Fri Oct 04 17:26:56 2019 +0200 +++ b/schema/updates/1300/02.views_to_geoservers.sql Wed Oct 09 16:40:18 2019 +0200 @@ -154,13 +154,13 @@ (location_code).hectometre FROM waterway.distance_marks_virtual $$), - ('waterway', 'sounding_results_contour_lines_geoserver', 4326, $$ + ('waterway', 'sounding_results_areas_geoserver', 4326, $$ SELECT bottleneck_id, date_info, height, - lines - FROM waterway.sounding_results_contour_lines cl - JOIN waterway.sounding_results sr ON sr.id = cl.sounding_result_id + areas + FROM waterway.sounding_results_iso_areas ia + JOIN waterway.sounding_results sr ON sr.id = ia.sounding_result_id $$), ('waterway', 'bottlenecks_geoserver', 4326, $$ SELECT @@ -227,11 +227,11 @@ bn.objnam AS objnam, srm.date_info AS minuend, srs.date_info AS subtrahend, - sdcl.height AS height, - sdcl.lines AS lines + sdia.height AS height, + sdia.areas AS areas FROM caching.sounding_differences sd - JOIN caching.sounding_differences_contour_lines sdcl - ON sd.id = sdcl.sounding_differences_id + JOIN caching.sounding_differences_iso_areas sdia + ON sd.id = sdia.sounding_differences_id JOIN waterway.sounding_results srm ON sd.minuend = srm.id JOIN waterway.sounding_results srs @@ -252,6 +252,6 @@ waterway.bottlenecks_geoserver, waterway.stretches_geoserver, waterway.sections_geoserver, - waterway.sounding_results_contour_lines_geoserver, waterway.bottleneck_overview, + waterway.sounding_results_areas_geoserver, waterway.sounding_differences;