Stop working with removed provider

include/OsmAndCore/Map/AmenitySymbolsProvider.h

@@ -25,7 +25,9 @@ namespace OsmAnd
     class Amenity;
 
     class AmenitySymbolsProvider_P;
-    class OSMAND_CORE_API AmenitySymbolsProvider : public IMapTiledSymbolsProvider
+    class OSMAND_CORE_API AmenitySymbolsProvider
+        : public std::enable_shared_from_this<AmenitySymbolsProvider>
+        , public IMapTiledSymbolsProvider
     {
         Q_DISABLE_COPY_AND_MOVE(AmenitySymbolsProvider);
     public:

include/OsmAndCore/Map/FavoriteLocationsPresenter.h

@@ -25,7 +25,9 @@ namespace OsmAnd
     class IFavoriteLocationsCollection;
 
     class FavoriteLocationsPresenter_P;
-    class OSMAND_CORE_API FavoriteLocationsPresenter : public IMapKeyedSymbolsProvider
+    class OSMAND_CORE_API FavoriteLocationsPresenter
+        : public std::enable_shared_from_this<FavoriteLocationsPresenter>
+        , public IMapKeyedSymbolsProvider
     {
         Q_DISABLE_COPY_AND_MOVE(FavoriteLocationsPresenter);
 

include/OsmAndCore/Map/GeoTileObjectsProvider.h

@@ -19,7 +19,9 @@ namespace OsmAnd
     class MapObject;
 
     class GeoTileObjectsProvider_P;
-    class OSMAND_CORE_API GeoTileObjectsProvider Q_DECL_FINAL : public IMapObjectsProvider
+    class OSMAND_CORE_API GeoTileObjectsProvider Q_DECL_FINAL
+        : public std::enable_shared_from_this<GeoTileObjectsProvider>
+        , public IMapObjectsProvider
     {
         Q_DISABLE_COPY_AND_MOVE(GeoTileObjectsProvider);
 

include/OsmAndCore/Map/GpxAdditionalIconsProvider.h

@@ -25,7 +25,9 @@
 
 namespace OsmAnd
 {
-    class OSMAND_CORE_API GpxAdditionalIconsProvider : public IMapTiledSymbolsProvider
+    class OSMAND_CORE_API GpxAdditionalIconsProvider
+        : public std::enable_shared_from_this<GpxAdditionalIconsProvider>
+        , public IMapTiledSymbolsProvider
     {
         Q_DISABLE_COPY_AND_MOVE(GpxAdditionalIconsProvider);
     public:

include/OsmAndCore/Map/MapDataProviderHelpers.h

@@ -44,7 +44,7 @@ namespace OsmAnd
             std::shared_ptr<Metric>* const pOutMetric = nullptr);
 
         static void nonNaturalObtainDataAsync(
-            IMapDataProvider* const provider,
+            const std::shared_ptr<IMapDataProvider>& provider,
             const IMapDataProvider::Request& request,
             const IMapDataProvider::ObtainDataAsyncCallback callback,
             const bool collectMetric = false);

include/OsmAndCore/Map/MapMarkersCollection.h

@@ -19,7 +19,9 @@ namespace OsmAnd
     class MapMarkerBuilder_P;
 
     class MapMarkersCollection_P;
-    class OSMAND_CORE_API MapMarkersCollection : public IMapKeyedSymbolsProvider
+    class OSMAND_CORE_API MapMarkersCollection
+        : public std::enable_shared_from_this<MapMarkersCollection>
+        , public IMapKeyedSymbolsProvider
     {
         Q_DISABLE_COPY_AND_MOVE(MapMarkersCollection);
 

include/OsmAndCore/Map/MapObjectsProvider.h

@@ -15,7 +15,9 @@ namespace OsmAnd
     class MapObject;
 
     class MapObjectsProvider_P;
-    class OSMAND_CORE_API MapObjectsProvider Q_DECL_FINAL : public IMapObjectsProvider
+    class OSMAND_CORE_API MapObjectsProvider Q_DECL_FINAL
+        : public std::enable_shared_from_this<MapObjectsProvider>
+        , public IMapObjectsProvider
     {
         Q_DISABLE_COPY_AND_MOVE(MapObjectsProvider);
 

include/OsmAndCore/Map/MapObjectsSymbolsProvider.h

@@ -20,7 +20,9 @@ namespace OsmAnd
     class MapObject;
 
     class MapObjectsSymbolsProvider_P;
-    class OSMAND_CORE_API MapObjectsSymbolsProvider : public IMapTiledSymbolsProvider
+    class OSMAND_CORE_API MapObjectsSymbolsProvider
+        : public std::enable_shared_from_this<MapObjectsSymbolsProvider>
+        , public IMapTiledSymbolsProvider
     {
         Q_DISABLE_COPY_AND_MOVE(MapObjectsSymbolsProvider);
     public:

include/OsmAndCore/Map/MapPrimitivesMetricsLayerProvider.h

@@ -24,7 +24,9 @@
 namespace OsmAnd
 {
     class MapPrimitivesMetricsLayerProvider_P;
-    class OSMAND_CORE_API MapPrimitivesMetricsLayerProvider Q_DECL_FINAL : public IRasterMapLayerProvider
+    class OSMAND_CORE_API MapPrimitivesMetricsLayerProvider Q_DECL_FINAL
+        : public std::enable_shared_from_this<MapPrimitivesMetricsLayerProvider>
+        , public IRasterMapLayerProvider
     {
         Q_DISABLE_COPY_AND_MOVE(MapPrimitivesMetricsLayerProvider);
     public:

include/OsmAndCore/Map/MapPrimitivesProvider.h

@@ -19,7 +19,9 @@
 namespace OsmAnd
 {
     class MapPrimitivesProvider_P;
-    class OSMAND_CORE_API MapPrimitivesProvider : public IMapTiledDataProvider
+    class OSMAND_CORE_API MapPrimitivesProvider
+        : public std::enable_shared_from_this<MapPrimitivesProvider>
+        , public IMapTiledDataProvider
     {
         Q_DISABLE_COPY_AND_MOVE(MapPrimitivesProvider);
     public:

include/OsmAndCore/Map/MapRasterLayerProvider.h

@@ -25,7 +25,9 @@
 namespace OsmAnd
 {
     class MapRasterLayerProvider_P;
-    class OSMAND_CORE_API MapRasterLayerProvider : public IRasterMapLayerProvider
+    class OSMAND_CORE_API MapRasterLayerProvider
+        : public std::enable_shared_from_this<MapRasterLayerProvider>
+        , public IRasterMapLayerProvider
     {
         Q_DISABLE_COPY_AND_MOVE(MapRasterLayerProvider);
     public:

include/OsmAndCore/Map/MapRasterMetricsLayerProvider.h

@@ -25,7 +25,9 @@
 namespace OsmAnd
 {
     class MapRasterMetricsLayerProvider_P;
-    class OSMAND_CORE_API MapRasterMetricsLayerProvider : public IRasterMapLayerProvider
+    class OSMAND_CORE_API MapRasterMetricsLayerProvider
+        : public std::enable_shared_from_this<MapRasterMetricsLayerProvider>
+        , public IRasterMapLayerProvider
     {
         Q_DISABLE_COPY_AND_MOVE(MapRasterMetricsLayerProvider);
     public:

include/OsmAndCore/Map/MapTiledCollectionProvider.h

@@ -23,7 +23,9 @@
 
 namespace OsmAnd
 {
-    class OSMAND_CORE_API MapTiledCollectionProvider : public IMapTiledSymbolsProvider
+    class OSMAND_CORE_API MapTiledCollectionProvider
+        : public std::enable_shared_from_this<MapTiledCollectionProvider>
+        , public IMapTiledSymbolsProvider
     {
         Q_DISABLE_COPY_AND_MOVE(MapTiledCollectionProvider);
         public:

include/OsmAndCore/Map/ObfMapObjectsMetricsLayerProvider.h

@@ -24,7 +24,9 @@
 namespace OsmAnd
 {
     class ObfMapObjectsMetricsLayerProvider_P;
-    class OSMAND_CORE_API ObfMapObjectsMetricsLayerProvider : public IRasterMapLayerProvider
+    class OSMAND_CORE_API ObfMapObjectsMetricsLayerProvider
+        : public std::enable_shared_from_this<ObfMapObjectsMetricsLayerProvider>
+        , public IRasterMapLayerProvider
     {
         Q_DISABLE_COPY_AND_MOVE(ObfMapObjectsMetricsLayerProvider);
     public:

include/OsmAndCore/Map/ObfMapObjectsProvider.h

@@ -20,7 +20,9 @@ namespace OsmAnd
     class IObfsCollection;
 
     class ObfMapObjectsProvider_P;
-    class OSMAND_CORE_API ObfMapObjectsProvider Q_DECL_FINAL : public IMapObjectsProvider
+    class OSMAND_CORE_API ObfMapObjectsProvider Q_DECL_FINAL
+        : public std::enable_shared_from_this<ObfMapObjectsProvider>
+        , public IMapObjectsProvider
     {
         Q_DISABLE_COPY_AND_MOVE(ObfMapObjectsProvider);
     public:

include/OsmAndCore/Map/PolygonsCollection.h

@@ -20,7 +20,9 @@ namespace OsmAnd
     class PolygonBuilder_P;
 
     class PolygonsCollection_P;
-    class OSMAND_CORE_API PolygonsCollection : public IMapKeyedSymbolsProvider
+    class OSMAND_CORE_API PolygonsCollection
+        : public std::enable_shared_from_this<PolygonsCollection>
+        , public IMapKeyedSymbolsProvider
     {
         Q_DISABLE_COPY_AND_MOVE(PolygonsCollection);
 

include/OsmAndCore/Map/SqliteHeightmapTileProvider.h

@@ -17,7 +17,9 @@ namespace OsmAnd
     class ITileSqliteDatabasesCollection;
 
     class SqliteHeightmapTileProvider_P;
-    class OSMAND_CORE_API SqliteHeightmapTileProvider : public IMapElevationDataProvider
+    class OSMAND_CORE_API SqliteHeightmapTileProvider
+        : public std::enable_shared_from_this<SqliteHeightmapTileProvider>
+        , public IMapElevationDataProvider
     {
         Q_DISABLE_COPY_AND_MOVE(SqliteHeightmapTileProvider);
 

include/OsmAndCore/Map/TransportStopSymbolsProvider.h

@@ -26,7 +26,9 @@ namespace OsmAnd
     class TransportRoute;
 
     class TransportStopSymbolsProvider_P;
-    class OSMAND_CORE_API TransportStopSymbolsProvider : public IMapTiledSymbolsProvider
+    class OSMAND_CORE_API TransportStopSymbolsProvider
+        : public std::enable_shared_from_this<TransportStopSymbolsProvider>
+        , public IMapTiledSymbolsProvider
     {
         Q_DISABLE_COPY_AND_MOVE(TransportStopSymbolsProvider);
     public:

include/OsmAndCore/Map/VectorLineArrowsProvider.h

@@ -16,7 +16,9 @@ namespace OsmAnd
 {
     class VectorLinesCollection;
     class VectorLineArrowsProvider_P;
-    class OSMAND_CORE_API VectorLineArrowsProvider : public IMapKeyedSymbolsProvider
+    class OSMAND_CORE_API VectorLineArrowsProvider
+        : public std::enable_shared_from_this<VectorLineArrowsProvider>
+        , public IMapKeyedSymbolsProvider
     {
         Q_DISABLE_COPY_AND_MOVE(VectorLineArrowsProvider);
 

src/Map/AmenitySymbolsProvider.cpp

@@ -60,7 +60,7 @@ void OsmAnd::AmenitySymbolsProvider::obtainDataAsync(
     const IMapDataProvider::ObtainDataAsyncCallback callback,
     const bool collectMetric /*= false*/)
 {
-    MapDataProviderHelpers::nonNaturalObtainDataAsync(this, request, callback, collectMetric);
+    MapDataProviderHelpers::nonNaturalObtainDataAsync(shared_from_this(), request, callback, collectMetric);
 }
 
 OsmAnd::AmenitySymbolsProvider::Data::Data(

src/Map/FavoriteLocationsPresenter.cpp

@@ -72,7 +72,7 @@ void OsmAnd::FavoriteLocationsPresenter::obtainDataAsync(
     const IMapDataProvider::ObtainDataAsyncCallback callback,
     const bool collectMetric /*= false*/)
 {
-    MapDataProviderHelpers::nonNaturalObtainDataAsync(this, request, callback, collectMetric);
+    MapDataProviderHelpers::nonNaturalObtainDataAsync(shared_from_this(), request, callback, collectMetric);
 }
 
 OsmAnd::ZoomLevel OsmAnd::FavoriteLocationsPresenter::getMinZoom() const

src/Map/GeoTileObjectsProvider.cpp

@@ -55,5 +55,5 @@ void OsmAnd::GeoTileObjectsProvider::obtainDataAsync(
     const IMapDataProvider::ObtainDataAsyncCallback callback,
     const bool collectMetric /*= false*/)
 {
-    MapDataProviderHelpers::nonNaturalObtainDataAsync(this, request, callback, collectMetric);
+    MapDataProviderHelpers::nonNaturalObtainDataAsync(shared_from_this(), request, callback, collectMetric);
 }

src/Map/GpxAdditionalIconsProvider.cpp

@@ -267,7 +267,7 @@ void OsmAnd::GpxAdditionalIconsProvider::obtainDataAsync(const IMapDataProvider:
                                                  const IMapDataProvider::ObtainDataAsyncCallback callback,
                                                  const bool collectMetric /*= false*/)
 {
-    OsmAnd::MapDataProviderHelpers::nonNaturalObtainDataAsync(this, request, callback, collectMetric);
+    OsmAnd::MapDataProviderHelpers::nonNaturalObtainDataAsync(shared_from_this(), request, callback, collectMetric);
 }
 
 OsmAnd::GpxAdditionalIconsProvider::Data::Data(const OsmAnd::TileId tileId_,

src/Map/MapDataProviderHelpers.cpp

@@ -60,23 +60,28 @@ bool OsmAnd::MapDataProviderHelpers::nonNaturalObtainData(
 }
 
 void OsmAnd::MapDataProviderHelpers::nonNaturalObtainDataAsync(
-    IMapDataProvider* const provider,
+    const std::shared_ptr<IMapDataProvider>& provider,
     const IMapDataProvider::Request& request,
     const IMapDataProvider::ObtainDataAsyncCallback callback,
     const bool collectMetric /*= false*/)
 {
     assert(provider->supportsNaturalObtainData());
 
+    const auto weakProvider = std::weak_ptr<IMapDataProvider>(provider);
     const auto requestClone = request.clone();
     const QRunnableFunctor::Callback task =
-        [provider, requestClone, callback, collectMetric]
+        [weakProvider, requestClone, callback, collectMetric]
         (const QRunnableFunctor* const runnable)
         {
-            std::shared_ptr<IMapDataProvider::Data> data;
-            std::shared_ptr<Metric> metric;
-            const bool requestSucceeded = provider->obtainData(*requestClone, data, collectMetric ? &metric : nullptr);
-
-            callback(provider, requestSucceeded, data, metric);
+            const auto provider = weakProvider.lock();
+            if (provider)
+            {
+                std::shared_ptr<IMapDataProvider::Data> data;
+                std::shared_ptr<Metric> metric;
+                const bool requestSucceeded =
+                    provider->obtainData(*requestClone, data, collectMetric ? &metric : nullptr);
+                callback(provider.get(), requestSucceeded, data, metric);
+            }
         };
 
     const auto taskRunnable = new QRunnableFunctor(task);

src/Map/MapMarkersCollection.cpp

@@ -58,7 +58,7 @@ void OsmAnd::MapMarkersCollection::obtainDataAsync(
     const IMapDataProvider::ObtainDataAsyncCallback callback,
     const bool collectMetric /*= false*/)
 {
-    MapDataProviderHelpers::nonNaturalObtainDataAsync(this, request, callback, collectMetric);
+    MapDataProviderHelpers::nonNaturalObtainDataAsync(shared_from_this(), request, callback, collectMetric);
 }
 
 OsmAnd::ZoomLevel OsmAnd::MapMarkersCollection::getMinZoom() const

src/Map/MapObjectsProvider.cpp

@@ -47,5 +47,5 @@ void OsmAnd::MapObjectsProvider::obtainDataAsync(
     const IMapDataProvider::ObtainDataAsyncCallback callback,
     const bool collectMetric /*= false*/)
 {
-    MapDataProviderHelpers::nonNaturalObtainDataAsync(this, request, callback, collectMetric);
+    MapDataProviderHelpers::nonNaturalObtainDataAsync(shared_from_this(), request, callback, collectMetric);
 }

src/Map/MapObjectsSymbolsProvider.cpp

@@ -54,7 +54,7 @@ void OsmAnd::MapObjectsSymbolsProvider::obtainDataAsync(
     const IMapDataProvider::ObtainDataAsyncCallback callback,
     const bool collectMetric /*= false*/)
 {
-    MapDataProviderHelpers::nonNaturalObtainDataAsync(this, request, callback, collectMetric);
+    MapDataProviderHelpers::nonNaturalObtainDataAsync(shared_from_this(), request, callback, collectMetric);
 }
 
 OsmAnd::MapObjectsSymbolsProvider::Data::Data(

src/Map/MapPrimitivesMetricsLayerProvider.cpp

@@ -58,7 +58,7 @@ void OsmAnd::MapPrimitivesMetricsLayerProvider::obtainDataAsync(
     const IMapDataProvider::ObtainDataAsyncCallback callback,
     const bool collectMetric /*= false*/)
 {
-    MapDataProviderHelpers::nonNaturalObtainDataAsync(this, request, callback, collectMetric);
+    MapDataProviderHelpers::nonNaturalObtainDataAsync(shared_from_this(), request, callback, collectMetric);
 }
 
 bool OsmAnd::MapPrimitivesMetricsLayerProvider::obtainMetricsTile(

src/Map/MapPrimitivesProvider.cpp

@@ -61,7 +61,7 @@ void OsmAnd::MapPrimitivesProvider::obtainDataAsync(
     const IMapDataProvider::ObtainDataAsyncCallback callback,
     const bool collectMetric /*= false*/)
 {
-    MapDataProviderHelpers::nonNaturalObtainDataAsync(this, request, callback, collectMetric);
+    MapDataProviderHelpers::nonNaturalObtainDataAsync(shared_from_this(), request, callback, collectMetric);
 }
 
 OsmAnd::MapPrimitivesProvider::Data::Data(

src/Map/MapRasterLayerProvider.cpp

@@ -59,7 +59,7 @@ void OsmAnd::MapRasterLayerProvider::obtainDataAsync(
     const IMapDataProvider::ObtainDataAsyncCallback callback,
     const bool collectMetric /*= false*/)
 {
-    MapDataProviderHelpers::nonNaturalObtainDataAsync(this, request, callback, collectMetric);
+    MapDataProviderHelpers::nonNaturalObtainDataAsync(shared_from_this(), request, callback, collectMetric);
 }
 
 bool OsmAnd::MapRasterLayerProvider::obtainRasterizedTile(

src/Map/MapRasterMetricsLayerProvider.cpp

@@ -56,7 +56,7 @@ void OsmAnd::MapRasterMetricsLayerProvider::obtainDataAsync(
     const IMapDataProvider::ObtainDataAsyncCallback callback,
     const bool collectMetric /*= false*/)
 {
-    MapDataProviderHelpers::nonNaturalObtainDataAsync(this, request, callback, collectMetric);
+    MapDataProviderHelpers::nonNaturalObtainDataAsync(shared_from_this(), request, callback, collectMetric);
 }
 
 bool OsmAnd::MapRasterMetricsLayerProvider::obtainMetricsTile(

src/Map/MapTiledCollectionProvider.cpp

@@ -210,7 +210,7 @@ void OsmAnd::MapTiledCollectionProvider::obtainDataAsync(
     const IMapDataProvider::ObtainDataAsyncCallback callback,
     const bool collectMetric /*= false*/)
 {
-    MapDataProviderHelpers::nonNaturalObtainDataAsync(this, request, callback, collectMetric);
+    MapDataProviderHelpers::nonNaturalObtainDataAsync(shared_from_this(), request, callback, collectMetric);
 }
 
 OsmAnd::MapTiledCollectionProvider::Data::Data(

src/Map/ObfMapObjectsMetricsLayerProvider.cpp

@@ -56,7 +56,7 @@ void OsmAnd::ObfMapObjectsMetricsLayerProvider::obtainDataAsync(
     const IMapDataProvider::ObtainDataAsyncCallback callback,
     const bool collectMetric /*= false*/)
 {
-    MapDataProviderHelpers::nonNaturalObtainDataAsync(this, request, callback, collectMetric);
+    MapDataProviderHelpers::nonNaturalObtainDataAsync(shared_from_this(), request, callback, collectMetric);
 }
 
 bool OsmAnd::ObfMapObjectsMetricsLayerProvider::obtainMetricsTile(

src/Map/ObfMapObjectsProvider.cpp

@@ -40,7 +40,7 @@ void OsmAnd::ObfMapObjectsProvider::obtainDataAsync(
     const IMapDataProvider::ObtainDataAsyncCallback callback,
     const bool collectMetric /*= false*/)
 {
-    MapDataProviderHelpers::nonNaturalObtainDataAsync(this, request, callback, collectMetric);
+    MapDataProviderHelpers::nonNaturalObtainDataAsync(shared_from_this(), request, callback, collectMetric);
 }
 
 bool OsmAnd::ObfMapObjectsProvider::obtainTiledObfMapObjects(

src/Map/PolygonsCollection.cpp

@@ -58,7 +58,7 @@ void OsmAnd::PolygonsCollection::obtainDataAsync(
     const IMapDataProvider::ObtainDataAsyncCallback callback,
     const bool collectMetric /*= false*/)
 {
-    MapDataProviderHelpers::nonNaturalObtainDataAsync(this, request, callback, collectMetric);
+    MapDataProviderHelpers::nonNaturalObtainDataAsync(shared_from_this(), request, callback, collectMetric);
 }
 
 OsmAnd::ZoomLevel OsmAnd::PolygonsCollection::getMinZoom() const

src/Map/SqliteHeightmapTileProvider.cpp

@@ -54,5 +54,5 @@ void OsmAnd::SqliteHeightmapTileProvider::obtainDataAsync(
     const IMapDataProvider::ObtainDataAsyncCallback callback,
     const bool collectMetric /*= false*/)
 {
-    MapDataProviderHelpers::nonNaturalObtainDataAsync(this, request, callback, collectMetric);
+    MapDataProviderHelpers::nonNaturalObtainDataAsync(shared_from_this(), request, callback, collectMetric);
 }

src/Map/TransportStopSymbolsProvider.cpp

@@ -54,7 +54,7 @@ void OsmAnd::TransportStopSymbolsProvider::obtainDataAsync(
     const IMapDataProvider::ObtainDataAsyncCallback callback,
     const bool collectMetric /*= false*/)
 {
-    MapDataProviderHelpers::nonNaturalObtainDataAsync(this, request, callback, collectMetric);
+    MapDataProviderHelpers::nonNaturalObtainDataAsync(shared_from_this(), request, callback, collectMetric);
 }
 
 OsmAnd::TransportStopSymbolsProvider::Data::Data(

src/Map/VectorLineArrowsProvider.cpp

@@ -44,7 +44,7 @@ void OsmAnd::VectorLineArrowsProvider::obtainDataAsync(
     const IMapDataProvider::ObtainDataAsyncCallback callback,
     const bool collectMetric /*= false*/)
 {
-    MapDataProviderHelpers::nonNaturalObtainDataAsync(this, request, callback, collectMetric);
+    MapDataProviderHelpers::nonNaturalObtainDataAsync(shared_from_this(), request, callback, collectMetric);
 }
 
 OsmAnd::ZoomLevel OsmAnd::VectorLineArrowsProvider::getMinZoom() const