use projection string from MDAL provider in Mesh Layer

PeterPetrik · PeterPetrik · commit 7ad1b7174d96 · 2018-09-24T11:04:50.000+02:00
diff --git a/src/providers/mdal/qgsmdalprovider.cpp b/src/providers/mdal/qgsmdalprovider.cpp
@@ -44,14 +44,20 @@ QString QgsMdalProvider::description() const
 
 QgsCoordinateReferenceSystem QgsMdalProvider::crs() const
 {
-  return QgsCoordinateReferenceSystem();
+  return mCrs;
 }
 
 QgsMdalProvider::QgsMdalProvider( const QString &uri, const ProviderOptions &options )
   : QgsMeshDataProvider( uri, options )
 {
   QByteArray curi = uri.toAscii();
   mMeshH = MDAL_LoadMesh( curi.constData() );
+  if ( mMeshH )
+  {
+    const QString proj = MDAL_M_projection( mMeshH );
+    if ( !proj.isEmpty() )
+      mCrs.createFromString( proj );
+  }
 }
 
 QgsMdalProvider::~QgsMdalProvider()
diff --git a/src/providers/mdal/qgsmdalprovider.h b/src/providers/mdal/qgsmdalprovider.h
@@ -26,6 +26,7 @@
 
 class QMutex;
 class QgsCoordinateTransform;
+class QgsCoordinateReferenceSystem;
 
 /**
   \brief Data provider for MDAL layers.
@@ -69,6 +70,7 @@ class QgsMdalProvider : public QgsMeshDataProvider
   private:
     MeshH mMeshH;
     QStringList mExtraDatasetUris;
+    QgsCoordinateReferenceSystem mCrs;
 };
 
 #endif //QGSMDALPROVIDER_H

Original file line number	Diff line number	Diff line change
`@@ -44,14 +44,20 @@ QString QgsMdalProvider::description() const`
`44`	`44`
`45`	`45`	`QgsCoordinateReferenceSystem QgsMdalProvider::crs() const`
`46`	`46`	`{`
`47`		`- return QgsCoordinateReferenceSystem();`
	`47`	`+ return mCrs;`
`48`	`48`	`}`
`49`	`49`
`50`	`50`	`QgsMdalProvider::QgsMdalProvider( const QString &uri, const ProviderOptions &options )`
`51`	`51`	`: QgsMeshDataProvider( uri, options )`
`52`	`52`	`{`
`53`	`53`	`QByteArray curi = uri.toAscii();`
`54`	`54`	`mMeshH = MDAL_LoadMesh( curi.constData() );`
	`55`	`+ if ( mMeshH )`
	`56`	`+ {`
	`57`	`+ const QString proj = MDAL_M_projection( mMeshH );`
	`58`	`+ if ( !proj.isEmpty() )`
	`59`	`+ mCrs.createFromString( proj );`
	`60`	`+ }`
`55`	`61`	`}`
`56`	`62`
`57`	`63`	`QgsMdalProvider::~QgsMdalProvider()`