pyogrio 0.9.0__cp311-cp311-macosx_12_0_arm64.whl → 0.11.0__cp311-cp311-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.

Files changed (86) hide show
  1. pyogrio/.dylibs/{libgdal.34.3.8.5.dylib → libgdal.36.3.10.3.dylib} +0 -0
  2. pyogrio/__init__.py +28 -21
  3. pyogrio/_compat.py +15 -1
  4. pyogrio/_env.py +4 -6
  5. pyogrio/_err.cpython-311-darwin.so +0 -0
  6. pyogrio/_geometry.cpython-311-darwin.so +0 -0
  7. pyogrio/_io.cpython-311-darwin.so +0 -0
  8. pyogrio/_ogr.cpython-311-darwin.so +0 -0
  9. pyogrio/_version.py +3 -3
  10. pyogrio/_vsi.cpython-311-darwin.so +0 -0
  11. pyogrio/core.py +86 -20
  12. pyogrio/errors.py +9 -16
  13. pyogrio/gdal_data/GDAL-targets-release.cmake +3 -3
  14. pyogrio/gdal_data/GDAL-targets.cmake +2 -2
  15. pyogrio/gdal_data/GDALConfig.cmake +0 -1
  16. pyogrio/gdal_data/GDALConfigVersion.cmake +3 -3
  17. pyogrio/gdal_data/MM_m_idofic.csv +321 -0
  18. pyogrio/gdal_data/gdalinfo_output.schema.json +3 -3
  19. pyogrio/gdal_data/gdaltileindex.xsd +253 -0
  20. pyogrio/gdal_data/gdalvrt.xsd +178 -63
  21. pyogrio/gdal_data/nitf_spec.xml +1 -17
  22. pyogrio/gdal_data/nitf_spec.xsd +1 -17
  23. pyogrio/gdal_data/ogrinfo_output.schema.json +23 -0
  24. pyogrio/gdal_data/ogrvrt.xsd +4 -17
  25. pyogrio/gdal_data/osmconf.ini +3 -1
  26. pyogrio/gdal_data/pci_datum.txt +222 -155
  27. pyogrio/gdal_data/pci_ellips.txt +90 -38
  28. pyogrio/gdal_data/pdfcomposition.xsd +1 -17
  29. pyogrio/gdal_data/vcpkg.spdx.json +29 -24
  30. pyogrio/gdal_data/vcpkg_abi_info.txt +31 -30
  31. pyogrio/gdal_data/vdv452.xml +1 -17
  32. pyogrio/gdal_data/vdv452.xsd +1 -17
  33. pyogrio/geopandas.py +122 -66
  34. pyogrio/proj_data/ITRF2014 +1 -1
  35. pyogrio/proj_data/ITRF2020 +91 -0
  36. pyogrio/proj_data/proj-config-version.cmake +2 -2
  37. pyogrio/proj_data/proj-config.cmake +1 -1
  38. pyogrio/proj_data/proj-targets.cmake +3 -3
  39. pyogrio/proj_data/proj.db +0 -0
  40. pyogrio/proj_data/proj.ini +11 -3
  41. pyogrio/proj_data/proj4-targets.cmake +3 -3
  42. pyogrio/proj_data/projjson.schema.json +1 -1
  43. pyogrio/proj_data/usage +7 -2
  44. pyogrio/proj_data/vcpkg.spdx.json +27 -22
  45. pyogrio/proj_data/vcpkg_abi_info.txt +18 -17
  46. pyogrio/raw.py +46 -30
  47. pyogrio/tests/conftest.py +214 -12
  48. pyogrio/tests/fixtures/README.md +32 -13
  49. pyogrio/tests/fixtures/curve.gpkg +0 -0
  50. pyogrio/tests/fixtures/{test_multisurface.gpkg → curvepolygon.gpkg} +0 -0
  51. pyogrio/tests/fixtures/line_zm.gpkg +0 -0
  52. pyogrio/tests/fixtures/multisurface.gpkg +0 -0
  53. pyogrio/tests/test_arrow.py +181 -24
  54. pyogrio/tests/test_core.py +170 -76
  55. pyogrio/tests/test_geopandas_io.py +483 -135
  56. pyogrio/tests/test_path.py +39 -17
  57. pyogrio/tests/test_raw_io.py +170 -55
  58. pyogrio/tests/test_util.py +56 -0
  59. pyogrio/util.py +69 -32
  60. pyogrio-0.11.0.dist-info/METADATA +124 -0
  61. {pyogrio-0.9.0.dist-info → pyogrio-0.11.0.dist-info}/RECORD +64 -78
  62. {pyogrio-0.9.0.dist-info → pyogrio-0.11.0.dist-info}/WHEEL +2 -1
  63. {pyogrio-0.9.0.dist-info → pyogrio-0.11.0.dist-info/licenses}/LICENSE +1 -1
  64. pyogrio/_err.pxd +0 -4
  65. pyogrio/_err.pyx +0 -250
  66. pyogrio/_geometry.pxd +0 -4
  67. pyogrio/_geometry.pyx +0 -129
  68. pyogrio/_io.pxd +0 -0
  69. pyogrio/_io.pyx +0 -2742
  70. pyogrio/_ogr.pxd +0 -444
  71. pyogrio/_ogr.pyx +0 -346
  72. pyogrio/_vsi.pxd +0 -4
  73. pyogrio/_vsi.pyx +0 -140
  74. pyogrio/arrow_bridge.h +0 -115
  75. pyogrio/gdal_data/bag_template.xml +0 -201
  76. pyogrio/gdal_data/gmlasconf.xml +0 -169
  77. pyogrio/gdal_data/gmlasconf.xsd +0 -1066
  78. pyogrio/gdal_data/netcdf_config.xsd +0 -143
  79. pyogrio/tests/fixtures/poly_not_enough_points.shp.zip +0 -0
  80. pyogrio/tests/fixtures/test_datetime.geojson +0 -7
  81. pyogrio/tests/fixtures/test_datetime_tz.geojson +0 -8
  82. pyogrio/tests/fixtures/test_fgdb.gdb.zip +0 -0
  83. pyogrio/tests/fixtures/test_nested.geojson +0 -18
  84. pyogrio/tests/fixtures/test_ogr_types_list.geojson +0 -12
  85. pyogrio-0.9.0.dist-info/METADATA +0 -100
  86. {pyogrio-0.9.0.dist-info → pyogrio-0.11.0.dist-info}/top_level.txt +0 -0
@@ -10,50 +10,80 @@
10
10
  **********************************************************************
11
11
  * Copyright (c) 2015, Even Rouault
12
12
  *
13
- * Permission is hereby granted, free of charge, to any person obtaining a
14
- * copy of this software and associated documentation files (the "Software"),
15
- * to deal in the Software without restriction, including without limitation
16
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
17
- * and/or sell copies of the Software, and to permit persons to whom the
18
- * Software is furnished to do so, subject to the following conditions:
19
- *
20
- * The above copyright notice and this permission notice shall be included
21
- * in all copies or substantial portions of the Software.
22
- *
23
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
24
- * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
25
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
26
- * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
27
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
28
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
29
- * DEALINGS IN THE SOFTWARE.
13
+ * SPDX-License-Identifier: MIT
30
14
  ****************************************************************************/
31
15
  -->
32
16
  <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" version="1.0">
33
- <xs:element name="VRTDataset">
34
- <xs:complexType>
35
- <xs:sequence>
36
- <xs:choice minOccurs="0" maxOccurs="unbounded">
37
- <xs:element name="SRS" type="SRSType"/>
38
- <xs:element name="GeoTransform" type="xs:string"/>
39
- <xs:element name="GCPList" type="GCPListType"/>
40
- <xs:element name="BlockXSize" type="nonNegativeInteger32"/>
41
- <xs:element name="BlockYSize" type="nonNegativeInteger32"/>
42
- <xs:element name="Metadata" type="MetadataType"/> <!-- may be repeated -->
43
- <xs:element name="VRTRasterBand" type="VRTRasterBandType"/> <!-- may be repeated -->
44
- <xs:element name="MaskBand" type="MaskBandType"/>
45
- <xs:element name="GDALWarpOptions" type="GDALWarpOptionsType"/> <!-- only if subClass="VRTWarpedDataset" -->
46
- <xs:element name="PansharpeningOptions" type="PansharpeningOptionsType"/> <!-- only if subClass="VRTPansharpenedDataset" -->
47
- <xs:element name="Group" type="GroupType"/> <!-- only for multidimensional dataset -->
48
- <xs:element name="OverviewList" type="OverviewListType"/>
49
- </xs:choice>
50
- </xs:sequence>
51
- <xs:attribute name="subClass" type="xs:string"/>
52
- <xs:attribute name="rasterXSize" type="nonNegativeInteger32"/>
53
- <xs:attribute name="rasterYSize" type="nonNegativeInteger32"/>
54
- </xs:complexType>
17
+ <xs:element name="VRTDataset" type="VRTDatasetType">
18
+ <xs:annotation>
19
+ <xs:documentation>Root element</xs:documentation>
20
+ </xs:annotation>
55
21
  </xs:element>
56
22
 
23
+ <xs:complexType name="VRTDatasetType">
24
+ <xs:sequence>
25
+ <xs:choice minOccurs="0" maxOccurs="unbounded">
26
+ <xs:element name="SRS" type="SRSType"/>
27
+ <xs:element name="GeoTransform" type="xs:string"/>
28
+ <xs:element name="GCPList" type="GCPListType"/>
29
+ <xs:element name="BlockXSize" type="nonNegativeInteger32"/>
30
+ <xs:element name="BlockYSize" type="nonNegativeInteger32"/>
31
+ <xs:element name="Metadata" type="MetadataType">
32
+ <xs:annotation>
33
+ <xs:documentation>May be repeated</xs:documentation>
34
+ </xs:annotation>
35
+ </xs:element>
36
+ <xs:element name="VRTRasterBand" type="VRTRasterBandType">
37
+ <xs:annotation>
38
+ <xs:documentation>May be repeated</xs:documentation>
39
+ </xs:annotation>
40
+ </xs:element>
41
+ <xs:element name="MaskBand" type="MaskBandType"/>
42
+ <xs:element name="GDALWarpOptions" type="GDALWarpOptionsType">
43
+ <xs:annotation>
44
+ <xs:documentation>Allowed only if subClass="VRTWarpedDataset"</xs:documentation>
45
+ </xs:annotation>
46
+ </xs:element>
47
+ <xs:element name="PansharpeningOptions" type="PansharpeningOptionsType">
48
+ <xs:annotation>
49
+ <xs:documentation>Allowed only if subClass="VRTPansharpenedDataset"</xs:documentation>
50
+ </xs:annotation>
51
+ </xs:element>
52
+ <xs:element name="Input" type="InputType">
53
+ <xs:annotation>
54
+ <xs:documentation>Allowed only if subClass="VRTProcessedDataset"</xs:documentation>
55
+ </xs:annotation>
56
+ </xs:element>
57
+ <xs:element name="ProcessingSteps" type="ProcessingStepsType">
58
+ <xs:annotation>
59
+ <xs:documentation>Allowed only if subClass="VRTProcessedDataset"</xs:documentation>
60
+ </xs:annotation>
61
+ </xs:element>
62
+ <xs:element name="Group" type="GroupType">
63
+ <xs:annotation>
64
+ <xs:documentation>only for multidimensional dataset</xs:documentation>
65
+ </xs:annotation>
66
+ </xs:element>
67
+ <xs:element name="OverviewList" type="OverviewListType"/>
68
+ </xs:choice>
69
+ </xs:sequence>
70
+ <xs:attribute name="subClass" type="DatasetSubclassType"/>
71
+ <xs:attribute name="rasterXSize" type="nonNegativeInteger32"/>
72
+ <xs:attribute name="rasterYSize" type="nonNegativeInteger32"/>
73
+ </xs:complexType>
74
+
75
+ <xs:simpleType name="DatasetSubclassType">
76
+ <xs:restriction base="xs:string">
77
+ <xs:enumeration value="VRTWarpedDataset"/>
78
+ <xs:enumeration value="VRTPansharpenedDataset"/>
79
+ <xs:enumeration value="VRTProcessedDataset">
80
+ <xs:annotation>
81
+ <xs:documentation>Added in GDAL 3.9</xs:documentation>
82
+ </xs:annotation>
83
+ </xs:enumeration>
84
+ </xs:restriction>
85
+ </xs:simpleType>
86
+
57
87
  <xs:complexType name="OverviewListType">
58
88
  <xs:simpleContent>
59
89
  <xs:extension base="integerList">
@@ -158,6 +188,51 @@
158
188
  </xs:sequence>
159
189
  </xs:complexType>
160
190
 
191
+ <xs:complexType name="InputType">
192
+ <xs:sequence>
193
+ <xs:choice minOccurs="0" maxOccurs="1">
194
+ <xs:element name="SourceFilename" type="SourceFilenameType"/>
195
+ <xs:element name="VRTDataset" type="VRTDatasetType"/>
196
+ </xs:choice>
197
+ </xs:sequence>
198
+ </xs:complexType>
199
+
200
+ <xs:complexType name="ProcessingStepsType">
201
+ <xs:sequence minOccurs="1" maxOccurs="unbounded">
202
+ <xs:element name="Step" type="ProcessingStepType"/>
203
+ </xs:sequence>
204
+ </xs:complexType>
205
+
206
+ <xs:complexType name="ProcessingStepType">
207
+ <xs:annotation>
208
+ <xs:documentation>Processing step of a VRTPansharpenedDataset</xs:documentation>
209
+ </xs:annotation>
210
+ <xs:sequence>
211
+ <xs:element name="Algorithm" type="xs:string" minOccurs="1">
212
+ <xs:annotation>
213
+ <xs:documentation>Builtin allowed names are BandAffineCombination, LUT, LocalScaleOffset, Trimming. More algorithms can be registered at run-time.</xs:documentation>
214
+ </xs:annotation>
215
+ </xs:element>
216
+ <xs:element name="Argument" type="ArgumentType" maxOccurs="unbounded"/>
217
+ </xs:sequence>
218
+ <xs:attribute name="name" type="xs:string"/>
219
+ </xs:complexType>
220
+
221
+ <xs:complexType name="ArgumentType">
222
+ <xs:annotation>
223
+ <xs:documentation>Argument of a processing function</xs:documentation>
224
+ </xs:annotation>
225
+ <xs:simpleContent>
226
+ <xs:extension base="xs:string">
227
+ <xs:attribute name="name" type="xs:string" use="required">
228
+ <xs:annotation>
229
+ <xs:documentation>Allowed names are specific of each processing function</xs:documentation>
230
+ </xs:annotation>
231
+ </xs:attribute>
232
+ </xs:extension>
233
+ </xs:simpleContent>
234
+ </xs:complexType>
235
+
161
236
  <xs:complexType name="MDIType">
162
237
  <xs:simpleContent>
163
238
  <xs:extension base="xs:string">
@@ -189,6 +264,7 @@
189
264
  <xs:element name="SimpleSource" type="SimpleSourceType"/>
190
265
  <xs:element name="ComplexSource" type="ComplexSourceType"/>
191
266
  <xs:element name="AveragedSource" type="SimpleSourceType"/>
267
+ <xs:element name="NoDataFromMaskSource" type="NoDataFromMaskSourceType"/>
192
268
  <xs:element name="KernelFilteredSource" type="KernelFilteredSourceType"/>
193
269
  <xs:element name="ArraySource" type="ArraySourceType"/>
194
270
 
@@ -233,6 +309,7 @@
233
309
  <xs:enumeration value="VRTDerivedRasterBand"/>
234
310
  <xs:enumeration value="VRTRawRasterBand"/>
235
311
  <xs:enumeration value="VRTPansharpenedRasterBand"/>
312
+ <xs:enumeration value="VRTProcessedRasterBand"/>
236
313
  </xs:restriction>
237
314
  </xs:simpleType>
238
315
 
@@ -349,6 +426,23 @@
349
426
  <xs:enumeration value="YCbCr_Cb"/>
350
427
  <xs:enumeration value="YCbCr_Cr"/>
351
428
  <xs:enumeration value="Undefined"/>
429
+ <xs:enumeration value="Pan"/> <!-- 3.10 addition -->
430
+ <xs:enumeration value="Coastal"/> <!-- 3.10 addition -->
431
+ <xs:enumeration value="RedEdge"/> <!-- 3.10 addition -->
432
+ <xs:enumeration value="NIR"/> <!-- 3.10 addition -->
433
+ <xs:enumeration value="SWIR"/> <!-- 3.10 addition -->
434
+ <xs:enumeration value="MWIR"/> <!-- 3.10 addition -->
435
+ <xs:enumeration value="LWIR"/> <!-- 3.10 addition -->
436
+ <xs:enumeration value="TIR"/> <!-- 3.10 addition -->
437
+ <xs:enumeration value="OtherIR"/> <!-- 3.10 addition -->
438
+ <xs:enumeration value="SAR_Ka"/> <!-- 3.10 addition -->
439
+ <xs:enumeration value="SAR_K"/> <!-- 3.10 addition -->
440
+ <xs:enumeration value="SAR_Ku"/> <!-- 3.10 addition -->
441
+ <xs:enumeration value="SAR_X"/> <!-- 3.10 addition -->
442
+ <xs:enumeration value="SAR_C"/> <!-- 3.10 addition -->
443
+ <xs:enumeration value="SAR_S"/> <!-- 3.10 addition -->
444
+ <xs:enumeration value="SAR_L"/> <!-- 3.10 addition -->
445
+ <xs:enumeration value="SAR_P"/> <!-- 3.10 addition -->
352
446
  </xs:restriction>
353
447
  </xs:simpleType>
354
448
 
@@ -408,6 +502,21 @@
408
502
  <xs:attribute name="resampling" type="xs:string"/>
409
503
  </xs:complexType>
410
504
 
505
+ <xs:group name="NoDataFromMaskSourceElementsGroup">
506
+ <xs:sequence>
507
+ <xs:choice minOccurs="0" maxOccurs="unbounded">
508
+ <xs:group ref="SimpleSourceElementsGroup"/>
509
+ <xs:element name="NODATA" type="DoubleOrNanType"/> <!-- NODATA and UseMaskBand are mutually exclusive -->
510
+ <xs:element name="MaskValueThreshold" type="xs:double"/>
511
+ <xs:element name="RemappedValue" type="xs:double"/>
512
+ </xs:choice>
513
+ </xs:sequence>
514
+ </xs:group>
515
+
516
+ <xs:complexType name="NoDataFromMaskSourceType">
517
+ <xs:group ref="NoDataFromMaskSourceElementsGroup"/>
518
+ </xs:complexType>
519
+
411
520
  <xs:complexType name="KernelFilteredSourceType">
412
521
  <xs:sequence>
413
522
  <xs:choice minOccurs="0" maxOccurs="unbounded">
@@ -526,35 +635,41 @@
526
635
  </xs:complexType>
527
636
 
528
637
  <xs:complexType name="ArrayType">
529
- <xs:sequence>
530
- <xs:element name="DataType" type="xs:string" minOccurs="1" maxOccurs="1"/>
531
- <xs:sequence>
532
- <xs:choice minOccurs="0" maxOccurs="unbounded">
533
- <xs:element name="Dimension" type="DimensionType"/>
534
- <xs:element name="DimensionRef" type="DimensionRefType"/>
535
- </xs:choice>
536
- </xs:sequence>
537
- <xs:element name="SRS" type="SRSType" minOccurs="0" maxOccurs="1"/>
538
- <xs:element name="Unit" type="xs:string" minOccurs="0" maxOccurs="1"/>
539
- <xs:element name="NoDataValue" type="DoubleOrNanType" minOccurs="0" maxOccurs="1"/>
540
- <xs:element name="Offset" type="xs:double" minOccurs="0" maxOccurs="1"/>
541
- <xs:element name="Scale" type="xs:double" minOccurs="0" maxOccurs="1"/>
542
- <xs:choice>
543
- <xs:element name="RegularlySpacedValues" type="RegularlySpacedValuesType" minOccurs="0" maxOccurs="1"/>
638
+ <xs:complexContent>
639
+ <xs:extension base="AbstractArrayType">
544
640
  <xs:sequence>
545
- <xs:choice minOccurs="0" maxOccurs="unbounded">
546
- <xs:element name="ConstantValue" type="ConstantValueType"/>
547
- <xs:element name="InlineValues" type="InlineValuesType"/>
548
- <xs:element name="InlineValuesWithValueElement" type="InlineValuesWithValueElementType"/>
549
- <xs:element name="Source" type="SourceType"/>
641
+ <xs:element name="DataType" type="xs:string" minOccurs="1" maxOccurs="1"/>
642
+ <xs:sequence>
643
+ <xs:choice minOccurs="0" maxOccurs="unbounded">
644
+ <xs:element name="Dimension" type="DimensionType"/>
645
+ <xs:element name="DimensionRef" type="DimensionRefType"/>
646
+ </xs:choice>
647
+ </xs:sequence>
648
+ <xs:element name="SRS" type="SRSType" minOccurs="0" maxOccurs="1"/>
649
+ <xs:element name="Unit" type="xs:string" minOccurs="0" maxOccurs="1"/>
650
+ <xs:element name="NoDataValue" type="DoubleOrNanType" minOccurs="0" maxOccurs="1"/>
651
+ <xs:element name="Offset" type="xs:double" minOccurs="0" maxOccurs="1"/>
652
+ <xs:element name="Scale" type="xs:double" minOccurs="0" maxOccurs="1"/>
653
+ <xs:choice>
654
+ <xs:element name="RegularlySpacedValues" type="RegularlySpacedValuesType" minOccurs="0" maxOccurs="1"/>
655
+ <xs:sequence>
656
+ <xs:choice minOccurs="0" maxOccurs="unbounded">
657
+ <xs:element name="ConstantValue" type="ConstantValueType"/>
658
+ <xs:element name="InlineValues" type="InlineValuesType"/>
659
+ <xs:element name="InlineValuesWithValueElement" type="InlineValuesWithValueElementType"/>
660
+ <xs:element name="Source" type="SourceType"/>
661
+ </xs:choice>
662
+ </xs:sequence>
550
663
  </xs:choice>
664
+ <xs:element name="Attribute" type="AttributeType" minOccurs="0" maxOccurs="unbounded"/>
551
665
  </xs:sequence>
552
- </xs:choice>
553
- <xs:element name="Attribute" type="AttributeType" minOccurs="0" maxOccurs="unbounded"/>
554
- </xs:sequence>
555
- <xs:attribute name="name" type="xs:string" use="required"/>
666
+ <xs:attribute name="name" type="xs:string" use="required"/>
667
+ </xs:extension>
668
+ </xs:complexContent>
556
669
  </xs:complexType>
557
670
 
671
+ <xs:element name="Array" substitutionGroup="AbstractArray" type="ArrayType"/>
672
+
558
673
  <xs:complexType name="RegularlySpacedValuesType">
559
674
  <xs:attribute name="start" type="xs:double" use="required"/>
560
675
  <xs:attribute name="increment" type="xs:double" use="required"/>
@@ -10,23 +10,7 @@
10
10
  **********************************************************************
11
11
  * Copyright (c) 2011, Even Rouault
12
12
  *
13
- * Permission is hereby granted, free of charge, to any person obtaining a
14
- * copy of this software and associated documentation files (the "Software"),
15
- * to deal in the Software without restriction, including without limitation
16
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
17
- * and/or sell copies of the Software, and to permit persons to whom the
18
- * Software is furnished to do so, subject to the following conditions:
19
- *
20
- * The above copyright notice and this permission notice shall be included
21
- * in all copies or substantial portions of the Software.
22
- *
23
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
24
- * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
25
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
26
- * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
27
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
28
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
29
- * DEALINGS IN THE SOFTWARE.
13
+ * SPDX-License-Identifier: MIT
30
14
  ****************************************************************************/
31
15
  -->
32
16
 
@@ -10,23 +10,7 @@
10
10
  **********************************************************************
11
11
  * Copyright (c) 2011, Even Rouault
12
12
  *
13
- * Permission is hereby granted, free of charge, to any person obtaining a
14
- * copy of this software and associated documentation files (the "Software"),
15
- * to deal in the Software without restriction, including without limitation
16
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
17
- * and/or sell copies of the Software, and to permit persons to whom the
18
- * Software is furnished to do so, subject to the following conditions:
19
- *
20
- * The above copyright notice and this permission notice shall be included
21
- * in all copies or substantial portions of the Software.
22
- *
23
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
24
- * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
25
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
26
- * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
27
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
28
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
29
- * DEALINGS IN THE SOFTWARE.
13
+ * SPDX-License-Identifier: MIT
30
14
  ****************************************************************************/
31
15
  -->
32
16
  <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema">
@@ -212,6 +212,17 @@
212
212
  "maxItems": 4
213
213
  }
214
214
  },
215
+ "extent3D": {
216
+ "type": "array",
217
+ "items": {
218
+ "type": [
219
+ "null",
220
+ "number"
221
+ ],
222
+ "minItems": 6,
223
+ "maxItems": 6
224
+ }
225
+ },
215
226
  "coordinateSystem": {
216
227
  "oneOf": [
217
228
  {
@@ -254,6 +265,18 @@
254
265
  }
255
266
  ]
256
267
  }
268
+ },
269
+ "xyCoordinateResolution": {
270
+ "type": "number"
271
+ },
272
+ "zCoordinateResolution": {
273
+ "type": "number"
274
+ },
275
+ "mCoordinateResolution": {
276
+ "type": "number"
277
+ },
278
+ "coordinatePrecisionFormatSpecificOptions": {
279
+ "type": "object"
257
280
  }
258
281
  },
259
282
  "required": [
@@ -10,23 +10,7 @@
10
10
  **********************************************************************
11
11
  * Copyright (c) 2012, Even Rouault
12
12
  *
13
- * Permission is hereby granted, free of charge, to any person obtaining a
14
- * copy of this software and associated documentation files (the "Software"),
15
- * to deal in the Software without restriction, including without limitation
16
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
17
- * and/or sell copies of the Software, and to permit persons to whom the
18
- * Software is furnished to do so, subject to the following conditions:
19
- *
20
- * The above copyright notice and this permission notice shall be included
21
- * in all copies or substantial portions of the Software.
22
- *
23
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
24
- * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
25
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
26
- * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
27
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
28
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
29
- * DEALINGS IN THE SOFTWARE.
13
+ * SPDX-License-Identifier: MIT
30
14
  ****************************************************************************/
31
15
  -->
32
16
  <xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" version="1.0">
@@ -393,6 +377,9 @@
393
377
  <xs:element name="SrcRegion" type="SrcRegionType"/>
394
378
  <xs:element name="SRS" type="nonEmptyStringType"/>
395
379
  <xs:group ref="ExtentType"/>
380
+ <xs:element name="XYResolution" type="xs:double" minOccurs="0" maxOccurs="1"/>
381
+ <xs:element name="ZResolution" type="xs:double" minOccurs="0" maxOccurs="1"/>
382
+ <xs:element name="MResolution" type="xs:double" minOccurs="0" maxOccurs="1"/>
396
383
  </xs:choice>
397
384
  </xs:sequence>
398
385
  <xs:attributeGroup ref="GeometryFieldTypeAttrGroupWithoutSrc"/>
@@ -1,6 +1,8 @@
1
1
  #
2
- # Configuration file for OSM import
2
+ # Configuration file for importing OSM data into OGR
3
3
  #
4
+ # NOTE: remove the below "[general]" line for GDAL < 3.10
5
+ [general]
4
6
 
5
7
  # put here the name of keys, or key=value, for ways that are assumed to be polygons if they are closed
6
8
  # see http://wiki.openstreetmap.org/wiki/Map_Features