From: Nicklas Avén <nicklas.aven@jordogskog.no>
Date: Sat, 3 Oct 2015 19:05:00 +0000 (+0000)
Subject: Fix for #3298, open for multi-geometries with mixed dim or 2d in 3d measurment functions
X-Git-Tag: 2.2.0~31
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=72330168be4c9a470e911f35795fc65a69022469;p=postgis

Fix for #3298, open for multi-geometries with mixed dim or 2d in 3d measurment functions

git-svn-id: http://svn.osgeo.org/postgis/trunk@14179 b70326c6-7e19-0410-871a-916f4a2858ee
---

diff --git a/liblwgeom/measures3d.c b/liblwgeom/measures3d.c
index 873e07875..99fbcbd14 100644
--- a/liblwgeom/measures3d.c
+++ b/liblwgeom/measures3d.c
@@ -37,18 +37,6 @@ get_3dcross_product(VECTOR3D *v1,VECTOR3D *v2, VECTOR3D *v)
 	return LW_TRUE;
 }
 
-/**
-Used for check compability before sending control to 2D calculations
-in case of mixed dimmentionality*/
-static inline int
-supported_type(const LWGEOM *lwg)
-{
-	int	t = lwg->type;
-	if(t==POINTTYPE || t==LINETYPE || t==POLYGONTYPE)
-		return LW_TRUE;
-	else
-		return LW_FALSE;
-}
 
 /**
 This function is used to create a vertical line used for cases where one if the 
@@ -113,10 +101,6 @@ lw_dist3d_distanceline(const LWGEOM *lw1, const LWGEOM *lw2, int srid, int mode)
 	/*as an infinite z-value at one or two of the geometries*/
 	if(!lwgeom_has_z(lw1) || !lwgeom_has_z(lw2))
 	{
-		if(!supported_type(lw1))
-			lwerror("Unsupported geometry type: %s", lwtype_name(lw1->type));
-		if(!supported_type(lw2))
-			lwerror("Unsupported geometry type: %s", lwtype_name(lw2->type));
 		
 		lwnotice("One or both of the geometries is missing z-value. The unknown z-value will be regarded as \"any value\"");
 		
@@ -221,15 +205,9 @@ lw_dist3d_distancepoint(const LWGEOM *lw1, const LWGEOM *lw2, int srid, int mode
 	/*If not, send it to 2D-calculations which will give the same result*/
 	/*as an infinite z-value at one or two of the geometries*/
 	if(!lwgeom_has_z(lw1) || !lwgeom_has_z(lw2))
-	{
-		if(!supported_type(lw1))
-			lwerror("Unsupported geometry type: %s", lwtype_name(lw1->type));
-		if(!supported_type(lw2))
-			lwerror("Unsupported geometry type: %s", lwtype_name(lw2->type));
-		
+	{		
 		lwnotice("One or both of the geometries is missing z-value. The unknown z-value will be regarded as \"any value\"");
-		
-		
+				
 		if(!lwgeom_has_z(lw1) && !lwgeom_has_z(lw2))
 			return lw_dist2d_distancepoint(lw1, lw2, srid, mode);
 			
@@ -325,11 +303,6 @@ lwgeom_maxdistance3d_tolerance(const LWGEOM *lw1, const LWGEOM *lw2, double tole
 {
 	if(!lwgeom_has_z(lw1) || !lwgeom_has_z(lw2))
 	{
-		if(!supported_type(lw1))
-			lwerror("Unsupported geometry type: %s", lwtype_name(lw1->type));
-		if(!supported_type(lw2))
-			lwerror("Unsupported geometry type: %s", lwtype_name(lw2->type));
-		
 		lwnotice("One or both of the geometries is missing z-value. The unknown z-value will be regarded as \"any value\"");
 		return lwgeom_maxdistance2d_tolerance(lw1, lw2, tolerance);	
 	}
@@ -367,12 +340,8 @@ lwgeom_mindistance3d_tolerance(const LWGEOM *lw1, const LWGEOM *lw2, double tole
 {
 	if(!lwgeom_has_z(lw1) || !lwgeom_has_z(lw2))
 	{
-		if(!supported_type(lw1))
-			lwerror("Unsupported geometry type: %s", lwtype_name(lw1->type));
-		if(!supported_type(lw2))
-			lwerror("Unsupported geometry type: %s", lwtype_name(lw2->type));
-
 		lwnotice("One or both of the geometries is missing z-value. The unknown z-value will be regarded as \"any value\"");
+		
 		return lwgeom_mindistance2d_tolerance(lw1, lw2, tolerance);	
 	}
 	DISTPTS3D thedl;