Rename VRTTI driver to GTI

OSGeo · Jan 22, 2024 · ce9b1a7 · ce9b1a7
1 parent 82ab1da
commit ce9b1a7
Show file tree

Hide file tree

Showing 22 changed files with 538 additions and 540 deletions.
diff --git a/apps/gdaladdo.cpp b/apps/gdaladdo.cpp
@@ -296,7 +296,7 @@ static bool PartialRefreshFromSourceTimestamp(
         return false;
     }
 
-    std::vector<VRTTISourceDesc> regions;
+    std::vector<GTISourceDesc> regions;
 
     double dfTotalPixels = 0;
 
@@ -357,7 +357,7 @@ static bool PartialRefreshFromSourceTimestamp(
                         }
 
                         dfTotalPixels += static_cast<double>(nXSize) * nYSize;
-                        VRTTISourceDesc region;
+                        GTISourceDesc region;
                         region.osFilename = poSource->GetSourceDatasetName();
                         region.nDstXOff = nXOff;
                         region.nDstYOff = nYOff;
@@ -369,10 +369,9 @@ static bool PartialRefreshFromSourceTimestamp(
             }
         }
     }
-    else if (auto poVRTTIDS = GDALDatasetCastToVRTTIDataset(poDS))
+    else if (auto poGTIDS = GDALDatasetCastToGTIDataset(poDS))
     {
-        regions =
-            VRTTIGetSourcesMoreRecentThan(poVRTTIDS, sStatVRTOvr.st_mtime);
+        regions = GTIGetSourcesMoreRecentThan(poGTIDS, sStatVRTOvr.st_mtime);
         for (const auto &region : regions)
         {
             dfTotalPixels +=

diff --git a/apps/gdaltindex_bin.cpp b/apps/gdaltindex_bin.cpp
@@ -52,7 +52,7 @@ static void Usage(bool bIsError, const char *pszErrorMsg)
         "                  [-src_srs_name field_name] [-src_srs_format "
         "{AUTO|WKT|EPSG|PROJ}]\n"
         "                  [-lyr_name <name>]\n"
-        "                  [-vrtti_filename <name>]\n"
+        "                  [-gti_filename <name>]\n"
         "                  [-tr <xres> <yres>] [-te <xmin> <ymin> <xmax> "
         "<ymax>]\n"
         "                  [-ot <datatype>] [-bandcount <val>] [-nodata "

diff --git a/apps/gdaltindex_lib.cpp b/apps/gdaltindex_lib.cpp
@@ -92,7 +92,7 @@ struct GDALTileIndexOptions
     std::string osDataType{};
     bool bMaskBand = false;
     std::vector<std::string> aosMetadata{};
-    std::string osVRTTIFilename{};
+    std::string osGTIFilename{};
     bool bRecursive = false;
     double dfMinPixelSize = std::numeric_limits<double>::quiet_NaN();
     double dfMaxPixelSize = std::numeric_limits<double>::quiet_NaN();
@@ -538,16 +538,16 @@ GDALDatasetH GDALTileIndex(const char *pszDest, int nSrcCount,
         }
     }
 
-    if (!psOptions->osVRTTIFilename.empty())
+    if (!psOptions->osGTIFilename.empty())
     {
         if (!psOptions->aosMetadata.empty())
         {
             CPLError(CE_Failure, CPLE_NotSupported,
-                     "-mo is not supported when -vrtti_filename is used");
+                     "-mo is not supported when -gti_filename is used");
             return nullptr;
         }
         CPLXMLNode *psRoot =
-            CPLCreateXMLNode(nullptr, CXT_Element, "VRTTileIndexDataset");
+            CPLCreateXMLNode(nullptr, CXT_Element, "GDALTileIndexDataset");
         CPLCreateXMLElementAndValue(psRoot, "IndexDataset", pszDest);
         CPLCreateXMLElementAndValue(psRoot, "IndexLayer", poLayer->GetName());
         CPLCreateXMLElementAndValue(psRoot, "LocationField",
@@ -648,8 +648,8 @@ GDALDatasetH GDALTileIndex(const char *pszDest, int nSrcCount,
         {
             CPLCreateXMLElementAndValue(psRoot, "MaskBand", "true");
         }
-        int res = CPLSerializeXMLTreeToFile(psRoot,
-                                            psOptions->osVRTTIFilename.c_str());
+        int res =
+            CPLSerializeXMLTreeToFile(psRoot, psOptions->osGTIFilename.c_str());
         CPLDestroyXMLNode(psRoot);
         if (!res)
             return nullptr;
@@ -778,12 +778,12 @@ GDALDatasetH GDALTileIndex(const char *pszDest, int nSrcCount,
         CPLFree(pszCurrentPath);
     }
 
-    const bool bIsVRTTIContext =
+    const bool bIsGTIContext =
         !std::isnan(psOptions->xres) || !std::isnan(psOptions->xmin) ||
         !psOptions->osBandCount.empty() || !psOptions->osNodata.empty() ||
         !psOptions->osColorInterp.empty() || !psOptions->osDataType.empty() ||
         psOptions->bMaskBand || !psOptions->aosMetadata.empty() ||
-        !psOptions->osVRTTIFilename.empty();
+        !psOptions->osGTIFilename.empty();
 
     /* -------------------------------------------------------------------- */
     /*      loop over GDAL files, processing.                               */
@@ -931,15 +931,15 @@ GDALDatasetH GDALTileIndex(const char *pszDest, int nSrcCount,
                 }
             }
         }
-        else if (bIsVRTTIContext && !oAlreadyExistingSRS.IsEmpty() &&
+        else if (bIsGTIContext && !oAlreadyExistingSRS.IsEmpty() &&
                  (poSrcSRS == nullptr ||
                   !poSrcSRS->IsSame(&oAlreadyExistingSRS)))
         {
             CPLError(
                 CE_Failure, CPLE_AppDefined,
                 "%s is not using the same projection system "
                 "as other files in the tileindex. This is not compatible of "
-                "VRTTI use. Use -t_srs option to reproject tile extents "
+                "GTI use. Use -t_srs option to reproject tile extents "
                 "to a common SRS.",
                 osSrcFilename.c_str());
             return nullptr;
@@ -1288,10 +1288,10 @@ GDALTileIndexOptionsNew(char **papszArgv,
         {
             psOptions->bMaskBand = true;
         }
-        else if (EQUAL(papszArgv[iArg], "-vrtti_filename"))
+        else if (EQUAL(papszArgv[iArg], "-gti_filename"))
         {
             CHECK_HAS_ENOUGH_ADDITIONAL_ARGS(1);
-            psOptions->osVRTTIFilename = papszArgv[++iArg];
+            psOptions->osGTIFilename = papszArgv[++iArg];
         }
         else if (EQUAL(papszArgv[iArg], "-overwrite"))
         {