From 1a571c8a9ca2b22baecdb2edcc561a800fc24497 Mon Sep 17 00:00:00 2001 From: Carla Date: Thu, 14 Apr 2016 11:13:59 +0200 Subject: [PATCH 1/3] Set tolerance to 1 pixel --- scripts-available/CDB_Overviews.sql | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts-available/CDB_Overviews.sql b/scripts-available/CDB_Overviews.sql index b80be3d..5c8686e 100644 --- a/scripts-available/CDB_Overviews.sql +++ b/scripts-available/CDB_Overviews.sql @@ -693,7 +693,7 @@ DECLARE tolerance_px FLOAT8; BEGIN -- Use the default tolerance - tolerance_px := 2.0; + tolerance_px := 1.0; RETURN CDB_CreateOverviewsWithToleranceInPixels(reloid, tolerance_px, refscale_strategy, reduce_strategy); END; $$ LANGUAGE PLPGSQL; From 213adcca168d0376ed8910e0bc6602e449b4859d Mon Sep 17 00:00:00 2001 From: Carla Date: Thu, 14 Apr 2016 11:24:10 +0200 Subject: [PATCH 2/3] Fixes tests for tolerance_px = 1.0, with no zoom 3 --- test/CDB_OverviewsTest_expect | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/test/CDB_OverviewsTest_expect b/test/CDB_OverviewsTest_expect index 85627d4..5a936da 100644 --- a/test/CDB_OverviewsTest_expect +++ b/test/CDB_OverviewsTest_expect @@ -9,35 +9,30 @@ SELECT 1114 -{_vovw_3_base_bare_t,_vovw_2_base_bare_t,_vovw_1_base_bare_t,_vovw_0_base_bare_t} -113 +{_vovw_2_base_bare_t,_vovw_1_base_bare_t,_vovw_0_base_bare_t} +126 number,int_number,name,start AVG(number)::double precision AS number,AVG(int_number)::integer AS int_number,CASE count(*) WHEN 1 THEN MIN(name) ELSE NULL END::text AS name,CASE count(*) WHEN 1 THEN MIN(start) ELSE NULL END::date AS start AVG(tab.number)::double precision AS number,AVG(tab.int_number)::integer AS int_number,CASE count(*) WHEN 1 THEN MIN(tab.name) ELSE NULL END::text AS name,CASE count(*) WHEN 1 THEN MIN(tab.start) ELSE NULL END::date AS start -{_vovw_3_base_t,_vovw_2_base_t,_vovw_1_base_t,_vovw_0_base_t} -113 +{_vovw_2_base_t,_vovw_1_base_t,_vovw_0_base_t} +126 -{_vovw_3_column_types_t,_vovw_2_column_types_t,_vovw_1_column_types_t,_vovw_0_column_types_t} +{_vovw_2_column_types_t,_vovw_1_column_types_t,_vovw_0_column_types_t} (base_t,0,_vovw_0_base_t) (base_t,1,_vovw_1_base_t) (base_t,2,_vovw_2_base_t) -(base_t,3,_vovw_3_base_t) (base_t,0,_vovw_0_base_t) (base_t,1,_vovw_1_base_t) (base_t,2,_vovw_2_base_t) -(base_t,3,_vovw_3_base_t) (base_bare_t,0,_vovw_0_base_bare_t) (base_bare_t,1,_vovw_1_base_bare_t) (base_bare_t,2,_vovw_2_base_bare_t) -(base_bare_t,3,_vovw_3_base_bare_t) (base_t,0,_vovw_0_base_t) (base_t,1,_vovw_1_base_t) (base_t,2,_vovw_2_base_t) -(base_t,3,_vovw_3_base_t) (column_types_t,0,_vovw_0_column_types_t) (column_types_t,1,_vovw_1_column_types_t) (column_types_t,2,_vovw_2_column_types_t) -(column_types_t,3,_vovw_3_column_types_t) From 14b8cd7d9923315dffd46ce416920b5f7cacb294 Mon Sep 17 00:00:00 2001 From: Carla Date: Thu, 14 Apr 2016 12:12:17 +0200 Subject: [PATCH 3/3] Set default value to 1 and remove typo line --- scripts-available/CDB_Overviews.sql | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/scripts-available/CDB_Overviews.sql b/scripts-available/CDB_Overviews.sql index 5c8686e..c7c7f7c 100644 --- a/scripts-available/CDB_Overviews.sql +++ b/scripts-available/CDB_Overviews.sql @@ -601,7 +601,6 @@ AS $$ IF array_upper(gtypes, 1) <> 1 OR gtypes[1] <> 'ST_Point' THEN -- This strategy only supports datasets with point geomety RETURN NULL; - RETURN 'x'; END IF; --TODO: check applicability: geometry type, minimum number of points... @@ -610,7 +609,7 @@ AS $$ -- Grid size in pixels at Z level overview_z IF grid_px IS NULL THEN - grid_px := 7.5; + grid_px := 1.0; END IF; SELECT * FROM _cdb_split_table_name(reloid) INTO schema_name, table_name;