Mercurial > gemma

diff schema/geoserver_views.sql @ 4358:a7196b55c064

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Remove VIEW columns ignored by GeoServer Removed columns were ignored with a warning on layer creation.
author Tom Gottfried <tom@intevation.de>
date Mon, 09 Sep 2019 16:13:26 +0200
parents 0ba3fc89b499
children 5e38667f740c
line wrap: on
line diff
--- a/schema/geoserver_views.sql	Mon Sep 09 16:12:43 2019 +0200
+++ b/schema/geoserver_views.sql	Mon Sep 09 16:13:26 2019 +0200
@@ -55,13 +55,11 @@
 
 CREATE OR REPLACE VIEW waterway.gauges_geoserver AS
     SELECT
-        location,
         isrs_code,
         objname,
         geom,
         applicability_from_km,
         applicability_to_km,
-        validity,
         zero_point,
         geodref,
         date_info,
@@ -76,7 +74,7 @@
     WHERE NOT erased;
 
 CREATE OR REPLACE VIEW waterway.distance_marks_geoserver AS
-    SELECT location_code,
+    SELECT
        isrs_asText(location_code) AS location,
        geom::Geometry(POINT, 4326),
        related_enc,
@@ -99,7 +97,6 @@
         b.bottleneck_id,
         b.objnam,
         b.nobjnm,
-        b.stretch,
         b.area,
         b.rb,
         b.lb,
@@ -108,7 +105,6 @@
         b.limiting,
         b.date_info,
         b.source_organization,
-        g.location AS gauge_isrs_code,
         g.objname AS gauge_objname,
         g.reference_water_levels,
         fal.date_info AS fa_date_info,
@@ -155,7 +151,8 @@
         max(g.forecast_accuracy_3d) AS forecast_accuracy_3d,
         max(g.forecast_accuracy_1d) AS forecast_accuracy_1d
     FROM waterway.stretches s
-        LEFT JOIN waterway.gauges_geoserver g ON g.location <@ s.stretch
+        LEFT JOIN waterway.gauges_geoserver g
+            ON isrs_fromtext(g.isrs_code) <@ s.stretch
     GROUP BY s.id;
 
 CREATE OR REPLACE VIEW waterway.sections_geoserver AS
@@ -175,7 +172,8 @@
         max(g.forecast_accuracy_3d) AS forecast_accuracy_3d,
         max(g.forecast_accuracy_1d) AS forecast_accuracy_1d
     FROM waterway.sections s
-        LEFT JOIN waterway.gauges_geoserver g ON g.location <@ s.section
+        LEFT JOIN waterway.gauges_geoserver g
+            ON isrs_fromtext(g.isrs_code) <@ s.section
     GROUP BY s.id;
 
 CREATE OR REPLACE VIEW waterway.sounding_results_contour_lines_geoserver AS