pyogrio 0.9.0__cp311-cp311-manylinux_2_28_aarch64.whl → 0.11.0__cp311-cp311-manylinux_2_28_aarch64.whl

pyogrio/geopandas.py

@@ -1,24 +1,31 @@
+"""Functions for reading and writing GeoPandas dataframes."""
+
 import os
+import warnings
 
 import numpy as np
 
-from pyogrio._compat import HAS_GEOPANDAS, PANDAS_GE_15, PANDAS_GE_20, PANDAS_GE_22
+from pyogrio._compat import (
+    HAS_GEOPANDAS,
+    PANDAS_GE_15,
+    PANDAS_GE_20,
+    PANDAS_GE_22,
+    PANDAS_GE_30,
+    PYARROW_GE_19,
+)
+from pyogrio.errors import DataSourceError
 from pyogrio.raw import (
-    DRIVERS_NO_MIXED_SINGLE_MULTI,
     DRIVERS_NO_MIXED_DIMENSIONS,
+    DRIVERS_NO_MIXED_SINGLE_MULTI,
+    _get_write_path_driver,
     read,
     read_arrow,
     write,
-    _get_write_path_driver,
 )
-from pyogrio.errors import DataSourceError
-import warnings
 
 
 def _stringify_path(path):
-    """
-    Convert path-like to a string if possible, pass-through other objects
-    """
+    """Convert path-like to a string if possible, pass-through other objects."""
     if isinstance(path, str):
         return path
 
@@ -34,11 +41,11 @@ def _try_parse_datetime(ser):
     import pandas as pd  # only called when pandas is known to be installed
 
     if PANDAS_GE_22:
-        datetime_kwargs = dict(format="ISO8601")
+        datetime_kwargs = {"format": "ISO8601"}
     elif PANDAS_GE_20:
-        datetime_kwargs = dict(format="ISO8601", errors="ignore")
+        datetime_kwargs = {"format": "ISO8601", "errors": "ignore"}
     else:
-        datetime_kwargs = dict(yearfirst=True)
+        datetime_kwargs = {"yearfirst": True}
     with warnings.catch_warnings():
         warnings.filterwarnings(
             "ignore",
@@ -52,13 +59,13 @@ def _try_parse_datetime(ser):
         except Exception:
             res = ser
     # if object dtype, try parse as utc instead
-    if res.dtype == "object":
+    if res.dtype in ("object", "string"):
         try:
             res = pd.to_datetime(ser, utc=True, **datetime_kwargs)
         except Exception:
             pass
 
-    if res.dtype != "object":
+    if res.dtype.kind == "M":  # any datetime64
         # GDAL only supports ms precision, convert outputs to match.
         # Pandas 2.0 supports datetime[ms] directly, prior versions only support [ns],
         # Instead, round the values to [ms] precision.
@@ -92,6 +99,7 @@ def read_dataframe(
     **kwargs,
 ):
     """Read from an OGR data source to a GeoPandas GeoDataFrame or Pandas DataFrame.
+
     If the data source does not have a geometry column or ``read_geometry`` is False,
     a DataFrame will be returned.
 
@@ -100,7 +108,7 @@ def read_dataframe(
     Parameters
     ----------
     path_or_buffer : pathlib.Path or str, or bytes buffer
-         A dataset path or URI, or raw buffer.
+        A dataset path or URI, raw buffer, or file-like object with a read method.
     layer : int or str, optional (default: first layer)
         If an integer is provided, it corresponds to the index of the layer
         with the data source.  If a string is provided, it must match the name
@@ -199,13 +207,18 @@ def read_dataframe(
         Defaults to False, but this default can also be globally overridden
         by setting the ``PYOGRIO_USE_ARROW=1`` environment variable.
     on_invalid : str, optional (default: "raise")
+        The action to take when an invalid geometry is encountered. Possible
+        values:
 
         - **raise**: an exception will be raised if a WKB input geometry is
           invalid.
-        - **warn**: a warning will be raised and invalid WKB geometries will be
-          returned as ``None``.
+        - **warn**: invalid WKB geometries will be returned as ``None`` and a
+          warning will be raised.
         - **ignore**: invalid WKB geometries will be returned as ``None``
           without a warning.
+        - **fix**: an effort is made to fix invalid input geometries (currently
+          just unclosed rings). If this is not possible, they are returned as
+          ``None`` without a warning. Requires GEOS >= 3.11 and shapely >= 2.1.
 
     arrow_to_pandas_kwargs : dict, optional (default: None)
         When `use_arrow` is True, these kwargs will be passed to the `to_pandas`_
@@ -238,12 +251,13 @@ def read_dataframe(
 
         https://arrow.apache.org/docs/python/generated/pyarrow.Table.html#pyarrow.Table.to_pandas
 
-    """  # noqa: E501
+    """
     if not HAS_GEOPANDAS:
         raise ImportError("geopandas is required to use pyogrio.read_dataframe()")
 
-    import pandas as pd
     import geopandas as gp
+    import pandas as pd
+
     import shapely  # if geopandas is present, shapely is expected to be present
 
     path_or_buffer = _stringify_path(path_or_buffer)
@@ -278,14 +292,42 @@ def read_dataframe(
     )
 
     if use_arrow:
+        import pyarrow as pa
+
         meta, table = result
 
         # split_blocks and self_destruct decrease memory usage, but have as side effect
         # that accessing table afterwards causes crash, so del table to avoid.
         kwargs = {"self_destruct": True}
+        if PANDAS_GE_30:
+            # starting with pyarrow 19.0, pyarrow will correctly handle this themselves,
+            # so only use types_mapper as workaround for older versions
+            if not PYARROW_GE_19:
+                kwargs["types_mapper"] = {
+                    pa.string(): pd.StringDtype(na_value=np.nan),
+                    pa.large_string(): pd.StringDtype(na_value=np.nan),
+                    pa.json_(): pd.StringDtype(na_value=np.nan),
+                }.get
+            # TODO enable the below block when upstream issue to accept extension types
+            # is fixed
+            # else:
+            #     # for newer pyarrow, still include mapping for json
+            #     # GDAL 3.11 started to emit this extension type, but pyarrow does not
+            #     # yet support it properly in the conversion to pandas
+            #     kwargs["types_mapper"] = {
+            #         pa.json_(): pd.StringDtype(na_value=np.nan),
+            #     }.get
         if arrow_to_pandas_kwargs is not None:
             kwargs.update(arrow_to_pandas_kwargs)
-        df = table.to_pandas(**kwargs)
+
+        try:
+            df = table.to_pandas(**kwargs)
+        except UnicodeDecodeError as ex:
+            # Arrow does not support reading data in a non-UTF-8 encoding
+            raise DataSourceError(
+                "The file being read is not encoded in UTF-8; please use_arrow=False"
+            ) from ex
+
         del table
 
         if fid_as_index:
@@ -329,7 +371,6 @@ def read_dataframe(
     return gp.GeoDataFrame(df, geometry=geometry, crs=meta["crs"])
 
 
-# TODO: handle index properly
 def write_dataframe(
     df,
     path,
@@ -348,8 +389,7 @@ def write_dataframe(
     layer_options=None,
     **kwargs,
 ):
-    """
-    Write GeoPandas GeoDataFrame to an OGR file format.
+    """Write GeoPandas GeoDataFrame to an OGR file format.
 
     Parameters
     ----------
@@ -360,7 +400,8 @@ def write_dataframe(
         in the output file.
     path : str or io.BytesIO
         path to output file on writeable file system or an io.BytesIO object to
-        allow writing to memory
+        allow writing to memory.  Will raise NotImplementedError if an open file
+        handle is passed; use BytesIO instead.
         NOTE: support for writing to memory is limited to specific drivers.
     layer : str, optional (default: None)
         layer name to create.  If writing to memory and layer name is not
@@ -438,15 +479,15 @@ def write_dataframe(
         explicit `dataset_options` or `layer_options` keywords to manually
         do this (for example if an option exists as both dataset and layer
         option).
+
     """
     # TODO: add examples to the docstring (e.g. OGR kwargs)
 
     if not HAS_GEOPANDAS:
         raise ImportError("geopandas is required to use pyogrio.write_dataframe()")
 
-    from geopandas.array import to_wkb
     import pandas as pd
-    from pyproj.enums import WktVersion  # if geopandas is available so is pyproj
+    from geopandas.array import to_wkb
 
     if not isinstance(df, pd.DataFrame):
         raise ValueError("'df' must be a DataFrame or GeoDataFrame")
@@ -465,47 +506,9 @@ def write_dataframe(
     if len(geometry_columns) > 0:
         geometry_column = geometry_columns[0]
         geometry = df[geometry_column]
-        fields = [c for c in df.columns if not c == geometry_column]
     else:
         geometry_column = None
         geometry = None
-        fields = list(df.columns)
-
-    # TODO: may need to fill in pd.NA, etc
-    field_data = []
-    field_mask = []
-    # dict[str, np.array(int)] special case for dt-tz fields
-    gdal_tz_offsets = {}
-    for name in fields:
-        col = df[name]
-        if isinstance(col.dtype, pd.DatetimeTZDtype):
-            # Deal with datetimes with timezones by passing down timezone separately
-            # pass down naive datetime
-            naive = col.dt.tz_localize(None)
-            values = naive.values
-            # compute offset relative to UTC explicitly
-            tz_offset = naive - col.dt.tz_convert("UTC").dt.tz_localize(None)
-            # Convert to GDAL timezone offset representation.
-            # GMT is represented as 100 and offsets are represented by adding /
-            # subtracting 1 for every 15 minutes different from GMT.
-            # https://gdal.org/development/rfc/rfc56_millisecond_precision.html#core-changes
-            # Convert each row offset to a signed multiple of 15m and add to GMT value
-            gdal_offset_representation = tz_offset // pd.Timedelta("15m") + 100
-            gdal_tz_offsets[name] = gdal_offset_representation.values
-        else:
-            values = col.values
-        if isinstance(values, pd.api.extensions.ExtensionArray):
-            from pandas.arrays import IntegerArray, FloatingArray, BooleanArray
-
-            if isinstance(values, (IntegerArray, FloatingArray, BooleanArray)):
-                field_data.append(values._data)
-                field_mask.append(values._mask)
-            else:
-                field_data.append(np.asarray(values))
-                field_mask.append(np.asarray(values.isna()))
-        else:
-            field_data.append(values)
-            field_mask.append(None)
 
     # Determine geometry_type and/or promote_to_multi
     if geometry_column is not None:
@@ -520,7 +523,10 @@ def write_dataframe(
         # If there is data, infer layer geometry type + promote_to_multi
         if not df.empty:
             # None/Empty geometries sometimes report as Z incorrectly, so ignore them
-            has_z_arr = geometry[geometry.notna() & (~geometry.is_empty)].has_z
+            with warnings.catch_warnings():
+                warnings.filterwarnings("ignore", r"GeoSeries\.notna", UserWarning)
+                geometry_notna = geometry.notna()
+            has_z_arr = geometry[geometry_notna & (~geometry.is_empty)].has_z
             has_z = has_z_arr.any()
             all_z = has_z_arr.all()
 
@@ -573,12 +579,13 @@ def write_dataframe(
         # if possible use EPSG codes instead
         epsg = geometry.crs.to_epsg()
         if epsg:
-            crs = f"EPSG:{epsg}"  # noqa: E231
+            crs = f"EPSG:{epsg}"
         else:
-            crs = geometry.crs.to_wkt(WktVersion.WKT1_GDAL)
+            crs = geometry.crs.to_wkt("WKT1_GDAL")
 
     if use_arrow:
         import pyarrow as pa
+
         from pyogrio.raw import write_arrow
 
         if geometry_column is not None:
@@ -614,6 +621,15 @@ def write_dataframe(
 
         table = pa.Table.from_pandas(df, preserve_index=False)
 
+        # Null arrow columns are not supported by GDAL, so convert to string
+        for field_index, field in enumerate(table.schema):
+            if field.type == pa.null():
+                table = table.set_column(
+                    field_index,
+                    field.with_type(pa.string()),
+                    table[field_index].cast(pa.string()),
+                )
+
         if geometry_column is not None:
             # ensure that the geometry column is binary (for all-null geometries,
             # this could be a wrong type)
@@ -650,6 +666,46 @@ def write_dataframe(
     # If there is geometry data, prepare it to be written
     if geometry_column is not None:
         geometry = to_wkb(geometry.values)
+        fields = [c for c in df.columns if not c == geometry_column]
+    else:
+        fields = list(df.columns)
+
+    # Convert data to numpy arrays for writing
+    # TODO: may need to fill in pd.NA, etc
+    field_data = []
+    field_mask = []
+    # dict[str, np.array(int)] special case for dt-tz fields
+    gdal_tz_offsets = {}
+    for name in fields:
+        col = df[name]
+        if isinstance(col.dtype, pd.DatetimeTZDtype):
+            # Deal with datetimes with timezones by passing down timezone separately
+            # pass down naive datetime
+            naive = col.dt.tz_localize(None)
+            values = naive.values
+            # compute offset relative to UTC explicitly
+            tz_offset = naive - col.dt.tz_convert("UTC").dt.tz_localize(None)
+            # Convert to GDAL timezone offset representation.
+            # GMT is represented as 100 and offsets are represented by adding /
+            # subtracting 1 for every 15 minutes different from GMT.
+            # https://gdal.org/development/rfc/rfc56_millisecond_precision.html#core-changes
+            # Convert each row offset to a signed multiple of 15m and add to GMT value
+            gdal_offset_representation = tz_offset // pd.Timedelta("15m") + 100
+            gdal_tz_offsets[name] = gdal_offset_representation.values
+        else:
+            values = col.values
+        if isinstance(values, pd.api.extensions.ExtensionArray):
+            from pandas.arrays import BooleanArray, FloatingArray, IntegerArray
+
+            if isinstance(values, (IntegerArray, FloatingArray, BooleanArray)):
+                field_data.append(values._data)
+                field_mask.append(values._mask)
+            else:
+                field_data.append(np.asarray(values))
+                field_mask.append(np.asarray(values.isna()))
+        else:
+            field_data.append(values)
+            field_mask.append(None)
 
     write(
         path,

pyogrio/proj_data/ITRF2014

@@ -7,7 +7,7 @@
 
 <ITRF2000> +proj=helmert +x=0.0007 +y=0.0012 +z=-0.0261 +s=0.00212 +dx=0.0001 +dy=0.0001 +dz=-0.0019 +ds=0.00011 +t_epoch=2010.0 +convention=position_vector
 
-<ITRF97> +proj=helmert +x=0.0074 +y=-0.0005 +z=-0.0628 +d=0.0038 +rz=0.00026 +dx0.0001	+dy=-0.0005 +dz=-0.0033	+ds=0.00012 +drz=0.00002 +t_epoch=2010.0 +convention=position_vector
+<ITRF97> +proj=helmert +x=0.0074 +y=-0.0005 +z=-0.0628 +s=0.0038 +rz=0.00026 +dx=0.0001	+dy=-0.0005 +dz=-0.0033	+ds=0.00012 +drz=0.00002 +t_epoch=2010.0 +convention=position_vector
 
 <ITRF96> +proj=helmert +x=0.0074 +y=-0.0005 +z=-0.0628 +s=0.0038 +rz=0.00026 +dx=0.0001 +dy=-0.0005 +dz=-0.0033 +ds=0.00012 +drz=0.00002 +t_epoch=2010.0 +convention=position_vector
 

pyogrio/proj_data/ITRF2020

@@ -0,0 +1,91 @@
+# ITRF2020 params are in mm/year, PJ_helmert uses m/year
+
+# Generated with generate_itrf2020.py from EPSG database
+
+<ITRF2014> +proj=helmert +x=-0.0014 +y=-0.0009 +z=0.0014 +s=-0.00042 +dy=-0.0001 +dz=0.0002 +t_epoch=2015 +convention=position_vector
+
+<ITRF2008> +proj=helmert +x=0.0002 +y=0.001 +z=0.0033 +s=-0.00029 +dy=-0.0001 +dz=0.0001 +ds=3e-05 +t_epoch=2015 +convention=position_vector
+
+<ITRF2005> +proj=helmert +x=0.0027 +y=0.0001 +z=-0.0014 +s=0.00065 +dx=0.0003 +dy=-0.0001 +dz=0.0001 +ds=3e-05 +t_epoch=2015 +convention=position_vector
+
+<ITRF2000> +proj=helmert +x=-0.0002 +y=0.0008 +z=-0.0342 +s=0.00225 +dx=0.0001 +dz=-0.0017 +ds=0.00011 +t_epoch=2015 +convention=position_vector
+
+<ITRF97> +proj=helmert +x=0.0065 +y=-0.0039 +z=-0.0779 +rz=0.00036 +s=0.00398 +dx=0.0001 +dy=-0.0006 +dz=-0.0031 +drz=2e-05 +ds=0.00012 +t_epoch=2015 +convention=position_vector
+
+<ITRF96> +proj=helmert +x=0.0065 +y=-0.0039 +z=-0.0779 +rz=0.00036 +s=0.00398 +dx=0.0001 +dy=-0.0006 +dz=-0.0031 +drz=2e-05 +ds=0.00012 +t_epoch=2015 +convention=position_vector
+
+<ITRF94> +proj=helmert +x=0.0065 +y=-0.0039 +z=-0.0779 +rz=0.00036 +s=0.00398 +dx=0.0001 +dy=-0.0006 +dz=-0.0031 +drz=2e-05 +ds=0.00012 +t_epoch=2015 +convention=position_vector
+
+<ITRF93> +proj=helmert +x=-0.0658 +y=0.0019 +z=-0.0713 +rx=-0.00336 +ry=-0.00433 +rz=0.00075 +s=0.00447 +dx=-0.0028 +dy=-0.0002 +dz=-0.0023 +drx=-0.00011 +dry=-0.00019 +drz=7e-05 +ds=0.00012 +t_epoch=2015 +convention=position_vector
+
+<ITRF92> +proj=helmert +x=0.0145 +y=-0.0019 +z=-0.0859 +rz=0.00036 +s=0.00327 +dx=0.0001 +dy=-0.0006 +dz=-0.0031 +drz=2e-05 +ds=0.00012 +t_epoch=2015 +convention=position_vector
+
+<ITRF91> +proj=helmert +x=0.0265 +y=0.0121 +z=-0.0919 +rz=0.00036 +s=0.00467 +dx=0.0001 +dy=-0.0006 +dz=-0.0031 +drz=2e-05 +ds=0.00012 +t_epoch=2015 +convention=position_vector
+
+<ITRF90> +proj=helmert +x=0.0245 +y=0.0081 +z=-0.1079 +rz=0.00036 +s=0.00497 +dx=0.0001 +dy=-0.0006 +dz=-0.0031 +drz=2e-05 +ds=0.00012 +t_epoch=2015 +convention=position_vector
+
+<ITRF89> +proj=helmert +x=0.0295 +y=0.0321 +z=-0.1459 +rz=0.00036 +s=0.00837 +dx=0.0001 +dy=-0.0006 +dz=-0.0031 +drz=2e-05 +ds=0.00012 +t_epoch=2015 +convention=position_vector
+
+<ITRF88> +proj=helmert +x=0.0245 +y=-0.0039 +z=-0.1699 +rx=0.0001 +rz=0.00036 +s=0.01147 +dx=0.0001 +dy=-0.0006 +dz=-0.0031 +drz=2e-05 +ds=0.00012 +t_epoch=2015 +convention=position_vector
+
+# ITRF2020 Plate Motion Model parameters
+#
+# As described in https://agupubs.onlinelibrary.wiley.com/doi/full/10.1029/2023GL106373
+# (and also in https://itrf.ign.fr/docs/solutions/itrf2020/ITRF2020-PMM.dat, but with
+# different units)
+
+<AMUR> +proj=helmert +drx=-0.000131 +dry=-0.000551 +drz=0.000837 +convention=position_vector
+
+<ANTA> +proj=helmert +drx=-0.000269 +dry=-0.000312 +drz=0.000678 +convention=position_vector
+
+<ARAB> +proj=helmert +drx=0.001129 +dry=-0.000146 +drz=0.001438 +convention=position_vector
+
+<AUST> +proj=helmert +drx=0.001487 +dry=0.001175 +drz=0.001223 +convention=position_vector
+
+<CARB> +proj=helmert +drx=0.000207 +dry=-0.001422 +drz=0.000726 +convention=position_vector
+
+<EURA> +proj=helmert +drx=-0.000085 +dry=-0.000519 +drz=0.000753 +convention=position_vector
+
+<INDI> +proj=helmert +drx=0.001137 +dry=0.000013 +drz=0.001444 +convention=position_vector
+
+<NAZC> +proj=helmert +drx=-0.000327 +dry=-0.001561 +drz=0.001605 +convention=position_vector
+
+<NOAM> +proj=helmert +drx=0.000045 +dry=-0.000666 +drz=-0.000098 +convention=position_vector
+
+<NUBI> +proj=helmert +drx=0.000090 +dry=-0.000585 +drz=0.000717 +convention=position_vector
+
+<PCFC> +proj=helmert +drx=-0.000404 +dry=0.001021 +drz=-0.002154 +convention=position_vector
+
+<SOAM> +proj=helmert +drx=-0.000261 +dry=-0.000282 +drz=-0.000157 +convention=position_vector
+
+<SOMA> +proj=helmert +drx=-0.000081 +dry=-0.000719 +drz=0.000864 +convention=position_vector
+
+# Plate names suffixed by _T (for Translation) that includes the translation
+# rates +dx=0.00037 +dy=0.00035 +dz=0.00074 given by Table 2 of the ITRF2020 plate motion model
+# paper
+
+<AMUR_T> +proj=helmert +dx=0.00037 +dy=0.00035 +dz=0.00074 +drx=-0.000131 +dry=-0.000551 +drz=0.000837 +convention=position_vector
+
+<ANTA_T> +proj=helmert +dx=0.00037 +dy=0.00035 +dz=0.00074 +drx=-0.000269 +dry=-0.000312 +drz=0.000678 +convention=position_vector
+
+<ARAB_T> +proj=helmert +dx=0.00037 +dy=0.00035 +dz=0.00074 +drx=0.001129 +dry=-0.000146 +drz=0.001438 +convention=position_vector
+
+<AUST_T> +proj=helmert +dx=0.00037 +dy=0.00035 +dz=0.00074 +drx=0.001487 +dry=0.001175 +drz=0.001223 +convention=position_vector
+
+<CARB_T> +proj=helmert +dx=0.00037 +dy=0.00035 +dz=0.00074 +drx=0.000207 +dry=-0.001422 +drz=0.000726 +convention=position_vector
+
+<EURA_T> +proj=helmert +dx=0.00037 +dy=0.00035 +dz=0.00074 +drx=-0.000085 +dry=-0.000519 +drz=0.000753 +convention=position_vector
+
+<INDI_T> +proj=helmert +dx=0.00037 +dy=0.00035 +dz=0.00074 +drx=0.001137 +dry=0.000013 +drz=0.001444 +convention=position_vector
+
+<NAZC_T> +proj=helmert +dx=0.00037 +dy=0.00035 +dz=0.00074 +drx=-0.000327 +dry=-0.001561 +drz=0.001605 +convention=position_vector
+
+<NOAM_T> +proj=helmert +dx=0.00037 +dy=0.00035 +dz=0.00074 +drx=0.000045 +dry=-0.000666 +drz=-0.000098 +convention=position_vector
+
+<NUBI_T> +proj=helmert +dx=0.00037 +dy=0.00035 +dz=0.00074 +drx=0.000090 +dry=-0.000585 +drz=0.000717 +convention=position_vector
+
+<PCFC_T> +proj=helmert +dx=0.00037 +dy=0.00035 +dz=0.00074 +drx=-0.000404 +dry=0.001021 +drz=-0.002154 +convention=position_vector
+
+<SOAM_T> +proj=helmert +dx=0.00037 +dy=0.00035 +dz=0.00074 +drx=-0.000261 +dry=-0.000282 +drz=-0.000157 +convention=position_vector
+
+<SOMA_T> +proj=helmert +dx=0.00037 +dy=0.00035 +dz=0.00074 +drx=-0.000081 +dry=-0.000719 +drz=0.000864 +convention=position_vector

pyogrio/proj_data/proj-config-version.cmake

@@ -1,8 +1,8 @@
 # Version checking for PROJ
 
-set (PACKAGE_VERSION "9.4.0")
+set (PACKAGE_VERSION "9.6.0")
 set (PACKAGE_VERSION_MAJOR "9")
-set (PACKAGE_VERSION_MINOR "4")
+set (PACKAGE_VERSION_MINOR "6")
 set (PACKAGE_VERSION_PATCH "0")
 
 # These variable definitions parallel those in PROJ's

pyogrio/proj_data/proj-config.cmake

@@ -27,7 +27,7 @@ if("TRUE")
 endif()
 cmake_policy(POP)
 
-find_dependency(SQLite3)
+find_dependency(unofficial-sqlite3)
 
 if(DEFINED PROJ_CONFIG_FIND_TIFF_DEP)
     find_dependency(TIFF)

pyogrio/proj_data/proj-targets.cmake

@@ -1,13 +1,13 @@
 # Generated by CMake
 
 if("${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}" LESS 2.8)
-   message(FATAL_ERROR "CMake >= 2.8.0 required")
+   message(FATAL_ERROR "CMake >= 2.8.12 required")
 endif()
 if(CMAKE_VERSION VERSION_LESS "2.8.12")
    message(FATAL_ERROR "CMake >= 2.8.12 required")
 endif()
 cmake_policy(PUSH)
-cmake_policy(VERSION 2.8.12...3.27)
+cmake_policy(VERSION 2.8.12...3.29)
 #----------------------------------------------------------------
 # Generated CMake target import file.
 #----------------------------------------------------------------
@@ -60,7 +60,7 @@ add_library(PROJ::proj STATIC IMPORTED)
 set_target_properties(PROJ::proj PROPERTIES
   INTERFACE_COMPILE_DEFINITIONS "PROJ_DLL="
   INTERFACE_INCLUDE_DIRECTORIES "${_IMPORT_PREFIX}/include"
-  INTERFACE_LINK_LIBRARIES "\$<LINK_ONLY:-lm>;\$<LINK_ONLY:-ldl>;\$<LINK_ONLY:-pthread>;\$<LINK_ONLY:SQLite::SQLite3>;\$<LINK_ONLY:>;\$<LINK_ONLY:TIFF::TIFF>;\$<LINK_ONLY:CURL::libcurl>;\$<LINK_ONLY:\$<\$<CXX_COMPILER_ID:MSVC>:ws2_32>>;\$<LINK_ONLY:\$<\$<CXX_COMPILER_ID:MSVC>:wldap32>>;\$<LINK_ONLY:\$<\$<CXX_COMPILER_ID:MSVC>:advapi32>>;\$<LINK_ONLY:\$<\$<CXX_COMPILER_ID:MSVC>:crypt32>>;\$<LINK_ONLY:\$<\$<CXX_COMPILER_ID:MSVC>:normaliz>>"
+  INTERFACE_LINK_LIBRARIES "\$<LINK_ONLY:-lm>;\$<LINK_ONLY:-ldl>;\$<LINK_ONLY:-pthread>;\$<LINK_ONLY:unofficial::sqlite3::sqlite3>;\$<LINK_ONLY:>;\$<LINK_ONLY:TIFF::TIFF>;\$<LINK_ONLY:CURL::libcurl>;\$<LINK_ONLY:\$<\$<CXX_COMPILER_ID:MSVC>:ws2_32>>;\$<LINK_ONLY:\$<\$<CXX_COMPILER_ID:MSVC>:wldap32>>;\$<LINK_ONLY:\$<\$<CXX_COMPILER_ID:MSVC>:advapi32>>;\$<LINK_ONLY:\$<\$<CXX_COMPILER_ID:MSVC>:crypt32>>;\$<LINK_ONLY:\$<\$<CXX_COMPILER_ID:MSVC>:normaliz>>"
 )
 
 # Load information for each installed configuration.

pyogrio/proj_data/proj.ini

@@ -23,13 +23,13 @@ cache_enabled = on
 cache_size_MB = 300
 
 ; Time-to-live delay in seconds before already accessed remote resources are
-; acessed again to check if they have been updated.
+; accessed again to check if they have been updated.
 cache_ttl_sec = 86400
 
 ; Can be set to on so that by default the lack of a known resource files needed
 ; for the best transformation PROJ would normally use causes an error, or off
 ; to accept missing resource files without errors or warnings.
-; This default value itself is overriden by the PROJ_ONLY_BEST_DEFAULT environment
+; This default value itself is overridden by the PROJ_ONLY_BEST_DEFAULT environment
 ; variable if set, and then by the ONLY_BEST setting that can be
 ; passed to the proj_create_crs_to_crs() method, or with the --only-best
 ; option of the cs2cs program.
@@ -38,10 +38,18 @@ cache_ttl_sec = 86400
 only_best_default = off
 
 ; Filename of the Certificate Authority (CA) bundle.
-; Can be overriden with the PROJ_CURL_CA_BUNDLE / CURL_CA_BUNDLE environment variable.
+; Can be overridden with the PROJ_CURL_CA_BUNDLE / CURL_CA_BUNDLE environment variable.
 ; (added in PROJ 9.0)
 ; ca_bundle_path = /path/to/cabundle.pem
 
+; When this is set to on, the operating systems native CA store will be used for certificate verification
+; If you set this option to on and also set ca_bundle_path then during verification those certificates are
+; searched in addition to the native CA store.
+; (added in PROJ 9.6)
+; Valid values = on, off
+;native_ca = on
+
+
 ; Transverse Mercator (and UTM)  default algorithm: auto, evenden_snyder or poder_engsager
 ; * evenden_snyder is the fastest, but less accurate far from central meridian
 ; * poder_engsager is slower, but more accurate far from central meridian

pyogrio/proj_data/proj4-targets.cmake

@@ -1,13 +1,13 @@
 # Generated by CMake
 
 if("${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}" LESS 2.8)
-   message(FATAL_ERROR "CMake >= 2.8.0 required")
+   message(FATAL_ERROR "CMake >= 2.8.12 required")
 endif()
 if(CMAKE_VERSION VERSION_LESS "2.8.12")
    message(FATAL_ERROR "CMake >= 2.8.12 required")
 endif()
 cmake_policy(PUSH)
-cmake_policy(VERSION 2.8.12...3.27)
+cmake_policy(VERSION 2.8.12...3.29)
 #----------------------------------------------------------------
 # Generated CMake target import file.
 #----------------------------------------------------------------
@@ -60,7 +60,7 @@ add_library(PROJ4::proj STATIC IMPORTED)
 set_target_properties(PROJ4::proj PROPERTIES
   INTERFACE_COMPILE_DEFINITIONS "PROJ_DLL="
   INTERFACE_INCLUDE_DIRECTORIES "${_IMPORT_PREFIX}/include"
-  INTERFACE_LINK_LIBRARIES "\$<LINK_ONLY:-lm>;\$<LINK_ONLY:-ldl>;\$<LINK_ONLY:-pthread>;\$<LINK_ONLY:SQLite::SQLite3>;\$<LINK_ONLY:>;\$<LINK_ONLY:TIFF::TIFF>;\$<LINK_ONLY:CURL::libcurl>;\$<LINK_ONLY:\$<\$<CXX_COMPILER_ID:MSVC>:ws2_32>>;\$<LINK_ONLY:\$<\$<CXX_COMPILER_ID:MSVC>:wldap32>>;\$<LINK_ONLY:\$<\$<CXX_COMPILER_ID:MSVC>:advapi32>>;\$<LINK_ONLY:\$<\$<CXX_COMPILER_ID:MSVC>:crypt32>>;\$<LINK_ONLY:\$<\$<CXX_COMPILER_ID:MSVC>:normaliz>>"
+  INTERFACE_LINK_LIBRARIES "\$<LINK_ONLY:-lm>;\$<LINK_ONLY:-ldl>;\$<LINK_ONLY:-pthread>;\$<LINK_ONLY:unofficial::sqlite3::sqlite3>;\$<LINK_ONLY:>;\$<LINK_ONLY:TIFF::TIFF>;\$<LINK_ONLY:CURL::libcurl>;\$<LINK_ONLY:\$<\$<CXX_COMPILER_ID:MSVC>:ws2_32>>;\$<LINK_ONLY:\$<\$<CXX_COMPILER_ID:MSVC>:wldap32>>;\$<LINK_ONLY:\$<\$<CXX_COMPILER_ID:MSVC>:advapi32>>;\$<LINK_ONLY:\$<\$<CXX_COMPILER_ID:MSVC>:crypt32>>;\$<LINK_ONLY:\$<\$<CXX_COMPILER_ID:MSVC>:normaliz>>"
 )
 
 # Load information for each installed configuration.

pyogrio/proj_data/projjson.schema.json

@@ -2,7 +2,7 @@
   "$id": "https://proj.org/schemas/v0.7/projjson.schema.json",
   "$schema": "http://json-schema.org/draft-07/schema#",
   "description": "Schema for PROJJSON (v0.7)",
-  "$comment": "This file exists both in data/ and in schemas/vXXX/. Keep both in sync. And if changing the value of $id, change PROJJSON_DEFAULT_VERSION accordingly in io.cpp",
+  "$comment": "This document is copyright Even Rouault and PROJ contributors, 2019-2023, and subject to the MIT license. This file exists both in data/ and in schemas/vXXX/. Keep both in sync. And if changing the value of $id, change PROJJSON_DEFAULT_VERSION accordingly in io.cpp",
 
   "oneOf": [
     { "$ref": "#/definitions/crs" },

pyogrio/proj_data/usage

@@ -1,4 +1,9 @@
 proj provides CMake targets:
 
-    find_package(PROJ CONFIG REQUIRED)
-    target_link_libraries(main PRIVATE PROJ::proj)
+  find_package(PROJ CONFIG REQUIRED)
+  target_link_libraries(main PRIVATE PROJ::proj)
+
+proj provides pkg-config modules:
+
+  # Coordinate transformation software library
+  proj