LVBAG: honour IsSingleAllowedDriver()

OSGeo · Sep 15, 2024 · 4216271 · 4216271
1 parent a763a24
commit 4216271
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 2 deletions.
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/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") !=