From b8ce37eb60c5da80d966330982d2dd952562464d Mon Sep 17 00:00:00 2001 From: abelvm Date: Fri, 2 Sep 2016 14:37:52 +0200 Subject: [PATCH] back to the original signature --- src/pg/sql/19_contour.sql | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/src/pg/sql/19_contour.sql b/src/pg/sql/19_contour.sql index ae48eb5..5c2cfc2 100644 --- a/src/pg/sql/19_contour.sql +++ b/src/pg/sql/19_contour.sql @@ -1,5 +1,3 @@ -DROP FUNCTION IF EXISTS cdb_contour(geometry[],numeric[],numeric,integer,integer,integer,integer); - CREATE OR REPLACE FUNCTION CDB_Contour( IN geomin geometry[], IN colin numeric[], @@ -7,7 +5,7 @@ CREATE OR REPLACE FUNCTION CDB_Contour( IN intmethod integer, IN classmethod integer, IN steps integer, - IN resolution integer DEFAULT -90 + IN max_time integer DEFAULT -90 ) RETURNS TABLE( the_geom geometry, @@ -19,11 +17,14 @@ RETURNS TABLE( DECLARE cell_count integer; tin geometry[]; - max_time integer; + resolution integer; BEGIN - -- calc the optimal number of cells for the current dataset + -- nasty trick to override issue #121 + resolution := max_time; max_time := -1 * resolution; + + -- calc the optimal number of cells for the current dataset SELECT CASE intmethod WHEN 0 THEN round(3.7745903782 * max_time - 9.4399210051 * array_length(geomin,1) - 1350.8778213073)