--- a/schema/gemma.sql	Wed Oct 03 13:08:23 2018 +0200
+++ b/schema/gemma.sql	Mon Oct 08 10:54:50 2018 +0200
@@ -402,23 +402,14 @@
         bottleneck_id varchar NOT NULL REFERENCES bottlenecks,
         date_info date NOT NULL,
         UNIQUE (bottleneck_id, date_info),
-        area geography(POLYGON, 4326),
+        area geography(POLYGON, 4326) NOT NULL,
         surtyp varchar REFERENCES survey_types,
         coverage varchar REFERENCES coverage_types,
         depth_reference char(3) NOT NULL REFERENCES depth_references,
-        point_cloud geography(MULTIPOINTZ, 4326),
-        -- XXX: We may raster the data later.
-        -- sounding_data raster NOT NULL,
+        point_cloud geography(MULTIPOINTZ, 4326) NOT NULL,
         staging_done boolean NOT NULL DEFAULT false
     )
 
-    CREATE TABLE meshes (
-        sounding_result_id int NOT NULL REFERENCES sounding_results,
-        geom geometry(polygonz) NOT NULL
-    )
-
-    CREATE INDEX meshes_gix ON meshes USING gist(geom)
-
     CREATE TABLE octrees (
         sounding_result_id int NOT NULL UNIQUE REFERENCES sounding_results,
         checksum varchar NOT NULL,
@@ -428,7 +419,7 @@
     CREATE TABLE sounding_results_contour_lines (
         sounding_result_id int NOT NULL REFERENCES sounding_results,
         height numeric NOT NULL,
-        lines geography(multilinestringz, 4326) NOT NULL,
+        lines geography(multilinestring, 4326) NOT NULL,
         UNIQUE (sounding_result_id, height)
     )
     -- A view to help geoserver serve contour lines.
@@ -437,7 +428,7 @@
         SELECT bottleneck_id,
                 date_info,
                 height,
-                CAST(lines AS geometry(multilinestringz, 4326)) AS lines
+                CAST(lines AS geometry(multilinestring, 4326)) AS lines
             FROM waterway.sounding_results_contour_lines cl
                 JOIN waterway.sounding_results sr
                     ON sr.id = cl.sounding_result_id