pyogrio 0.9.0__cp312-cp312-macosx_12_0_arm64.whl → 0.10.0__cp312-cp312-macosx_12_0_arm64.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.
- pyogrio/.dylibs/{libgdal.34.3.8.5.dylib → libgdal.35.3.9.1.dylib} +0 -0
- pyogrio/__init__.py +20 -13
- pyogrio/_compat.py +7 -1
- pyogrio/_env.py +4 -6
- pyogrio/_err.cpython-312-darwin.so +0 -0
- pyogrio/_geometry.cpython-312-darwin.so +0 -0
- pyogrio/_io.cpython-312-darwin.so +0 -0
- pyogrio/_ogr.cpython-312-darwin.so +0 -0
- pyogrio/_version.py +3 -3
- pyogrio/_vsi.cpython-312-darwin.so +0 -0
- pyogrio/core.py +86 -20
- pyogrio/errors.py +9 -16
- pyogrio/gdal_data/GDAL-targets-release.cmake +3 -3
- pyogrio/gdal_data/GDAL-targets.cmake +1 -1
- pyogrio/gdal_data/GDALConfig.cmake +0 -1
- pyogrio/gdal_data/GDALConfigVersion.cmake +3 -3
- pyogrio/gdal_data/MM_m_idofic.csv +321 -0
- pyogrio/gdal_data/gdaltileindex.xsd +269 -0
- pyogrio/gdal_data/gdalvrt.xsd +130 -22
- pyogrio/gdal_data/ogrinfo_output.schema.json +23 -0
- pyogrio/gdal_data/ogrvrt.xsd +3 -0
- pyogrio/gdal_data/pci_datum.txt +222 -155
- pyogrio/gdal_data/pci_ellips.txt +90 -38
- pyogrio/gdal_data/vcpkg.spdx.json +21 -21
- pyogrio/gdal_data/vcpkg_abi_info.txt +26 -26
- pyogrio/geopandas.py +32 -24
- pyogrio/proj_data/proj-config-version.cmake +2 -2
- pyogrio/proj_data/proj-targets.cmake +1 -1
- pyogrio/proj_data/proj.db +0 -0
- pyogrio/proj_data/proj4-targets.cmake +1 -1
- pyogrio/proj_data/projjson.schema.json +1 -1
- pyogrio/proj_data/vcpkg.spdx.json +17 -17
- pyogrio/proj_data/vcpkg_abi_info.txt +14 -14
- pyogrio/raw.py +46 -30
- pyogrio/tests/conftest.py +206 -12
- pyogrio/tests/fixtures/README.md +32 -13
- pyogrio/tests/fixtures/curve.gpkg +0 -0
- pyogrio/tests/fixtures/{test_multisurface.gpkg → curvepolygon.gpkg} +0 -0
- pyogrio/tests/fixtures/line_zm.gpkg +0 -0
- pyogrio/tests/fixtures/multisurface.gpkg +0 -0
- pyogrio/tests/test_arrow.py +178 -24
- pyogrio/tests/test_core.py +162 -72
- pyogrio/tests/test_geopandas_io.py +239 -99
- pyogrio/tests/test_path.py +29 -17
- pyogrio/tests/test_raw_io.py +165 -54
- pyogrio/tests/test_util.py +56 -0
- pyogrio/util.py +54 -30
- {pyogrio-0.9.0.dist-info → pyogrio-0.10.0.dist-info}/LICENSE +1 -1
- {pyogrio-0.9.0.dist-info → pyogrio-0.10.0.dist-info}/METADATA +37 -8
- {pyogrio-0.9.0.dist-info → pyogrio-0.10.0.dist-info}/RECORD +52 -68
- {pyogrio-0.9.0.dist-info → pyogrio-0.10.0.dist-info}/WHEEL +1 -1
- pyogrio/_err.pxd +0 -4
- pyogrio/_err.pyx +0 -250
- pyogrio/_geometry.pxd +0 -4
- pyogrio/_geometry.pyx +0 -129
- pyogrio/_io.pxd +0 -0
- pyogrio/_io.pyx +0 -2742
- pyogrio/_ogr.pxd +0 -444
- pyogrio/_ogr.pyx +0 -346
- pyogrio/_vsi.pxd +0 -4
- pyogrio/_vsi.pyx +0 -140
- pyogrio/arrow_bridge.h +0 -115
- pyogrio/gdal_data/bag_template.xml +0 -201
- pyogrio/gdal_data/gmlasconf.xml +0 -169
- pyogrio/gdal_data/gmlasconf.xsd +0 -1066
- pyogrio/gdal_data/netcdf_config.xsd +0 -143
- pyogrio/gdal_data/template_tiles.mapml +0 -28
- pyogrio/tests/fixtures/poly_not_enough_points.shp.zip +0 -0
- pyogrio/tests/fixtures/test_datetime.geojson +0 -7
- pyogrio/tests/fixtures/test_datetime_tz.geojson +0 -8
- pyogrio/tests/fixtures/test_fgdb.gdb.zip +0 -0
- pyogrio/tests/fixtures/test_nested.geojson +0 -18
- pyogrio/tests/fixtures/test_ogr_types_list.geojson +0 -12
- {pyogrio-0.9.0.dist-info → pyogrio-0.10.0.dist-info}/top_level.txt +0 -0
pyogrio/gdal_data/pci_ellips.txt
CHANGED
|
@@ -1,57 +1,69 @@
|
|
|
1
1
|
!
|
|
2
|
-
!
|
|
2
|
+
! From https://github.com/OSGeo/gdal/issues/8034, June 30, 2023
|
|
3
3
|
!
|
|
4
|
-
! I,
|
|
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
|
-
!
|
|
8
|
-
!
|
|
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
|
-
"
|
|
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
|
-
"
|
|
28
|
-
"
|
|
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
|
-
"
|
|
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
|
-
"
|
|
42
|
-
"
|
|
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
|
-
"
|
|
52
|
-
"
|
|
53
|
-
"
|
|
54
|
-
"
|
|
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.
|
|
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",
|
|
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-arm64-osx-dynamic-release-3.
|
|
7
|
-
"name": "gdal:arm64-osx-dynamic-release@3.
|
|
6
|
+
"documentNamespace": "https://spdx.org/spdxdocs/gdal-arm64-osx-dynamic-release-3.9.1-b331061d-c93d-4dbd-80c5-dc9857187183",
|
|
7
|
+
"name": "gdal:arm64-osx-dynamic-release@3.9.1 30b727933787000162a8802f047d7eb6016fccd4146f578b63c82e6b077ed3c5",
|
|
8
8
|
"creationInfo": {
|
|
9
9
|
"creators": [
|
|
10
|
-
"Tool: vcpkg-
|
|
10
|
+
"Tool: vcpkg-2024-08-01-fd884a0d390d12783076341bd43d77c3a6a15658"
|
|
11
11
|
],
|
|
12
|
-
"created": "2024-
|
|
12
|
+
"created": "2024-09-28T18:41:15Z"
|
|
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.
|
|
121
|
-
"downloadLocation": "git+https://github.com/Microsoft/vcpkg@
|
|
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:arm64-osx-dynamic-release",
|
|
131
131
|
"SPDXID": "SPDXRef-binary",
|
|
132
|
-
"versionInfo": "
|
|
132
|
+
"versionInfo": "30b727933787000162a8802f047d7eb6016fccd4146f578b63c82e6b077ed3c5",
|
|
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.
|
|
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": "
|
|
149
|
+
"checksumValue": "d9ab5d94dc870df17b010166d3ebbe897a1f673ba05bf31cd4bed437b6db303dd9e373ba5099d3a191ff3e48c995556fb5bcc77d03d975614df4aa20a2c2b085"
|
|
150
150
|
}
|
|
151
151
|
]
|
|
152
152
|
}
|
|
153
153
|
],
|
|
154
154
|
"files": [
|
|
155
155
|
{
|
|
156
|
-
"fileName": ".//usr/local/share/vcpkg/buildtrees/versioning_/versions/gdal/
|
|
156
|
+
"fileName": ".//usr/local/share/vcpkg/buildtrees/versioning_/versions/gdal/65b271a32a93a9dfa4dfd3905fcd0b5388926f81/libkml.patch",
|
|
157
157
|
"SPDXID": "SPDXRef-file-0",
|
|
158
158
|
"checksums": [
|
|
159
159
|
{
|
|
@@ -165,7 +165,7 @@
|
|
|
165
165
|
"copyrightText": "NOASSERTION"
|
|
166
166
|
},
|
|
167
167
|
{
|
|
168
|
-
"fileName": ".//usr/local/share/vcpkg/buildtrees/versioning_/versions/gdal/
|
|
168
|
+
"fileName": ".//usr/local/share/vcpkg/buildtrees/versioning_/versions/gdal/65b271a32a93a9dfa4dfd3905fcd0b5388926f81/usage",
|
|
169
169
|
"SPDXID": "SPDXRef-file-1",
|
|
170
170
|
"checksums": [
|
|
171
171
|
{
|
|
@@ -177,31 +177,31 @@
|
|
|
177
177
|
"copyrightText": "NOASSERTION"
|
|
178
178
|
},
|
|
179
179
|
{
|
|
180
|
-
"fileName": ".//usr/local/share/vcpkg/buildtrees/versioning_/versions/gdal/
|
|
180
|
+
"fileName": ".//usr/local/share/vcpkg/buildtrees/versioning_/versions/gdal/65b271a32a93a9dfa4dfd3905fcd0b5388926f81/portfile.cmake",
|
|
181
181
|
"SPDXID": "SPDXRef-file-2",
|
|
182
182
|
"checksums": [
|
|
183
183
|
{
|
|
184
184
|
"algorithm": "SHA256",
|
|
185
|
-
"checksumValue": "
|
|
185
|
+
"checksumValue": "92a0c437215b5fed404a2deb00ade3a8cfb4da00c518af38525a3194a7d89c1a"
|
|
186
186
|
}
|
|
187
187
|
],
|
|
188
188
|
"licenseConcluded": "NOASSERTION",
|
|
189
189
|
"copyrightText": "NOASSERTION"
|
|
190
190
|
},
|
|
191
191
|
{
|
|
192
|
-
"fileName": ".//usr/local/share/vcpkg/buildtrees/versioning_/versions/gdal/
|
|
192
|
+
"fileName": ".//usr/local/share/vcpkg/buildtrees/versioning_/versions/gdal/65b271a32a93a9dfa4dfd3905fcd0b5388926f81/vcpkg.json",
|
|
193
193
|
"SPDXID": "SPDXRef-file-3",
|
|
194
194
|
"checksums": [
|
|
195
195
|
{
|
|
196
196
|
"algorithm": "SHA256",
|
|
197
|
-
"checksumValue": "
|
|
197
|
+
"checksumValue": "71bb644d1501bdc16fbe5e88a45a27c478bee667cbace588c569de28778c89ff"
|
|
198
198
|
}
|
|
199
199
|
],
|
|
200
200
|
"licenseConcluded": "NOASSERTION",
|
|
201
201
|
"copyrightText": "NOASSERTION"
|
|
202
202
|
},
|
|
203
203
|
{
|
|
204
|
-
"fileName": ".//usr/local/share/vcpkg/buildtrees/versioning_/versions/gdal/
|
|
204
|
+
"fileName": ".//usr/local/share/vcpkg/buildtrees/versioning_/versions/gdal/65b271a32a93a9dfa4dfd3905fcd0b5388926f81/target-is-valid.patch",
|
|
205
205
|
"SPDXID": "SPDXRef-file-4",
|
|
206
206
|
"checksums": [
|
|
207
207
|
{
|
|
@@ -213,7 +213,7 @@
|
|
|
213
213
|
"copyrightText": "NOASSERTION"
|
|
214
214
|
},
|
|
215
215
|
{
|
|
216
|
-
"fileName": ".//usr/local/share/vcpkg/buildtrees/versioning_/versions/gdal/
|
|
216
|
+
"fileName": ".//usr/local/share/vcpkg/buildtrees/versioning_/versions/gdal/65b271a32a93a9dfa4dfd3905fcd0b5388926f81/fix-gdal-target-interfaces.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": ".//usr/local/share/vcpkg/buildtrees/versioning_/versions/gdal/
|
|
228
|
+
"fileName": ".//usr/local/share/vcpkg/buildtrees/versioning_/versions/gdal/65b271a32a93a9dfa4dfd3905fcd0b5388926f81/vcpkg-cmake-wrapper.cmake",
|
|
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": ".//usr/local/share/vcpkg/buildtrees/versioning_/versions/gdal/
|
|
240
|
+
"fileName": ".//usr/local/share/vcpkg/buildtrees/versioning_/versions/gdal/65b271a32a93a9dfa4dfd3905fcd0b5388926f81/cmake-project-include.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": ".//usr/local/share/vcpkg/buildtrees/versioning_/versions/gdal/
|
|
252
|
+
"fileName": ".//usr/local/share/vcpkg/buildtrees/versioning_/versions/gdal/65b271a32a93a9dfa4dfd3905fcd0b5388926f81/find-link-libraries.patch",
|
|
253
253
|
"SPDXID": "SPDXRef-file-8",
|
|
254
254
|
"checksums": [
|
|
255
255
|
{
|
|
256
256
|
"algorithm": "SHA256",
|
|
257
|
-
"checksumValue": "
|
|
257
|
+
"checksumValue": "043cbdd6298fce33c29d128241470b71990dc13eb63bfa44b3d82b17f5384468"
|
|
258
258
|
}
|
|
259
259
|
],
|
|
260
260
|
"licenseConcluded": "NOASSERTION",
|
|
@@ -1,41 +1,41 @@
|
|
|
1
|
-
cmake 3.
|
|
1
|
+
cmake 3.30.3
|
|
2
2
|
cmake-project-include.cmake 60c0f79155c78ec0ec4ccdc77e00f4613ae4630c6697f51f884bf8f979a48593
|
|
3
|
-
curl
|
|
4
|
-
expat
|
|
3
|
+
curl b05d6dda7ca5aee75b6212c53fa145da50c7a3d88850f9566e5368bc4a6e4964
|
|
4
|
+
expat 804f7539f07ed42d99577364afcdee586525d80b5f7db608801b0fc3e65275ca
|
|
5
5
|
features core;curl;expat;geos;iconv;jpeg;lerc;png;qhull;recommended-features;sqlite3
|
|
6
|
-
find-link-libraries.patch
|
|
6
|
+
find-link-libraries.patch 043cbdd6298fce33c29d128241470b71990dc13eb63bfa44b3d82b17f5384468
|
|
7
7
|
fix-gdal-target-interfaces.patch 9dbe9d5e0dbc3a21370bb3560aa32811d10cc0b19e4b6833cd7258699d206215
|
|
8
|
-
geos
|
|
9
|
-
json-c
|
|
10
|
-
lerc
|
|
11
|
-
libgeotiff
|
|
12
|
-
libiconv
|
|
13
|
-
libjpeg-turbo
|
|
8
|
+
geos 8971c2bb58577cf4630a66380d7736536a8ca3e427488c70ddf99b6ed6fa82a7
|
|
9
|
+
json-c 459e1e396413da1c1d1dffd4c94caa78e45ae308c05186eb1a0af3cd18b6fce9
|
|
10
|
+
lerc b40cbfbafcadf8a3cfa193472de41227c09d47832ac3fd43b5dae54f12b45aed
|
|
11
|
+
libgeotiff 1ab53bfb70351545e0b8648d429a1191f4617a57ed2f25d9ba09fd8a8821295d
|
|
12
|
+
libiconv 4ad83e4ffa73c2fda98d20bdb4ab853867c732e1c2aa8d6d3f9d16c1bb276128
|
|
13
|
+
libjpeg-turbo c57dfefa93698724ef21d4d36f3b1eb3c59a05e9407e212a7c067f8477c1e0bb
|
|
14
14
|
libkml.patch fe888df8a7c9e468cdd87640c025f48f165d5264af1fa20604bd60859e6f000f
|
|
15
|
-
libpng
|
|
16
|
-
pkgconf
|
|
17
|
-
portfile.cmake
|
|
18
|
-
ports.cmake
|
|
15
|
+
libpng eec9b67798eda021b6c53fdb5251d1d53e57fccd3145fd32a0e294e9d6caadee
|
|
16
|
+
pkgconf 30606d6c5825dfe30e59d80fa4982b68f90bd48c7818c916b0db952868a97daf
|
|
17
|
+
portfile.cmake 92a0c437215b5fed404a2deb00ade3a8cfb4da00c518af38525a3194a7d89c1a
|
|
18
|
+
ports.cmake 3581688c16865b2026d28240d7c6257b848475ffc9fe81b3f3d304973253cf5e
|
|
19
19
|
post_build_checks 2
|
|
20
|
-
proj
|
|
21
|
-
qhull
|
|
22
|
-
sqlite3
|
|
20
|
+
proj 5a1a7dbeacb3aebc73b4e1bf072017a71cdf2af83ef1752e80eaa7edbe646441
|
|
21
|
+
qhull 2456ef8df197d28540a5daa1f3fa8a859f594e3295a19bdf17c199a2e3f5443b
|
|
22
|
+
sqlite3 7088305e8e220bd88e68b7b65aa8a89b317a74364a2f5b3d16897d279f408b2c
|
|
23
23
|
target-is-valid.patch 6a369356c57860f97bd756d3604e7219774e2bfe5c74e5e0178496fad253900f
|
|
24
|
-
tiff
|
|
24
|
+
tiff 6bee7e85690e39fd12d59b13d904e5c2ccc33f22668daa83bcaa8d1ec9bb3ae9
|
|
25
25
|
triplet arm64-osx-dynamic-release
|
|
26
|
-
triplet_abi bfb2f1a725a6c7d4c5a71c9867dbce26242b53ad1005a453f934440a490c77ba-
|
|
26
|
+
triplet_abi bfb2f1a725a6c7d4c5a71c9867dbce26242b53ad1005a453f934440a490c77ba-4cdbc0a68d47eedc16d246a07a21fabfbbe19abb89f00890c58902e2cf872d6f-5f75c9acc02e05029cedb7eca90c49644cc3a77a
|
|
27
27
|
usage c85584261e2011a94b86f04c3a28dd2e165c9e6b47677a9bee26a3d387bc05f2
|
|
28
|
-
vcpkg-cmake
|
|
29
|
-
vcpkg-cmake-config
|
|
28
|
+
vcpkg-cmake c8f1bf76f78dee8ca0d9884a6918cf0ec11c1abe045fd9bca2f9ae44af917e05
|
|
29
|
+
vcpkg-cmake-config dc22b69eeb823c856b78701093a239737a86039d6e913df4a326bd163f23f9f3
|
|
30
30
|
vcpkg-cmake-wrapper.cmake c507eaa077072e9877607fd5f70381eebf19900661e2e1fd099d84c4df1b8c24
|
|
31
|
-
vcpkg-pkgconfig-get-modules
|
|
32
|
-
vcpkg.json
|
|
31
|
+
vcpkg-pkgconfig-get-modules fa73494acc856df7517791770af3ff3e2fc06d500106d03e7ba18a4c7899ec38
|
|
32
|
+
vcpkg.json 71bb644d1501bdc16fbe5e88a45a27c478bee667cbace588c569de28778c89ff
|
|
33
33
|
vcpkg_check_features 943b217e0968d64cf2cb9c272608e6a0b497377e792034f819809a79e1502c2b
|
|
34
34
|
vcpkg_copy_pdbs d57e4f196c82dc562a9968c6155073094513c31e2de475694143d3aa47954b1c
|
|
35
35
|
vcpkg_copy_tools 3d45ff761bddbabe8923b52330168dc3abd295fa469d3f2e47cb14dce85332d5
|
|
36
|
-
vcpkg_fixup_pkgconfig
|
|
36
|
+
vcpkg_fixup_pkgconfig 1a15f6c6d8e2b244d83a7514a0412d339127d2217d1df60ad1388b546c85f777
|
|
37
37
|
vcpkg_from_git 96ed81968f76354c00096dd8cd4e63c6a235fa969334a11ab18d11c0c512ff58
|
|
38
38
|
vcpkg_from_github b743742296a114ea1b18ae99672e02f142c4eb2bef7f57d36c038bedbfb0502f
|
|
39
39
|
vcpkg_install_copyright ba6c169ab4e59fa05682e530cdeb883767de22c8391f023d4e6844a7ec5dd3d2
|
|
40
|
-
vcpkg_replace_string
|
|
41
|
-
zlib
|
|
40
|
+
vcpkg_replace_string b450deb79207478b37119743e00808ebc42de0628e7b98c14ab24728bd5c78b8
|
|
41
|
+
zlib 57a05545e358c1413c36c61d80640d32bfa56070760e74e862be2d76fa12704a
|
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 =
|
|
37
|
+
datetime_kwargs = {"format": "ISO8601"}
|
|
38
38
|
elif PANDAS_GE_20:
|
|
39
|
-
datetime_kwargs =
|
|
39
|
+
datetime_kwargs = {"format": "ISO8601", "errors": "ignore"}
|
|
40
40
|
else:
|
|
41
|
-
datetime_kwargs =
|
|
41
|
+
datetime_kwargs = {"yearfirst": True}
|
|
42
42
|
with warnings.catch_warnings():
|
|
43
43
|
warnings.filterwarnings(
|
|
44
44
|
"ignore",
|
|
@@ -92,6 +92,7 @@ def read_dataframe(
|
|
|
92
92
|
**kwargs,
|
|
93
93
|
):
|
|
94
94
|
"""Read from an OGR data source to a GeoPandas GeoDataFrame or Pandas DataFrame.
|
|
95
|
+
|
|
95
96
|
If the data source does not have a geometry column or ``read_geometry`` is False,
|
|
96
97
|
a DataFrame will be returned.
|
|
97
98
|
|
|
@@ -100,7 +101,7 @@ def read_dataframe(
|
|
|
100
101
|
Parameters
|
|
101
102
|
----------
|
|
102
103
|
path_or_buffer : pathlib.Path or str, or bytes buffer
|
|
103
|
-
|
|
104
|
+
A dataset path or URI, raw buffer, or file-like object with a read method.
|
|
104
105
|
layer : int or str, optional (default: first layer)
|
|
105
106
|
If an integer is provided, it corresponds to the index of the layer
|
|
106
107
|
with the data source. If a string is provided, it must match the name
|
|
@@ -199,11 +200,13 @@ def read_dataframe(
|
|
|
199
200
|
Defaults to False, but this default can also be globally overridden
|
|
200
201
|
by setting the ``PYOGRIO_USE_ARROW=1`` environment variable.
|
|
201
202
|
on_invalid : str, optional (default: "raise")
|
|
203
|
+
The action to take when an invalid geometry is encountered. Possible
|
|
204
|
+
values:
|
|
202
205
|
|
|
203
206
|
- **raise**: an exception will be raised if a WKB input geometry is
|
|
204
207
|
invalid.
|
|
205
|
-
- **warn**:
|
|
206
|
-
|
|
208
|
+
- **warn**: invalid WKB geometries will be returned as ``None`` and a
|
|
209
|
+
warning will be raised.
|
|
207
210
|
- **ignore**: invalid WKB geometries will be returned as ``None``
|
|
208
211
|
without a warning.
|
|
209
212
|
|
|
@@ -238,12 +241,13 @@ def read_dataframe(
|
|
|
238
241
|
|
|
239
242
|
https://arrow.apache.org/docs/python/generated/pyarrow.Table.html#pyarrow.Table.to_pandas
|
|
240
243
|
|
|
241
|
-
"""
|
|
244
|
+
"""
|
|
242
245
|
if not HAS_GEOPANDAS:
|
|
243
246
|
raise ImportError("geopandas is required to use pyogrio.read_dataframe()")
|
|
244
247
|
|
|
245
|
-
import pandas as pd
|
|
246
248
|
import geopandas as gp
|
|
249
|
+
import pandas as pd
|
|
250
|
+
|
|
247
251
|
import shapely # if geopandas is present, shapely is expected to be present
|
|
248
252
|
|
|
249
253
|
path_or_buffer = _stringify_path(path_or_buffer)
|
|
@@ -348,8 +352,7 @@ def write_dataframe(
|
|
|
348
352
|
layer_options=None,
|
|
349
353
|
**kwargs,
|
|
350
354
|
):
|
|
351
|
-
"""
|
|
352
|
-
Write GeoPandas GeoDataFrame to an OGR file format.
|
|
355
|
+
"""Write GeoPandas GeoDataFrame to an OGR file format.
|
|
353
356
|
|
|
354
357
|
Parameters
|
|
355
358
|
----------
|
|
@@ -360,7 +363,8 @@ def write_dataframe(
|
|
|
360
363
|
in the output file.
|
|
361
364
|
path : str or io.BytesIO
|
|
362
365
|
path to output file on writeable file system or an io.BytesIO object to
|
|
363
|
-
allow writing to memory
|
|
366
|
+
allow writing to memory. Will raise NotImplementedError if an open file
|
|
367
|
+
handle is passed; use BytesIO instead.
|
|
364
368
|
NOTE: support for writing to memory is limited to specific drivers.
|
|
365
369
|
layer : str, optional (default: None)
|
|
366
370
|
layer name to create. If writing to memory and layer name is not
|
|
@@ -438,15 +442,15 @@ def write_dataframe(
|
|
|
438
442
|
explicit `dataset_options` or `layer_options` keywords to manually
|
|
439
443
|
do this (for example if an option exists as both dataset and layer
|
|
440
444
|
option).
|
|
445
|
+
|
|
441
446
|
"""
|
|
442
447
|
# TODO: add examples to the docstring (e.g. OGR kwargs)
|
|
443
448
|
|
|
444
449
|
if not HAS_GEOPANDAS:
|
|
445
450
|
raise ImportError("geopandas is required to use pyogrio.write_dataframe()")
|
|
446
451
|
|
|
447
|
-
from geopandas.array import to_wkb
|
|
448
452
|
import pandas as pd
|
|
449
|
-
from
|
|
453
|
+
from geopandas.array import to_wkb
|
|
450
454
|
|
|
451
455
|
if not isinstance(df, pd.DataFrame):
|
|
452
456
|
raise ValueError("'df' must be a DataFrame or GeoDataFrame")
|
|
@@ -495,7 +499,7 @@ def write_dataframe(
|
|
|
495
499
|
else:
|
|
496
500
|
values = col.values
|
|
497
501
|
if isinstance(values, pd.api.extensions.ExtensionArray):
|
|
498
|
-
from pandas.arrays import
|
|
502
|
+
from pandas.arrays import BooleanArray, FloatingArray, IntegerArray
|
|
499
503
|
|
|
500
504
|
if isinstance(values, (IntegerArray, FloatingArray, BooleanArray)):
|
|
501
505
|
field_data.append(values._data)
|
|
@@ -520,7 +524,10 @@ def write_dataframe(
|
|
|
520
524
|
# If there is data, infer layer geometry type + promote_to_multi
|
|
521
525
|
if not df.empty:
|
|
522
526
|
# None/Empty geometries sometimes report as Z incorrectly, so ignore them
|
|
523
|
-
|
|
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
|
|
524
531
|
has_z = has_z_arr.any()
|
|
525
532
|
all_z = has_z_arr.all()
|
|
526
533
|
|
|
@@ -573,12 +580,13 @@ def write_dataframe(
|
|
|
573
580
|
# if possible use EPSG codes instead
|
|
574
581
|
epsg = geometry.crs.to_epsg()
|
|
575
582
|
if epsg:
|
|
576
|
-
crs = f"EPSG:{epsg}"
|
|
583
|
+
crs = f"EPSG:{epsg}"
|
|
577
584
|
else:
|
|
578
|
-
crs = geometry.crs.to_wkt(
|
|
585
|
+
crs = geometry.crs.to_wkt("WKT1_GDAL")
|
|
579
586
|
|
|
580
587
|
if use_arrow:
|
|
581
588
|
import pyarrow as pa
|
|
589
|
+
|
|
582
590
|
from pyogrio.raw import write_arrow
|
|
583
591
|
|
|
584
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.
|
|
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 "
|
|
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.12")
|
|
|
7
7
|
message(FATAL_ERROR "CMake >= 2.8.12 required")
|
|
8
8
|
endif()
|
|
9
9
|
cmake_policy(PUSH)
|
|
10
|
-
cmake_policy(VERSION 2.8.12...3.
|
|
10
|
+
cmake_policy(VERSION 2.8.12...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.12")
|
|
|
7
7
|
message(FATAL_ERROR "CMake >= 2.8.12 required")
|
|
8
8
|
endif()
|
|
9
9
|
cmake_policy(PUSH)
|
|
10
|
-
cmake_policy(VERSION 2.8.12...3.
|
|
10
|
+
cmake_policy(VERSION 2.8.12...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" },
|