From 64f55744096353a8ab0625ea1d2b2b36b1e2e565 Mon Sep 17 00:00:00 2001
From: Paul Ramsey <pramsey@opengeo.org>
Date: Fri, 15 Mar 2013 10:24:24 -1000
Subject: [PATCH] Update online regression tests

---
 pgsql/expected/pointcloud.out | 119 ++++++++++++++++++++++------------
 pgsql/sql/pointcloud.sql      |  19 ++++++
 2 files changed, 97 insertions(+), 41 deletions(-)

diff --git a/pgsql/expected/pointcloud.out b/pgsql/expected/pointcloud.out
index 4e45f21..b7b2e51 100644
--- a/pgsql/expected/pointcloud.out
+++ b/pgsql/expected/pointcloud.out
@@ -48,7 +48,7 @@ VALUES (1, 0,
 </pc:PointCloudSchema>'
 );
 INSERT INTO pointcloud_formats (pcid, srid, schema)
-VALUES (20, 0, 
+VALUES (3, 0, 
 '<?xml version="1.0" encoding="UTF-8"?>
 <pc:PointCloudSchema xmlns:pc="http://pointcloud.org/schemas/PC/1.1" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <pc:dimension>
@@ -85,12 +85,6 @@ VALUES (20, 0,
   </pc:dimension>
   <pc:metadata>
     <Metadata name="compression">dimensional</Metadata>
-    <Metadata name="ght_xmin"></Metadata>
-    <Metadata name="ght_ymin"></Metadata>
-    <Metadata name="ght_xmax"></Metadata>
-    <Metadata name="ght_ymax"></Metadata>
-    <Metadata name="ght_keylength"></Metadata>
-    <Metadata name="ght_depth"></Metadata>
     <Metadata name="spatialreference" type="id">4326</Metadata>
   </pc:metadata>
 </pc:PointCloudSchema>'
@@ -134,6 +128,26 @@ SELECT PC_AsText(pt) FROM pt_test;
  {"pcid":1,"pt":[0.03,0.04,0.03,6]}
 (3 rows)
 
+SELECT PC_AsText(PC_Patch(pt)) FROM pt_test;
+                                  pc_astext                                  
+-----------------------------------------------------------------------------
+ {"pcid":1,"pts":[[0.01,0.02,0.03,4],[0.02,0.03,0.03,5],[0.03,0.04,0.03,6]]}
+(1 row)
+
+SELECT PC_AsText(PC_Explode(PC_Patch(pt))) FROM pt_test;
+             pc_astext              
+------------------------------------
+ {"pcid":1,"pt":[0.01,0.02,0.03,4]}
+ {"pcid":1,"pt":[0.02,0.03,0.03,5]}
+ {"pcid":1,"pt":[0.03,0.04,0.03,6]}
+(3 rows)
+
+SELECT Sum(PC_MemSize(pt)) FROM pt_test;
+ sum 
+-----
+  75
+(1 row)
+
 CREATE TABLE IF NOT EXISTS pa_test (
     pa PCPATCH(1)
 );
@@ -148,15 +162,16 @@ INSERT INTO pa_test (pa) VALUES ('0000000002000000000000000200000002000000030000
 ERROR:  no entry in "pointcloud_formats" for pcid = 2
 LINE 1: INSERT INTO pa_test (pa) VALUES ('00000000020000000000000002...
                                          ^
-SELECT PC_Uncompress(pa) FROM pa_test LIMIT 1;
- pc_uncompress 
----------------
-(0 rows)
-
 INSERT INTO pa_test (pa) VALUES ('0000000001000000000000000200000002000000030000000500060000000200000003000000050008');
 INSERT INTO pa_test (pa) VALUES ('000000000100000000000000020000000600000007000000050006000000090000000A00000005000A');
 INSERT INTO pa_test (pa) VALUES ('000000000100000000000000020000000600000007000000050006000000090000000A00000005000A');
 INSERT INTO pa_test (pa) VALUES ('000000000100000000000000020000000600000007000000050006000000090000000A00000005000A');
+SELECT PC_Uncompress(pa) FROM pa_test LIMIT 1;
+                                   pc_uncompress                                    
+------------------------------------------------------------------------------------
+ 0101000000000000000200000002000000030000000500000006000200000003000000050000000800
+(1 row)
+
 SELECT PC_AsText(pa) FROM pa_test;
                         pc_astext                         
 ----------------------------------------------------------
@@ -175,20 +190,6 @@ SELECT PC_Envelope(pa) from pa_test;
  \x01030000000100000005000000b81e85eb51b8ae3fec51b81e85ebb13fb81e85eb51b8ae3f9a9999999999b93f0ad7a3703d0ab73f9a9999999999b93f0ad7a3703d0ab73fec51b81e85ebb13fb81e85eb51b8ae3fec51b81e85ebb13f
 (4 rows)
 
-SELECT PC_AsText(PC_Patch(pt)) FROM pt_test;
-                                  pc_astext                                  
------------------------------------------------------------------------------
- {"pcid":1,"pts":[[0.01,0.02,0.03,4],[0.02,0.03,0.03,5],[0.03,0.04,0.03,6]]}
-(1 row)
-
-SELECT PC_AsText(PC_Explode(PC_Patch(pt))) FROM pt_test;
-             pc_astext              
-------------------------------------
- {"pcid":1,"pt":[0.01,0.02,0.03,4]}
- {"pcid":1,"pt":[0.02,0.03,0.03,5]}
- {"pcid":1,"pt":[0.03,0.04,0.03,6]}
-(3 rows)
-
 SELECT PC_AsText(PC_Union(pa)) FROM pa_test;
                                                                                  pc_astext                                                                                  
 ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------
@@ -202,18 +203,18 @@ SELECT sum(PC_NumPoints(pa)) FROM pa_test;
 (1 row)
 
 CREATE TABLE IF NOT EXISTS pa_test_dim (
-    pa PCPATCH(20)
+    pa PCPATCH(3)
 );
 \d pa_test_dim
-    Table "public.pa_test_dim"
- Column |    Type     | Modifiers 
---------+-------------+-----------
- pa     | pcpatch(20) | 
+   Table "public.pa_test_dim"
+ Column |    Type    | Modifiers 
+--------+------------+-----------
+ pa     | pcpatch(3) | 
 
-INSERT INTO pa_test_dim (pa) VALUES ('0000000014000000000000000200000002000000030000000500060000000200000003000000050008');
-INSERT INTO pa_test_dim (pa) VALUES ('000000001400000000000000020000000600000007000000050006000000090000000A00000005000A');
-INSERT INTO pa_test_dim (pa) VALUES ('0000000014000000000000000200000002000000030000000500060000000200000003000000050003');
-INSERT INTO pa_test_dim (pa) VALUES ('0000000014000000000000000200000002000000030000000500060000000200000003000000050001');
+INSERT INTO pa_test_dim (pa) VALUES ('0000000003000000000000000200000002000000030000000500060000000200000003000000050008');
+INSERT INTO pa_test_dim (pa) VALUES ('000000000300000000000000020000000600000007000000050006000000090000000A00000005000A');
+INSERT INTO pa_test_dim (pa) VALUES ('0000000003000000000000000200000002000000030000000500060000000200000003000000050003');
+INSERT INTO pa_test_dim (pa) VALUES ('0000000003000000000000000200000002000000030000000500060000000200000003000000050001');
 SELECT Sum(PC_NumPoints(pa)) FROM pa_test_dim;
  sum 
 -----
@@ -226,12 +227,6 @@ SELECT Sum(PC_MemSize(pa)) FROM pa_test_dim;
  516
 (1 row)
 
-SELECT Sum(PC_MemSize(pt)) FROM pt_test;
- sum 
------
-  75
-(1 row)
-
 SELECT Sum(PC_PatchMax(pa,'x')) FROM pa_test_dim;
  sum  
 ------
@@ -244,6 +239,48 @@ SELECT Sum(PC_PatchMin(pa,'x')) FROM pa_test_dim;
  0.12
 (1 row)
 
+DELETE FROM pa_test_dim;
+INSERT INTO pa_test_dim (pa)
+SELECT PC_Patch(PC_MakePoint(3, ARRAY[x,y,z,intensity]))
+FROM (
+ SELECT  
+ -127+a/100.0 AS x, 
+   45+a/100.0 AS y,
+        1.0*a AS z,
+         a/10 AS intensity,
+         a/400 AS gid
+ FROM generate_series(1,1600) AS a
+) AS values GROUP BY gid;
+SELECT Sum(PC_NumPoints(pa)) FROM pa_test_dim;
+ sum  
+------
+ 1600
+(1 row)
+
+SELECT Sum(PC_MemSize(pa)) FROM pa_test_dim;
+ sum  
+------
+ 8523
+(1 row)
+
+SELECT Max(PC_PatchMax(pa,'x')) FROM pa_test_dim;
+ max  
+------
+ -111
+(1 row)
+
+SELECT Min(PC_PatchMin(pa,'x')) FROM pa_test_dim;
+   min   
+---------
+ -126.99
+(1 row)
+
+SELECT Min(PC_PatchMin(pa,'z')) FROM pa_test_dim;
+ min 
+-----
+   1
+(1 row)
+
 --DROP TABLE pts_collection;
 --DROP TABLE pt_test;
 --DROP TABLE pa_test;
diff --git a/pgsql/sql/pointcloud.sql b/pgsql/sql/pointcloud.sql
index 5fec9ea..f52e209 100644
--- a/pgsql/sql/pointcloud.sql
+++ b/pgsql/sql/pointcloud.sql
@@ -146,6 +146,25 @@ SELECT Sum(PC_MemSize(pa)) FROM pa_test_dim;
 SELECT Sum(PC_PatchMax(pa,'x')) FROM pa_test_dim;
 SELECT Sum(PC_PatchMin(pa,'x')) FROM pa_test_dim;
 
+DELETE FROM pa_test_dim;
+INSERT INTO pa_test_dim (pa)
+SELECT PC_Patch(PC_MakePoint(3, ARRAY[x,y,z,intensity]))
+FROM (
+ SELECT  
+ -127+a/100.0 AS x, 
+   45+a/100.0 AS y,
+        1.0*a AS z,
+         a/10 AS intensity,
+         a/400 AS gid
+ FROM generate_series(1,1600) AS a
+) AS values GROUP BY gid;
+
+SELECT Sum(PC_NumPoints(pa)) FROM pa_test_dim;
+SELECT Sum(PC_MemSize(pa)) FROM pa_test_dim;
+
+SELECT Max(PC_PatchMax(pa,'x')) FROM pa_test_dim;
+SELECT Min(PC_PatchMin(pa,'x')) FROM pa_test_dim;
+SELECT Min(PC_PatchMin(pa,'z')) FROM pa_test_dim;
 
 --DROP TABLE pts_collection;
 --DROP TABLE pt_test;