Changeset 2059

Timestamp:

11/23/05 06:52:39 (6 years ago)

Author:

strk

Message:

Changed M() and Z() to return NULL when input doesn't have
the requested dimension. Updated regress tests with a few
of these cases.

Location:

trunk

Files:

• CHANGES (modified) (1 diff)
• lwgeom/lwgeom_ogc.c (modified) (4 diffs)
• regress/regress_expected (modified) (1 diff)
• regress/regress.sql (modified) (1 diff)

trunk/CHANGES

@@ -24 +24 @@
         - Initial support for topology modelling
         - Stricter mapping between DBF and SQL integer and string attributes
+        - Changed M() and Z() functions to return NULL if requested
+          dimension is not available
 
 PostGIS 1.0.5CVS

trunk/lwgeom/lwgeom_ogc.c

@@ -617 +617 @@
 // Z(GEOMETRY) -- find the first POINT(..) in GEOMETRY, returns its Z value.
 // Return NULL if there is no POINT(..) in GEOMETRY.
-// Return 0 if there is no Z in this geometry.
+// Return NULL if there is no Z in this geometry.
 PG_FUNCTION_INFO_V1(LWGEOM_z_point);
 Datum LWGEOM_z_point(PG_FUNCTION_ARGS)
@@ -629 +629 @@
         geom = (PG_LWGEOM *)PG_DETOAST_DATUM(PG_GETARG_DATUM(0));
 
-        // if there's no Z return 0
-        if ( ! TYPE_HASZ(geom->type) ) PG_RETURN_FLOAT8(0.0);
+        // if there's no Z return NULL
+        if ( ! TYPE_HASZ(geom->type) ) PG_RETURN_NULL();
 
         inspected = lwgeom_inspect(SERIALIZED_FORM(geom));
@@ -656 +656 @@
 // M(GEOMETRY) -- find the first POINT(..) in GEOMETRY, returns its M value.
 // Return NULL if there is no POINT(..) in GEOMETRY.
-// Return 0 if there is no M in this geometry.
+// Return NULL if there is no M in this geometry.
 PG_FUNCTION_INFO_V1(LWGEOM_m_point);
 Datum LWGEOM_m_point(PG_FUNCTION_ARGS)
@@ -668 +668 @@
         geom = (PG_LWGEOM *)PG_DETOAST_DATUM(PG_GETARG_DATUM(0));
 
-        // if there's no M return 0
-        if ( ! TYPE_HASM(geom->type) ) PG_RETURN_FLOAT8(0.0);
+        // if there's no M return NULL
+        if ( ! TYPE_HASM(geom->type) ) PG_RETURN_NULL();
 
         inspected = lwgeom_inspect(SERIALIZED_FORM(geom));

trunk/regress/regress_expected

@@ -133 +133 @@
 131|1
 132|2
-133|0
+133|
+133a|3
+133b|
+133c|
+133d|4
+133e|
 134|0
 135|13

trunk/regress/regress.sql

@@ -224 +224 @@
 select '132', Y('POINT(1 2)');
 select '133', Z('POINT(1 2)');
+select '133a', Z('POINT(1 2 3)');
+select '133b', Z('POINTM(1 2 3)');
+select '133c', M('POINT(1 2)');
+select '133d', M('POINTM(1 2 4)');
+select '133e', M('POINT(1 2 4)');
 
 select '134', distance('POINT(1 2)', 'POINT(1 2)');