diff options
author | Ivo van Dongen <info@ivovandongen.nl> | 2016-12-01 11:23:26 +0200 |
---|---|---|
committer | Jesse Bounds <jesse@rebounds.net> | 2016-12-13 10:03:05 -0800 |
commit | bb6973ae90d91134de168dc75f0d51e3e28c8ae4 (patch) | |
tree | f4e764c37cfd786e26ea792b7786561e486fc40e /src | |
parent | 18730d598d29cf876064ce6964ef88ef0351f78f (diff) | |
download | qtlocation-mapboxgl-bb6973ae90d91134de168dc75f0d51e3e28c8ae4.tar.gz |
[core] guard against duplicate layer ids
Diffstat (limited to 'src')
-rw-r--r-- | src/mbgl/style/style.cpp | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/src/mbgl/style/style.cpp b/src/mbgl/style/style.cpp index e55119f9fd..d28963aa64 100644 --- a/src/mbgl/style/style.cpp +++ b/src/mbgl/style/style.cpp @@ -198,6 +198,15 @@ Layer* Style::getLayer(const std::string& id) const { Layer* Style::addLayer(std::unique_ptr<Layer> layer, optional<std::string> before) { // TODO: verify source + // Guard against duplicate layer ids + auto it = std::find_if(layers.begin(), layers.end(), [&](const auto& existing) { + return existing->getID() == layer->getID(); + }); + + if (it != layers.end()) { + throw std::runtime_error(std::string{"Layer "} + layer->getID() + " already exists"); + } + if (SymbolLayer* symbolLayer = layer->as<SymbolLayer>()) { if (!symbolLayer->impl->spriteAtlas) { symbolLayer->impl->spriteAtlas = spriteAtlas.get(); |