pyogrio 0.10.0__cp310-cp310-win_amd64.whl → 0.11.0__cp310-cp310-win_amd64.whl

pyogrio/_geometry.c

@@ -1,4 +1,4 @@
-/* Generated by Cython 3.0.11 */
+/* Generated by Cython 3.0.12 */
 
 /* BEGIN: Cython Metadata
 {
@@ -58,10 +58,10 @@ END: Cython Metadata */
 #else
 #define __PYX_EXTRA_ABI_MODULE_NAME ""
 #endif
-#define CYTHON_ABI "3_0_11" __PYX_EXTRA_ABI_MODULE_NAME
+#define CYTHON_ABI "3_0_12" __PYX_EXTRA_ABI_MODULE_NAME
 #define __PYX_ABI_MODULE_NAME "_cython_" CYTHON_ABI
 #define __PYX_TYPE_MODULE_PREFIX __PYX_ABI_MODULE_NAME "."
-#define CYTHON_HEX_VERSION 0x03000BF0
+#define CYTHON_HEX_VERSION 0x03000CF0
 #define CYTHON_FUTURE_DIVISION 1
 #include <stddef.h>
 #ifndef offsetof
@@ -1515,6 +1515,7 @@ static const char *__pyx_filename;
 
 static const char *__pyx_f[] = {
   "pyogrio\\\\_geometry.pyx",
+  "pyogrio\\\\_err.pxd",
 };
 /* #### Code section: utility_code_proto_before_types ### */
 /* ForceInitThreads.proto */
@@ -1527,9 +1528,10 @@ static const char *__pyx_f[] = {
 /* #### Code section: type_declarations ### */
 
 /*--- Type declarations ---*/
+struct __pyx_obj_7pyogrio_4_err_ErrorHandler;
 struct __pyx_opt_args_7pyogrio_4_ogr_get_string;
 
-/* "pyogrio/_ogr.pxd":452
+/* "pyogrio/_ogr.pxd":514
  * 
  * 
  * cdef get_string(const char *c_str, str encoding=*)             # <<<<<<<<<<<<<<
@@ -1538,6 +1540,28 @@ struct __pyx_opt_args_7pyogrio_4_ogr_get_string {
   int __pyx_n;
   PyObject *encoding;
 };
+
+/* "pyogrio/_err.pxd":5
+ * cdef void *check_pointer(void *ptr) except NULL
+ * 
+ * cdef class ErrorHandler:             # <<<<<<<<<<<<<<
+ *     cdef object error_stack
+ *     cdef int check_int(self, int retval, bint squash_errors) except -1
+ */
+struct __pyx_obj_7pyogrio_4_err_ErrorHandler {
+  PyObject_HEAD
+  struct __pyx_vtabstruct_7pyogrio_4_err_ErrorHandler *__pyx_vtab;
+  PyObject *error_stack;
+};
+
+
+
+struct __pyx_vtabstruct_7pyogrio_4_err_ErrorHandler {
+  int (*check_int)(struct __pyx_obj_7pyogrio_4_err_ErrorHandler *, int, int);
+  void *(*check_pointer)(struct __pyx_obj_7pyogrio_4_err_ErrorHandler *, void *, int);
+  void (*_handle_error_stack)(struct __pyx_obj_7pyogrio_4_err_ErrorHandler *, int);
+};
+static struct __pyx_vtabstruct_7pyogrio_4_err_ErrorHandler *__pyx_vtabptr_7pyogrio_4_err_ErrorHandler;
 /* #### Code section: utility_code_proto ### */
 
 /* --- Runtime support code (head) --- */
@@ -1787,7 +1811,7 @@ static PyObject *__Pyx_PyFunction_FastCallDict(PyObject *func, PyObject **args,
 #if !CYTHON_VECTORCALL
 #if PY_VERSION_HEX >= 0x03080000
   #include "frameobject.h"
-#if PY_VERSION_HEX >= 0x030b00a6 && !CYTHON_COMPILING_IN_LIMITED_API
+#if PY_VERSION_HEX >= 0x030b00a6 && !CYTHON_COMPILING_IN_LIMITED_API && !defined(PYPY_VERSION)
   #ifndef Py_BUILD_CORE
     #define Py_BUILD_CORE 1
   #endif
@@ -1939,6 +1963,28 @@ static PyObject *__Pyx_PyDict_GetItem(PyObject *d, PyObject* key);
 #define __Pyx_PyObject_Dict_GetItem(obj, name)  PyObject_GetItem(obj, name)
 #endif
 
+/* TypeImport.proto */
+#ifndef __PYX_HAVE_RT_ImportType_proto_3_0_12
+#define __PYX_HAVE_RT_ImportType_proto_3_0_12
+#if defined (__STDC_VERSION__) && __STDC_VERSION__ >= 201112L
+#include <stdalign.h>
+#endif
+#if (defined (__STDC_VERSION__) && __STDC_VERSION__ >= 201112L) || __cplusplus >= 201103L
+#define __PYX_GET_STRUCT_ALIGNMENT_3_0_12(s) alignof(s)
+#else
+#define __PYX_GET_STRUCT_ALIGNMENT_3_0_12(s) sizeof(void*)
+#endif
+enum __Pyx_ImportType_CheckSize_3_0_12 {
+   __Pyx_ImportType_CheckSize_Error_3_0_12 = 0,
+   __Pyx_ImportType_CheckSize_Warn_3_0_12 = 1,
+   __Pyx_ImportType_CheckSize_Ignore_3_0_12 = 2
+};
+static PyTypeObject *__Pyx_ImportType_3_0_12(PyObject* module, const char *module_name, const char *class_name, size_t size, size_t alignment, enum __Pyx_ImportType_CheckSize_3_0_12 check_size);
+#endif
+
+/* GetVTable.proto */
+static void* __Pyx_GetVtable(PyTypeObject *type);
+
 /* Import.proto */
 static PyObject *__Pyx_Import(PyObject *name, PyObject *from_list, int level);
 
@@ -2060,7 +2106,7 @@ static int __Pyx_check_binary_version(unsigned long ct_version, unsigned long rt
 static int __Pyx_ExportFunction(const char *name, void (*f)(void), const char *sig);
 
 /* FunctionImport.proto */
-static int __Pyx_ImportFunction_3_0_11(PyObject *module, const char *funcname, void (**f)(void), const char *sig);
+static int __Pyx_ImportFunction_3_0_12(PyObject *module, const char *funcname, void (**f)(void), const char *sig);
 
 /* InitStrings.proto */
 static int __Pyx_InitStrings(__Pyx_StringTabEntry *t);
@@ -2076,7 +2122,7 @@ static int __Pyx_InitStrings(__Pyx_StringTabEntry *t);
 /* Module declarations from "pyogrio._ogr" */
 
 /* Module declarations from "pyogrio._err" */
-static void *(*__pyx_f_7pyogrio_4_err_exc_wrap_pointer)(void *); /*proto*/
+static void *(*__pyx_f_7pyogrio_4_err_check_pointer)(void *); /*proto*/
 
 /* Module declarations from "pyogrio._geometry" */
 static PyObject *__pyx_7genexpr__pyx_v_7pyogrio_9_geometry_k;
@@ -2114,6 +2160,7 @@ static const char __pyx_k_2_5D_Point[] = "2.5D Point";
 static const char __pyx_k_LineString[] = "LineString";
 static const char __pyx_k_LinearRing[] = "LinearRing";
 static const char __pyx_k_MultiPoint[] = "MultiPoint";
+static const char __pyx_k_pyx_vtable[] = "__pyx_vtable__";
 static const char __pyx_k_2_5D_Polygon[] = "2.5D Polygon";
 static const char __pyx_k_LineString_Z[] = "LineString Z";
 static const char __pyx_k_MultiPoint_Z[] = "MultiPoint Z";
@@ -2194,6 +2241,7 @@ typedef struct {
   #endif
   #if CYTHON_USE_MODULE_STATE
   #endif
+  PyTypeObject *__pyx_ptype_7pyogrio_4_err_ErrorHandler;
   #if CYTHON_USE_MODULE_STATE
   #endif
   PyObject *__pyx_kp_u_;
@@ -2257,6 +2305,7 @@ typedef struct {
   PyObject *__pyx_n_s_name;
   PyObject *__pyx_n_s_pyogrio__err;
   PyObject *__pyx_n_s_pyogrio_errors;
+  PyObject *__pyx_n_s_pyx_vtable;
   PyObject *__pyx_n_s_spec;
   PyObject *__pyx_n_s_test;
   PyObject *__pyx_n_s_update;
@@ -2311,6 +2360,7 @@ static int __pyx_m_clear(PyObject *m) {
   #ifdef __Pyx_FusedFunction_USED
   Py_CLEAR(clear_module_state->__pyx_FusedFunctionType);
   #endif
+  Py_CLEAR(clear_module_state->__pyx_ptype_7pyogrio_4_err_ErrorHandler);
   Py_CLEAR(clear_module_state->__pyx_kp_u_);
   Py_CLEAR(clear_module_state->__pyx_kp_u_2_5D_GeometryCollection);
   Py_CLEAR(clear_module_state->__pyx_kp_u_2_5D_LineString);
@@ -2372,6 +2422,7 @@ static int __pyx_m_clear(PyObject *m) {
   Py_CLEAR(clear_module_state->__pyx_n_s_name);
   Py_CLEAR(clear_module_state->__pyx_n_s_pyogrio__err);
   Py_CLEAR(clear_module_state->__pyx_n_s_pyogrio_errors);
+  Py_CLEAR(clear_module_state->__pyx_n_s_pyx_vtable);
   Py_CLEAR(clear_module_state->__pyx_n_s_spec);
   Py_CLEAR(clear_module_state->__pyx_n_s_test);
   Py_CLEAR(clear_module_state->__pyx_n_s_update);
@@ -2404,6 +2455,7 @@ static int __pyx_m_traverse(PyObject *m, visitproc visit, void *arg) {
   #ifdef __Pyx_FusedFunction_USED
   Py_VISIT(traverse_module_state->__pyx_FusedFunctionType);
   #endif
+  Py_VISIT(traverse_module_state->__pyx_ptype_7pyogrio_4_err_ErrorHandler);
   Py_VISIT(traverse_module_state->__pyx_kp_u_);
   Py_VISIT(traverse_module_state->__pyx_kp_u_2_5D_GeometryCollection);
   Py_VISIT(traverse_module_state->__pyx_kp_u_2_5D_LineString);
@@ -2465,6 +2517,7 @@ static int __pyx_m_traverse(PyObject *m, visitproc visit, void *arg) {
   Py_VISIT(traverse_module_state->__pyx_n_s_name);
   Py_VISIT(traverse_module_state->__pyx_n_s_pyogrio__err);
   Py_VISIT(traverse_module_state->__pyx_n_s_pyogrio_errors);
+  Py_VISIT(traverse_module_state->__pyx_n_s_pyx_vtable);
   Py_VISIT(traverse_module_state->__pyx_n_s_spec);
   Py_VISIT(traverse_module_state->__pyx_n_s_test);
   Py_VISIT(traverse_module_state->__pyx_n_s_update);
@@ -2515,6 +2568,7 @@ static int __pyx_m_traverse(PyObject *m, visitproc visit, void *arg) {
 #endif
 #if CYTHON_USE_MODULE_STATE
 #endif
+#define __pyx_ptype_7pyogrio_4_err_ErrorHandler __pyx_mstate_global->__pyx_ptype_7pyogrio_4_err_ErrorHandler
 #if CYTHON_USE_MODULE_STATE
 #endif
 #define __pyx_kp_u_ __pyx_mstate_global->__pyx_kp_u_
@@ -2578,6 +2632,7 @@ static int __pyx_m_traverse(PyObject *m, visitproc visit, void *arg) {
 #define __pyx_n_s_name __pyx_mstate_global->__pyx_n_s_name
 #define __pyx_n_s_pyogrio__err __pyx_mstate_global->__pyx_n_s_pyogrio__err
 #define __pyx_n_s_pyogrio_errors __pyx_mstate_global->__pyx_n_s_pyogrio_errors
+#define __pyx_n_s_pyx_vtable __pyx_mstate_global->__pyx_n_s_pyx_vtable
 #define __pyx_n_s_spec __pyx_mstate_global->__pyx_n_s_spec
 #define __pyx_n_s_test __pyx_mstate_global->__pyx_n_s_test
 #define __pyx_n_s_update __pyx_mstate_global->__pyx_n_s_update
@@ -2601,9 +2656,8 @@ static int __pyx_m_traverse(PyObject *m, visitproc visit, void *arg) {
  */
 
 static PyObject *__pyx_f_7pyogrio_9_geometry_get_geometry_type(void *__pyx_v_ogr_layer) {
-  CYTHON_UNUSED void *__pyx_v_cogr_featuredef;
-  OGRwkbGeometryType __pyx_v_ogr_type;
   void *__pyx_v_ogr_featuredef;
+  OGRwkbGeometryType __pyx_v_ogr_type;
   PyObject *__pyx_v_exc = NULL;
   PyObject *__pyx_v_original_type = NULL;
   PyObject *__pyx_r = NULL;
@@ -2640,17 +2694,17 @@ static PyObject *__pyx_f_7pyogrio_9_geometry_get_geometry_type(void *__pyx_v_ogr
   /* "pyogrio/_geometry.pyx":83
  *         geometry type
  *     """
- *     cdef void *cogr_featuredef = NULL             # <<<<<<<<<<<<<<
+ *     cdef void *ogr_featuredef = NULL             # <<<<<<<<<<<<<<
  *     cdef OGRwkbGeometryType ogr_type
  * 
  */
-  __pyx_v_cogr_featuredef = NULL;
+  __pyx_v_ogr_featuredef = NULL;
 
   /* "pyogrio/_geometry.pyx":86
  *     cdef OGRwkbGeometryType ogr_type
  * 
  *     try:             # <<<<<<<<<<<<<<
- *         ogr_featuredef = exc_wrap_pointer(OGR_L_GetLayerDefn(ogr_layer))
+ *         ogr_featuredef = check_pointer(OGR_L_GetLayerDefn(ogr_layer))
  *     except NullPointerError:
  */
   {
@@ -2665,18 +2719,18 @@ static PyObject *__pyx_f_7pyogrio_9_geometry_get_geometry_type(void *__pyx_v_ogr
       /* "pyogrio/_geometry.pyx":87
  * 
  *     try:
- *         ogr_featuredef = exc_wrap_pointer(OGR_L_GetLayerDefn(ogr_layer))             # <<<<<<<<<<<<<<
+ *         ogr_featuredef = check_pointer(OGR_L_GetLayerDefn(ogr_layer))             # <<<<<<<<<<<<<<
  *     except NullPointerError:
  *         raise DataLayerError("Could not get layer definition")
  */
-      __pyx_t_4 = __pyx_f_7pyogrio_4_err_exc_wrap_pointer(OGR_L_GetLayerDefn(__pyx_v_ogr_layer)); if (unlikely(__pyx_t_4 == ((void *)NULL))) __PYX_ERR(0, 87, __pyx_L3_error)
+      __pyx_t_4 = __pyx_f_7pyogrio_4_err_check_pointer(OGR_L_GetLayerDefn(__pyx_v_ogr_layer)); if (unlikely(__pyx_t_4 == ((void *)NULL))) __PYX_ERR(0, 87, __pyx_L3_error)
       __pyx_v_ogr_featuredef = __pyx_t_4;
 
       /* "pyogrio/_geometry.pyx":86
  *     cdef OGRwkbGeometryType ogr_type
  * 
  *     try:             # <<<<<<<<<<<<<<
- *         ogr_featuredef = exc_wrap_pointer(OGR_L_GetLayerDefn(ogr_layer))
+ *         ogr_featuredef = check_pointer(OGR_L_GetLayerDefn(ogr_layer))
  *     except NullPointerError:
  */
     }
@@ -2688,7 +2742,7 @@ static PyObject *__pyx_f_7pyogrio_9_geometry_get_geometry_type(void *__pyx_v_ogr
 
     /* "pyogrio/_geometry.pyx":88
  *     try:
- *         ogr_featuredef = exc_wrap_pointer(OGR_L_GetLayerDefn(ogr_layer))
+ *         ogr_featuredef = check_pointer(OGR_L_GetLayerDefn(ogr_layer))
  *     except NullPointerError:             # <<<<<<<<<<<<<<
  *         raise DataLayerError("Could not get layer definition")
  * 
@@ -2708,7 +2762,7 @@ static PyObject *__pyx_f_7pyogrio_9_geometry_get_geometry_type(void *__pyx_v_ogr
       __Pyx_XGOTREF(__pyx_t_5);
 
       /* "pyogrio/_geometry.pyx":89
- *         ogr_featuredef = exc_wrap_pointer(OGR_L_GetLayerDefn(ogr_layer))
+ *         ogr_featuredef = check_pointer(OGR_L_GetLayerDefn(ogr_layer))
  *     except NullPointerError:
  *         raise DataLayerError("Could not get layer definition")             # <<<<<<<<<<<<<<
  * 
@@ -2857,7 +2911,7 @@ static PyObject *__pyx_f_7pyogrio_9_geometry_get_geometry_type(void *__pyx_v_ogr
  *     cdef OGRwkbGeometryType ogr_type
  * 
  *     try:             # <<<<<<<<<<<<<<
- *         ogr_featuredef = exc_wrap_pointer(OGR_L_GetLayerDefn(ogr_layer))
+ *         ogr_featuredef = check_pointer(OGR_L_GetLayerDefn(ogr_layer))
  *     except NullPointerError:
  */
     __pyx_L5_except_error:;
@@ -3348,6 +3402,7 @@ static int __Pyx_CreateStringTabAndInitStrings(void) {
     {&__pyx_n_s_name, __pyx_k_name, sizeof(__pyx_k_name), 0, 0, 1, 1},
     {&__pyx_n_s_pyogrio__err, __pyx_k_pyogrio__err, sizeof(__pyx_k_pyogrio__err), 0, 0, 1, 1},
     {&__pyx_n_s_pyogrio_errors, __pyx_k_pyogrio_errors, sizeof(__pyx_k_pyogrio_errors), 0, 0, 1, 1},
+    {&__pyx_n_s_pyx_vtable, __pyx_k_pyx_vtable, sizeof(__pyx_k_pyx_vtable), 0, 0, 1, 1},
     {&__pyx_n_s_spec, __pyx_k_spec, sizeof(__pyx_k_spec), 0, 0, 1, 1},
     {&__pyx_n_s_test, __pyx_k_test, sizeof(__pyx_k_test), 0, 0, 1, 1},
     {&__pyx_n_s_update, __pyx_k_update, sizeof(__pyx_k_update), 0, 0, 1, 1},
@@ -3443,10 +3498,23 @@ static int __Pyx_modinit_type_init_code(void) {
 
 static int __Pyx_modinit_type_import_code(void) {
   __Pyx_RefNannyDeclarations
+  PyObject *__pyx_t_1 = NULL;
+  int __pyx_lineno = 0;
+  const char *__pyx_filename = NULL;
+  int __pyx_clineno = 0;
   __Pyx_RefNannySetupContext("__Pyx_modinit_type_import_code", 0);
   /*--- Type import code ---*/
+  __pyx_t_1 = PyImport_ImportModule("pyogrio._err"); if (unlikely(!__pyx_t_1)) __PYX_ERR(1, 5, __pyx_L1_error)
+  __Pyx_GOTREF(__pyx_t_1);
+  __pyx_ptype_7pyogrio_4_err_ErrorHandler = __Pyx_ImportType_3_0_12(__pyx_t_1, "pyogrio._err", "ErrorHandler", sizeof(struct __pyx_obj_7pyogrio_4_err_ErrorHandler), __PYX_GET_STRUCT_ALIGNMENT_3_0_12(struct __pyx_obj_7pyogrio_4_err_ErrorHandler),__Pyx_ImportType_CheckSize_Warn_3_0_12); if (!__pyx_ptype_7pyogrio_4_err_ErrorHandler) __PYX_ERR(1, 5, __pyx_L1_error)
+  __pyx_vtabptr_7pyogrio_4_err_ErrorHandler = (struct __pyx_vtabstruct_7pyogrio_4_err_ErrorHandler*)__Pyx_GetVtable(__pyx_ptype_7pyogrio_4_err_ErrorHandler); if (unlikely(!__pyx_vtabptr_7pyogrio_4_err_ErrorHandler)) __PYX_ERR(1, 5, __pyx_L1_error)
+  __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
   __Pyx_RefNannyFinishContext();
   return 0;
+  __pyx_L1_error:;
+  __Pyx_XDECREF(__pyx_t_1);
+  __Pyx_RefNannyFinishContext();
+  return -1;
 }
 
 static int __Pyx_modinit_variable_import_code(void) {
@@ -3467,7 +3535,7 @@ static int __Pyx_modinit_function_import_code(void) {
   /*--- Function import code ---*/
   __pyx_t_1 = PyImport_ImportModule("pyogrio._err"); if (!__pyx_t_1) __PYX_ERR(0, 1, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_1);
-  if (__Pyx_ImportFunction_3_0_11(__pyx_t_1, "exc_wrap_pointer", (void (**)(void))&__pyx_f_7pyogrio_4_err_exc_wrap_pointer, "void *(void *)") < 0) __PYX_ERR(0, 1, __pyx_L1_error)
+  if (__Pyx_ImportFunction_3_0_12(__pyx_t_1, "check_pointer", (void (**)(void))&__pyx_f_7pyogrio_4_err_check_pointer, "void *(void *)") < 0) __PYX_ERR(0, 1, __pyx_L1_error)
   __Pyx_DECREF(__pyx_t_1); __pyx_t_1 = 0;
   __Pyx_RefNannyFinishContext();
   return 0;
@@ -3754,7 +3822,7 @@ if (!__Pyx_RefNanny) {
   (void)__Pyx_modinit_variable_export_code();
   if (unlikely((__Pyx_modinit_function_export_code() < 0))) __PYX_ERR(0, 1, __pyx_L1_error)
   (void)__Pyx_modinit_type_init_code();
-  (void)__Pyx_modinit_type_import_code();
+  if (unlikely((__Pyx_modinit_type_import_code() < 0))) __PYX_ERR(0, 1, __pyx_L1_error)
   (void)__Pyx_modinit_variable_import_code();
   if (unlikely((__Pyx_modinit_function_import_code() < 0))) __PYX_ERR(0, 1, __pyx_L1_error)
   /*--- Execution code ---*/
@@ -3831,9 +3899,9 @@ if (!__Pyx_RefNanny) {
   /* "pyogrio/_geometry.pyx":11
  * 
  * GEOMETRY_TYPES = {
- *     wkbUnknown: 'Unknown',             # <<<<<<<<<<<<<<
- *     wkbPoint: 'Point',
- *     wkbLineString: 'LineString',
+ *     wkbUnknown: "Unknown",             # <<<<<<<<<<<<<<
+ *     wkbPoint: "Point",
+ *     wkbLineString: "LineString",
  */
   __pyx_t_2 = __Pyx_PyDict_NewPresized(31); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 11, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_2);
@@ -3844,10 +3912,10 @@ if (!__Pyx_RefNanny) {
 
   /* "pyogrio/_geometry.pyx":12
  * GEOMETRY_TYPES = {
- *     wkbUnknown: 'Unknown',
- *     wkbPoint: 'Point',             # <<<<<<<<<<<<<<
- *     wkbLineString: 'LineString',
- *     wkbPolygon: 'Polygon',
+ *     wkbUnknown: "Unknown",
+ *     wkbPoint: "Point",             # <<<<<<<<<<<<<<
+ *     wkbLineString: "LineString",
+ *     wkbPolygon: "Polygon",
  */
   __pyx_t_3 = __Pyx_PyInt_From_OGRwkbGeometryType(wkbPoint); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 12, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_3);
@@ -3855,11 +3923,11 @@ if (!__Pyx_RefNanny) {
   __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
 
   /* "pyogrio/_geometry.pyx":13
- *     wkbUnknown: 'Unknown',
- *     wkbPoint: 'Point',
- *     wkbLineString: 'LineString',             # <<<<<<<<<<<<<<
- *     wkbPolygon: 'Polygon',
- *     wkbMultiPoint: 'MultiPoint',
+ *     wkbUnknown: "Unknown",
+ *     wkbPoint: "Point",
+ *     wkbLineString: "LineString",             # <<<<<<<<<<<<<<
+ *     wkbPolygon: "Polygon",
+ *     wkbMultiPoint: "MultiPoint",
  */
   __pyx_t_3 = __Pyx_PyInt_From_OGRwkbGeometryType(wkbLineString); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 13, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_3);
@@ -3867,11 +3935,11 @@ if (!__Pyx_RefNanny) {
   __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
 
   /* "pyogrio/_geometry.pyx":14
- *     wkbPoint: 'Point',
- *     wkbLineString: 'LineString',
- *     wkbPolygon: 'Polygon',             # <<<<<<<<<<<<<<
- *     wkbMultiPoint: 'MultiPoint',
- *     wkbMultiLineString: 'MultiLineString',
+ *     wkbPoint: "Point",
+ *     wkbLineString: "LineString",
+ *     wkbPolygon: "Polygon",             # <<<<<<<<<<<<<<
+ *     wkbMultiPoint: "MultiPoint",
+ *     wkbMultiLineString: "MultiLineString",
  */
   __pyx_t_3 = __Pyx_PyInt_From_OGRwkbGeometryType(wkbPolygon); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 14, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_3);
@@ -3879,11 +3947,11 @@ if (!__Pyx_RefNanny) {
   __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
 
   /* "pyogrio/_geometry.pyx":15
- *     wkbLineString: 'LineString',
- *     wkbPolygon: 'Polygon',
- *     wkbMultiPoint: 'MultiPoint',             # <<<<<<<<<<<<<<
- *     wkbMultiLineString: 'MultiLineString',
- *     wkbMultiPolygon: 'MultiPolygon',
+ *     wkbLineString: "LineString",
+ *     wkbPolygon: "Polygon",
+ *     wkbMultiPoint: "MultiPoint",             # <<<<<<<<<<<<<<
+ *     wkbMultiLineString: "MultiLineString",
+ *     wkbMultiPolygon: "MultiPolygon",
  */
   __pyx_t_3 = __Pyx_PyInt_From_OGRwkbGeometryType(wkbMultiPoint); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 15, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_3);
@@ -3891,11 +3959,11 @@ if (!__Pyx_RefNanny) {
   __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
 
   /* "pyogrio/_geometry.pyx":16
- *     wkbPolygon: 'Polygon',
- *     wkbMultiPoint: 'MultiPoint',
- *     wkbMultiLineString: 'MultiLineString',             # <<<<<<<<<<<<<<
- *     wkbMultiPolygon: 'MultiPolygon',
- *     wkbGeometryCollection: 'GeometryCollection',
+ *     wkbPolygon: "Polygon",
+ *     wkbMultiPoint: "MultiPoint",
+ *     wkbMultiLineString: "MultiLineString",             # <<<<<<<<<<<<<<
+ *     wkbMultiPolygon: "MultiPolygon",
+ *     wkbGeometryCollection: "GeometryCollection",
  */
   __pyx_t_3 = __Pyx_PyInt_From_OGRwkbGeometryType(wkbMultiLineString); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 16, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_3);
@@ -3903,10 +3971,10 @@ if (!__Pyx_RefNanny) {
   __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
 
   /* "pyogrio/_geometry.pyx":17
- *     wkbMultiPoint: 'MultiPoint',
- *     wkbMultiLineString: 'MultiLineString',
- *     wkbMultiPolygon: 'MultiPolygon',             # <<<<<<<<<<<<<<
- *     wkbGeometryCollection: 'GeometryCollection',
+ *     wkbMultiPoint: "MultiPoint",
+ *     wkbMultiLineString: "MultiLineString",
+ *     wkbMultiPolygon: "MultiPolygon",             # <<<<<<<<<<<<<<
+ *     wkbGeometryCollection: "GeometryCollection",
  *     wkbNone: None,
  */
   __pyx_t_3 = __Pyx_PyInt_From_OGRwkbGeometryType(wkbMultiPolygon); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 17, __pyx_L1_error)
@@ -3915,11 +3983,11 @@ if (!__Pyx_RefNanny) {
   __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
 
   /* "pyogrio/_geometry.pyx":18
- *     wkbMultiLineString: 'MultiLineString',
- *     wkbMultiPolygon: 'MultiPolygon',
- *     wkbGeometryCollection: 'GeometryCollection',             # <<<<<<<<<<<<<<
+ *     wkbMultiLineString: "MultiLineString",
+ *     wkbMultiPolygon: "MultiPolygon",
+ *     wkbGeometryCollection: "GeometryCollection",             # <<<<<<<<<<<<<<
  *     wkbNone: None,
- *     wkbLinearRing: 'LinearRing',
+ *     wkbLinearRing: "LinearRing",
  */
   __pyx_t_3 = __Pyx_PyInt_From_OGRwkbGeometryType(wkbGeometryCollection); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 18, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_3);
@@ -3927,10 +3995,10 @@ if (!__Pyx_RefNanny) {
   __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
 
   /* "pyogrio/_geometry.pyx":19
- *     wkbMultiPolygon: 'MultiPolygon',
- *     wkbGeometryCollection: 'GeometryCollection',
+ *     wkbMultiPolygon: "MultiPolygon",
+ *     wkbGeometryCollection: "GeometryCollection",
  *     wkbNone: None,             # <<<<<<<<<<<<<<
- *     wkbLinearRing: 'LinearRing',
+ *     wkbLinearRing: "LinearRing",
  *     # WARNING: Measured types are not supported in GEOS and downstream uses
  */
   __pyx_t_3 = __Pyx_PyInt_From_OGRwkbGeometryType(wkbNone); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 19, __pyx_L1_error)
@@ -3939,9 +4007,9 @@ if (!__Pyx_RefNanny) {
   __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
 
   /* "pyogrio/_geometry.pyx":20
- *     wkbGeometryCollection: 'GeometryCollection',
+ *     wkbGeometryCollection: "GeometryCollection",
  *     wkbNone: None,
- *     wkbLinearRing: 'LinearRing',             # <<<<<<<<<<<<<<
+ *     wkbLinearRing: "LinearRing",             # <<<<<<<<<<<<<<
  *     # WARNING: Measured types are not supported in GEOS and downstream uses
  *     # these are stripped automatically to their corresponding 2D / 3D types
  */
@@ -3953,9 +4021,9 @@ if (!__Pyx_RefNanny) {
   /* "pyogrio/_geometry.pyx":23
  *     # WARNING: Measured types are not supported in GEOS and downstream uses
  *     # these are stripped automatically to their corresponding 2D / 3D types
- *     wkbPointM: 'PointM',             # <<<<<<<<<<<<<<
- *     wkbLineStringM: 'Measured LineString',
- *     wkbPolygonM: 'Measured Polygon',
+ *     wkbPointM: "PointM",             # <<<<<<<<<<<<<<
+ *     wkbLineStringM: "Measured LineString",
+ *     wkbPolygonM: "Measured Polygon",
  */
   __pyx_t_3 = __Pyx_PyInt_From_OGRwkbGeometryType(wkbPointM); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 23, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_3);
@@ -3964,10 +4032,10 @@ if (!__Pyx_RefNanny) {
 
   /* "pyogrio/_geometry.pyx":24
  *     # these are stripped automatically to their corresponding 2D / 3D types
- *     wkbPointM: 'PointM',
- *     wkbLineStringM: 'Measured LineString',             # <<<<<<<<<<<<<<
- *     wkbPolygonM: 'Measured Polygon',
- *     wkbMultiPointM: 'Measured MultiPoint',
+ *     wkbPointM: "PointM",
+ *     wkbLineStringM: "Measured LineString",             # <<<<<<<<<<<<<<
+ *     wkbPolygonM: "Measured Polygon",
+ *     wkbMultiPointM: "Measured MultiPoint",
  */
   __pyx_t_3 = __Pyx_PyInt_From_OGRwkbGeometryType(wkbLineStringM); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 24, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_3);
@@ -3975,11 +4043,11 @@ if (!__Pyx_RefNanny) {
   __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
 
   /* "pyogrio/_geometry.pyx":25
- *     wkbPointM: 'PointM',
- *     wkbLineStringM: 'Measured LineString',
- *     wkbPolygonM: 'Measured Polygon',             # <<<<<<<<<<<<<<
- *     wkbMultiPointM: 'Measured MultiPoint',
- *     wkbMultiLineStringM: 'Measured MultiLineString',
+ *     wkbPointM: "PointM",
+ *     wkbLineStringM: "Measured LineString",
+ *     wkbPolygonM: "Measured Polygon",             # <<<<<<<<<<<<<<
+ *     wkbMultiPointM: "Measured MultiPoint",
+ *     wkbMultiLineStringM: "Measured MultiLineString",
  */
   __pyx_t_3 = __Pyx_PyInt_From_OGRwkbGeometryType(wkbPolygonM); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 25, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_3);
@@ -3987,11 +4055,11 @@ if (!__Pyx_RefNanny) {
   __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
 
   /* "pyogrio/_geometry.pyx":26
- *     wkbLineStringM: 'Measured LineString',
- *     wkbPolygonM: 'Measured Polygon',
- *     wkbMultiPointM: 'Measured MultiPoint',             # <<<<<<<<<<<<<<
- *     wkbMultiLineStringM: 'Measured MultiLineString',
- *     wkbMultiPolygonM: 'Measured MultiPolygon',
+ *     wkbLineStringM: "Measured LineString",
+ *     wkbPolygonM: "Measured Polygon",
+ *     wkbMultiPointM: "Measured MultiPoint",             # <<<<<<<<<<<<<<
+ *     wkbMultiLineStringM: "Measured MultiLineString",
+ *     wkbMultiPolygonM: "Measured MultiPolygon",
  */
   __pyx_t_3 = __Pyx_PyInt_From_OGRwkbGeometryType(wkbMultiPointM); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 26, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_3);
@@ -3999,11 +4067,11 @@ if (!__Pyx_RefNanny) {
   __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
 
   /* "pyogrio/_geometry.pyx":27
- *     wkbPolygonM: 'Measured Polygon',
- *     wkbMultiPointM: 'Measured MultiPoint',
- *     wkbMultiLineStringM: 'Measured MultiLineString',             # <<<<<<<<<<<<<<
- *     wkbMultiPolygonM: 'Measured MultiPolygon',
- *     wkbGeometryCollectionM: 'Measured GeometryCollection',
+ *     wkbPolygonM: "Measured Polygon",
+ *     wkbMultiPointM: "Measured MultiPoint",
+ *     wkbMultiLineStringM: "Measured MultiLineString",             # <<<<<<<<<<<<<<
+ *     wkbMultiPolygonM: "Measured MultiPolygon",
+ *     wkbGeometryCollectionM: "Measured GeometryCollection",
  */
   __pyx_t_3 = __Pyx_PyInt_From_OGRwkbGeometryType(wkbMultiLineStringM); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 27, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_3);
@@ -4011,11 +4079,11 @@ if (!__Pyx_RefNanny) {
   __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
 
   /* "pyogrio/_geometry.pyx":28
- *     wkbMultiPointM: 'Measured MultiPoint',
- *     wkbMultiLineStringM: 'Measured MultiLineString',
- *     wkbMultiPolygonM: 'Measured MultiPolygon',             # <<<<<<<<<<<<<<
- *     wkbGeometryCollectionM: 'Measured GeometryCollection',
- *     wkbPointZM: 'Measured 3D Point',
+ *     wkbMultiPointM: "Measured MultiPoint",
+ *     wkbMultiLineStringM: "Measured MultiLineString",
+ *     wkbMultiPolygonM: "Measured MultiPolygon",             # <<<<<<<<<<<<<<
+ *     wkbGeometryCollectionM: "Measured GeometryCollection",
+ *     wkbPointZM: "Measured 3D Point",
  */
   __pyx_t_3 = __Pyx_PyInt_From_OGRwkbGeometryType(wkbMultiPolygonM); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 28, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_3);
@@ -4023,11 +4091,11 @@ if (!__Pyx_RefNanny) {
   __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
 
   /* "pyogrio/_geometry.pyx":29
- *     wkbMultiLineStringM: 'Measured MultiLineString',
- *     wkbMultiPolygonM: 'Measured MultiPolygon',
- *     wkbGeometryCollectionM: 'Measured GeometryCollection',             # <<<<<<<<<<<<<<
- *     wkbPointZM: 'Measured 3D Point',
- *     wkbLineStringZM: 'Measured 3D LineString',
+ *     wkbMultiLineStringM: "Measured MultiLineString",
+ *     wkbMultiPolygonM: "Measured MultiPolygon",
+ *     wkbGeometryCollectionM: "Measured GeometryCollection",             # <<<<<<<<<<<<<<
+ *     wkbPointZM: "Measured 3D Point",
+ *     wkbLineStringZM: "Measured 3D LineString",
  */
   __pyx_t_3 = __Pyx_PyInt_From_OGRwkbGeometryType(wkbGeometryCollectionM); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 29, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_3);
@@ -4035,11 +4103,11 @@ if (!__Pyx_RefNanny) {
   __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
 
   /* "pyogrio/_geometry.pyx":30
- *     wkbMultiPolygonM: 'Measured MultiPolygon',
- *     wkbGeometryCollectionM: 'Measured GeometryCollection',
- *     wkbPointZM: 'Measured 3D Point',             # <<<<<<<<<<<<<<
- *     wkbLineStringZM: 'Measured 3D LineString',
- *     wkbPolygonZM: 'Measured 3D Polygon',
+ *     wkbMultiPolygonM: "Measured MultiPolygon",
+ *     wkbGeometryCollectionM: "Measured GeometryCollection",
+ *     wkbPointZM: "Measured 3D Point",             # <<<<<<<<<<<<<<
+ *     wkbLineStringZM: "Measured 3D LineString",
+ *     wkbPolygonZM: "Measured 3D Polygon",
  */
   __pyx_t_3 = __Pyx_PyInt_From_OGRwkbGeometryType(wkbPointZM); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 30, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_3);
@@ -4047,11 +4115,11 @@ if (!__Pyx_RefNanny) {
   __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
 
   /* "pyogrio/_geometry.pyx":31
- *     wkbGeometryCollectionM: 'Measured GeometryCollection',
- *     wkbPointZM: 'Measured 3D Point',
- *     wkbLineStringZM: 'Measured 3D LineString',             # <<<<<<<<<<<<<<
- *     wkbPolygonZM: 'Measured 3D Polygon',
- *     wkbMultiPointZM: 'Measured 3D MultiPoint',
+ *     wkbGeometryCollectionM: "Measured GeometryCollection",
+ *     wkbPointZM: "Measured 3D Point",
+ *     wkbLineStringZM: "Measured 3D LineString",             # <<<<<<<<<<<<<<
+ *     wkbPolygonZM: "Measured 3D Polygon",
+ *     wkbMultiPointZM: "Measured 3D MultiPoint",
  */
   __pyx_t_3 = __Pyx_PyInt_From_OGRwkbGeometryType(wkbLineStringZM); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 31, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_3);
@@ -4059,11 +4127,11 @@ if (!__Pyx_RefNanny) {
   __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
 
   /* "pyogrio/_geometry.pyx":32
- *     wkbPointZM: 'Measured 3D Point',
- *     wkbLineStringZM: 'Measured 3D LineString',
- *     wkbPolygonZM: 'Measured 3D Polygon',             # <<<<<<<<<<<<<<
- *     wkbMultiPointZM: 'Measured 3D MultiPoint',
- *     wkbMultiLineStringZM: 'Measured 3D MultiLineString',
+ *     wkbPointZM: "Measured 3D Point",
+ *     wkbLineStringZM: "Measured 3D LineString",
+ *     wkbPolygonZM: "Measured 3D Polygon",             # <<<<<<<<<<<<<<
+ *     wkbMultiPointZM: "Measured 3D MultiPoint",
+ *     wkbMultiLineStringZM: "Measured 3D MultiLineString",
  */
   __pyx_t_3 = __Pyx_PyInt_From_OGRwkbGeometryType(wkbPolygonZM); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 32, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_3);
@@ -4071,11 +4139,11 @@ if (!__Pyx_RefNanny) {
   __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
 
   /* "pyogrio/_geometry.pyx":33
- *     wkbLineStringZM: 'Measured 3D LineString',
- *     wkbPolygonZM: 'Measured 3D Polygon',
- *     wkbMultiPointZM: 'Measured 3D MultiPoint',             # <<<<<<<<<<<<<<
- *     wkbMultiLineStringZM: 'Measured 3D MultiLineString',
- *     wkbMultiPolygonZM: 'Measured 3D MultiPolygon',
+ *     wkbLineStringZM: "Measured 3D LineString",
+ *     wkbPolygonZM: "Measured 3D Polygon",
+ *     wkbMultiPointZM: "Measured 3D MultiPoint",             # <<<<<<<<<<<<<<
+ *     wkbMultiLineStringZM: "Measured 3D MultiLineString",
+ *     wkbMultiPolygonZM: "Measured 3D MultiPolygon",
  */
   __pyx_t_3 = __Pyx_PyInt_From_OGRwkbGeometryType(wkbMultiPointZM); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 33, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_3);
@@ -4083,11 +4151,11 @@ if (!__Pyx_RefNanny) {
   __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
 
   /* "pyogrio/_geometry.pyx":34
- *     wkbPolygonZM: 'Measured 3D Polygon',
- *     wkbMultiPointZM: 'Measured 3D MultiPoint',
- *     wkbMultiLineStringZM: 'Measured 3D MultiLineString',             # <<<<<<<<<<<<<<
- *     wkbMultiPolygonZM: 'Measured 3D MultiPolygon',
- *     wkbGeometryCollectionZM: 'Measured 3D GeometryCollection',
+ *     wkbPolygonZM: "Measured 3D Polygon",
+ *     wkbMultiPointZM: "Measured 3D MultiPoint",
+ *     wkbMultiLineStringZM: "Measured 3D MultiLineString",             # <<<<<<<<<<<<<<
+ *     wkbMultiPolygonZM: "Measured 3D MultiPolygon",
+ *     wkbGeometryCollectionZM: "Measured 3D GeometryCollection",
  */
   __pyx_t_3 = __Pyx_PyInt_From_OGRwkbGeometryType(wkbMultiLineStringZM); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 34, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_3);
@@ -4095,11 +4163,11 @@ if (!__Pyx_RefNanny) {
   __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
 
   /* "pyogrio/_geometry.pyx":35
- *     wkbMultiPointZM: 'Measured 3D MultiPoint',
- *     wkbMultiLineStringZM: 'Measured 3D MultiLineString',
- *     wkbMultiPolygonZM: 'Measured 3D MultiPolygon',             # <<<<<<<<<<<<<<
- *     wkbGeometryCollectionZM: 'Measured 3D GeometryCollection',
- *     wkbPoint25D: 'Point Z',
+ *     wkbMultiPointZM: "Measured 3D MultiPoint",
+ *     wkbMultiLineStringZM: "Measured 3D MultiLineString",
+ *     wkbMultiPolygonZM: "Measured 3D MultiPolygon",             # <<<<<<<<<<<<<<
+ *     wkbGeometryCollectionZM: "Measured 3D GeometryCollection",
+ *     wkbPoint25D: "Point Z",
  */
   __pyx_t_3 = __Pyx_PyInt_From_OGRwkbGeometryType(wkbMultiPolygonZM); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 35, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_3);
@@ -4107,11 +4175,11 @@ if (!__Pyx_RefNanny) {
   __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
 
   /* "pyogrio/_geometry.pyx":36
- *     wkbMultiLineStringZM: 'Measured 3D MultiLineString',
- *     wkbMultiPolygonZM: 'Measured 3D MultiPolygon',
- *     wkbGeometryCollectionZM: 'Measured 3D GeometryCollection',             # <<<<<<<<<<<<<<
- *     wkbPoint25D: 'Point Z',
- *     wkbLineString25D: 'LineString Z',
+ *     wkbMultiLineStringZM: "Measured 3D MultiLineString",
+ *     wkbMultiPolygonZM: "Measured 3D MultiPolygon",
+ *     wkbGeometryCollectionZM: "Measured 3D GeometryCollection",             # <<<<<<<<<<<<<<
+ *     wkbPoint25D: "Point Z",
+ *     wkbLineString25D: "LineString Z",
  */
   __pyx_t_3 = __Pyx_PyInt_From_OGRwkbGeometryType(wkbGeometryCollectionZM); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 36, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_3);
@@ -4119,11 +4187,11 @@ if (!__Pyx_RefNanny) {
   __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
 
   /* "pyogrio/_geometry.pyx":37
- *     wkbMultiPolygonZM: 'Measured 3D MultiPolygon',
- *     wkbGeometryCollectionZM: 'Measured 3D GeometryCollection',
- *     wkbPoint25D: 'Point Z',             # <<<<<<<<<<<<<<
- *     wkbLineString25D: 'LineString Z',
- *     wkbPolygon25D: 'Polygon Z',
+ *     wkbMultiPolygonZM: "Measured 3D MultiPolygon",
+ *     wkbGeometryCollectionZM: "Measured 3D GeometryCollection",
+ *     wkbPoint25D: "Point Z",             # <<<<<<<<<<<<<<
+ *     wkbLineString25D: "LineString Z",
+ *     wkbPolygon25D: "Polygon Z",
  */
   __pyx_t_3 = __Pyx_PyInt_From_OGRwkbGeometryType(wkbPoint25D); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 37, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_3);
@@ -4131,11 +4199,11 @@ if (!__Pyx_RefNanny) {
   __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
 
   /* "pyogrio/_geometry.pyx":38
- *     wkbGeometryCollectionZM: 'Measured 3D GeometryCollection',
- *     wkbPoint25D: 'Point Z',
- *     wkbLineString25D: 'LineString Z',             # <<<<<<<<<<<<<<
- *     wkbPolygon25D: 'Polygon Z',
- *     wkbMultiPoint25D: 'MultiPoint Z',
+ *     wkbGeometryCollectionZM: "Measured 3D GeometryCollection",
+ *     wkbPoint25D: "Point Z",
+ *     wkbLineString25D: "LineString Z",             # <<<<<<<<<<<<<<
+ *     wkbPolygon25D: "Polygon Z",
+ *     wkbMultiPoint25D: "MultiPoint Z",
  */
   __pyx_t_3 = __Pyx_PyInt_From_OGRwkbGeometryType(wkbLineString25D); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 38, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_3);
@@ -4143,11 +4211,11 @@ if (!__Pyx_RefNanny) {
   __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
 
   /* "pyogrio/_geometry.pyx":39
- *     wkbPoint25D: 'Point Z',
- *     wkbLineString25D: 'LineString Z',
- *     wkbPolygon25D: 'Polygon Z',             # <<<<<<<<<<<<<<
- *     wkbMultiPoint25D: 'MultiPoint Z',
- *     wkbMultiLineString25D: 'MultiLineString Z',
+ *     wkbPoint25D: "Point Z",
+ *     wkbLineString25D: "LineString Z",
+ *     wkbPolygon25D: "Polygon Z",             # <<<<<<<<<<<<<<
+ *     wkbMultiPoint25D: "MultiPoint Z",
+ *     wkbMultiLineString25D: "MultiLineString Z",
  */
   __pyx_t_3 = __Pyx_PyInt_From_OGRwkbGeometryType(wkbPolygon25D); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 39, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_3);
@@ -4155,11 +4223,11 @@ if (!__Pyx_RefNanny) {
   __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
 
   /* "pyogrio/_geometry.pyx":40
- *     wkbLineString25D: 'LineString Z',
- *     wkbPolygon25D: 'Polygon Z',
- *     wkbMultiPoint25D: 'MultiPoint Z',             # <<<<<<<<<<<<<<
- *     wkbMultiLineString25D: 'MultiLineString Z',
- *     wkbMultiPolygon25D: 'MultiPolygon Z',
+ *     wkbLineString25D: "LineString Z",
+ *     wkbPolygon25D: "Polygon Z",
+ *     wkbMultiPoint25D: "MultiPoint Z",             # <<<<<<<<<<<<<<
+ *     wkbMultiLineString25D: "MultiLineString Z",
+ *     wkbMultiPolygon25D: "MultiPolygon Z",
  */
   __pyx_t_3 = __Pyx_PyInt_From_OGRwkbGeometryType(wkbMultiPoint25D); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 40, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_3);
@@ -4167,11 +4235,11 @@ if (!__Pyx_RefNanny) {
   __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
 
   /* "pyogrio/_geometry.pyx":41
- *     wkbPolygon25D: 'Polygon Z',
- *     wkbMultiPoint25D: 'MultiPoint Z',
- *     wkbMultiLineString25D: 'MultiLineString Z',             # <<<<<<<<<<<<<<
- *     wkbMultiPolygon25D: 'MultiPolygon Z',
- *     wkbGeometryCollection25D: 'GeometryCollection Z',
+ *     wkbPolygon25D: "Polygon Z",
+ *     wkbMultiPoint25D: "MultiPoint Z",
+ *     wkbMultiLineString25D: "MultiLineString Z",             # <<<<<<<<<<<<<<
+ *     wkbMultiPolygon25D: "MultiPolygon Z",
+ *     wkbGeometryCollection25D: "GeometryCollection Z",
  */
   __pyx_t_3 = __Pyx_PyInt_From_OGRwkbGeometryType(wkbMultiLineString25D); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 41, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_3);
@@ -4179,10 +4247,10 @@ if (!__Pyx_RefNanny) {
   __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
 
   /* "pyogrio/_geometry.pyx":42
- *     wkbMultiPoint25D: 'MultiPoint Z',
- *     wkbMultiLineString25D: 'MultiLineString Z',
- *     wkbMultiPolygon25D: 'MultiPolygon Z',             # <<<<<<<<<<<<<<
- *     wkbGeometryCollection25D: 'GeometryCollection Z',
+ *     wkbMultiPoint25D: "MultiPoint Z",
+ *     wkbMultiLineString25D: "MultiLineString Z",
+ *     wkbMultiPolygon25D: "MultiPolygon Z",             # <<<<<<<<<<<<<<
+ *     wkbGeometryCollection25D: "GeometryCollection Z",
  * }
  */
   __pyx_t_3 = __Pyx_PyInt_From_OGRwkbGeometryType(wkbMultiPolygon25D); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 42, __pyx_L1_error)
@@ -4191,9 +4259,9 @@ if (!__Pyx_RefNanny) {
   __Pyx_DECREF(__pyx_t_3); __pyx_t_3 = 0;
 
   /* "pyogrio/_geometry.pyx":43
- *     wkbMultiLineString25D: 'MultiLineString Z',
- *     wkbMultiPolygon25D: 'MultiPolygon Z',
- *     wkbGeometryCollection25D: 'GeometryCollection Z',             # <<<<<<<<<<<<<<
+ *     wkbMultiLineString25D: "MultiLineString Z",
+ *     wkbMultiPolygon25D: "MultiPolygon Z",
+ *     wkbGeometryCollection25D: "GeometryCollection Z",             # <<<<<<<<<<<<<<
  * }
  * 
  */
@@ -4207,7 +4275,7 @@ if (!__Pyx_RefNanny) {
   /* "pyogrio/_geometry.pyx":46
  * }
  * 
- * GEOMETRY_TYPE_CODES = {v:k for k, v in GEOMETRY_TYPES.items()}             # <<<<<<<<<<<<<<
+ * GEOMETRY_TYPE_CODES = {v: k for k, v in GEOMETRY_TYPES.items()}             # <<<<<<<<<<<<<<
  * 
  * # add additional aliases from 2.5D format
  */
@@ -4264,8 +4332,8 @@ if (!__Pyx_RefNanny) {
  * 
  * # add additional aliases from 2.5D format
  * GEOMETRY_TYPE_CODES.update({             # <<<<<<<<<<<<<<
- *     '2.5D Point': wkbPoint25D,
- *     '2.5D LineString': wkbLineString25D,
+ *     "2.5D Point": wkbPoint25D,
+ *     "2.5D LineString": wkbLineString25D,
  */
   __Pyx_GetModuleGlobalName(__pyx_t_2, __pyx_n_s_GEOMETRY_TYPE_CODES); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 49, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_2);
@@ -4276,9 +4344,9 @@ if (!__Pyx_RefNanny) {
   /* "pyogrio/_geometry.pyx":50
  * # add additional aliases from 2.5D format
  * GEOMETRY_TYPE_CODES.update({
- *     '2.5D Point': wkbPoint25D,             # <<<<<<<<<<<<<<
- *     '2.5D LineString': wkbLineString25D,
- *     '2.5D Polygon': wkbPolygon25D,
+ *     "2.5D Point": wkbPoint25D,             # <<<<<<<<<<<<<<
+ *     "2.5D LineString": wkbLineString25D,
+ *     "2.5D Polygon": wkbPolygon25D,
  */
   __pyx_t_2 = __Pyx_PyDict_NewPresized(7); if (unlikely(!__pyx_t_2)) __PYX_ERR(0, 50, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_2);
@@ -4289,10 +4357,10 @@ if (!__Pyx_RefNanny) {
 
   /* "pyogrio/_geometry.pyx":51
  * GEOMETRY_TYPE_CODES.update({
- *     '2.5D Point': wkbPoint25D,
- *     '2.5D LineString': wkbLineString25D,             # <<<<<<<<<<<<<<
- *     '2.5D Polygon': wkbPolygon25D,
- *     '2.5D MultiPoint': wkbMultiPoint25D,
+ *     "2.5D Point": wkbPoint25D,
+ *     "2.5D LineString": wkbLineString25D,             # <<<<<<<<<<<<<<
+ *     "2.5D Polygon": wkbPolygon25D,
+ *     "2.5D MultiPoint": wkbMultiPoint25D,
  */
   __pyx_t_7 = __Pyx_PyInt_From_OGRwkbGeometryType(wkbLineString25D); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 51, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_7);
@@ -4300,11 +4368,11 @@ if (!__Pyx_RefNanny) {
   __Pyx_DECREF(__pyx_t_7); __pyx_t_7 = 0;
 
   /* "pyogrio/_geometry.pyx":52
- *     '2.5D Point': wkbPoint25D,
- *     '2.5D LineString': wkbLineString25D,
- *     '2.5D Polygon': wkbPolygon25D,             # <<<<<<<<<<<<<<
- *     '2.5D MultiPoint': wkbMultiPoint25D,
- *     '2.5D MultiLineString': wkbMultiLineString25D,
+ *     "2.5D Point": wkbPoint25D,
+ *     "2.5D LineString": wkbLineString25D,
+ *     "2.5D Polygon": wkbPolygon25D,             # <<<<<<<<<<<<<<
+ *     "2.5D MultiPoint": wkbMultiPoint25D,
+ *     "2.5D MultiLineString": wkbMultiLineString25D,
  */
   __pyx_t_7 = __Pyx_PyInt_From_OGRwkbGeometryType(wkbPolygon25D); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 52, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_7);
@@ -4312,11 +4380,11 @@ if (!__Pyx_RefNanny) {
   __Pyx_DECREF(__pyx_t_7); __pyx_t_7 = 0;
 
   /* "pyogrio/_geometry.pyx":53
- *     '2.5D LineString': wkbLineString25D,
- *     '2.5D Polygon': wkbPolygon25D,
- *     '2.5D MultiPoint': wkbMultiPoint25D,             # <<<<<<<<<<<<<<
- *     '2.5D MultiLineString': wkbMultiLineString25D,
- *     '2.5D MultiPolygon': wkbMultiPolygon25D,
+ *     "2.5D LineString": wkbLineString25D,
+ *     "2.5D Polygon": wkbPolygon25D,
+ *     "2.5D MultiPoint": wkbMultiPoint25D,             # <<<<<<<<<<<<<<
+ *     "2.5D MultiLineString": wkbMultiLineString25D,
+ *     "2.5D MultiPolygon": wkbMultiPolygon25D,
  */
   __pyx_t_7 = __Pyx_PyInt_From_OGRwkbGeometryType(wkbMultiPoint25D); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 53, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_7);
@@ -4324,11 +4392,11 @@ if (!__Pyx_RefNanny) {
   __Pyx_DECREF(__pyx_t_7); __pyx_t_7 = 0;
 
   /* "pyogrio/_geometry.pyx":54
- *     '2.5D Polygon': wkbPolygon25D,
- *     '2.5D MultiPoint': wkbMultiPoint25D,
- *     '2.5D MultiLineString': wkbMultiLineString25D,             # <<<<<<<<<<<<<<
- *     '2.5D MultiPolygon': wkbMultiPolygon25D,
- *     '2.5D GeometryCollection': wkbGeometryCollection25D
+ *     "2.5D Polygon": wkbPolygon25D,
+ *     "2.5D MultiPoint": wkbMultiPoint25D,
+ *     "2.5D MultiLineString": wkbMultiLineString25D,             # <<<<<<<<<<<<<<
+ *     "2.5D MultiPolygon": wkbMultiPolygon25D,
+ *     "2.5D GeometryCollection": wkbGeometryCollection25D
  */
   __pyx_t_7 = __Pyx_PyInt_From_OGRwkbGeometryType(wkbMultiLineString25D); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 54, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_7);
@@ -4336,10 +4404,10 @@ if (!__Pyx_RefNanny) {
   __Pyx_DECREF(__pyx_t_7); __pyx_t_7 = 0;
 
   /* "pyogrio/_geometry.pyx":55
- *     '2.5D MultiPoint': wkbMultiPoint25D,
- *     '2.5D MultiLineString': wkbMultiLineString25D,
- *     '2.5D MultiPolygon': wkbMultiPolygon25D,             # <<<<<<<<<<<<<<
- *     '2.5D GeometryCollection': wkbGeometryCollection25D
+ *     "2.5D MultiPoint": wkbMultiPoint25D,
+ *     "2.5D MultiLineString": wkbMultiLineString25D,
+ *     "2.5D MultiPolygon": wkbMultiPolygon25D,             # <<<<<<<<<<<<<<
+ *     "2.5D GeometryCollection": wkbGeometryCollection25D
  * })
  */
   __pyx_t_7 = __Pyx_PyInt_From_OGRwkbGeometryType(wkbMultiPolygon25D); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 55, __pyx_L1_error)
@@ -4348,9 +4416,9 @@ if (!__Pyx_RefNanny) {
   __Pyx_DECREF(__pyx_t_7); __pyx_t_7 = 0;
 
   /* "pyogrio/_geometry.pyx":56
- *     '2.5D MultiLineString': wkbMultiLineString25D,
- *     '2.5D MultiPolygon': wkbMultiPolygon25D,
- *     '2.5D GeometryCollection': wkbGeometryCollection25D             # <<<<<<<<<<<<<<
+ *     "2.5D MultiLineString": wkbMultiLineString25D,
+ *     "2.5D MultiPolygon": wkbMultiPolygon25D,
+ *     "2.5D GeometryCollection": wkbGeometryCollection25D             # <<<<<<<<<<<<<<
  * })
  * 
  */
@@ -4363,8 +4431,8 @@ if (!__Pyx_RefNanny) {
  * 
  * # add additional aliases from 2.5D format
  * GEOMETRY_TYPE_CODES.update({             # <<<<<<<<<<<<<<
- *     '2.5D Point': wkbPoint25D,
- *     '2.5D LineString': wkbLineString25D,
+ *     "2.5D Point": wkbPoint25D,
+ *     "2.5D LineString": wkbLineString25D,
  */
   __pyx_t_7 = __Pyx_PyObject_CallOneArg(__pyx_t_3, __pyx_t_2); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 49, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_7);
@@ -4376,8 +4444,8 @@ if (!__Pyx_RefNanny) {
  * 
  * # 2.5D also represented using negative numbers not enumerated above
  * GEOMETRY_TYPES.update({             # <<<<<<<<<<<<<<
- *     -2147483647: 'Point Z',
- *     -2147483646: 'LineString Z',
+ *     -2147483647: "Point Z",
+ *     -2147483646: "LineString Z",
  */
   __Pyx_GetModuleGlobalName(__pyx_t_7, __pyx_n_s_GEOMETRY_TYPES); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 60, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_7);
@@ -4388,9 +4456,9 @@ if (!__Pyx_RefNanny) {
   /* "pyogrio/_geometry.pyx":61
  * # 2.5D also represented using negative numbers not enumerated above
  * GEOMETRY_TYPES.update({
- *     -2147483647: 'Point Z',             # <<<<<<<<<<<<<<
- *     -2147483646: 'LineString Z',
- *     -2147483645: 'Polygon Z',
+ *     -2147483647: "Point Z",             # <<<<<<<<<<<<<<
+ *     -2147483646: "LineString Z",
+ *     -2147483645: "Polygon Z",
  */
   __pyx_t_7 = __Pyx_PyDict_NewPresized(7); if (unlikely(!__pyx_t_7)) __PYX_ERR(0, 61, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_7);
@@ -4406,8 +4474,8 @@ if (!__Pyx_RefNanny) {
  * 
  * # 2.5D also represented using negative numbers not enumerated above
  * GEOMETRY_TYPES.update({             # <<<<<<<<<<<<<<
- *     -2147483647: 'Point Z',
- *     -2147483646: 'LineString Z',
+ *     -2147483647: "Point Z",
+ *     -2147483646: "LineString Z",
  */
   __pyx_t_3 = __Pyx_PyObject_CallOneArg(__pyx_t_2, __pyx_t_7); if (unlikely(!__pyx_t_3)) __PYX_ERR(0, 60, __pyx_L1_error)
   __Pyx_GOTREF(__pyx_t_3);
@@ -5920,6 +5988,106 @@ static PyObject *__Pyx_PyDict_GetItem(PyObject *d, PyObject* key) {
 }
 #endif
 
+/* TypeImport */
+#ifndef __PYX_HAVE_RT_ImportType_3_0_12
+#define __PYX_HAVE_RT_ImportType_3_0_12
+static PyTypeObject *__Pyx_ImportType_3_0_12(PyObject *module, const char *module_name, const char *class_name,
+    size_t size, size_t alignment, enum __Pyx_ImportType_CheckSize_3_0_12 check_size)
+{
+    PyObject *result = 0;
+    char warning[200];
+    Py_ssize_t basicsize;
+    Py_ssize_t itemsize;
+#if CYTHON_COMPILING_IN_LIMITED_API
+    PyObject *py_basicsize;
+    PyObject *py_itemsize;
+#endif
+    result = PyObject_GetAttrString(module, class_name);
+    if (!result)
+        goto bad;
+    if (!PyType_Check(result)) {
+        PyErr_Format(PyExc_TypeError,
+            "%.200s.%.200s is not a type object",
+            module_name, class_name);
+        goto bad;
+    }
+#if !CYTHON_COMPILING_IN_LIMITED_API
+    basicsize = ((PyTypeObject *)result)->tp_basicsize;
+    itemsize = ((PyTypeObject *)result)->tp_itemsize;
+#else
+    py_basicsize = PyObject_GetAttrString(result, "__basicsize__");
+    if (!py_basicsize)
+        goto bad;
+    basicsize = PyLong_AsSsize_t(py_basicsize);
+    Py_DECREF(py_basicsize);
+    py_basicsize = 0;
+    if (basicsize == (Py_ssize_t)-1 && PyErr_Occurred())
+        goto bad;
+    py_itemsize = PyObject_GetAttrString(result, "__itemsize__");
+    if (!py_itemsize)
+        goto bad;
+    itemsize = PyLong_AsSsize_t(py_itemsize);
+    Py_DECREF(py_itemsize);
+    py_itemsize = 0;
+    if (itemsize == (Py_ssize_t)-1 && PyErr_Occurred())
+        goto bad;
+#endif
+    if (itemsize) {
+        if (size % alignment) {
+            alignment = size % alignment;
+        }
+        if (itemsize < (Py_ssize_t)alignment)
+            itemsize = (Py_ssize_t)alignment;
+    }
+    if ((size_t)(basicsize + itemsize) < size) {
+        PyErr_Format(PyExc_ValueError,
+            "%.200s.%.200s size changed, may indicate binary incompatibility. "
+            "Expected %zd from C header, got %zd from PyObject",
+            module_name, class_name, size, basicsize+itemsize);
+        goto bad;
+    }
+    if (check_size == __Pyx_ImportType_CheckSize_Error_3_0_12 &&
+            ((size_t)basicsize > size || (size_t)(basicsize + itemsize) < size)) {
+        PyErr_Format(PyExc_ValueError,
+            "%.200s.%.200s size changed, may indicate binary incompatibility. "
+            "Expected %zd from C header, got %zd-%zd from PyObject",
+            module_name, class_name, size, basicsize, basicsize+itemsize);
+        goto bad;
+    }
+    else if (check_size == __Pyx_ImportType_CheckSize_Warn_3_0_12 && (size_t)basicsize > size) {
+        PyOS_snprintf(warning, sizeof(warning),
+            "%s.%s size changed, may indicate binary incompatibility. "
+            "Expected %zd from C header, got %zd from PyObject",
+            module_name, class_name, size, basicsize);
+        if (PyErr_WarnEx(NULL, warning, 0) < 0) goto bad;
+    }
+    return (PyTypeObject *)result;
+bad:
+    Py_XDECREF(result);
+    return NULL;
+}
+#endif
+
+/* GetVTable */
+static void* __Pyx_GetVtable(PyTypeObject *type) {
+    void* ptr;
+#if CYTHON_COMPILING_IN_LIMITED_API
+    PyObject *ob = PyObject_GetAttr((PyObject *)type, __pyx_n_s_pyx_vtable);
+#else
+    PyObject *ob = PyObject_GetItem(type->tp_dict, __pyx_n_s_pyx_vtable);
+#endif
+    if (!ob)
+        goto bad;
+    ptr = PyCapsule_GetPointer(ob, 0);
+    if (!ptr && !PyErr_Occurred())
+        PyErr_SetString(PyExc_RuntimeError, "invalid vtable found for imported type");
+    Py_DECREF(ob);
+    return ptr;
+bad:
+    Py_XDECREF(ob);
+    return NULL;
+}
+
 /* Import */
 static PyObject *__Pyx_Import(PyObject *name, PyObject *from_list, int level) {
     PyObject *module = 0;
@@ -6623,7 +6791,7 @@ static void __pyx_insert_code_object(int code_line, PyCodeObject* code_object) {
 #include "compile.h"
 #include "frameobject.h"
 #include "traceback.h"
-#if PY_VERSION_HEX >= 0x030b00a6 && !CYTHON_COMPILING_IN_LIMITED_API
+#if PY_VERSION_HEX >= 0x030b00a6 && !CYTHON_COMPILING_IN_LIMITED_API && !defined(PYPY_VERSION)
   #ifndef Py_BUILD_CORE
     #define Py_BUILD_CORE 1
   #endif
@@ -7808,9 +7976,9 @@ bad:
 }
 
 /* FunctionImport */
-#ifndef __PYX_HAVE_RT_ImportFunction_3_0_11
-#define __PYX_HAVE_RT_ImportFunction_3_0_11
-static int __Pyx_ImportFunction_3_0_11(PyObject *module, const char *funcname, void (**f)(void), const char *sig) {
+#ifndef __PYX_HAVE_RT_ImportFunction_3_0_12
+#define __PYX_HAVE_RT_ImportFunction_3_0_12
+static int __Pyx_ImportFunction_3_0_12(PyObject *module, const char *funcname, void (**f)(void), const char *sig) {
     PyObject *d = 0;
     PyObject *cobj = 0;
     union {