Changeset 2053

Timestamp:

11/22/05 13:29:41 (6 years ago)

Author:

strk

Message:

Fixed a bug in getPoint{3dm,3dz,4d}_p() api calls automatically
fixing bugs in force_{3dm,3dz,4d}() user functions, for which
tests have been added in regress dir.
Wrapped paranoid checks in PARANOIA_LEVEL preprocessor blocks.
Updated release notes and CHANGES file.

Location:

trunk

Files:

• CHANGES (modified) (1 diff)
• doc/postgis.xml (modified) (1 diff)
• lwgeom/liblwgeom.h (modified) (1 diff)
• lwgeom/lwgeom_api.c (modified) (11 diffs)
• regress/regress_expected (modified) (1 diff)
• regress/regress.sql (modified) (1 diff)

trunk/CHANGES

@@ -36 +36 @@
         - Fixed memory alignment problems
         - Speedup of serializer functions
+        - Bug fix in force_4d, force_3dm and force_3dz functions
 
 PostGIS 1.0.4

trunk/doc/postgis.xml

@@ -5017 +5017 @@
         <para>Fixed a small bug in the getPoint4d_p() low-level function</para>
         <para>Speedup of serializer functions</para>
+        <para>Fixed a bug in force_3dm(), force_3dz() and force_4d()</para>
                         </sect2>
 

trunk/lwgeom/liblwgeom.h

@@ -270 +270 @@
 // copies a point from the point array into the parameter point
 // will set point's z=0 (or NaN) if pa is 2d
-// will set point's m=0 (or NaN( if pa is 3d or 2d
+// will set point's m=0 (or NaN) if pa is 3d or 2d
 // NOTE: point is a real POINT3D *not* a pointer
 extern POINT4D getPoint4d(const POINTARRAY *pa, int n);

trunk/lwgeom/lwgeom_api.c

@@ -8 +8 @@
 #include "liblwgeom.h"
 #include "wktparse.h"
+
+/*
+ * Lower this to reduce integrity checks
+ */
+#define PARANOIA_LEVEL 1
 
 //#define PGIS_DEBUG 1
@@ -428 +433 @@
 
 // copies a point from the point array into the parameter point
-// will set point's z=0 (or NaN) if pa is 2d
-// will set point's m=0 (or NaN( if pa is 3d or 2d
+// will set point's z=NO_Z_VALUE  if pa is 2d
+// will set point's m=NO_M_VALUE  if pa is 3d or 2d
 // NOTE: this will modify the point4d pointed to by 'point'.
 int
-getPoint4d_p(const POINTARRAY *pa, int n, POINT4D *point)
-{
-        int size;
-
+getPoint4d_p(const POINTARRAY *pa, int n, POINT4D *op)
+{
+        uchar *ptr;
+        int zmflag;
+
+#if PARANOIA_LEVEL > 0
         if ( ! pa ) return 0;
 
@@ -443 +450 @@
                 return 0; //error
         }
-
-        memset(point, 0, sizeof(POINT4D));
-        size = pointArray_ptsize(pa);
-        memcpy(point, getPoint_internal(pa, n), size);
+#endif
+
+        /* Get a pointer to nth point offset and zmflag */
+        ptr=getPoint_internal(pa, n);
+        zmflag=TYPE_GETZM(pa->dims);
+
+        switch (zmflag)
+        {
+                case 0: // 2d 
+                        memcpy(op, ptr, sizeof(POINT2D));
+                        op->m=NO_M_VALUE;
+                        op->z=NO_Z_VALUE;
+                        break;
+
+                case 3: // ZM
+                        memcpy(op, ptr, sizeof(POINT4D));
+                        break;
+
+                case 2: // Z
+                        memcpy(op, ptr, sizeof(POINT3DZ));
+                        op->m=NO_M_VALUE;
+                        break;
+
+                case 1: // M
+                        memcpy(op, ptr, sizeof(POINT3DM));
+                        op->m=op->z; // we use Z as temporary storage
+                        op->z=NO_Z_VALUE;
+                        break;
+
+                default:
+                        lwerror("Unkown ZM flag ??");
+        }
+
         return 1;
+
 }
 
@@ -480 +517 @@
 getPoint3dz_p(const POINTARRAY *pa, int n, POINT3DZ *op)
 {
-        int size;
-
+        uchar *ptr;
+
+#if PARANOIA_LEVEL > 0
         if ( ! pa ) return 0;
+
+        if ( (n<0) || (n>=pa->npoints))
+        {
+                lwnotice("%d out of numpoint range (%d)", n, pa->npoints);
+                return 0; //error
+        }
+#endif
 
 #ifdef PGIS_DEBUG
@@ -489 +534 @@
 #endif
 
-        if ( (n<0) || (n>=pa->npoints))
-        {
-                lwnotice("%d out of numpoint range (%d)", n, pa->npoints);
-                return 0; //error
-        }
-
-        /* initialize point */
-        memset(op, 0, sizeof(POINT3DZ));
-
-        /* copy */
-        size = pointArray_ptsize(pa);
-#ifdef PGIS_DEBUG
-        lwnotice("getPoint3dz_p: point size: %d", size);
-#endif
-        memcpy(op, getPoint_internal(pa, n), size);
+        /* Get a pointer to nth point offset */
+        ptr=getPoint_internal(pa, n);
+
+        /*
+         * if input POINTARRAY has the Z, it is always
+         * at third position so make a single copy
+         */
+        if ( TYPE_HASZ(pa->dims) )
+        {
+                memcpy(op, ptr, sizeof(POINT3DZ));
+        }
+
+        /*
+         * Otherwise copy the 2d part and initialize
+         * Z to NO_Z_VALUE
+         */
+        else
+        {
+                memcpy(op, ptr, sizeof(POINT2D));
+                op->z=NO_Z_VALUE;
+        }
+
         return 1;
 
@@ -509 +561 @@
 
 // copies a point from the point array into the parameter point
-// will set point's m=NO_Z_VALUE if pa has no M
+// will set point's m=NO_M_VALUE if pa has no M
 // NOTE: this will modify the point3dm pointed to by 'point'.
 int
 getPoint3dm_p(const POINTARRAY *pa, int n, POINT3DM *op)
 {
-        int size;
-
+        uchar *ptr;
+        int zmflag;
+
+#if PARANOIA_LEVEL > 0
         if ( ! pa ) return 0;
+
+        if ( (n<0) || (n>=pa->npoints))
+        {
+                lwerror("%d out of numpoint range (%d)", n, pa->npoints);
+                return 0; //error
+        }
+#endif 
 
 #ifdef PGIS_DEBUG
@@ -523 +584 @@
 #endif
 
-        if ( (n<0) || (n>=pa->npoints))
-        {
-                lwerror("%d out of numpoint range (%d)", n, pa->npoints);
-                return 0; //error
-        }
-
-        /* initialize point */
-        memset(op, 0, sizeof(POINT3DM));
-
-        /* copy */
-        size = pointArray_ptsize(pa);
-#ifdef PGIS_DEBUG
-        lwnotice("getPoint3dz_p: point size: %d", size);
-#endif
-        memcpy(op, getPoint_internal(pa, n), size);
+
+        /* Get a pointer to nth point offset and zmflag */
+        ptr=getPoint_internal(pa, n);
+        zmflag=TYPE_GETZM(pa->dims);
+
+        /*
+         * if input POINTARRAY has the M and NO Z,
+         * we can issue a single memcpy
+         */
+        if ( zmflag == 1 )
+        {
+                memcpy(op, ptr, sizeof(POINT3DM));
+                return 1;
+        }
+
+        /*
+         * Otherwise copy the 2d part and 
+         * initialize M to NO_M_VALUE
+         */
+        memcpy(op, ptr, sizeof(POINT2D));
+
+        /*
+         * Then, if input has Z skip it and
+         * copy next double, otherwise initialize
+         * M to NO_M_VALUE
+         */
+        if ( zmflag == 3 )
+        {
+                ptr+=sizeof(POINT3DZ);
+                memcpy(&(op->m), ptr, sizeof(double));
+        }
+        else
+        {
+                op->m=NO_M_VALUE;
+        }
+
         return 1;
 }
@@ -549 +631 @@
 {
         POINT2D result;
-        int size;
-
-        if ( (n<0) || (n>=pa->npoints))
-        {
-                return result; //error
-        }
-
-        size = pointArray_ptsize(pa);
-
-        // this does x,y
-        memcpy(&result.x, &pa->serialized_pointlist[size*n],sizeof(double)*2 );
+        getPoint2d_p(pa, n, &result);
         return result;
 }
@@ -569 +641 @@
 getPoint2d_p(const POINTARRAY *pa, int n, POINT2D *point)
 {
-         int size;
-
+#if PARANOIA_LEVEL > 0
         if ( ! pa ) return 0;
 
-         if ( (n<0) || (n>=pa->npoints))
-         {
-                 lwerror("getPoint2d_p: point offset out of range");
-                 return 0; //error
-         }
-
-         size = pointArray_ptsize(pa);
-
-         // this does x,y
-         memcpy(point, &pa->serialized_pointlist[size*n],sizeof(double)*2 );
-         return 1;
+        if ( (n<0) || (n>=pa->npoints))
+        {
+                lwerror("getPoint2d_p: point offset out of range");
+                return 0; //error
+        }
+#endif
+
+        // this does x,y
+        memcpy(point, getPoint_internal(pa, n), sizeof(POINT2D));
+        return 1;
 }
 
@@ -594 +664 @@
         int size;
 
+#if PARANOIA_LEVEL > 0
         if ( pa == NULL ) {
                 lwerror("getPoint got NULL pointarray");
@@ -603 +674 @@
                 return NULL; //error
         }
+#endif
 
         size = pointArray_ptsize(pa);

trunk/regress/regress_expected

@@ -144 +144 @@
 142|SRID=5;MULTILINESTRING((2 2,3 3))
 143|SRID=6;MULTIPOLYGON(((0 0,1 0,1 1,0 1,0 0)))
+144|POINTM(1 2 0)
+145|POINT(1 2 0)
+146|POINT(1 2 0 3)
+147|POINT(1 2 3 0)
 144|LINESTRING(-5 -5,0 0,1 1,4 4)

trunk/regress/regress.sql

@@ -239 +239 @@
 select '143', asewkt(multi(setsrid('POLYGON((0 0, 1 0, 1 1, 0 1, 0 0))'::geometry, 6)));
 
+select '144', asewkt(force_3dm('POINT(1 2 3)'));
+select '145', asewkt(force_3dz('POINTM(1 2 3)'));
+select '146', asewkt(force_4d('POINTM(1 2 3)'));
+select '147', asewkt(force_4d('POINT(1 2 3)'));
+
 select '144', asewkt(linemerge('GEOMETRYCOLLECTION(LINESTRING(0 0, 1 1), LINESTRING(4 4, 1 1), LINESTRING(-5 -5, 0 0))'::geometry));