wip

Author: lbartoletti

liblwgeom/lwgeom_nurbs.c

@@ -27,6 +27,7 @@
 #include <string.h>
 #include <math.h>
 #include "liblwgeom_internal.h"
+#include "stringbuffer.h"
 #include "lwgeom_log.h"
 #include "lwgeom_nurbs.h"
 
@@ -485,11 +486,6 @@ lwgeom_as_lwnurbs(const LWGEOM *lwgeom)
 	return (LWNURBSCURVE*)lwgeom;
 }
 
-/* WKB and WKT functions would be implemented here following PostGIS patterns,
- * but are omitted for brevity. They would follow the same patterns as
- * lwcircstring_to_wkb_buf, lwcircstring_from_wkb_state, etc.
- */
-
 /**
  * WKB serialization size calculation
  */
@@ -539,19 +535,6 @@ lwnurbs_to_wkt(const LWNURBSCURVE *nurbs, uint8_t variant, int precision, size_t
 	return result;
 }
 
-uint8_t *
-lwnurbs_to_wkb_buf(const LWNURBSCURVE *nurbs, uint8_t *buf, uint8_t variant)
-{
-	// TODO: FIX: Convert to linestring atm
-	LWLINE *line = lwnurbs_to_linestring(nurbs, NURBS_DEFAULT_SAMPLES);
-	if (line)
-	{
-		buf = lwgeom_to_wkb_buf((LWGEOM*)line, buf, variant);
-		lwline_free(line);
-	}
-	return buf;
-}
-
 LWNURBSCURVE *
 lwnurbs_from_wkb_state(wkb_parse_state *s)
 {

liblwgeom/lwgeom_nurbs.h

@@ -26,9 +26,7 @@
 #define _LWGEOM_NURBS_H 1
 
 #include "liblwgeom.h"
-
-/* Forward declaration */
-typedef struct wkb_parse_state_t wkb_parse_state;
+#include "lwin.h"
 
 /**
  * NURBS curve constants
@@ -88,13 +86,10 @@ extern void lwnurbs_compute_bbox_p(LWNURBSCURVE *nurbs);
 extern double *lwnurbs_uniform_knots(uint32_t degree, uint32_t nctrl);
 extern double *lwnurbs_clamped_knots(uint32_t degree, uint32_t nctrl);
 
-/* WKB serialization - only declare if wkb_parse_state is available */
-#ifdef LIBLWGEOM_INTERNAL_H
+/* WKB serialization */
 extern uint8_t *lwnurbs_to_wkb_buf(const LWNURBSCURVE *nurbs, uint8_t *buf,
                                   uint8_t variant);
-extern LWNURBSCURVE *lwnurbs_from_wkb_state(wkb_parse_state *s);
 extern size_t lwnurbs_to_wkb_size(const LWNURBSCURVE *nurbs, uint8_t variant);
-#endif
 
 /* WKT serialization */
 extern char *lwnurbs_to_wkt(const LWNURBSCURVE *nurbs, uint8_t variant,
@@ -106,6 +101,9 @@ extern uint32_t lwnurbs_get_npoints(const LWNURBSCURVE *nurbs);
 extern int lwnurbs_startpoint(const LWNURBSCURVE *nurbs, POINT4D *pt);
 extern int lwnurbs_endpoint(const LWNURBSCURVE *nurbs, POINT4D *pt);
 
+/* Forward declaration for WKB functions */
+extern LWNURBSCURVE *lwnurbs_from_wkb_state(wkb_parse_state *s);
+
 /* Type conversion */
 extern LWGEOM *lwnurbs_as_lwgeom(const LWNURBSCURVE *nurbs);
 extern LWNURBSCURVE *lwgeom_as_lwnurbs(const LWGEOM *lwgeom);

liblwgeom/lwin.h

@@ -0,0 +1,50 @@
+/**********************************************************************
+ *
+ * PostGIS - Spatial Types for PostgreSQL
+ * http://postgis.net
+ *
+ * PostGIS is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * PostGIS is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with PostGIS.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ **********************************************************************
+ *
+ * Copyright (C) 2025 PostGIS contributors
+ *
+ **********************************************************************/
+
+#ifndef _LWIN_H
+#define _LWIN_H 1
+
+/** Max depth in a geometry. Matches the default YYINITDEPTH for WKT */
+#define LW_PARSER_MAX_DEPTH 200
+
+/**
+* Used for passing the parse state between the parsing functions.
+*/
+typedef struct
+{
+	const uint8_t *wkb; /* Points to start of WKB */
+	int32_t srid;    /* Current SRID we are handling */
+	size_t wkb_size; /* Expected size of WKB */
+	int8_t swap_bytes;  /* Do an endian flip? */
+	int8_t check;       /* Simple validity checks on geometries */
+	int8_t lwtype;      /* Current type we are handling */
+	int8_t has_z;       /* Z? */
+	int8_t has_m;       /* M? */
+	int8_t has_srid;    /* SRID? */
+	int8_t error;       /* An error was found (not enough bytes to read) */
+	uint8_t depth;      /* Current recursion level (to prevent stack overflows). Maxes at LW_PARSER_MAX_DEPTH */
+	const uint8_t *pos; /* Current parse position */
+} wkb_parse_state;
+
+#endif

liblwgeom/lwin_wkb.c

@@ -30,29 +30,7 @@
 #include <math.h>
 #include <limits.h>
 #include "lwgeom_nurbs.h"
-
-/** Max depth in a geometry. Matches the default YYINITDEPTH for WKT */
-#define LW_PARSER_MAX_DEPTH 200
-
-/**
-* Used for passing the parse state between the parsing functions.
-*/
-typedef struct
-{
-	const uint8_t *wkb; /* Points to start of WKB */
-	int32_t srid;    /* Current SRID we are handling */
-	size_t wkb_size; /* Expected size of WKB */
-	int8_t swap_bytes;  /* Do an endian flip? */
-	int8_t check;       /* Simple validity checks on geometries */
-	int8_t lwtype;      /* Current type we are handling */
-	int8_t has_z;       /* Z? */
-	int8_t has_m;       /* M? */
-	int8_t has_srid;    /* SRID? */
-	int8_t error;       /* An error was found (not enough bytes to read) */
-	uint8_t depth;      /* Current recursion level (to prevent stack overflows). Maxes at LW_PARSER_MAX_DEPTH */
-	const uint8_t *pos; /* Current parse position */
-} wkb_parse_state;
-
+#include "lwin.h"
 
 /**
 * Internal function declarations.