Add additional formats

qgis · Aug 8, 2021 · 906b7f0 · 906b7f0
1 parent 17fa482
commit 906b7f0
Show file tree

Hide file tree

Showing 4 changed files with 37 additions and 11 deletions.
diff --git a/src/core/providers/gdal/qgsgdalprovider.cpp b/src/core/providers/gdal/qgsgdalprovider.cpp
@@ -3765,6 +3765,13 @@ QStringList QgsGdalProviderMetadata::sidecarFilesForUri( const QString &uri ) co
         QStringLiteral( "vdc" ),
         QStringLiteral( "avl" ),
       }
+    },
+    {
+      QStringLiteral( "sdat" ), {
+        QStringLiteral( "sgrd" ),
+        QStringLiteral( "mgrd" ),
+        QStringLiteral( "prj" ),
+      }
     }
   };
 
@@ -3786,8 +3793,9 @@ QStringList QgsGdalProviderMetadata::sidecarFilesForUri( const QString &uri ) co
   for ( const QString &ext :
         {
           QStringLiteral( "aux.xml" ),
+          QStringLiteral( "vat.dbf" ),
           QStringLiteral( "ovr" ),
-          QStringLiteral( "wld" )
+          QStringLiteral( "wld" ),
         } )
   {
     res.append( fileInfo.dir().filePath( fileInfo.completeBaseName() + '.' + ext ) );
@@ -3801,3 +3809,4 @@ QgsGdalProviderMetadata::QgsGdalProviderMetadata():
 }
 
 ///@endcond
+
diff --git a/src/core/providers/ogr/qgsogrprovidermetadata.cpp b/src/core/providers/ogr/qgsogrprovidermetadata.cpp
@@ -1339,6 +1339,11 @@ QStringList QgsOgrProviderMetadata::sidecarFilesForUri( const QString &uri ) con
         QStringLiteral( "lma" ),
       }
     },
+    {
+      QStringLiteral( "mif" ), {
+        QStringLiteral( "mid" ),
+      }
+    },
     {
       QStringLiteral( "gml" ), {
         QStringLiteral( "gfs" ),

diff --git a/tests/src/python/test_provider_gdal.py b/tests/src/python/test_provider_gdal.py
@@ -14,14 +14,11 @@
 
 from qgis.core import (
     QgsProviderRegistry,
-    QgsDataProvider,
     QgsRasterLayer,
     QgsRectangle,
 )
 from qgis.testing import start_app, unittest
 
-from qgis.PyQt.QtGui import qRed
-
 from utilities import unitTestDataPath
 
 start_app()
@@ -124,33 +121,46 @@ def test_provider_sidecar_files_for_uri(self):
 
         self.assertEqual(metadata.sidecarFilesForUri(''), [])
         self.assertEqual(metadata.sidecarFilesForUri('/home/me/some_file.asc'),
-                         ['/home/me/some_file.aux.xml', '/home/me/some_file.ovr', '/home/me/some_file.wld'])
+                         ['/home/me/some_file.aux.xml', '/home/me/some_file.vat.dbf', '/home/me/some_file.ovr',
+                          '/home/me/some_file.wld'])
         self.assertEqual(metadata.sidecarFilesForUri('/home/me/special.jpg'),
                          ['/home/me/special.jpw', '/home/me/special.jgw', '/home/me/special.jpgw',
-                          '/home/me/special.jpegw', '/home/me/special.aux.xml', '/home/me/special.ovr',
+                          '/home/me/special.jpegw', '/home/me/special.aux.xml', '/home/me/special.vat.dbf',
+                          '/home/me/special.ovr',
                           '/home/me/special.wld'])
         self.assertEqual(metadata.sidecarFilesForUri('/home/me/special.img'),
-                         ['/home/me/special.ige', '/home/me/special.aux.xml', '/home/me/special.ovr',
+                         ['/home/me/special.ige', '/home/me/special.aux.xml', '/home/me/special.vat.dbf',
+                          '/home/me/special.ovr',
                           '/home/me/special.wld'])
         self.assertEqual(metadata.sidecarFilesForUri('/home/me/special.sid'),
-                         ['/home/me/special.j2w', '/home/me/special.aux.xml', '/home/me/special.ovr',
+                         ['/home/me/special.j2w', '/home/me/special.aux.xml', '/home/me/special.vat.dbf',
+                          '/home/me/special.ovr',
                           '/home/me/special.wld'])
         self.assertEqual(metadata.sidecarFilesForUri('/home/me/special.tif'),
                          ['/home/me/special.tifw', '/home/me/special.tfw', '/home/me/special.aux.xml',
+                          '/home/me/special.vat.dbf',
                           '/home/me/special.ovr', '/home/me/special.wld'])
         self.assertEqual(metadata.sidecarFilesForUri('/home/me/special.bil'),
                          ['/home/me/special.bilw', '/home/me/special.blw', '/home/me/special.aux.xml',
+                          '/home/me/special.vat.dbf',
                           '/home/me/special.ovr', '/home/me/special.wld'])
         self.assertEqual(metadata.sidecarFilesForUri('/home/me/special.raster'),
-                         ['/home/me/special.rasterw', '/home/me/special.aux.xml', '/home/me/special.ovr',
+                         ['/home/me/special.rasterw', '/home/me/special.aux.xml', '/home/me/special.vat.dbf',
+                          '/home/me/special.ovr',
                           '/home/me/special.wld'])
         self.assertEqual(metadata.sidecarFilesForUri('/home/me/special.bt'),
-                         ['/home/me/special.btw', '/home/me/special.aux.xml', '/home/me/special.ovr',
+                         ['/home/me/special.btw', '/home/me/special.aux.xml', '/home/me/special.vat.dbf',
+                          '/home/me/special.ovr',
                           '/home/me/special.wld'])
         self.assertEqual(metadata.sidecarFilesForUri('/home/me/special.rst'),
                          ['/home/me/special.rdc', '/home/me/special.smp', '/home/me/special.ref',
                           '/home/me/special.vct', '/home/me/special.vdc', '/home/me/special.avl',
-                          '/home/me/special.aux.xml', '/home/me/special.ovr', '/home/me/special.wld'])
+                          '/home/me/special.aux.xml', '/home/me/special.vat.dbf', '/home/me/special.ovr',
+                          '/home/me/special.wld'])
+        self.assertEqual(metadata.sidecarFilesForUri('/home/me/special.sdat'),
+                         ['/home/me/special.sgrd', '/home/me/special.mgrd', '/home/me/special.prj',
+                          '/home/me/special.aux.xml', '/home/me/special.vat.dbf', '/home/me/special.ovr',
+                          '/home/me/special.wld'])
 
 
 if __name__ == '__main__':

diff --git a/tests/src/python/test_provider_ogr.py b/tests/src/python/test_provider_ogr.py
@@ -2144,6 +2144,8 @@ def test_provider_sidecar_files_for_uri(self):
                          ['/home/me/special.dat', '/home/me/special.id', '/home/me/special.map', '/home/me/special.ind',
                           '/home/me/special.tda', '/home/me/special.tin', '/home/me/special.tma',
                           '/home/me/special.lda', '/home/me/special.lin', '/home/me/special.lma'])
+        self.assertEqual(metadata.sidecarFilesForUri('/home/me/special.mif'),
+                         ['/home/me/special.mid'])
         self.assertEqual(metadata.sidecarFilesForUri('/home/me/special.gml'),
                          ['/home/me/special.gfs', '/home/me/special.xsd'])
         self.assertEqual(metadata.sidecarFilesForUri('/home/me/special.csv'), ['/home/me/special.csvt'])