GDAL 3.9.1__tar.gz → 3.9.3__tar.gz

{gdal-3.9.1 → gdal-3.9.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: GDAL
-Version: 3.9.1
+Version: 3.9.3
 Summary: GDAL: Geospatial Data Abstraction Library
 Home-page: http://www.gdal.org
 Author: Frank Warmerdam, Howard Butler, Even Rouault
@@ -44,7 +44,7 @@ reference documentation, but the https://gdal.org/api/python_bindings.html#tutor
 Dependencies
 ------------
 
- * libgdal (3.9.1 or greater) and header files (gdal-devel)
+ * libgdal (3.9.3 or greater) and header files (gdal-devel)
  * numpy (1.0.0 or greater) and header files (numpy-devel) (not explicitly
    required, but many examples and utilities will not work without it)
 

{gdal-3.9.1 → gdal-3.9.3}/README.rst

@@ -13,7 +13,7 @@ reference documentation, but the https://gdal.org/api/python_bindings.html#tutor
 Dependencies
 ------------
 
- * libgdal (3.9.1 or greater) and header files (gdal-devel)
+ * libgdal (3.9.3 or greater) and header files (gdal-devel)
  * numpy (1.0.0 or greater) and header files (numpy-devel) (not explicitly
    required, but many examples and utilities will not work without it)
 

{gdal-3.9.1 → gdal-3.9.3}/extensions/gdal_wrap.cpp

@@ -6622,8 +6622,8 @@ SWIGINTERN CPLErr GDALMDArrayHS_Read(GDALMDArrayHS *self,int nDims1,GUIntBig *ar
 SWIGINTERN CPLErr GDALMDArrayHS_WriteStringArray(GDALMDArrayHS *self,int nDims1,GUIntBig *array_start_idx,int nDims2,GUIntBig *count,int nDims3,GIntBig *array_step,GDALExtendedDataTypeHS *buffer_datatype,char **options){
 
     const int nExpectedDims = (int)GDALMDArrayGetDimensionCount(self);
-    std::vector<size_t> count_internal(nExpectedDims);
-    if( nExpectedDims != 1 )
+    std::vector<size_t> count_internal(nExpectedDims + 1);
+    if( nExpectedDims > 1 )
     {
         CPLError(CE_Failure, CPLE_AppDefined,
             "Unsupported number of dimensions");
@@ -6638,23 +6638,26 @@ SWIGINTERN CPLErr GDALMDArrayHS_WriteStringArray(GDALMDArrayHS *self,int nDims1,
             return CE_Failure;
         }
     }
-    if( nDims1 != 1 )
+    if( nExpectedDims == 1 )
     {
-        CPLError(CE_Failure, CPLE_AppDefined,
-            "Wrong number of values in array_start_idx");
-        return CE_Failure;
-    }
-    if( nDims2 != 1 )
-    {
-        CPLError(CE_Failure, CPLE_AppDefined,
-            "Wrong number of values in count");
-        return CE_Failure;
-    }
-    if( nDims3 != 1 )
-    {
-        CPLError(CE_Failure, CPLE_AppDefined,
-            "Wrong number of values in array_step");
-        return CE_Failure;
+        if( nDims1 != 1 )
+        {
+            CPLError(CE_Failure, CPLE_AppDefined,
+                "Wrong number of values in array_start_idx");
+            return CE_Failure;
+        }
+        if( nDims2 != 1 )
+        {
+            CPLError(CE_Failure, CPLE_AppDefined,
+                "Wrong number of values in count");
+            return CE_Failure;
+        }
+        if( nDims3 != 1 )
+        {
+            CPLError(CE_Failure, CPLE_AppDefined,
+                "Wrong number of values in array_step");
+            return CE_Failure;
+        }
     }
 
     CPLErr eErr = GDALMDArrayWrite(self,

{gdal-3.9.1 → gdal-3.9.3}/gdal-utils/GDAL.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: GDAL
-Version: 3.9.1
+Version: 3.9.3
 Summary: GDAL: Geospatial Data Abstraction Library
 Home-page: http://www.gdal.org
 Author: Frank Warmerdam, Howard Butler, Even Rouault
@@ -44,7 +44,7 @@ reference documentation, but the https://gdal.org/api/python_bindings.html#tutor
 Dependencies
 ------------
 
- * libgdal (3.9.1 or greater) and header files (gdal-devel)
+ * libgdal (3.9.3 or greater) and header files (gdal-devel)
  * numpy (1.0.0 or greater) and header files (numpy-devel) (not explicitly
    required, but many examples and utilities will not work without it)
 

{gdal-3.9.1 → gdal-3.9.3}/gdal-utils/osgeo_utils/__init__.py

@@ -1,5 +1,5 @@
 __package_name__ = "gdal-utils"
-gdal_utils_version = (3, 9, 1, 0)
+gdal_utils_version = (3, 9, 3, 0)
 __version__ = ".".join(str(i) for i in gdal_utils_version)
 __author__ = "Frank Warmerdam"
 __author_email__ = "warmerdam@pobox.com"

{gdal-3.9.1 → gdal-3.9.3}/gdal-utils/osgeo_utils/gdal2tiles.py

@@ -895,13 +895,22 @@ def scale_query_to_tile(dsquery, dstile, options, tilefilename=""):
         options.excluded_values or options.nodata_values_pct_threshold < 100
     ):
 
+        warp_options = "-r average"
+
+        assert options.nodata_values_pct_threshold is not None
+        warp_options += (
+            f" -wo NODATA_VALUES_PCT_THRESHOLD={options.nodata_values_pct_threshold}"
+        )
+
+        if options.excluded_values:
+            assert options.excluded_values_pct_threshold is not None
+            warp_options += f" -wo EXCLUDED_VALUES={options.excluded_values}"
+            warp_options += f" -wo EXCLUDED_VALUES_PCT_THRESHOLD={options.excluded_values_pct_threshold}"
+
         gdal.Warp(
             dstile,
             dsquery,
-            options="-r average "
-            + f"-wo EXCLUDED_VALUES={options.excluded_values} "
-            + f"-wo EXCLUDED_VALUES_PCT_THRESHOLD={options.excluded_values_pct_threshold} "
-            + f"-wo NODATA_VALUES_PCT_THRESHOLD={options.nodata_values_pct_threshold}",
+            options=warp_options,
         )
 
     elif options.resampling == "average":
@@ -3979,13 +3988,10 @@ function ExtDraggableObject(src, opt_drag) {
 
         // Base layers
         //  .. OpenStreetMap
-        var osm = L.tileLayer('http://{s}.tile.osm.org/{z}/{x}/{y}.png', {attribution: '&copy; <a href="http://osm.org/copyright">OpenStreetMap</a> contributors', minZoom: %(minzoom)s, maxZoom: %(maxzoom)s});
+        var osm = L.tileLayer('https://tile.openstreetmap.org/{z}/{x}/{y}.png', {attribution: '&copy; <a href="https://www.openstreetmap.org/copyright">OpenStreetMap</a> contributors', minZoom: %(minzoom)s, maxZoom: %(maxzoom)s});
 
         //  .. CartoDB Positron
-        var cartodb = L.tileLayer('http://{s}.basemaps.cartocdn.com/light_all/{z}/{x}/{y}.png', {attribution: '&copy; <a href="http://www.openstreetmap.org/copyright">OpenStreetMap</a> contributors, &copy; <a href="http://cartodb.com/attributions">CartoDB</a>', minZoom: %(minzoom)s, maxZoom: %(maxzoom)s});
-
-        //  .. OSM Toner
-        var toner = L.tileLayer('http://{s}.tile.stamen.com/toner/{z}/{x}/{y}.png', {attribution: 'Map tiles by <a href="http://stamen.com">Stamen Design</a>, under <a href="http://creativecommons.org/licenses/by/3.0">CC BY 3.0</a>. Data by <a href="http://openstreetmap.org">OpenStreetMap</a>, under <a href="http://www.openstreetmap.org/copyright">ODbL</a>.', minZoom: %(minzoom)s, maxZoom: %(maxzoom)s});
+        var cartodb = L.tileLayer('https://{s}.basemaps.cartocdn.com/light_all/{z}/{x}/{y}.png', {attribution: '&copy; <a href="https://www.openstreetmap.org/copyright">OpenStreetMap</a> contributors, &copy; <a href="https://carto.com/attribution">CartoDB</a>', minZoom: %(minzoom)s, maxZoom: %(maxzoom)s});
 
         //  .. White background
         var white = L.tileLayer("data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAQAAAAEAAQMAAABmvDolAAAAA1BMVEX///+nxBvIAAAAH0lEQVQYGe3BAQ0AAADCIPunfg43YAAAAAAAAAAA5wIhAAAB9aK9BAAAAABJRU5ErkJggg==", {minZoom: %(minzoom)s, maxZoom: %(maxzoom)s});
@@ -4002,7 +4008,7 @@ function ExtDraggableObject(src, opt_drag) {
             layers: [osm]
         });
 
-        var basemaps = {"OpenStreetMap": osm, "CartoDB Positron": cartodb, "Stamen Toner": toner, "Without background": white}
+        var basemaps = {"OpenStreetMap": osm, "CartoDB Positron": cartodb, "Without background": white}
         var overlaymaps = {"Layer": lyr}
 
         // Title
@@ -4018,7 +4024,7 @@ function ExtDraggableObject(src, opt_drag) {
         title.addTo(map);
 
         // Note
-        var src = 'Generated by <a href="https://gdal.org/programs/gdal2tiles.html">GDAL2Tiles</a>, Copyright &copy; 2008 <a href="http://www.klokan.cz/">Klokan Petr Pridal</a>,  <a href="https://gdal.org">GDAL</a> &amp; <a href="http://www.osgeo.org/">OSGeo</a> <a href="http://code.google.com/soc/">GSoC</a>';
+        var src = 'Generated by <a href="https://gdal.org/programs/gdal2tiles.html">GDAL2Tiles</a>, Copyright &copy; 2008 <a href="http://www.klokan.cz/">Klokan Petr Pridal</a>,  <a href="https://gdal.org">GDAL</a> &amp; <a href="https://www.osgeo.org/">OSGeo</a> <a href="https://summerofcode.withgoogle.com/">GSoC</a>';
         var title = L.control({position: 'bottomleft'});
         title.onAdd = function(map) {
             this._div = L.DomUtil.create('div', 'ctl src');

{gdal-3.9.1 → gdal-3.9.3}/gdal-utils/osgeo_utils/gdal_retile.py

@@ -337,13 +337,52 @@ def getTileIndexFromFiles(g):
     ogrTileIndexDS = createTileIndex(
         g.Verbose, "TileIndex", g.TileIndexFieldName, None, g.TileIndexDriverTyp
     )
+    firstTile = True
+    globalSRS = None
     for inputTile in g.Names:
 
         fhInputTile = gdal.Open(inputTile)
         if fhInputTile is None:
             return None
 
-        dec = AffineTransformDecorator(fhInputTile.GetGeoTransform())
+        # Check the geotransform has no rotational terms.
+        gt = fhInputTile.GetGeoTransform()
+        if gt[2] != 0 or gt[4] != 0:
+            print(
+                "File %s has a geotransform matrix with rotational terms, which is not supported. You may need to use gdalwarp before."
+                % inputTile,
+                file=sys.stderr,
+            )
+            return None
+
+        # Check SRS consistency among tiles
+        srs = fhInputTile.GetSpatialRef()
+        if firstTile:
+            globalSRS = srs
+        else:
+            if globalSRS is not None and srs is None:
+                print(
+                    "File %s has no SRS whether other tiles have one." % inputTile,
+                    file=sys.stderr,
+                )
+                return None
+            elif globalSRS is None and srs is not None:
+                print(
+                    "File %s has a SRS whether other tiles do not." % inputTile,
+                    file=sys.stderr,
+                )
+                return None
+            elif (
+                globalSRS is not None and srs is not None and not globalSRS.IsSame(srs)
+            ):
+                print(
+                    "File %s has a SRS different from other tiles." % inputTile,
+                    file=sys.stderr,
+                )
+                return None
+
+        firstTile = False
+        dec = AffineTransformDecorator(gt)
         points = dec.pointsFor(fhInputTile.RasterXSize, fhInputTile.RasterYSize)
 
         addFeature(

{gdal-3.9.1 → gdal-3.9.3}/osgeo/gdal.py

@@ -1067,7 +1067,7 @@ def WarpOptions(options=None, format=None,
         if transformerOptions is not None:
             if isinstance(transformerOptions, dict):
                 for k, v in transformerOptions.items():
-                    new_options += ['-to', opt]
+                    new_options += ['-to', f'{k}={v}']
             else:
                 for opt in transformerOptions:
                     new_options += ['-to', opt]
@@ -2333,15 +2333,15 @@ def Footprint(destNameOrDestDS, srcDS, **kwargs):
 
     1. Special mode to get deserialized GeoJSON (in EPSG:4326 if dstSRS not specified):
 
-    >>> deserialized_geojson = gdal.FootPrint(None, src_ds, format="GeoJSON")
+    >>> deserialized_geojson = gdal.Footprint(None, src_ds, format="GeoJSON")
 
     2. Special mode to get WKT:
 
-    >>> wkt = gdal.FootPrint(None, src_ds, format="WKT")
+    >>> wkt = gdal.Footprint(None, src_ds, format="WKT")
 
     3. Get result in a GeoPackage
 
-    >>> gdal.FootPrintf("out.gpkg", src_ds, format="GPKG")
+    >>> gdal.Footprint("out.gpkg", src_ds, format="GPKG")
 
     """
 
@@ -6271,13 +6271,13 @@ class MDArray(object):
         if not buffer_datatype:
           buffer_datatype = self.GetDataType()
 
-        is_1d_string = self.GetDataType().GetClass() == GEDTC_STRING and buffer_datatype.GetClass() == GEDTC_STRING and dimCount == 1
+        is_0d_or_1d_string = self.GetDataType().GetClass() == GEDTC_STRING and buffer_datatype.GetClass() == GEDTC_STRING and dimCount <= 1
 
         if not array_start_idx:
           array_start_idx = [0] * dimCount
 
         if not count:
-          if is_1d_string:
+          if is_0d_or_1d_string:
               assert type(buffer) == type([])
               count = [ len(buffer) ]
           else:
@@ -6296,7 +6296,7 @@ class MDArray(object):
               stride *= cnt
           buffer_stride.reverse()
 
-        if is_1d_string:
+        if is_0d_or_1d_string:
             return _gdal.MDArray_WriteStringArray(self, array_start_idx, count, array_step, buffer_datatype, buffer)
 
         return _gdal.MDArray_Write(self, array_start_idx, count, array_step, buffer_stride, buffer_datatype, buffer)

{gdal-3.9.1 → gdal-3.9.3}/setup.py

@@ -17,7 +17,7 @@ from setuptools import setup
 from setuptools import find_packages
 from setuptools import Extension
 
-version = '3.9.1'
+version = '3.9.3'
 
 # If CXX is defined in the environment, it will be used to link the .so
 # but setuptools will be confused if it is made of several words like 'ccache g++'
@@ -317,6 +317,14 @@ class gdal_ext(build_ext):
         # the Extension() instantiations below because we want to use the same
         # logic to resolve the location of gdal-config throughout.
         ext.extra_compile_args.extend(self.extra_cflags)
+
+        # Work around "swig/python detected a memory leak" bug
+        # Cf https://github.com/swig/swig/issues/2638#issuecomment-2345002698
+        if self.get_compiler() == 'msvc':
+            ext.extra_compile_args.append("/DSWIG_PYTHON_SILENT_MEMLEAK")
+        else:
+            ext.extra_compile_args.append("-DSWIG_PYTHON_SILENT_MEMLEAK")
+
         return build_ext.build_extension(self, ext)