summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorIvo van Dongen <info@ivovandongen.nl>2017-05-29 14:13:52 +0300
committerIvo van Dongen <ivovandongen@users.noreply.github.com>2017-05-30 13:07:03 +0300
commit005dc6d122d5ae0c8d20d2f7297649d2bbae9ac8 (patch)
treef4012a6af2af5ded570bee4c530e66dd4a306f7b /src
parentff3dc29ffd371227a0013ed14176d5c5d6d96b0b (diff)
downloadqtlocation-mapboxgl-005dc6d122d5ae0c8d20d2f7297649d2bbae9ac8.tar.gz
[core] check source usage before remove
Diffstat (limited to 'src')
-rw-r--r--src/mbgl/style/style.cpp23
1 files changed, 23 insertions, 0 deletions
diff --git a/src/mbgl/style/style.cpp b/src/mbgl/style/style.cpp
index a03a18fdaf..0a212b977f 100644
--- a/src/mbgl/style/style.cpp
+++ b/src/mbgl/style/style.cpp
@@ -158,7 +158,30 @@ void Style::addSource(std::unique_ptr<Source> source) {
sources.emplace_back(std::move(source));
}
+struct SourceIdUsageEvaluator {
+ const std::string& sourceId;
+
+ bool operator()(BackgroundLayer&) { return false; }
+ bool operator()(CustomLayer&) { return false; }
+
+ template <class LayerType>
+ bool operator()(LayerType& layer) {
+ return layer.getSourceID() == sourceId;
+ }
+};
+
std::unique_ptr<Source> Style::removeSource(const std::string& id) {
+ // Check if source is in use
+ SourceIdUsageEvaluator sourceIdEvaluator {id};
+ auto layerIt = std::find_if(layers.begin(), layers.end(), [&](const auto& layer) {
+ return layer->accept(sourceIdEvaluator);
+ });
+
+ if (layerIt != layers.end()) {
+ Log::Warning(Event::General, "Source '%s' is in use, cannot remove", id.c_str());
+ return nullptr;
+ }
+
auto it = std::find_if(sources.begin(), sources.end(), [&](const auto& source) {
return source->getID() == id;
});