pyogrio 0.10.0__cp311-cp311-macosx_12_0_arm64.whl → 0.11.1__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 (49) hide show
  1. pyogrio/.dylibs/{libgdal.35.3.9.1.dylib → libgdal.36.3.10.3.dylib} +0 -0
  2. pyogrio/__init__.py +12 -10
  3. pyogrio/_compat.py +8 -0
  4. pyogrio/_err.cpython-311-darwin.so +0 -0
  5. pyogrio/_geometry.cpython-311-darwin.so +0 -0
  6. pyogrio/_io.cpython-311-darwin.so +0 -0
  7. pyogrio/_ogr.cpython-311-darwin.so +0 -0
  8. pyogrio/_version.py +3 -3
  9. pyogrio/_vsi.cpython-311-darwin.so +0 -0
  10. pyogrio/gdal_data/GDAL-targets-release.cmake +3 -3
  11. pyogrio/gdal_data/GDAL-targets.cmake +2 -2
  12. pyogrio/gdal_data/GDALConfigVersion.cmake +3 -3
  13. pyogrio/gdal_data/gdalinfo_output.schema.json +3 -3
  14. pyogrio/gdal_data/gdaltileindex.xsd +1 -17
  15. pyogrio/gdal_data/gdalvrt.xsd +48 -41
  16. pyogrio/gdal_data/nitf_spec.xml +1 -17
  17. pyogrio/gdal_data/nitf_spec.xsd +1 -17
  18. pyogrio/gdal_data/ogrvrt.xsd +1 -17
  19. pyogrio/gdal_data/osmconf.ini +3 -1
  20. pyogrio/gdal_data/pdfcomposition.xsd +1 -17
  21. pyogrio/gdal_data/template_tiles.mapml +28 -0
  22. pyogrio/gdal_data/vcpkg.spdx.json +30 -25
  23. pyogrio/gdal_data/vcpkg_abi_info.txt +28 -27
  24. pyogrio/gdal_data/vdv452.xml +1 -17
  25. pyogrio/gdal_data/vdv452.xsd +1 -17
  26. pyogrio/geopandas.py +91 -43
  27. pyogrio/proj_data/ITRF2014 +1 -1
  28. pyogrio/proj_data/ITRF2020 +91 -0
  29. pyogrio/proj_data/proj-config-version.cmake +3 -3
  30. pyogrio/proj_data/proj-config.cmake +1 -1
  31. pyogrio/proj_data/proj-targets.cmake +3 -3
  32. pyogrio/proj_data/proj.db +0 -0
  33. pyogrio/proj_data/proj.ini +11 -3
  34. pyogrio/proj_data/proj4-targets.cmake +3 -3
  35. pyogrio/proj_data/usage +7 -2
  36. pyogrio/proj_data/vcpkg.spdx.json +27 -22
  37. pyogrio/proj_data/vcpkg_abi_info.txt +16 -15
  38. pyogrio/tests/conftest.py +8 -0
  39. pyogrio/tests/test_arrow.py +3 -0
  40. pyogrio/tests/test_core.py +8 -4
  41. pyogrio/tests/test_geopandas_io.py +270 -45
  42. pyogrio/tests/test_path.py +10 -0
  43. pyogrio/tests/test_raw_io.py +6 -2
  44. pyogrio/util.py +15 -2
  45. {pyogrio-0.10.0.dist-info → pyogrio-0.11.1.dist-info}/METADATA +32 -37
  46. {pyogrio-0.10.0.dist-info → pyogrio-0.11.1.dist-info}/RECORD +49 -47
  47. {pyogrio-0.10.0.dist-info → pyogrio-0.11.1.dist-info}/WHEEL +2 -1
  48. {pyogrio-0.10.0.dist-info → pyogrio-0.11.1.dist-info/licenses}/LICENSE +0 -0
  49. {pyogrio-0.10.0.dist-info → pyogrio-0.11.1.dist-info}/top_level.txt +0 -0
pyogrio/__init__.py CHANGED
@@ -4,7 +4,9 @@ try:
4
4
  # we try importing shapely, to ensure it is imported (and it can load its
5
5
  # own GEOS copy) before we load GDAL and its linked GEOS
6
6
  import shapely
7
- import shapely.geos # noqa: F401
7
+
8
+ if shapely.__version__ < "2.0.0":
9
+ import shapely.geos
8
10
  except Exception:
9
11
  pass
10
12
 
@@ -32,24 +34,24 @@ __version__ = get_versions()["version"]
32
34
  del get_versions
33
35
 
34
36
  __all__ = [
35
- "list_drivers",
37
+ "__gdal_geos_version__",
38
+ "__gdal_version__",
39
+ "__gdal_version_string__",
40
+ "__version__",
36
41
  "detect_write_driver",
37
- "list_layers",
38
- "read_bounds",
39
- "read_info",
40
- "set_gdal_config_options",
41
42
  "get_gdal_config_option",
42
43
  "get_gdal_data_path",
44
+ "list_drivers",
45
+ "list_layers",
43
46
  "open_arrow",
44
47
  "read_arrow",
48
+ "read_bounds",
45
49
  "read_dataframe",
50
+ "read_info",
51
+ "set_gdal_config_options",
46
52
  "vsi_listtree",
47
53
  "vsi_rmtree",
48
54
  "vsi_unlink",
49
55
  "write_arrow",
50
56
  "write_dataframe",
51
- "__gdal_version__",
52
- "__gdal_version_string__",
53
- "__gdal_geos_version__",
54
- "__version__",
55
57
  ]
pyogrio/_compat.py CHANGED
@@ -33,15 +33,23 @@ HAS_ARROW_API = __gdal_version__ >= (3, 6, 0)
33
33
  HAS_ARROW_WRITE_API = __gdal_version__ >= (3, 8, 0)
34
34
  HAS_PYARROW = pyarrow is not None
35
35
  HAS_PYPROJ = pyproj is not None
36
+ PYARROW_GE_19 = pyarrow is not None and Version(pyarrow.__version__) >= Version(
37
+ "19.0.0"
38
+ )
36
39
 
37
40
  HAS_GEOPANDAS = geopandas is not None
38
41
 
39
42
  PANDAS_GE_15 = pandas is not None and Version(pandas.__version__) >= Version("1.5.0")
40
43
  PANDAS_GE_20 = pandas is not None and Version(pandas.__version__) >= Version("2.0.0")
41
44
  PANDAS_GE_22 = pandas is not None and Version(pandas.__version__) >= Version("2.2.0")
45
+ PANDAS_GE_30 = pandas is not None and Version(pandas.__version__) >= Version("3.0.0dev")
42
46
 
47
+ GDAL_GE_352 = __gdal_version__ >= (3, 5, 2)
48
+ GDAL_GE_37 = __gdal_version__ >= (3, 7, 0)
43
49
  GDAL_GE_38 = __gdal_version__ >= (3, 8, 0)
50
+ GDAL_GE_311 = __gdal_version__ >= (3, 11, 0)
44
51
 
45
52
  HAS_GDAL_GEOS = __gdal_geos_version__ is not None
46
53
 
47
54
  HAS_SHAPELY = shapely is not None and Version(shapely.__version__) >= Version("2.0.0")
55
+ SHAPELY_GE_21 = shapely is not None and Version(shapely.__version__) >= Version("2.1.0")
Binary file
Binary file
Binary file
Binary file
pyogrio/_version.py CHANGED
@@ -8,11 +8,11 @@ import json
8
8
 
9
9
  version_json = '''
10
10
  {
11
- "date": "2024-09-28T11:22:57-0700",
11
+ "date": "2025-08-02T21:41:37+0200",
12
12
  "dirty": false,
13
13
  "error": null,
14
- "full-revisionid": "eb8e7889224155ffa0f779360db29f07f370eef1",
15
- "version": "0.10.0"
14
+ "full-revisionid": "d3ff55ba80ea5f1744d40f7502adec3658d91b15",
15
+ "version": "0.11.1"
16
16
  }
17
17
  ''' # END VERSION_JSON
18
18
 
Binary file
@@ -8,12 +8,12 @@ set(CMAKE_IMPORT_FILE_VERSION 1)
8
8
  # Import target "GDAL::GDAL" for configuration "Release"
9
9
  set_property(TARGET GDAL::GDAL APPEND PROPERTY IMPORTED_CONFIGURATIONS RELEASE)
10
10
  set_target_properties(GDAL::GDAL PROPERTIES
11
- IMPORTED_LOCATION_RELEASE "${_IMPORT_PREFIX}/lib/libgdal.35.3.9.1.dylib"
12
- IMPORTED_SONAME_RELEASE "@rpath/libgdal.35.dylib"
11
+ IMPORTED_LOCATION_RELEASE "${_IMPORT_PREFIX}/lib/libgdal.36.3.10.3.dylib"
12
+ IMPORTED_SONAME_RELEASE "@rpath/libgdal.36.dylib"
13
13
  )
14
14
 
15
15
  list(APPEND _cmake_import_check_targets GDAL::GDAL )
16
- list(APPEND _cmake_import_check_files_for_GDAL::GDAL "${_IMPORT_PREFIX}/lib/libgdal.35.3.9.1.dylib" )
16
+ list(APPEND _cmake_import_check_files_for_GDAL::GDAL "${_IMPORT_PREFIX}/lib/libgdal.36.3.10.3.dylib" )
17
17
 
18
18
  # Commands beyond this point should not need to know the version.
19
19
  set(CMAKE_IMPORT_FILE_VERSION)
@@ -1,13 +1,13 @@
1
1
  # Generated by CMake
2
2
 
3
3
  if("${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}" LESS 2.8)
4
- message(FATAL_ERROR "CMake >= 2.8.0 required")
4
+ message(FATAL_ERROR "CMake >= 2.8.3 required")
5
5
  endif()
6
6
  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.28)
10
+ cmake_policy(VERSION 2.8.3...3.29)
11
11
  #----------------------------------------------------------------
12
12
  # Generated CMake target import file.
13
13
  #----------------------------------------------------------------
@@ -10,13 +10,13 @@
10
10
  # The variable CVF_VERSION must be set before calling configure_file().
11
11
 
12
12
 
13
- set(PACKAGE_VERSION "3.9.1")
13
+ set(PACKAGE_VERSION "3.10.3")
14
14
 
15
15
  if(PACKAGE_VERSION VERSION_LESS PACKAGE_FIND_VERSION)
16
16
  set(PACKAGE_VERSION_COMPATIBLE FALSE)
17
17
  else()
18
18
 
19
- if("3.9.1" MATCHES "^([0-9]+)\\.([0-9]+)")
19
+ if("3.10.3" MATCHES "^([0-9]+)\\.([0-9]+)")
20
20
  set(CVF_VERSION_MAJOR "${CMAKE_MATCH_1}")
21
21
  set(CVF_VERSION_MINOR "${CMAKE_MATCH_2}")
22
22
 
@@ -27,7 +27,7 @@ else()
27
27
  string(REGEX REPLACE "^0+" "" CVF_VERSION_MINOR "${CVF_VERSION_MINOR}")
28
28
  endif()
29
29
  else()
30
- set(CVF_VERSION_MAJOR "3.9.1")
30
+ set(CVF_VERSION_MAJOR "3.10.3")
31
31
  set(CVF_VERSION_MINOR "")
32
32
  endif()
33
33
 
@@ -277,7 +277,7 @@
277
277
  },
278
278
 
279
279
  "stac": {
280
- "$comment": "Derived from https://raw.githubusercontent.com/stac-extensions/projection/main/json-schema/schema.json#/definitions/fields, https://raw.githubusercontent.com/stac-extensions/eo/main/json-schema/schema.json#/definitions/bands and https://raw.githubusercontent.com/stac-extensions/eo/main/json-schema/schema.json#/definitions/bands",
280
+ "$comment": "Derived from https://raw.githubusercontent.com/stac-extensions/projection/main/json-schema/schema.json#/definitions/fields, https://raw.githubusercontent.com/stac-extensions/eo/v1.1.0/json-schema/schema.json#/definitions/bands and https://raw.githubusercontent.com/stac-extensions/eo/v1.1.0/json-schema/schema.json#/definitions/bands",
281
281
  "type": "object",
282
282
  "properties": {
283
283
  "proj:epsg": {
@@ -334,10 +334,10 @@
334
334
  }
335
335
  },
336
336
  "eo:bands": {
337
- "$ref": "https://raw.githubusercontent.com/stac-extensions/eo/main/json-schema/schema.json#/definitions/bands"
337
+ "$ref": "https://raw.githubusercontent.com/stac-extensions/eo/v1.1.0/json-schema/schema.json#/definitions/bands"
338
338
  },
339
339
  "raster:bands": {
340
- "$ref": "https://raw.githubusercontent.com/stac-extensions/eo/main/json-schema/schema.json#/definitions/bands"
340
+ "$ref": "https://raw.githubusercontent.com/stac-extensions/eo/v1.1.0/json-schema/schema.json#/definitions/bands"
341
341
  }
342
342
  },
343
343
  "additionalProperties": false
@@ -10,23 +10,7 @@
10
10
  **********************************************************************
11
11
  * Copyright (c) 2023, 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">
@@ -10,23 +10,7 @@
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">
@@ -442,6 +426,23 @@
442
426
  <xs:enumeration value="YCbCr_Cb"/>
443
427
  <xs:enumeration value="YCbCr_Cr"/>
444
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 -->
445
446
  </xs:restriction>
446
447
  </xs:simpleType>
447
448
 
@@ -634,35 +635,41 @@
634
635
  </xs:complexType>
635
636
 
636
637
  <xs:complexType name="ArrayType">
637
- <xs:sequence>
638
- <xs:element name="DataType" type="xs:string" minOccurs="1" maxOccurs="1"/>
639
- <xs:sequence>
640
- <xs:choice minOccurs="0" maxOccurs="unbounded">
641
- <xs:element name="Dimension" type="DimensionType"/>
642
- <xs:element name="DimensionRef" type="DimensionRefType"/>
643
- </xs:choice>
644
- </xs:sequence>
645
- <xs:element name="SRS" type="SRSType" minOccurs="0" maxOccurs="1"/>
646
- <xs:element name="Unit" type="xs:string" minOccurs="0" maxOccurs="1"/>
647
- <xs:element name="NoDataValue" type="DoubleOrNanType" minOccurs="0" maxOccurs="1"/>
648
- <xs:element name="Offset" type="xs:double" minOccurs="0" maxOccurs="1"/>
649
- <xs:element name="Scale" type="xs:double" minOccurs="0" maxOccurs="1"/>
650
- <xs:choice>
651
- <xs:element name="RegularlySpacedValues" type="RegularlySpacedValuesType" minOccurs="0" maxOccurs="1"/>
638
+ <xs:complexContent>
639
+ <xs:extension base="AbstractArrayType">
652
640
  <xs:sequence>
653
- <xs:choice minOccurs="0" maxOccurs="unbounded">
654
- <xs:element name="ConstantValue" type="ConstantValueType"/>
655
- <xs:element name="InlineValues" type="InlineValuesType"/>
656
- <xs:element name="InlineValuesWithValueElement" type="InlineValuesWithValueElementType"/>
657
- <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>
658
663
  </xs:choice>
664
+ <xs:element name="Attribute" type="AttributeType" minOccurs="0" maxOccurs="unbounded"/>
659
665
  </xs:sequence>
660
- </xs:choice>
661
- <xs:element name="Attribute" type="AttributeType" minOccurs="0" maxOccurs="unbounded"/>
662
- </xs:sequence>
663
- <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>
664
669
  </xs:complexType>
665
670
 
671
+ <xs:element name="Array" substitutionGroup="AbstractArray" type="ArrayType"/>
672
+
666
673
  <xs:complexType name="RegularlySpacedValuesType">
667
674
  <xs:attribute name="start" type="xs:double" use="required"/>
668
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">
@@ -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">
@@ -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
@@ -10,23 +10,7 @@
10
10
  **********************************************************************
11
11
  * Copyright (c) 2019, 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">
@@ -0,0 +1,28 @@
1
+ <mapml>
2
+ <head>
3
+ <title>states</title>
4
+ <base href="${URL}" />
5
+ <meta charset="utf-8" />
6
+ <meta content="text/mapml;projection=${TILING_SCHEME}" http-equiv="Content-Type" />
7
+ <!--
8
+ <link href="http://localhost:8080/myservice/mapml/WGS84?style=" rel="alternate" projection="WGS84" />
9
+ <link href="http://localhost:8080/myservice/mapml/OSMTILE?style=" rel="alternate" projection="OSMTILE" />
10
+ <link href="http://localhost:8080/myservice/mapml/CBMTILE?style=" rel="alternate" projection="CBMTILE" />
11
+ <link href="http://localhost:8080/myservice/mapml/APSTILE?style=" rel="alternate" projection="APSTILE" />
12
+ -->
13
+ </head>
14
+ <body>
15
+ <extent units="${TILING_SCHEME}">
16
+ <input name="z" type="zoom" value="${CURZOOM}" min="${MINZOOM}" max="${MAXZOOM}" />
17
+ <input name="x" type="location" axis="column" units="tilematrix" min="${MINTILEX}" max="${MAXTILEX}" />
18
+ <input name="y" type="location" axis="row" units="tilematrix" min="${MINTILEY}" max="${MAXTILEY}" />
19
+ <link tref="${URL}{z}/{x}/{y}.${TILEEXT}" rel="tile" />
20
+ <!--<link tref="http://localhost:8080/myservice/wmts?layer=MYLAYER&amp;style=&amp;tilematrixset=${TILING_SCHEME}&amp;service=WMTS&amp;request=GetTile&amp;version=1.0.0&amp;tilematrix={z}&amp;TileCol={x}&amp;TileRow={y}&amp;format=image/png" rel="tile" />-->
21
+ <!--
22
+ <input name="i" type="location" axis="i" units="tile" />
23
+ <input name="j" type="location" axis="j" units="tile" />
24
+ <link tref="http://localhost:8080/myservice/wmts/?LAYER=MYLAYER&amp;TILEMATRIX={z}&amp;TileCol={x}&amp;TileRow={y}&amp;TILEMATRIXSET=WGS84&amp;SERVICE=WMTS&amp;VERSION=1.0.0&amp;REQUEST=GetFeatureInfo&amp;FEATURE_COUNT=50&amp;FORMAT=image/png&amp;STYLE=&amp;INFOFORMAT=text/mapml&amp;I={i}&amp;J={j}" rel="query" />
25
+ -->
26
+ </extent>
27
+ </body>
28
+ </mapml>