From 5db85e534bf9f37cefa2ed26984213ecf93b1fe5 Mon Sep 17 00:00:00 2001
From: Regina Obe <lr@pcorp.us>
Date: Thu, 19 May 2011 04:53:22 +0000
Subject: [PATCH] support for 2D points, add multipoint 2d / 3d to cunit.  Add
 a mapping table to documentation to clarify how we map PostGIS geometries to
 X3D equivalent.

git-svn-id: http://svn.osgeo.org/postgis/trunk@7199 b70326c6-7e19-0410-871a-916f4a2858ee
---
 doc/reference_output.xml     | 44 +++++++++++++++++++++++++++++++++++-
 liblwgeom/cunit/cu_out_x3d.c | 13 ++++++++++-
 liblwgeom/lwout_x3d.c        | 22 ++++++++++++++----
 3 files changed, 72 insertions(+), 7 deletions(-)

diff --git a/doc/reference_output.xml b/doc/reference_output.xml
index ea8351cc1..50d33dee7 100644
--- a/doc/reference_output.xml
+++ b/doc/reference_output.xml
@@ -871,8 +871,50 @@ SELECT ST_AsGML(3, ST_GeomFromEWKT('POLYHEDRALSURFACE( ((0 0 0, 0 0 1, 0 1 1, 0
 		<note>
 		    <para>There are various options for translating PostGIS geometries to X3D since X3D geometry types don't map directly to PostGIS geometry types and some newer X3D types that might be better mappings we ahve avoided since most rendering tools don't currently support them.  
 		        These are the mappings we have settled on.  Feel free to post a bug ticket if you have thoughts on the idea or ways we can allow people to denote their preferred mappings.</para>
-		    <para>TINs are IndexedTriangleSets. MultiPoints are a PointSets. LineStrings are LineSets. Polyhedral Surfaces, Polygons, and Multipolygon as IndexedFaceSets.  </para>
+		    <para>Below is how we currently map PostGIS 2D/3D types to X3D types</para>
 		</note>
+		
+		<informaltable>
+				<tgroup cols="2">
+					<tbody>
+					  <row>
+						<entry>PostGIS Type</entry>
+						<entry>2D X3D Type</entry>
+						<entry>3D X3D Type</entry>
+					  </row>
+					  <row>
+						<entry>LINESTRING</entry>
+						<entry>not yet implemented - will be PolyLine2D</entry>
+						<entry>LineSet</entry>
+					  </row>
+					  <row>
+						<entry>MULTILINESTRING</entry>
+						<entry>not yet implemented - will be PolyLine2D</entry>
+						<entry>IndexedLineSet</entry>
+					  </row>
+					  <row>
+						<entry>MULTIPOINT</entry>
+						<entry>Polypoint2D</entry>
+						<entry>PointSet</entry>
+					  </row>
+					  <row>
+						<entry>POINT</entry>
+						<entry>outputs the space delimited coordinates</entry>
+						<entry>outputs the space delimited coordinates</entry>
+					  </row>
+					  <row>
+						<entry>(MULTI) POLYGON, POLYHEDRALSURFACE</entry>
+						<entry>Invalid X3D markup</entry>
+						<entry>IndexedFaceSet (inner rings currently output as another faceset)</entry>
+					  </row>
+					  <row>
+						<entry>TIN</entry>
+						<entry>TriangleSet2D (Not Yet Implemented)</entry>
+						<entry>IndexedTriangleSet</entry>
+					  </row>
+				</tbody>
+			</tgroup>
+		</informaltable>
 		<note><para>Using with any 2D geometries or 3D geometries with holes currently results in invalid X3D.  We are working on fixing this.</para></note>
 		<para>Lots of advancements happening in 3D space particularly with <ulink url="http://www.web3d.org/x3d/wiki/index.php/X3D_and_HTML5#Goals:_X3D_and_HTML5">X3D Integration with HTML5</ulink></para>
 		<para>There is also a nice open source X3D viewer you can use to view rendered geometries. Free Wrl <ulink url="http://freewrl.sourceforge.net/">http://freewrl.sourceforge.net/</ulink> binaries available for Mac, Linux, and Windows. Use the FreeWRL_Launcher packaged to view the geometries.</para>
diff --git a/liblwgeom/cunit/cu_out_x3d.c b/liblwgeom/cunit/cu_out_x3d.c
index b5bc82884..37526e1a8 100644
--- a/liblwgeom/cunit/cu_out_x3d.c
+++ b/liblwgeom/cunit/cu_out_x3d.c
@@ -103,7 +103,18 @@ static void out_x3d3_test_geoms(void)
 	        "",
 	    NULL, 0); **/
 
-	/* Multiline */
+	/* 2D MultiPoint */
+	do_x3d3_test(
+	    "MULTIPOINT(0 1,2 3,4 5)",
+	    "<Polypoint2D  point='0 1 2 3 4 5 ' />",
+	    NULL, 0);
+	
+	/* 3D MultiPoint */
+	do_x3d3_test(
+	    "MULTIPOINT Z(0 1 1,2 3 4,4 5 5)",
+	    "<PointSet ><Coordinate point='0 1 1 2 3 4 4 5 5 ' /></PointSet>",
+	    NULL, 0);
+	/* 3D Multiline */
 	do_x3d3_test(
 	    "MULTILINESTRING Z((0 1 1,2 3 4,4 5 5),(6 7 5,8 9 8,10 11 5))",
 	    "<IndexedLineSet  coordIndex='0 1 2 -1 3 4 5'><Coordinate point='0 1 1 2 3 4 4 5 5 6 7 5 8 9 8 10 11 5 ' /></IndexedLineSet>",
diff --git a/liblwgeom/lwout_x3d.c b/liblwgeom/lwout_x3d.c
index 49c153274..ff99aee70 100644
--- a/liblwgeom/lwout_x3d.c
+++ b/liblwgeom/lwout_x3d.c
@@ -405,6 +405,9 @@ asx3d3_multi_buf(const LWCOLLECTION *col, char *srs, char *output, int precision
 {
 	char *ptr, *x3dtype;
 	int i;
+	int dimension=2;
+
+	if (FLAGS_GET_Z(col->flags)) dimension = 3;
 	LWGEOM *subgeom;
 	ptr = output;
 	x3dtype="";
@@ -414,7 +417,13 @@ asx3d3_multi_buf(const LWCOLLECTION *col, char *srs, char *output, int precision
 	{
         case MULTIPOINTTYPE:
             x3dtype = "PointSet";
-            ptr += sprintf(ptr, "<%s %s>", x3dtype, defid);
+            if ( dimension == 2 ){ /** Use Polypoint2D instead **/
+                x3dtype = "Polypoint2D";   
+                ptr += sprintf(ptr, "<%s %s point='", x3dtype, defid);
+            }
+            else {
+                ptr += sprintf(ptr, "<%s %s>", x3dtype, defid);
+            }
             break;
         case MULTILINETYPE:
             x3dtype = "IndexedLineSet";
@@ -432,8 +441,9 @@ asx3d3_multi_buf(const LWCOLLECTION *col, char *srs, char *output, int precision
             lwerror("asx3d3_multi_buf: '%s' geometry type not supported", lwtype_name(col->type));
             return NULL;
     }
-
-	ptr += sprintf(ptr, "<Coordinate point='");
+    if (dimension == 3){
+        ptr += sprintf(ptr, "<Coordinate point='");
+    }
 
 	for (i=0; i<col->ngeoms; i++)
 	{
@@ -456,8 +466,10 @@ asx3d3_multi_buf(const LWCOLLECTION *col, char *srs, char *output, int precision
 	}
 
 	/* Close outmost tag */
-	ptr += sprintf(ptr, "' /></%s>", x3dtype);
-
+	if (dimension == 3){
+	    ptr += sprintf(ptr, "' /></%s>", x3dtype);
+	}
+	else { ptr += sprintf(ptr, "' />"); }    
 	return (ptr-output);
 }
 
-- 
2.50.1