diff options
| author | Ivo van Dongen <info@ivovandongen.nl> | 2016-12-01 11:23:26 +0200 |
|---|---|---|
| committer | Ivo van Dongen <ivovandongen@users.noreply.github.com> | 2016-12-12 09:05:23 -0500 |
| commit | 028db7febacf7d40598aff32653ae89599d0d0d2 (patch) | |
| tree | 7cd0342ceee82bb3a6861c5ab15ffd6139edc8a4 /src | |
| parent | c76a933514e4e1514a58ac0e668b13eebab37794 (diff) | |
| download | qtlocation-mapboxgl-028db7febacf7d40598aff32653ae89599d0d0d2.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 b1cf174bdb..2d11d16b1f 100644 --- a/src/mbgl/style/style.cpp +++ b/src/mbgl/style/style.cpp @@ -199,6 +199,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(); |