merge develop

src/pg/test/expected/08_interpolation_test.out

@@ -1,5 +1,7 @@
 SET client_min_messages TO WARNING;
 \set ECHO none
-cdb_spatialinterpolation
-t
+ nn  |           nni            |       idw       
+-----+--------------------------+-----------------
+ 200 | 238.41059602632179224595 | 341.46260750526
 (1 row)
+

src/pg/test/expected/19_contour_test.out

@@ -0,0 +1,9 @@
+SET client_min_messages TO WARNING;
+\set ECHO none
+bin|avg_value
+0|280.23070673030491816424178
+1|413.81702914846213479025305
+2|479.6334491374486884098328
+3|529.1545236882183479447113
+4|614.1132081424930103122037
+(5 rows)

src/pg/test/sql/08_interpolation_test.sql

@@ -1,10 +1,12 @@
 SET client_min_messages TO WARNING;
 \set ECHO none
-\pset format unaligned
-
 WITH a AS (
     SELECT
     ARRAY[800, 700, 600, 500, 400, 300, 200, 100] AS vals,
     ARRAY[ST_GeomFromText('POINT(2.1744 41.403)'),ST_GeomFromText('POINT(2.1228 41.380)'),ST_GeomFromText('POINT(2.1511 41.374)'),ST_GeomFromText('POINT(2.1528 41.413)'),ST_GeomFromText('POINT(2.165 41.391)'),ST_GeomFromText('POINT(2.1498 41.371)'),ST_GeomFromText('POINT(2.1533 41.368)'),ST_GeomFromText('POINT(2.131386 41.41399)')] AS g
 )
-SELECT (cdb_crankshaft.CDB_SpatialInterpolation(g, vals, ST_GeomFromText('POINT(2.154 41.37)'), 1) - 780.79470198683925288365) / 780.79470198683925288365 < 0.001 As cdb_spatialinterpolation FROM a;
+SELECT
+    cdb_crankshaft.CDB_SpatialInterpolation(g, vals, ST_GeomFromText('POINT(2.154 41.37)'),0) as NN,
+    cdb_crankshaft.CDB_SpatialInterpolation(g, vals, ST_GeomFromText('POINT(2.154 41.37)'),1) as NNI,
+    cdb_crankshaft.CDB_SpatialInterpolation(g, vals, ST_GeomFromText('POINT(2.154 41.37)'),2) as IDW
+FROM a;

src/pg/test/sql/19_contour_test.sql

@@ -0,0 +1,17 @@
+SET client_min_messages TO WARNING;
+\set ECHO none
+\pset format unaligned
+
+WITH a AS (
+    SELECT
+    ARRAY[800, 700, 600, 500, 400, 300, 200, 100]::numeric[] AS vals,
+    ARRAY[ST_GeomFromText('POINT(2.1744 41.403)',4326),ST_GeomFromText('POINT(2.1228 41.380)',4326),ST_GeomFromText('POINT(2.1511 41.374)',4326),ST_GeomFromText('POINT(2.1528 41.413)',4326),ST_GeomFromText('POINT(2.165 41.391)',4326),ST_GeomFromText('POINT(2.1498 41.371)',4326),ST_GeomFromText('POINT(2.1533 41.368)',4326),ST_GeomFromText('POINT(2.131386 41.41399)',4326)] AS g
+),
+b as(
+SELECT
+    foo.*
+FROM
+    a,
+    cdb_crankshaft.CDB_contour(a.g, a.vals,  0.0, 1, 3, 5, 60) foo
+)
+SELECT bin, avg_value from b order by bin;