handle basemaps in QgsPathResolver

3nids · 3nids · commit 6bfc7194e3ad · 2020-05-19T14:21:03.000+02:00
diff --git a/src/core/qgspathresolver.cpp b/src/core/qgspathresolver.cpp
@@ -14,13 +14,15 @@
  ***************************************************************************/
 
 #include "qgspathresolver.h"
+#include "qgsbasemappathregistry.h"
 
 #include "qgis.h"
 #include "qgsapplication.h"
 #include <QFileInfo>
 #include <QUrl>
 #include <QUuid>
 
+
 typedef std::vector< std::pair< QString, std::function< QString( const QString & ) > > > CustomResolvers;
 Q_GLOBAL_STATIC( CustomResolvers, sCustomResolvers )
 
@@ -48,6 +50,12 @@ QString QgsPathResolver::readPath( const QString &f ) const
     return QgsApplication::pkgDataPath() + QStringLiteral( "/resources" ) + src.mid( 8 );
   }
 
+  if ( src.startsWith( QLatin1String( "basemap:" ) ) )
+  {
+    // strip away "inbuilt:" prefix, replace with actual  inbuilt data folder path
+    return QgsApplication::basemapPathRegistry()->fullPath( src.mid( 8 ) ) ;
+  }
+
   if ( mBaseFileName.isNull() )
   {
     return src;
@@ -183,6 +191,10 @@ QString QgsPathResolver::writePath( const QString &src ) const
     return src;
   }
 
+  QString basemapPath = QgsApplication::basemapPathRegistry()->relativePath( src );
+  if ( !basemapPath.isEmpty() )
+    return QStringLiteral( "basemap:" ) + basemapPath;
+
   if ( src.startsWith( QgsApplication::pkgDataPath() + QStringLiteral( "/resources" ) ) )
   {
     // replace inbuilt data folder path with "inbuilt:" prefix
