Merge pull request OSGeo#10807 from rouault/gml_lvbag_force_opening

GML and LVBAG: honour IsSingleAllowedDriver()
innFactory · Sep 16, 2024 · ca5b639 · ca5b639
2 parents 5b9e9e7 + 4216271
commit ca5b639
Show file tree

Hide file tree

Showing 4 changed files with 34 additions and 2 deletions.
diff --git a/autotest/ogr/ogr_gml.py b/autotest/ogr/ogr_gml.py
@@ -4626,3 +4626,18 @@ def test_ogr_gml_get_layers_by_name_from_imported_schema_more_tests(tmp_path):
     assert isinstance(
         dat_erst, list
     ), f"Expected 'dat_erst' to be of type 'list', but got {type(dat_erst)}"
+
+
+###############################################################################
+# Test force opening a GML file
+
+
+def test_ogr_gml_force_opening(tmp_vsimem):
+
+    filename = str(tmp_vsimem / "test.gml")
+    gdal.FileFromMemBuffer(filename, open("data/nas/empty_nas.xml", "rb").read())
+
+    # Would be opened by NAS driver if not forced
+    with gdal.config_option("NAS_GFS_TEMPLATE", ""):
+        ds = gdal.OpenEx(filename, allowed_drivers=["GML"])
+        assert ds.GetDriver().GetDescription() == "GML"
diff --git a/autotest/ogr/ogr_lvbag.py b/autotest/ogr/ogr_lvbag.py
@@ -603,3 +603,14 @@ def test_ogr_lvbag_test_ogrsf_num():
     )
 
     assert "INFO" in ret and "ERROR" not in ret
+
+
+###############################################################################
+# Test force opening
+
+
+def test_ogr_lvbag_force_opening():
+
+    # Would be opened by GML driver if not forced
+    ds = gdal.OpenEx("data/gml/empty.gml", allowed_drivers=["LVBAG"])
+    assert ds.GetDriver().GetDescription() == "LVBAG"
diff --git a/ogr/ogrsf_frmts/gml/ogrgmldriver.cpp b/ogr/ogrsf_frmts/gml/ogrgmldriver.cpp
@@ -75,6 +75,9 @@ static int OGRGMLDriverIdentify(GDALOpenInfo *poOpenInfo)
         if (!poOpenInfo->TryToIngest(4096))
             return FALSE;
 
+        if (poOpenInfo->IsSingleAllowedDriver("GML"))
+            return TRUE;
+
         return OGRGMLDataSource::CheckHeader(
             reinterpret_cast<const char *>(poOpenInfo->pabyHeader));
     }

diff --git a/ogr/ogrsf_frmts/lvbag/ogrlvbagdriver.cpp b/ogr/ogrsf_frmts/lvbag/ogrlvbagdriver.cpp
@@ -39,13 +39,16 @@ static int OGRLVBAGDriverIdentify(GDALOpenInfo *poOpenInfo)
         return FALSE;
     if (poOpenInfo->bIsDirectory)
         return -1;  // Check later
-    if (poOpenInfo->fpL == nullptr)
+    if (poOpenInfo->fpL == nullptr || poOpenInfo->nHeaderBytes == 0)
         return FALSE;
 
     auto pszPtr = reinterpret_cast<const char *>(poOpenInfo->pabyHeader);
-    if (poOpenInfo->nHeaderBytes == 0 || pszPtr[0] != '<')
+    if (pszPtr[0] != '<')
         return FALSE;
 
+    if (poOpenInfo->IsSingleAllowedDriver("LVBAG"))
+        return TRUE;
+
     // Can't handle mutations just yet
     if (strstr(pszPtr,
                "http://www.kadaster.nl/schemas/mutatielevering-generiek/1.0") !=