diff options
author | Alexander Shalamov <alexander.shalamov@mapbox.com> | 2020-03-12 13:17:02 +0200 |
---|---|---|
committer | kevin <kevin.li@mapbox.com> | 2020-03-24 10:39:42 +0800 |
commit | 30ebae8e91774ec1ad5892bd474fb7dad8c73ebc (patch) | |
tree | 67d5b7987953576769ffaa6d8665bf3c7b5d3fc4 /platform/android/src/style/layers/layer.cpp | |
parent | 239ce4f44950772a0013723e09072f6da69f3a43 (diff) | |
download | qtlocation-mapboxgl-30ebae8e91774ec1ad5892bd474fb7dad8c73ebc.tar.gz |
Remove Map parameter from factories
- remove unused map from factory interfaces. Map is only needed for repaint.
Diffstat (limited to 'platform/android/src/style/layers/layer.cpp')
-rw-r--r-- | platform/android/src/style/layers/layer.cpp | 18 |
1 files changed, 3 insertions, 15 deletions
diff --git a/platform/android/src/style/layers/layer.cpp b/platform/android/src/style/layers/layer.cpp index b90d670a4b..839a7b91c4 100644 --- a/platform/android/src/style/layers/layer.cpp +++ b/platform/android/src/style/layers/layer.cpp @@ -45,33 +45,21 @@ namespace android { /** * Takes a non-owning reference. For lookup methods */ - Layer::Layer(mbgl::Map& coreMap, mbgl::style::Layer& coreLayer) : layer(coreLayer) , map(&coreMap) { + Layer::Layer(mbgl::style::Layer& coreLayer) : layer(coreLayer) { } - /** - * Takes a owning reference. Ownership is transfered to this peer, eg after removing - * from the map - */ - Layer::Layer(mbgl::Map& coreMap, std::unique_ptr<mbgl::style::Layer> coreLayer) - : ownedLayer(std::move(coreLayer)) - , layer(*ownedLayer) - , map(&coreMap) { - } Layer::~Layer() { } - void Layer::addToMap(mbgl::Map& _map, mbgl::optional<std::string> before) { + void Layer::addToStyle(mbgl::style::Style& style, mbgl::optional<std::string> before) { // Check to see if we own the layer first if (!ownedLayer) { throw std::runtime_error("Cannot add layer twice"); } // Add layer to map - _map.getStyle().addLayer(releaseCoreLayer(), before); - - // Save pointer to the map - this->map = &_map; + style.addLayer(releaseCoreLayer(), before); } void Layer::setLayer(std::unique_ptr<mbgl::style::Layer> sourceLayer) { |