innFactory · pull · Nov 26, 2024 · Nov 20, 2024 · Nov 20, 2024 · Nov 20, 2024
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -67,6 +67,7 @@ repos:
                 ogr/ogrsf_frmts/flatgeobuf/flatbuffers/|
                 ogr/ogrsf_frmts/pmtiles/pmtiles/|
                 ogr/ogrsf_frmts/ods/ods_formula_parser.cpp|
+                ogr/ogrsf_frmts/ods/ods_formula_parser.hpp|
                 ogr/ogrsf_frmts/sqlite/sqlite_rtree_bulk_load|
                 ogr/swq_parser.cpp|
                 ogr/swq_parser.hpp|

diff --git a/alg/contour.cpp b/alg/contour.cpp
@@ -710,7 +710,7 @@ CPLErr GDALContourGenerateEx(GDALRasterBandH hBand, void *hLayer,
         }
     }
 
-    bool ok = false;
+    bool ok = true;
 
     try
     {
@@ -880,6 +880,11 @@ CPLErr GDALContourGenerateEx(GDALRasterBandH hBand, void *hLayer,
         }
     }
 
+    if (ok)
+    {
+        pfnProgress(1.0, "", pProgressArg);
+    }
+
     return ok ? CE_None : CE_Failure;
 }
 

diff --git a/alg/internal_libqhull/poly_r.c b/alg/internal_libqhull/poly_r.c
@@ -1180,9 +1180,9 @@ int qh_pointid(qhT *qh, pointT *point) {
     /* coverity[divide_arg] */
     id= offset / qh->hull_dim;
   } else {
-    id = qh_setindex(qh->other_points, point);
-    if (id >= 0) {
-      id += qh->num_points;
+    const int idx = qh_setindex(qh->other_points, point);
+    if (idx >= 0) {
+      id = (ptr_intT)idx + qh->num_points;
     } else {
       return qh_IDunknown;
     }

diff --git a/apps/commonutils.h b/apps/commonutils.h
@@ -1,5 +1,4 @@
 /******************************************************************************
- * $Id$
  *
  * Project:  GDAL Utilities
  * Purpose:  Common utility routines

diff --git a/apps/gdal_utils.h b/apps/gdal_utils.h
@@ -1,5 +1,4 @@
 /******************************************************************************
- * $Id$
  *
  * Project:  GDAL Utilities
  * Purpose:  GDAL Utilities Public Declarations.

diff --git a/apps/gdal_utils_priv.h b/apps/gdal_utils_priv.h
@@ -1,5 +1,4 @@
 /******************************************************************************
- * $Id$
  *
  * Project:  GDAL Utilities
  * Purpose:  GDAL Utilities Private Declarations.

diff --git a/apps/ogr2ogr_lib.cpp b/apps/ogr2ogr_lib.cpp
@@ -4651,6 +4651,8 @@ SetupTargetLayer::Setup(OGRLayer *poSrcLayer, const char *pszNewLayerName,
             oCoordPrec.dfMResolution = psOptions->dfMRes;
         }
 
+        auto poSrcDriver = m_poSrcDS->GetDriver();
+
         // Force FID column as 64 bit if the source feature has a 64 bit FID,
         // the target driver supports 64 bit FID and the user didn't set it
         // manually.
@@ -4693,9 +4695,8 @@ SetupTargetLayer::Setup(OGRLayer *poSrcLayer, const char *pszNewLayerName,
         }
         // Detect scenario of converting from GPX to a format like GPKG
         // Cf https://github.com/OSGeo/gdal/issues/9225
-        else if (!bPreserveFID && !m_bUnsetFid && !bAppend &&
-                 m_poSrcDS->GetDriver() &&
-                 EQUAL(m_poSrcDS->GetDriver()->GetDescription(), "GPX") &&
+        else if (!bPreserveFID && !m_bUnsetFid && !bAppend && poSrcDriver &&
+                 EQUAL(poSrcDriver->GetDescription(), "GPX") &&
                  pszDestCreationOptions &&
                  (strstr(pszDestCreationOptions, "='FID'") != nullptr ||
                   strstr(pszDestCreationOptions, "=\"FID\"") != nullptr) &&
@@ -4787,6 +4788,23 @@ SetupTargetLayer::Setup(OGRLayer *poSrcLayer, const char *pszNewLayerName,
             }
         }
 
+        // Use case of https://github.com/OSGeo/gdal/issues/11057#issuecomment-2495479779
+        // Conversion from GPKG to OCI.
+        // OCI distinguishes between TIMESTAMP and TIMESTAMP WITH TIME ZONE
+        // GeoPackage is supposed to have DateTime in UTC, so we set
+        // TIMESTAMP_WITH_TIME_ZONE=YES
+        if (poSrcDriver && pszDestCreationOptions &&
+            strstr(pszDestCreationOptions, "TIMESTAMP_WITH_TIME_ZONE") &&
+            CSLFetchNameValue(m_papszLCO, "TIMESTAMP_WITH_TIME_ZONE") ==
+                nullptr &&
+            EQUAL(poSrcDriver->GetDescription(), "GPKG"))
+        {
+            papszLCOTemp = CSLSetNameValue(papszLCOTemp,
+                                           "TIMESTAMP_WITH_TIME_ZONE", "YES");
+            CPLDebug("GDALVectorTranslate",
+                     "Setting TIMESTAMP_WITH_TIME_ZONE=YES");
+        }
+
         OGRGeomFieldDefn oGeomFieldDefn(
             osGeomFieldName.c_str(),
             static_cast<OGRwkbGeometryType>(eGCreateLayerType));
@@ -4982,7 +5000,9 @@ SetupTargetLayer::Setup(OGRLayer *poSrcLayer, const char *pszNewLayerName,
 
     bool bError = false;
     OGRArrowArrayStream streamSrc;
+
     const bool bUseWriteArrowBatch =
+        !EQUAL(m_poDstDS->GetDriver()->GetDescription(), "OCI") &&
         CanUseWriteArrowBatch(poSrcLayer, poDstLayer, bJustCreatedLayer,
                               psOptions, bPreserveFID, bError, streamSrc);
     if (bError)

diff --git a/autotest/alg/applyverticalshiftgrid.py b/autotest/alg/applyverticalshiftgrid.py
@@ -1,7 +1,6 @@
 #!/usr/bin/env pytest
 # -*- coding: utf-8 -*-
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  Test GDALApplyVerticalShiftGrid algorithm.

diff --git a/autotest/alg/contour.py b/autotest/alg/contour.py
@@ -1,6 +1,5 @@
 #!/usr/bin/env pytest
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  ContourGenerate() testing
@@ -446,3 +445,28 @@ def test_contour_min_value_is_multiple_of_interval(tmp_vsimem):
     f = lyr.GetNextFeature()
     assert f["ELEV"] == 3
     ogrtest.check_feature_geometry(f, "LINESTRING (1.5 0.0,1.5 0.5,1.5 1.5,1.5 2.0)")
+
+
+###############################################################################
+# Test scenario of https://github.com/OSGeo/gdal/issues/11340
+
+
+def test_contour_constant_raster_value(tmp_vsimem):
+
+    ogr_ds = ogr.GetDriverByName("Memory").CreateDataSource("")
+    lyr = ogr_ds.CreateLayer("contour", geom_type=ogr.wkbLineString)
+    lyr.CreateField(ogr.FieldDefn("ID", ogr.OFTInteger))
+    lyr.CreateField(ogr.FieldDefn("ELEV", ogr.OFTReal))
+
+    src_ds = gdal.GetDriverByName("MEM").Create("", 1, 1)
+    assert (
+        gdal.ContourGenerateEx(
+            src_ds.GetRasterBand(1),
+            lyr,
+            options=["LEVEL_INTERVAL=10", "ID_FIELD=0", "ELEV_FIELD=1"],
+        )
+        == gdal.CE_None
+    )
+
+    f = lyr.GetNextFeature()
+    assert f is None
diff --git a/autotest/alg/cutline.py b/autotest/alg/cutline.py
@@ -1,6 +1,5 @@
 #!/usr/bin/env pytest
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  Test the image reprojection functions. Try to test as many

diff --git a/autotest/alg/dither.py b/autotest/alg/dither.py
@@ -1,6 +1,5 @@
 #!/usr/bin/env pytest
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  Test gdal.ComputeMedianCutPCT() and gdal.DitherRGB2PCT()

diff --git a/autotest/alg/fillnodata.py b/autotest/alg/fillnodata.py
@@ -1,6 +1,5 @@
 #!/usr/bin/env pytest
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  GDALFillNoData() testing

diff --git a/autotest/alg/los.py b/autotest/alg/los.py
@@ -1,6 +1,5 @@
 #!/usr/bin/env pytest
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  Test gdal.LineOfSightVisible algorithm.

diff --git a/autotest/alg/polygonize.py b/autotest/alg/polygonize.py
@@ -1,6 +1,5 @@
 #!/usr/bin/env pytest
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  Test Polygonize() algorithm.

diff --git a/autotest/alg/proximity.py b/autotest/alg/proximity.py
@@ -1,6 +1,5 @@
 #!/usr/bin/env pytest
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  Test ComputeProximity() algorithm.

diff --git a/autotest/alg/rasterize.py b/autotest/alg/rasterize.py
@@ -1,6 +1,5 @@
 #!/usr/bin/env pytest
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  Test RasterizeLayer() and related calls.

diff --git a/autotest/alg/reproject.py b/autotest/alg/reproject.py
@@ -1,7 +1,6 @@
 #!/usr/bin/env pytest
 # -*- coding: utf-8 -*-
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  Test ReprojectImage() algorithm.

diff --git a/autotest/alg/sieve.py b/autotest/alg/sieve.py
@@ -1,6 +1,5 @@
 #!/usr/bin/env pytest
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  Test SieveFilter() algorithm.

diff --git a/autotest/alg/transformgeoloc.py b/autotest/alg/transformgeoloc.py
@@ -1,7 +1,6 @@
 #!/usr/bin/env pytest
 # -*- coding: utf-8 -*-
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  Test TransformGeoloc algorithm.

diff --git a/autotest/alg/warp.py b/autotest/alg/warp.py
@@ -1,7 +1,6 @@
 #!/usr/bin/env pytest
 # -*- coding: utf-8 -*-
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  Test the image reprojection functions. Try to test as many

diff --git a/autotest/benchmark/conftest.py b/autotest/benchmark/conftest.py
@@ -1,7 +1,6 @@
 #!/usr/bin/env pytest
 # -*- coding: utf-8 -*-
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  Benchmarking

diff --git a/autotest/benchmark/test_gdalwarp.py b/autotest/benchmark/test_gdalwarp.py
@@ -1,7 +1,6 @@
 #!/usr/bin/env pytest
 # -*- coding: utf-8 -*-
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  Benchmarking of gdalwarp

diff --git a/autotest/benchmark/test_gtiff.py b/autotest/benchmark/test_gtiff.py
@@ -1,7 +1,6 @@
 #!/usr/bin/env pytest
 # -*- coding: utf-8 -*-
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  Benchmarking of GeoTIFF driver

diff --git a/autotest/benchmark/test_ogr2ogr.py b/autotest/benchmark/test_ogr2ogr.py
@@ -1,7 +1,6 @@
 #!/usr/bin/env pytest
 # -*- coding: utf-8 -*-
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  Benchmarking of ogr2ogr

diff --git a/autotest/benchmark/test_ogr_gpkg.py b/autotest/benchmark/test_ogr_gpkg.py
@@ -1,7 +1,6 @@
 #!/usr/bin/env pytest
 # -*- coding: utf-8 -*-
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  Benchmarking of GeoPackage driver

diff --git a/autotest/cpp/bug1488.cpp b/autotest/cpp/bug1488.cpp
@@ -1,5 +1,4 @@
 /******************************************************************************
- * $Id$
  *
  * Project:  GDAL Core
  * Purpose:  Test fix for https://github.com/OSGeo/gdal/issues/1488 (concurrency

diff --git a/autotest/cpp/test_alg.cpp b/autotest/cpp/test_alg.cpp
@@ -1,5 +1,4 @@
 /******************************************************************************
- * $Id$
  *
  * Project:  GDAL algorithms
  * Purpose:  Test alg

diff --git a/autotest/cpp/test_deferred_plugin.cpp b/autotest/cpp/test_deferred_plugin.cpp
@@ -1,5 +1,4 @@
 /******************************************************************************
- * $Id$
  *
  * Project:  GDAL
  * Purpose:  Test deferred plugin loading

diff --git a/autotest/cpp/test_marching_squares_contour.cpp b/autotest/cpp/test_marching_squares_contour.cpp
@@ -1,5 +1,4 @@
 /******************************************************************************
- * $Id$
  *
  * Project:  GDAL algorithms
  * Purpose:  Tests for the marching squares algorithm

diff --git a/autotest/cpp/test_marching_squares_polygon.cpp b/autotest/cpp/test_marching_squares_polygon.cpp
@@ -1,5 +1,4 @@
 /******************************************************************************
- * $Id$
  *
  * Project:  GDAL algorithms
  * Purpose:  Tests for the marching squares algorithm

diff --git a/autotest/cpp/test_marching_squares_square.cpp b/autotest/cpp/test_marching_squares_square.cpp
@@ -1,5 +1,4 @@
 /******************************************************************************
- * $Id$
  *
  * Project:  GDAL algorithms
  * Purpose:  Tests for the marching squares algorithm

diff --git a/autotest/cpp/test_marching_squares_tile.cpp b/autotest/cpp/test_marching_squares_tile.cpp
@@ -1,5 +1,4 @@
 /******************************************************************************
- * $Id$
  *
  * Project:  GDAL algorithms
  * Purpose:  Tests for the marching squares algorithm

diff --git a/autotest/cpp/test_osr_set_proj_search_paths.cpp b/autotest/cpp/test_osr_set_proj_search_paths.cpp
@@ -1,5 +1,4 @@
 /******************************************************************************
- * $Id$
  *
  * Project:  GDAL Core
  * Purpose:  Test OSRSetPROJSearchPaths()

diff --git a/autotest/cpp/test_triangulation.cpp b/autotest/cpp/test_triangulation.cpp
@@ -1,5 +1,4 @@
 /******************************************************************************
- * $Id$
  *
  * Project:  GDAL algorithms
  * Purpose:  Test Delaunay triangulation

diff --git a/autotest/cpp/testblockcache.cpp b/autotest/cpp/testblockcache.cpp
@@ -1,5 +1,4 @@
 /******************************************************************************
- * $Id$
  *
  * Project:  GDAL Core
  * Purpose:  Test block cache under multi-threading

diff --git a/autotest/cpp/testblockcachelimits.cpp b/autotest/cpp/testblockcachelimits.cpp
@@ -1,5 +1,4 @@
 /******************************************************************************
- * $Id$
  *
  * Project:  GDAL Core
  * Purpose:  Test block cache under multi-threading

diff --git a/autotest/cpp/testblockcachewrite.cpp b/autotest/cpp/testblockcachewrite.cpp
@@ -1,5 +1,4 @@
 /******************************************************************************
- * $Id$
  *
  * Project:  GDAL Core
  * Purpose:  Test block cache & writing behaviour under multi-threading

diff --git a/autotest/cpp/testclosedondestroydm.cpp b/autotest/cpp/testclosedondestroydm.cpp
@@ -1,5 +1,4 @@
 /******************************************************************************
- * $Id$
  *
  * Project:  GDAL Core
  * Purpose:  Test block cache & writing behaviour under multi-threading

diff --git a/autotest/cpp/testcopywords.cpp b/autotest/cpp/testcopywords.cpp
@@ -1,5 +1,4 @@
 /******************************************************************************
- * $Id$
  *
  * Project:  GDAL Core
  * Purpose:  Test GDALCopyWords().

diff --git a/autotest/cpp/testdestroy.cpp b/autotest/cpp/testdestroy.cpp
@@ -1,5 +1,4 @@
 /******************************************************************************
- * $Id$
  *
  * Project:  GDAL Core
  * Purpose:  Test GDALDestroy().

diff --git a/autotest/cpp/testlog.cpp b/autotest/cpp/testlog.cpp
@@ -1,5 +1,4 @@
 /******************************************************************************
- * $Id$
  *
  * Project:  GDAL
  * Purpose:  Test CPL_LOG

diff --git a/autotest/cpp/testthreadcond.cpp b/autotest/cpp/testthreadcond.cpp
@@ -1,5 +1,4 @@
 /******************************************************************************
- * $Id$
  *
  * Project:  GDAL Core
  * Purpose:  Test thread API

diff --git a/autotest/cpp/testvirtualmem.cpp b/autotest/cpp/testvirtualmem.cpp
@@ -1,5 +1,4 @@
 /******************************************************************************
- * $Id$
  *
  * Project:  GDAL algorithms
  * Purpose:  Test Delaunay triangulation

diff --git a/autotest/gcore/asyncreader.py b/autotest/gcore/asyncreader.py
@@ -1,6 +1,5 @@
 #!/usr/bin/env pytest
 ###############################################################################
-# $Id$
 #
 # Project:  GDAL/OGR Test Suite
 # Purpose:  Test AsyncReader interface
-Original file line number
+Diff line change
@@ Expand Up @@
             }
         }
-        bool ok = false;
+        bool ok = true;
         try
         {
@@ Expand Down Expand Up @@
             }
         }
+        if (ok)
+        {
+            pfnProgress(1.0, "", pProgressArg);
+        }
         return ok ? CE_None : CE_Failure;
     }
@@ Expand Down @@