pyogrio 0.8.0__cp39-cp39-win_amd64.whl → 0.10.0__cp39-cp39-win_amd64.whl

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Potentially problematic release.


This version of pyogrio might be problematic. Click here for more details.

Files changed (103) hide show
  1. pyogrio/__init__.py +33 -22
  2. pyogrio/_compat.py +7 -1
  3. pyogrio/_env.py +4 -6
  4. pyogrio/_err.c +460 -445
  5. pyogrio/_err.cp39-win_amd64.pyd +0 -0
  6. pyogrio/_geometry.c +645 -612
  7. pyogrio/_geometry.cp39-win_amd64.pyd +0 -0
  8. pyogrio/_io.c +7764 -7602
  9. pyogrio/_io.cp39-win_amd64.pyd +0 -0
  10. pyogrio/_ogr.c +601 -609
  11. pyogrio/_ogr.cp39-win_amd64.pyd +0 -0
  12. pyogrio/_version.py +3 -3
  13. pyogrio/_vsi.c +7570 -2514
  14. pyogrio/_vsi.cp39-win_amd64.pyd +0 -0
  15. pyogrio/core.py +86 -20
  16. pyogrio/errors.py +9 -16
  17. pyogrio/gdal_data/GDAL-targets.cmake +1 -1
  18. pyogrio/gdal_data/GDALConfig.cmake +0 -1
  19. pyogrio/gdal_data/GDALConfigVersion.cmake +3 -3
  20. pyogrio/gdal_data/MM_m_idofic.csv +321 -0
  21. pyogrio/gdal_data/gdaltileindex.xsd +269 -0
  22. pyogrio/gdal_data/gdalvrt.xsd +130 -22
  23. pyogrio/gdal_data/ogrinfo_output.schema.json +23 -0
  24. pyogrio/gdal_data/ogrvrt.xsd +3 -0
  25. pyogrio/gdal_data/pci_datum.txt +222 -155
  26. pyogrio/gdal_data/pci_ellips.txt +90 -38
  27. pyogrio/gdal_data/vcpkg.spdx.json +21 -21
  28. pyogrio/gdal_data/vcpkg_abi_info.txt +27 -27
  29. pyogrio/geopandas.py +44 -27
  30. pyogrio/proj_data/proj-config-version.cmake +2 -2
  31. pyogrio/proj_data/proj-targets.cmake +1 -1
  32. pyogrio/proj_data/proj.db +0 -0
  33. pyogrio/proj_data/proj4-targets.cmake +1 -1
  34. pyogrio/proj_data/projjson.schema.json +1 -1
  35. pyogrio/proj_data/vcpkg.spdx.json +17 -17
  36. pyogrio/proj_data/vcpkg_abi_info.txt +15 -15
  37. pyogrio/raw.py +46 -30
  38. pyogrio/tests/conftest.py +206 -12
  39. pyogrio/tests/fixtures/README.md +32 -13
  40. pyogrio/tests/fixtures/curve.gpkg +0 -0
  41. pyogrio/tests/fixtures/{test_multisurface.gpkg → curvepolygon.gpkg} +0 -0
  42. pyogrio/tests/fixtures/line_zm.gpkg +0 -0
  43. pyogrio/tests/fixtures/multisurface.gpkg +0 -0
  44. pyogrio/tests/test_arrow.py +178 -24
  45. pyogrio/tests/test_core.py +162 -72
  46. pyogrio/tests/test_geopandas_io.py +341 -96
  47. pyogrio/tests/test_path.py +30 -17
  48. pyogrio/tests/test_raw_io.py +165 -54
  49. pyogrio/tests/test_util.py +56 -0
  50. pyogrio/util.py +55 -31
  51. pyogrio-0.10.0.dist-info/DELVEWHEEL +2 -0
  52. {pyogrio-0.8.0.dist-info → pyogrio-0.10.0.dist-info}/LICENSE +1 -1
  53. {pyogrio-0.8.0.dist-info → pyogrio-0.10.0.dist-info}/METADATA +37 -8
  54. {pyogrio-0.8.0.dist-info → pyogrio-0.10.0.dist-info}/RECORD +75 -90
  55. {pyogrio-0.8.0.dist-info → pyogrio-0.10.0.dist-info}/WHEEL +1 -1
  56. pyogrio.libs/.load-order-pyogrio-0.10.0 +18 -0
  57. pyogrio.libs/{Lerc-62a2c1c74500e7815994b3e49b36750c.dll → Lerc-089e3fef3df84b17326dcddbf1dedaa4.dll} +0 -0
  58. pyogrio.libs/{gdal-2bfc6a9f962a8953b0640db9a272d797.dll → gdal-debee5933f0da7bb90b4bcd009023377.dll} +0 -0
  59. pyogrio.libs/{geos-289d7171bd083dfed1f8a90e4ae57442.dll → geos-ace4c5b5c1f569bb4213e7bbd0b0322e.dll} +0 -0
  60. pyogrio.libs/{geos_c-2a12859cd876719c648f1eb950b7d94c.dll → geos_c-7478ca0a86136b280d9b2d245c6f6627.dll} +0 -0
  61. pyogrio.libs/geotiff-c8fe8a095520a4ea4e465d27e06add3a.dll +0 -0
  62. pyogrio.libs/{iconv-2-f2d9304f8dc4cdd981024b520b73a099.dll → iconv-2-27352d156a5467ca5383d3951093ea5a.dll} +0 -0
  63. pyogrio.libs/{jpeg62-a67b2bf7fd32d34c565ae5bb6d47c224.dll → jpeg62-e56b6f95a95af498f4623b8da4cebd46.dll} +0 -0
  64. pyogrio.libs/{json-c-79a8df7e59952f5c5d594620e4b66c13.dll → json-c-c84940e2654a4f8468bfcf2ce992aa93.dll} +0 -0
  65. pyogrio.libs/libcurl-d69cfd4ad487d53d58743b6778ec85e7.dll +0 -0
  66. pyogrio.libs/{libexpat-fa55f107b678de136400c6d953c3cdde.dll → libexpat-6576a8d02641b6a3dbad35901ec200a7.dll} +0 -0
  67. pyogrio.libs/liblzma-9ee4accb476ec1ae24e924953140273d.dll +0 -0
  68. pyogrio.libs/{libpng16-6227e9a35c2a350ae6b0586079c10b9e.dll → libpng16-7c36142dda59f186f6bb683e8dae2bfe.dll} +0 -0
  69. pyogrio.libs/{msvcp140-46db46e967c8db2cb7a20fc75872a57e.dll → msvcp140-98b3e5b80de1e5e9d1703b786d795623.dll} +0 -0
  70. pyogrio.libs/proj-a408c5327f3fd2f5fabe8c56815beed7.dll +0 -0
  71. pyogrio.libs/{qhull_r-d8840f4ed1f7d452ff9a30237320bcfd.dll → qhull_r-516897f855568caab1ab1fe37912766c.dll} +0 -0
  72. pyogrio.libs/sqlite3-9bc109d8536d5ed9666332fec94485fc.dll +0 -0
  73. pyogrio.libs/{tiff-ffca1ff19d0e95dad39df0078fb037af.dll → tiff-9b3f605fffe0bccc0a964c374ee4f820.dll} +0 -0
  74. pyogrio.libs/{zlib1-aaba6ea052f6d3fa3d84a301e3eb3d30.dll → zlib1-e5af16a15c63f05bd82d90396807ae5b.dll} +0 -0
  75. pyogrio/_err.pxd +0 -4
  76. pyogrio/_err.pyx +0 -250
  77. pyogrio/_geometry.pxd +0 -4
  78. pyogrio/_geometry.pyx +0 -129
  79. pyogrio/_io.pxd +0 -0
  80. pyogrio/_io.pyx +0 -2738
  81. pyogrio/_ogr.pxd +0 -441
  82. pyogrio/_ogr.pyx +0 -346
  83. pyogrio/_vsi.pxd +0 -4
  84. pyogrio/_vsi.pyx +0 -140
  85. pyogrio/arrow_bridge.h +0 -115
  86. pyogrio/gdal_data/bag_template.xml +0 -201
  87. pyogrio/gdal_data/gmlasconf.xml +0 -169
  88. pyogrio/gdal_data/gmlasconf.xsd +0 -1066
  89. pyogrio/gdal_data/netcdf_config.xsd +0 -143
  90. pyogrio/gdal_data/template_tiles.mapml +0 -28
  91. pyogrio/tests/fixtures/test_datetime.geojson +0 -7
  92. pyogrio/tests/fixtures/test_datetime_tz.geojson +0 -8
  93. pyogrio/tests/fixtures/test_fgdb.gdb.zip +0 -0
  94. pyogrio/tests/fixtures/test_nested.geojson +0 -18
  95. pyogrio/tests/fixtures/test_ogr_types_list.geojson +0 -12
  96. pyogrio-0.8.0.dist-info/DELVEWHEEL +0 -2
  97. pyogrio.libs/.load-order-pyogrio-0.8.0 +0 -18
  98. pyogrio.libs/geotiff-d1c0fcc3c454409ad8be61ff04a7422c.dll +0 -0
  99. pyogrio.libs/libcurl-7fef9869f6520a5fbdb2bc9ce4c496cc.dll +0 -0
  100. pyogrio.libs/liblzma-5a1f648afc3d4cf36e3aef2266d55143.dll +0 -0
  101. pyogrio.libs/proj-74051a73897c9fa6d7bfef4561688568.dll +0 -0
  102. pyogrio.libs/sqlite3-fe7a86058d1c5658d1f9106228a7fd83.dll +0 -0
  103. {pyogrio-0.8.0.dist-info → pyogrio-0.10.0.dist-info}/top_level.txt +0 -0
@@ -1,57 +1,69 @@
1
1
  !
2
- ! By email on December 2nd, 2010:
2
+ ! From https://github.com/OSGeo/gdal/issues/8034, June 30, 2023
3
3
  !
4
- ! I, Louis Burry, on behalf of PCI Geomatics agree to allow the ellips.txt
4
+ ! I, Michael Goldberg, on behalf of PCI Geomatics agree to allow the ellips.txt
5
5
  ! and datum.txt file to be distributed under the GDAL open source license.
6
6
  !
7
- ! Louis Burry
8
- ! VP Technology & Delivery
7
+ ! Michael Goldberg
8
+ ! Development Manager
9
9
  ! PCI Geomatics
10
10
  !
11
+ ! PCI Ellipsoid Database
12
+ ! ----------------------
13
+ ! This file lists the different reference ellipsoids that may
14
+ ! be used by PCI coordinate systems. Ellipsoid entries in datum.txt
15
+ ! refer to entries in this file.
16
+ !
17
+ ! Each ellipsoid is listed on a single line. The format of each record
18
+ ! is as follows:
19
+ !
20
+ ! Ellipsoid_code, Description_string, Semimajor_axis_m, Semiminor_axis_m [,extra comments]
21
+ !
22
+ ! Ellipsoid_code is the code that uniquely identifies the ellipsoid
23
+ ! within PCI software
24
+ ! Description_string is a short description that helps users to identify
25
+ ! the ellipsoid. It may be listed, for example, in a dropdown list in
26
+ ! a PCI dialog box.
27
+ ! Semimajor_axis_m is the ellipsoid semi-major (equatorial) axis length in metres.
28
+ ! Semiminor_axis_m is the ellipsoid semi-minor (polar) axis length in metres.
29
+ !
30
+ ! Any extra fields may be added after these four elements if desired; they will
31
+ ! not be read by PCI software but may be helpful for the user.
11
32
  !
12
33
  ! NOTE: The range of "E908" to "E998" is set aside for
13
34
  ! the use of local customer development.
14
35
  !
15
- "E009","Airy 1830",6377563.396,6356256.91
16
- "E011","Modified Airy",6377340.189,6356034.448
17
- "E910","ATS77",6378135.0,6356750.304922
18
- "E014","Australian National 1965",6378160.,6356774.719
19
- "E002","Bessel 1841",6377397.155,6356078.96284
20
- "E900","Bessel 1841 (Namibia)",6377483.865,6356165.382966
21
- "E333","Bessel 1841 (Japan By Law)",6377397.155,6356078.963
22
36
  "E000","Clarke 1866",6378206.4,6356583.8
23
37
  "E001","Clarke 1880 (RGS)",6378249.145,6356514.86955
24
- "E202","Clarke 1880 (IGN, France)",6378249.2,6356515.0
38
+ "E002","Bessel 1841",6377397.155,6356078.96284
39
+ "E003","New International 1967",6378157.5,6356772.2
40
+ "E004","International 1924",6378388.,6356911.94613
41
+ "E005","WGS 72",6378135.,6356750.519915
25
42
  "E006","Everest (India 1830)",6377276.3452,6356075.4133
43
+ "E007","WGS 66",6378145.,6356759.769356
44
+ "E008","GRS 1980",6378137.,6356752.31414
45
+ "E009","Airy 1830",6377563.396,6356256.91
26
46
  "E010","Everest (W. Malaysia and Singapore 1948)",6377304.063,6356103.039
27
- "E901","Everest (India 1956)",6377301.243,6356100.228368
28
- "E902","Everest (W. Malaysia 1969)",6377295.664,6356094.667915
29
- "E903","Everest (E. Malaysia and Brunei)",6377298.556,6356097.550301
30
- "E201","Everest (Pakistan)",6377309.613,6356108.570542
31
- "E017","Fischer 1960",6378166.,6356784.283666
47
+ "E011","Modified Airy",6377340.189,6356034.448
48
+ "E012","WGS 84",6378137.,6356752.314245
32
49
  "E013","Modified Fischer 1960",6378155.,6356773.3205
33
- "E018","Fischer 1968",6378150.,6356768.337303
34
- "E008","GRS 1980",6378137.,6356752.31414
35
- "E904","Helmert 1906",6378200.,6356818.169628
36
- "E016","Hough 1960",6378270.,6356794.343479
37
- "E200","Indonesian 1974",6378160.,6356774.504086
38
- "E004","International 1924",6378388.,6356911.94613
39
- "E203","IUGG 67",6378160.,6356774.516090714
50
+ "E014","Australian National 1965",6378160.,6356774.719
40
51
  "E015","Krassovsky 1940",6378245.,6356863.0188
41
- "E700","MODIS (Sphere from WGS84)",6371007.181,6371007.181
42
- "E003","New International 1967",6378157.5,6356772.2
52
+ "E016","Hough 1960",6378270.,6356794.343479
53
+ "E017","Fischer 1960",6378166.,6356784.283666
54
+ "E018","Fischer 1968",6378150.,6356768.337303
43
55
  "E019","Normal Sphere",6370997.,6370997.
44
- "E905","SGS 85",6378136.,6356751.301569
45
- "E907","South American 1969",6378160.,6356774.719
46
- "E906","WGS 60",6378165.,6356783.286959
47
- "E007","WGS 66",6378145.,6356759.769356
48
- "E005","WGS 72",6378135.,6356750.519915
49
- "E012","WGS 84",6378137.,6356752.314245
50
56
  "E020","WGS 84 semimajor axis",6378137.,6378137.
51
- "E600","D-PAF (Orbits)",6378144.0,6356759.0
52
- "E601","Test Data Set 1",6378144.0,6356759.0
53
- "E602","Test Data Set 2",6377397.2,6356079.0
54
- "E204","War Office",6378300.583,6356752.270
57
+ "E021","WGS 84 semiminor axis",6356752.314245,6356752.314245
58
+ "E022","Clarke 1866 Authalic Sphere", 6370997.000000, 6370997.000000
59
+ "E023","GRS 1980 Authalic Sphere", 6371007.000000, 6371007.000000
60
+ "E024","International 1924 Authalic Sphere", 6371228.000000, 6371228.000000
61
+ "E025","GosatCAIL1B+ EarthRadius",6371008.77138,6371008.77138
62
+ "E200","Indonesian 1974",6378160.,6356774.504086
63
+ "E201","Everest (Pakistan)",6377309.613,6356108.570542
64
+ "E202","Clarke 1880 (IGN, France)",6378249.2,6356515.0
65
+ "E203","IUGG 67",6378160.,6356774.516090714
66
+ "E204","War Office",6378300.000,6356751.689189
55
67
  "E205","Clarke 1880 Arc",6378249.145,6356514.966
56
68
  "E206","Bessel Modified",6377492.018,6356173.5087
57
69
  "E207","Clarke 1858",6378293.639,6356617.98149
@@ -61,17 +73,57 @@
61
73
  "E211","Everest Modified",6377304.063,6356103.039
62
74
  "E212","Modified Everest 1969",6377295.664,6356094.668
63
75
  "E213","Everest (1967 Definition)",6377298.556,6356097.550
64
- "E214","Clarke 1880 (Benoit)",6378300.79,6356566.43
76
+ "E214","Clarke 1880 (Benoit)",6378300.789000,6356566.435000
65
77
  "E215","Clarke 1880 (SGA)",6378249.2,6356515.0
66
78
  "E216","Everest (1975 Definition)",6377299.151,6356098.1451
67
79
  "E217","GEM 10C",6378137,6356752.31414
68
80
  "E218","OSU 86F",6378136.2,6356751.516672
69
81
  "E219","OSU 91A",6378136.3,6356751.6163367
70
82
  "E220","Sphere",6371000,6371000
71
- "E221","Struve 1860",6378297,6356655.847
83
+ "E221","Struve 1860",6378298.300000,6356657.142670
72
84
  "E222","Walbeck",6376896,6355834.847
73
85
  "E223","Plessis 1817",6376523,6355862.933
74
86
  "E224","Xian 1980",6378140.0,6356755.288
75
87
  "E225","EMEP Sphere",6370000,6370000
76
88
  "E226","Everest (India and Nepal)",6377301.243,6356100.228368
89
+ "E227","Everest (1830 Definition)", 6377299.365595, 6356098.359005,"EPSG:7042"
90
+ "E228","Danish 1876", 6377019.270000, 6355762.539100
91
+ "E229","Bessel Namibia (GLM)", 6377483.865280, 6356165.383246
92
+ "E230","PZ-90", 6378136.000000, 6356751.361746
93
+ "E231","CGCS2000", 6378137.000000, 6356752.314140
94
+ "E232","IAG 1975", 6378140.000000, 6356755.288158
95
+ "E233","NWL 9D", 6378145.000000, 6356759.769489
96
+ "E234","Hughes 1980", 6378273.000000, 6356889.449000
97
+ "E235","Clarke 1880 (international foot)", 6378306.369600, 6356571.996000
98
+ "E236","Clarke 1866 Michigan", 6378450.047549, 6356826.621488
99
+ "E237","APL 4.5 (1968)", 6378144.000000, 6356757.338698
100
+ "E238","Airy (War Office)", 6377542.178, 6356235.764
101
+ "E239","Clarke 1858 (DIGEST)", 6378235.600, 6356560.140
102
+ "E240","Clarke 1880 (Palestine)", 6378300.782, 6356566.427
103
+ "E241","Clarke 1880 (Syria)", 6378247.842, 6356513.671
104
+ "E242","Clarke 1880 (Fiji)", 6378301.000, 6356566.548
105
+ "E243","Andrae", 6377104.430, 6355847.415
106
+ "E244","Delambre 1810", 6376985.228, 6356323.664
107
+ "E245","Delambre (Carte de France)", 6376985.000, 6356323.436
108
+ "E246","Germaine (Djibouti)", 6378284.000, 6356589.156
109
+ "E247","Hayford 1909", 6378388.000, 6356909.000
110
+ "E248","Krayenhoff 1827", 6376950.400, 6356356.341
111
+ "E249","Plessis Reconstituted", 6376523.994, 6355862.907
112
+ "E250","GRS 1967", 6378160.000, 6356774.516
113
+ "E251","Svanberg", 6376797.000, 6355837.971
114
+ "E252","Walbeck 1819 (Planheft 1942)", 6376895.000, 6355834.000
115
+ "E333","Bessel 1841 (Japan By Law)",6377397.155,6356078.963
116
+ "E600","D-PAF (Orbits)",6378144.0,6356759.0
117
+ "E601","Test Data Set 1",6378144.0,6356759.0
118
+ "E602","Test Data Set 2",6377397.2,6356079.0
119
+ "E700","MODIS (Sphere from WGS84)",6371007.181,6371007.181
77
120
  "E899","GRS 1967 Modified",6378160.,6356774.719195306
121
+ "E900","Bessel 1841 (Namibia)",6377483.865,6356165.382966
122
+ "E901","Everest (India 1956)",6377301.243,6356100.228368
123
+ "E902","Everest (W. Malaysia 1969)",6377295.664,6356094.667915
124
+ "E903","Everest (E. Malaysia and Brunei)",6377298.556,6356097.550301
125
+ "E904","Helmert 1906",6378200.,6356818.169628
126
+ "E905","SGS 85",6378136.,6356751.301569
127
+ "E906","WGS 60",6378165.,6356783.286959
128
+ "E907","South American 1969",6378160.,6356774.719
129
+ "E910","ATS77",6378135.0,6356750.304922
@@ -3,13 +3,13 @@
3
3
  "spdxVersion": "SPDX-2.2",
4
4
  "dataLicense": "CC0-1.0",
5
5
  "SPDXID": "SPDXRef-DOCUMENT",
6
- "documentNamespace": "https://spdx.org/spdxdocs/gdal-x64-windows-dynamic-release-3.8.5-aa54f6ca-0bd9-4546-9033-b31d8ab18e9f",
7
- "name": "gdal:x64-windows-dynamic-release@3.8.5 3eb20361977e696c7023a73bbf65b47f2b5a394dae88adda5226923690cbcc34",
6
+ "documentNamespace": "https://spdx.org/spdxdocs/gdal-x64-windows-dynamic-release-3.9.1-71a283f8-d5e9-4db1-8ff2-94b97ebf5f9e",
7
+ "name": "gdal:x64-windows-dynamic-release@3.9.1 476956deda0d72cf8c88dbefd140a4894dfd0af5507e979103747b99e8955e6b",
8
8
  "creationInfo": {
9
9
  "creators": [
10
- "Tool: vcpkg-7d353e869753e5609a1f1a057df3db8fd356e49d"
10
+ "Tool: vcpkg-2024-08-01-fd884a0d390d12783076341bd43d77c3a6a15658"
11
11
  ],
12
- "created": "2024-05-06T21:53:01Z"
12
+ "created": "2024-09-05T06:48:50Z"
13
13
  },
14
14
  "relationships": [
15
15
  {
@@ -117,8 +117,8 @@
117
117
  {
118
118
  "name": "gdal",
119
119
  "SPDXID": "SPDXRef-port",
120
- "versionInfo": "3.8.5",
121
- "downloadLocation": "git+https://github.com/Microsoft/vcpkg@ea4d3f8cb9ab32d885ac60b974421a604fdbcc87",
120
+ "versionInfo": "3.9.1",
121
+ "downloadLocation": "git+https://github.com/Microsoft/vcpkg@65b271a32a93a9dfa4dfd3905fcd0b5388926f81",
122
122
  "homepage": "https://gdal.org",
123
123
  "licenseConcluded": "NOASSERTION",
124
124
  "licenseDeclared": "NOASSERTION",
@@ -129,7 +129,7 @@
129
129
  {
130
130
  "name": "gdal:x64-windows-dynamic-release",
131
131
  "SPDXID": "SPDXRef-binary",
132
- "versionInfo": "3eb20361977e696c7023a73bbf65b47f2b5a394dae88adda5226923690cbcc34",
132
+ "versionInfo": "476956deda0d72cf8c88dbefd140a4894dfd0af5507e979103747b99e8955e6b",
133
133
  "downloadLocation": "NONE",
134
134
  "licenseConcluded": "NOASSERTION",
135
135
  "licenseDeclared": "NOASSERTION",
@@ -139,21 +139,21 @@
139
139
  {
140
140
  "SPDXID": "SPDXRef-resource-1",
141
141
  "name": "OSGeo/gdal",
142
- "downloadLocation": "git+https://github.com/OSGeo/gdal@v3.8.5",
142
+ "downloadLocation": "git+https://github.com/OSGeo/gdal@v3.9.1",
143
143
  "licenseConcluded": "NOASSERTION",
144
144
  "licenseDeclared": "NOASSERTION",
145
145
  "copyrightText": "NOASSERTION",
146
146
  "checksums": [
147
147
  {
148
148
  "algorithm": "SHA512",
149
- "checksumValue": "5b155229225e904b3619628ec27efdd273d9f083c1ee4f6d94041897d5bc9c3133590b70885ad61fc8864da2f334a75cf32bafe7f776c40bbbc3673fe842c986"
149
+ "checksumValue": "d9ab5d94dc870df17b010166d3ebbe897a1f673ba05bf31cd4bed437b6db303dd9e373ba5099d3a191ff3e48c995556fb5bcc77d03d975614df4aa20a2c2b085"
150
150
  }
151
151
  ]
152
152
  }
153
153
  ],
154
154
  "files": [
155
155
  {
156
- "fileName": "./C:/vcpkg/buildtrees/versioning_/versions/gdal/ea4d3f8cb9ab32d885ac60b974421a604fdbcc87/cmake-project-include.cmake",
156
+ "fileName": "./C:/vcpkg/buildtrees/versioning_/versions/gdal/65b271a32a93a9dfa4dfd3905fcd0b5388926f81/cmake-project-include.cmake",
157
157
  "SPDXID": "SPDXRef-file-0",
158
158
  "checksums": [
159
159
  {
@@ -165,19 +165,19 @@
165
165
  "copyrightText": "NOASSERTION"
166
166
  },
167
167
  {
168
- "fileName": "./C:/vcpkg/buildtrees/versioning_/versions/gdal/ea4d3f8cb9ab32d885ac60b974421a604fdbcc87/find-link-libraries.patch",
168
+ "fileName": "./C:/vcpkg/buildtrees/versioning_/versions/gdal/65b271a32a93a9dfa4dfd3905fcd0b5388926f81/find-link-libraries.patch",
169
169
  "SPDXID": "SPDXRef-file-1",
170
170
  "checksums": [
171
171
  {
172
172
  "algorithm": "SHA256",
173
- "checksumValue": "9e390300ab79cf6fef1bb009416346a1f98d4946cb14c71ee4ea46217e3cb9d2"
173
+ "checksumValue": "043cbdd6298fce33c29d128241470b71990dc13eb63bfa44b3d82b17f5384468"
174
174
  }
175
175
  ],
176
176
  "licenseConcluded": "NOASSERTION",
177
177
  "copyrightText": "NOASSERTION"
178
178
  },
179
179
  {
180
- "fileName": "./C:/vcpkg/buildtrees/versioning_/versions/gdal/ea4d3f8cb9ab32d885ac60b974421a604fdbcc87/fix-gdal-target-interfaces.patch",
180
+ "fileName": "./C:/vcpkg/buildtrees/versioning_/versions/gdal/65b271a32a93a9dfa4dfd3905fcd0b5388926f81/fix-gdal-target-interfaces.patch",
181
181
  "SPDXID": "SPDXRef-file-2",
182
182
  "checksums": [
183
183
  {
@@ -189,7 +189,7 @@
189
189
  "copyrightText": "NOASSERTION"
190
190
  },
191
191
  {
192
- "fileName": "./C:/vcpkg/buildtrees/versioning_/versions/gdal/ea4d3f8cb9ab32d885ac60b974421a604fdbcc87/libkml.patch",
192
+ "fileName": "./C:/vcpkg/buildtrees/versioning_/versions/gdal/65b271a32a93a9dfa4dfd3905fcd0b5388926f81/libkml.patch",
193
193
  "SPDXID": "SPDXRef-file-3",
194
194
  "checksums": [
195
195
  {
@@ -201,19 +201,19 @@
201
201
  "copyrightText": "NOASSERTION"
202
202
  },
203
203
  {
204
- "fileName": "./C:/vcpkg/buildtrees/versioning_/versions/gdal/ea4d3f8cb9ab32d885ac60b974421a604fdbcc87/portfile.cmake",
204
+ "fileName": "./C:/vcpkg/buildtrees/versioning_/versions/gdal/65b271a32a93a9dfa4dfd3905fcd0b5388926f81/portfile.cmake",
205
205
  "SPDXID": "SPDXRef-file-4",
206
206
  "checksums": [
207
207
  {
208
208
  "algorithm": "SHA256",
209
- "checksumValue": "7e5f1f6c6f1f420b994e149d8a31e1e31e23492a881ce29b3c30307ab28f2f92"
209
+ "checksumValue": "92a0c437215b5fed404a2deb00ade3a8cfb4da00c518af38525a3194a7d89c1a"
210
210
  }
211
211
  ],
212
212
  "licenseConcluded": "NOASSERTION",
213
213
  "copyrightText": "NOASSERTION"
214
214
  },
215
215
  {
216
- "fileName": "./C:/vcpkg/buildtrees/versioning_/versions/gdal/ea4d3f8cb9ab32d885ac60b974421a604fdbcc87/target-is-valid.patch",
216
+ "fileName": "./C:/vcpkg/buildtrees/versioning_/versions/gdal/65b271a32a93a9dfa4dfd3905fcd0b5388926f81/target-is-valid.patch",
217
217
  "SPDXID": "SPDXRef-file-5",
218
218
  "checksums": [
219
219
  {
@@ -225,7 +225,7 @@
225
225
  "copyrightText": "NOASSERTION"
226
226
  },
227
227
  {
228
- "fileName": "./C:/vcpkg/buildtrees/versioning_/versions/gdal/ea4d3f8cb9ab32d885ac60b974421a604fdbcc87/usage",
228
+ "fileName": "./C:/vcpkg/buildtrees/versioning_/versions/gdal/65b271a32a93a9dfa4dfd3905fcd0b5388926f81/usage",
229
229
  "SPDXID": "SPDXRef-file-6",
230
230
  "checksums": [
231
231
  {
@@ -237,7 +237,7 @@
237
237
  "copyrightText": "NOASSERTION"
238
238
  },
239
239
  {
240
- "fileName": "./C:/vcpkg/buildtrees/versioning_/versions/gdal/ea4d3f8cb9ab32d885ac60b974421a604fdbcc87/vcpkg-cmake-wrapper.cmake",
240
+ "fileName": "./C:/vcpkg/buildtrees/versioning_/versions/gdal/65b271a32a93a9dfa4dfd3905fcd0b5388926f81/vcpkg-cmake-wrapper.cmake",
241
241
  "SPDXID": "SPDXRef-file-7",
242
242
  "checksums": [
243
243
  {
@@ -249,12 +249,12 @@
249
249
  "copyrightText": "NOASSERTION"
250
250
  },
251
251
  {
252
- "fileName": "./C:/vcpkg/buildtrees/versioning_/versions/gdal/ea4d3f8cb9ab32d885ac60b974421a604fdbcc87/vcpkg.json",
252
+ "fileName": "./C:/vcpkg/buildtrees/versioning_/versions/gdal/65b271a32a93a9dfa4dfd3905fcd0b5388926f81/vcpkg.json",
253
253
  "SPDXID": "SPDXRef-file-8",
254
254
  "checksums": [
255
255
  {
256
256
  "algorithm": "SHA256",
257
- "checksumValue": "15039815ee85e9996bda2f7cb66eb87de8b544bcafba85f2518ba1b3f28c9fd5"
257
+ "checksumValue": "71bb644d1501bdc16fbe5e88a45a27c478bee667cbace588c569de28778c89ff"
258
258
  }
259
259
  ],
260
260
  "licenseConcluded": "NOASSERTION",
@@ -1,42 +1,42 @@
1
- cmake 3.29.2
1
+ cmake 3.30.3
2
2
  cmake-project-include.cmake 60c0f79155c78ec0ec4ccdc77e00f4613ae4630c6697f51f884bf8f979a48593
3
- curl c33ea1701fcf7db9a5e15fb2a32d3a3f3eeff90f567d4c02527f18932b2fd262
4
- expat 098ee75e21b25eec9a08604d8d032955a40a8c4de7899bedf1fe8dc56d2d571e
3
+ curl fa497fcd4e5d3fd8f58bfa8f9006baaa188e5c93e8b79f9b5126abb4f495f28f
4
+ expat d150fe7f7a224820a0888363b1e71e61acbe8f1f82b17eba4be421eb009d4fbf
5
5
  features core;curl;expat;geos;iconv;jpeg;lerc;png;qhull;recommended-features;sqlite3
6
- find-link-libraries.patch 9e390300ab79cf6fef1bb009416346a1f98d4946cb14c71ee4ea46217e3cb9d2
6
+ find-link-libraries.patch 043cbdd6298fce33c29d128241470b71990dc13eb63bfa44b3d82b17f5384468
7
7
  fix-gdal-target-interfaces.patch 9dbe9d5e0dbc3a21370bb3560aa32811d10cc0b19e4b6833cd7258699d206215
8
- geos 188ce79a38b0901699c552841a22dfabf416fd3ee3abb6bba5f0fb819bfa6dd2
9
- json-c 77106cd06fa7a75a9df16933859680c63387f07725da814b652514f08f947155
10
- lerc 6a4ac0c403b2148dea15a212a631de66c431f724a994ecf73f3455dce44583b6
11
- libgeotiff 1e6467a6655afb3639c28de1d2a1bd8c1582f777d38ea891c74411ee4b253c57
12
- libiconv fdc9916274621f42f2cb6a34d11c6c1f6d42df053f0edecf1efcf3bc649352dc
13
- libjpeg-turbo 0e2ffb3c6c6e9aef5a81d57e5c0011cb2b8c2ba6ca7f80d09e43b15862a71b96
8
+ geos ed1036caac6aef322b9bb4d24379ae0fd425db2d4c70cc6bd45a09763a8d90fe
9
+ json-c f643856796715ffdecb3c638f5f3551037bafb73b0958fb000c63bc2e92b1956
10
+ lerc a6259b0c14ea7895e73a9cbfe0b37a9541fdcdffe662dbfdf4ae2f5553438f7e
11
+ libgeotiff 7f1590a4f76b1a84827c26947e2b968f68ebefc15b5ec3fff68fc30c618f312b
12
+ libiconv 7461cfdbd444ee7c168ef3f7f2fe3abb7b01112200fa133c4c313a8d310760d3
13
+ libjpeg-turbo 5051df1d348651f8d7ab674b1b21da6bc0bc0820d5889e1582589f98ff59fbae
14
14
  libkml.patch fe888df8a7c9e468cdd87640c025f48f165d5264af1fa20604bd60859e6f000f
15
- libpng 8b17f56c3344602852d8f05db22d11e33be6a401d340a7507bfa1324d19f6596
16
- pkgconf ad5f9f0e61aac1850a41e41acb0cf857b4fddb327d8fbe7fffc450716da49cef
17
- portfile.cmake 7e5f1f6c6f1f420b994e149d8a31e1e31e23492a881ce29b3c30307ab28f2f92
18
- ports.cmake 0500e9e2422fe0084c99bdd0c9de4c7069b76da14c8b58228a7e95ebac43058a
15
+ libpng 3337be882e3913ea59c83ddfa34a69b0b2d0174e9fb6e47d54da70f421b52bc4
16
+ pkgconf 2d71329e95dbdbf0ebd55c1e55c3c343f8dba7b9d1d5c84c190add49b0d5d487
17
+ portfile.cmake 92a0c437215b5fed404a2deb00ade3a8cfb4da00c518af38525a3194a7d89c1a
18
+ ports.cmake 3581688c16865b2026d28240d7c6257b848475ffc9fe81b3f3d304973253cf5e
19
19
  post_build_checks 2
20
- powershell 7.4.2
21
- proj 416215fce461361d78576b34d62b8bd8ba78ddf1ef8d98456956f1e79086b9f7
22
- qhull ebe465afff8dd31022f1edec019d81d9660d2d94339b1957dab63a26332f2686
23
- sqlite3 340fdee0040de93163f16ef36cd21ba181401592d9aa521ed469196ab32210eb
20
+ powershell 7.4.5
21
+ proj 3221250292d4cd48d645445f204396e392ced5a9f49a37c6db6c1d43e529dde7
22
+ qhull 786590bebed80f3c6cf9be892a731ab860e054dbf0333645493de70cd6476d2a
23
+ sqlite3 84e61031efc3524e589d914a2c94f365f4f4f144a9d91540a855cd6fda40f8ec
24
24
  target-is-valid.patch 6a369356c57860f97bd756d3604e7219774e2bfe5c74e5e0178496fad253900f
25
- tiff 399edf2f907320f9665f3cf2abde0a53e698df24a587b9587fb004370b5cdef5
25
+ tiff 425dab9735e21a8cdea7696a65aada4e50bd6bb50c496df903d548c2fb92c7cc
26
26
  triplet x64-windows-dynamic-release
27
- triplet_abi 36210185afbd528d6d7303808480ab7d54f062730bbef9fc1603f69b72ca549a-e36df1c7f50ab25f9c182fa927d06c19ae082e0d599f132b3f655784b49e4b33-3361a17d8afbd07b0f5c7f4dac4bd892b23a29d3
27
+ triplet_abi 36210185afbd528d6d7303808480ab7d54f062730bbef9fc1603f69b72ca549a-35332a22d6cb1309b1967c1f42a8f3c0ff58fec1939f84bb1deef16946b27c77-3361a17d8afbd07b0f5c7f4dac4bd892b23a29d3
28
28
  usage c85584261e2011a94b86f04c3a28dd2e165c9e6b47677a9bee26a3d387bc05f2
29
- vcpkg-cmake 35740612fa4f62d67b3e95f3fdb06255dd6f6629d5b984d408d52d43d4a31dec
30
- vcpkg-cmake-config cb3e28d82ddc1a0b689299cdd01a853e00fb2d8d923b481f32cec4f126a90d2c
29
+ vcpkg-cmake 12907141e9d55701694a88fd0cf5a014cb0ac18de8e6298f393fe85d9d6b2082
30
+ vcpkg-cmake-config 353dcf000b6eb17d159df15cc49bf4035aaf38f785d32fb5774689f0dc44f341
31
31
  vcpkg-cmake-wrapper.cmake c507eaa077072e9877607fd5f70381eebf19900661e2e1fd099d84c4df1b8c24
32
- vcpkg-pkgconfig-get-modules 3efe902774401ec56f026993012d9f311ad89b24129214c7320652c5da55f169
33
- vcpkg.json 15039815ee85e9996bda2f7cb66eb87de8b544bcafba85f2518ba1b3f28c9fd5
32
+ vcpkg-pkgconfig-get-modules 05ac6d137850d5e629c8873e31a015fe1fb950a578cd6438333ad2107d0975d4
33
+ vcpkg.json 71bb644d1501bdc16fbe5e88a45a27c478bee667cbace588c569de28778c89ff
34
34
  vcpkg_check_features 943b217e0968d64cf2cb9c272608e6a0b497377e792034f819809a79e1502c2b
35
35
  vcpkg_copy_pdbs d57e4f196c82dc562a9968c6155073094513c31e2de475694143d3aa47954b1c
36
36
  vcpkg_copy_tools 3d45ff761bddbabe8923b52330168dc3abd295fa469d3f2e47cb14dce85332d5
37
- vcpkg_fixup_pkgconfig 904e67c46ecbb67379911bc1d7222855c0cbfcf1129bf47783858bcf0cc44970
37
+ vcpkg_fixup_pkgconfig 1a15f6c6d8e2b244d83a7514a0412d339127d2217d1df60ad1388b546c85f777
38
38
  vcpkg_from_git 96ed81968f76354c00096dd8cd4e63c6a235fa969334a11ab18d11c0c512ff58
39
39
  vcpkg_from_github b743742296a114ea1b18ae99672e02f142c4eb2bef7f57d36c038bedbfb0502f
40
40
  vcpkg_install_copyright ba6c169ab4e59fa05682e530cdeb883767de22c8391f023d4e6844a7ec5dd3d2
41
- vcpkg_replace_string d43c8699ce27e25d47367c970d1c546f6bc36b6df8fb0be0c3986eb5830bd4f1
42
- zlib ed9e7008f4c123d674b47a580eaa9f421c935d6cc84806da55dfab32ee25e391
41
+ vcpkg_replace_string b450deb79207478b37119743e00808ebc42de0628e7b98c14ab24728bd5c78b8
42
+ zlib e39ec53adafe960db494bf75ece18820b88f02bca698638f361dfab495bebbef
pyogrio/geopandas.py CHANGED
@@ -1,24 +1,24 @@
1
+ """Functions for reading and writing GeoPandas dataframes."""
2
+
1
3
  import os
4
+ import warnings
2
5
 
3
6
  import numpy as np
4
7
 
5
8
  from pyogrio._compat import HAS_GEOPANDAS, PANDAS_GE_15, PANDAS_GE_20, PANDAS_GE_22
9
+ from pyogrio.errors import DataSourceError
6
10
  from pyogrio.raw import (
7
- DRIVERS_NO_MIXED_SINGLE_MULTI,
8
11
  DRIVERS_NO_MIXED_DIMENSIONS,
12
+ DRIVERS_NO_MIXED_SINGLE_MULTI,
13
+ _get_write_path_driver,
9
14
  read,
10
15
  read_arrow,
11
16
  write,
12
- _get_write_path_driver,
13
17
  )
14
- from pyogrio.errors import DataSourceError
15
- import warnings
16
18
 
17
19
 
18
20
  def _stringify_path(path):
19
- """
20
- Convert path-like to a string if possible, pass-through other objects
21
- """
21
+ """Convert path-like to a string if possible, pass-through other objects."""
22
22
  if isinstance(path, str):
23
23
  return path
24
24
 
@@ -34,11 +34,11 @@ def _try_parse_datetime(ser):
34
34
  import pandas as pd # only called when pandas is known to be installed
35
35
 
36
36
  if PANDAS_GE_22:
37
- datetime_kwargs = dict(format="ISO8601")
37
+ datetime_kwargs = {"format": "ISO8601"}
38
38
  elif PANDAS_GE_20:
39
- datetime_kwargs = dict(format="ISO8601", errors="ignore")
39
+ datetime_kwargs = {"format": "ISO8601", "errors": "ignore"}
40
40
  else:
41
- datetime_kwargs = dict(yearfirst=True)
41
+ datetime_kwargs = {"yearfirst": True}
42
42
  with warnings.catch_warnings():
43
43
  warnings.filterwarnings(
44
44
  "ignore",
@@ -87,10 +87,12 @@ def read_dataframe(
87
87
  sql_dialect=None,
88
88
  fid_as_index=False,
89
89
  use_arrow=None,
90
+ on_invalid="raise",
90
91
  arrow_to_pandas_kwargs=None,
91
92
  **kwargs,
92
93
  ):
93
94
  """Read from an OGR data source to a GeoPandas GeoDataFrame or Pandas DataFrame.
95
+
94
96
  If the data source does not have a geometry column or ``read_geometry`` is False,
95
97
  a DataFrame will be returned.
96
98
 
@@ -99,7 +101,7 @@ def read_dataframe(
99
101
  Parameters
100
102
  ----------
101
103
  path_or_buffer : pathlib.Path or str, or bytes buffer
102
- A dataset path or URI, or raw buffer.
104
+ A dataset path or URI, raw buffer, or file-like object with a read method.
103
105
  layer : int or str, optional (default: first layer)
104
106
  If an integer is provided, it corresponds to the index of the layer
105
107
  with the data source. If a string is provided, it must match the name
@@ -197,6 +199,17 @@ def read_dataframe(
197
199
  installed). When enabled, this provides a further speed-up.
198
200
  Defaults to False, but this default can also be globally overridden
199
201
  by setting the ``PYOGRIO_USE_ARROW=1`` environment variable.
202
+ on_invalid : str, optional (default: "raise")
203
+ The action to take when an invalid geometry is encountered. Possible
204
+ values:
205
+
206
+ - **raise**: an exception will be raised if a WKB input geometry is
207
+ invalid.
208
+ - **warn**: invalid WKB geometries will be returned as ``None`` and a
209
+ warning will be raised.
210
+ - **ignore**: invalid WKB geometries will be returned as ``None``
211
+ without a warning.
212
+
200
213
  arrow_to_pandas_kwargs : dict, optional (default: None)
201
214
  When `use_arrow` is True, these kwargs will be passed to the `to_pandas`_
202
215
  call for the arrow to pandas conversion.
@@ -228,13 +241,13 @@ def read_dataframe(
228
241
 
229
242
  https://arrow.apache.org/docs/python/generated/pyarrow.Table.html#pyarrow.Table.to_pandas
230
243
 
231
- """ # noqa: E501
244
+ """
232
245
  if not HAS_GEOPANDAS:
233
246
  raise ImportError("geopandas is required to use pyogrio.read_dataframe()")
234
247
 
235
- import pandas as pd
236
248
  import geopandas as gp
237
- from geopandas.array import from_wkb
249
+ import pandas as pd
250
+
238
251
  import shapely # if geopandas is present, shapely is expected to be present
239
252
 
240
253
  path_or_buffer = _stringify_path(path_or_buffer)
@@ -292,10 +305,10 @@ def read_dataframe(
292
305
  if PANDAS_GE_15 and wkb_values.dtype != object:
293
306
  # for example ArrowDtype will otherwise create numpy array with pd.NA
294
307
  wkb_values = wkb_values.to_numpy(na_value=None)
295
- df["geometry"] = from_wkb(wkb_values, crs=meta["crs"])
308
+ df["geometry"] = shapely.from_wkb(wkb_values, on_invalid=on_invalid)
296
309
  if force_2d:
297
310
  df["geometry"] = shapely.force_2d(df["geometry"])
298
- return gp.GeoDataFrame(df, geometry="geometry")
311
+ return gp.GeoDataFrame(df, geometry="geometry", crs=meta["crs"])
299
312
  else:
300
313
  return df
301
314
 
@@ -315,9 +328,9 @@ def read_dataframe(
315
328
  if geometry is None or not read_geometry:
316
329
  return df
317
330
 
318
- geometry = from_wkb(geometry, crs=meta["crs"])
331
+ geometry = shapely.from_wkb(geometry, on_invalid=on_invalid)
319
332
 
320
- return gp.GeoDataFrame(df, geometry=geometry)
333
+ return gp.GeoDataFrame(df, geometry=geometry, crs=meta["crs"])
321
334
 
322
335
 
323
336
  # TODO: handle index properly
@@ -339,8 +352,7 @@ def write_dataframe(
339
352
  layer_options=None,
340
353
  **kwargs,
341
354
  ):
342
- """
343
- Write GeoPandas GeoDataFrame to an OGR file format.
355
+ """Write GeoPandas GeoDataFrame to an OGR file format.
344
356
 
345
357
  Parameters
346
358
  ----------
@@ -351,7 +363,8 @@ def write_dataframe(
351
363
  in the output file.
352
364
  path : str or io.BytesIO
353
365
  path to output file on writeable file system or an io.BytesIO object to
354
- allow writing to memory
366
+ allow writing to memory. Will raise NotImplementedError if an open file
367
+ handle is passed; use BytesIO instead.
355
368
  NOTE: support for writing to memory is limited to specific drivers.
356
369
  layer : str, optional (default: None)
357
370
  layer name to create. If writing to memory and layer name is not
@@ -429,15 +442,15 @@ def write_dataframe(
429
442
  explicit `dataset_options` or `layer_options` keywords to manually
430
443
  do this (for example if an option exists as both dataset and layer
431
444
  option).
445
+
432
446
  """
433
447
  # TODO: add examples to the docstring (e.g. OGR kwargs)
434
448
 
435
449
  if not HAS_GEOPANDAS:
436
450
  raise ImportError("geopandas is required to use pyogrio.write_dataframe()")
437
451
 
438
- from geopandas.array import to_wkb
439
452
  import pandas as pd
440
- from pyproj.enums import WktVersion # if geopandas is available so is pyproj
453
+ from geopandas.array import to_wkb
441
454
 
442
455
  if not isinstance(df, pd.DataFrame):
443
456
  raise ValueError("'df' must be a DataFrame or GeoDataFrame")
@@ -486,7 +499,7 @@ def write_dataframe(
486
499
  else:
487
500
  values = col.values
488
501
  if isinstance(values, pd.api.extensions.ExtensionArray):
489
- from pandas.arrays import IntegerArray, FloatingArray, BooleanArray
502
+ from pandas.arrays import BooleanArray, FloatingArray, IntegerArray
490
503
 
491
504
  if isinstance(values, (IntegerArray, FloatingArray, BooleanArray)):
492
505
  field_data.append(values._data)
@@ -511,7 +524,10 @@ def write_dataframe(
511
524
  # If there is data, infer layer geometry type + promote_to_multi
512
525
  if not df.empty:
513
526
  # None/Empty geometries sometimes report as Z incorrectly, so ignore them
514
- has_z_arr = geometry[geometry.notna() & (~geometry.is_empty)].has_z
527
+ with warnings.catch_warnings():
528
+ warnings.filterwarnings("ignore", r"GeoSeries\.notna", UserWarning)
529
+ geometry_notna = geometry.notna()
530
+ has_z_arr = geometry[geometry_notna & (~geometry.is_empty)].has_z
515
531
  has_z = has_z_arr.any()
516
532
  all_z = has_z_arr.all()
517
533
 
@@ -564,12 +580,13 @@ def write_dataframe(
564
580
  # if possible use EPSG codes instead
565
581
  epsg = geometry.crs.to_epsg()
566
582
  if epsg:
567
- crs = f"EPSG:{epsg}" # noqa: E231
583
+ crs = f"EPSG:{epsg}"
568
584
  else:
569
- crs = geometry.crs.to_wkt(WktVersion.WKT1_GDAL)
585
+ crs = geometry.crs.to_wkt("WKT1_GDAL")
570
586
 
571
587
  if use_arrow:
572
588
  import pyarrow as pa
589
+
573
590
  from pyogrio.raw import write_arrow
574
591
 
575
592
  if geometry_column is not None:
@@ -1,9 +1,9 @@
1
1
  # Version checking for PROJ
2
2
 
3
- set (PACKAGE_VERSION "9.4.0")
3
+ set (PACKAGE_VERSION "9.4.1")
4
4
  set (PACKAGE_VERSION_MAJOR "9")
5
5
  set (PACKAGE_VERSION_MINOR "4")
6
- set (PACKAGE_VERSION_PATCH "0")
6
+ set (PACKAGE_VERSION_PATCH "1")
7
7
 
8
8
  # These variable definitions parallel those in PROJ's
9
9
  # cmake/CMakeLists.txt.
@@ -7,7 +7,7 @@ if(CMAKE_VERSION VERSION_LESS "2.8.3")
7
7
  message(FATAL_ERROR "CMake >= 2.8.3 required")
8
8
  endif()
9
9
  cmake_policy(PUSH)
10
- cmake_policy(VERSION 2.8.3...3.27)
10
+ cmake_policy(VERSION 2.8.3...3.28)
11
11
  #----------------------------------------------------------------
12
12
  # Generated CMake target import file.
13
13
  #----------------------------------------------------------------
pyogrio/proj_data/proj.db CHANGED
Binary file
@@ -7,7 +7,7 @@ if(CMAKE_VERSION VERSION_LESS "2.8.3")
7
7
  message(FATAL_ERROR "CMake >= 2.8.3 required")
8
8
  endif()
9
9
  cmake_policy(PUSH)
10
- cmake_policy(VERSION 2.8.3...3.27)
10
+ cmake_policy(VERSION 2.8.3...3.28)
11
11
  #----------------------------------------------------------------
12
12
  # Generated CMake target import file.
13
13
  #----------------------------------------------------------------
@@ -2,7 +2,7 @@
2
2
  "$id": "https://proj.org/schemas/v0.7/projjson.schema.json",
3
3
  "$schema": "http://json-schema.org/draft-07/schema#",
4
4
  "description": "Schema for PROJJSON (v0.7)",
5
- "$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",
5
+ "$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",
6
6
 
7
7
  "oneOf": [
8
8
  { "$ref": "#/definitions/crs" },