diff options
author | Bruno de Oliveira Abinader <bruno@mapbox.com> | 2019-03-19 16:52:14 +0200 |
---|---|---|
committer | Alf Watt <alf.watt@mapbox.com> | 2019-03-21 12:25:11 -0700 |
commit | 15c6dbe967f4150a0d9f555781c7e353ecf20043 (patch) | |
tree | fd3332defbfc2c2d388c0d0cb910de92aeb1636e /src/mbgl/map/map.cpp | |
parent | de6b455209d22ad6c2a629e8c60d112ac9df59dd (diff) | |
download | qtlocation-mapboxgl-15c6dbe967f4150a0d9f555781c7e353ecf20043.tar.gz |
[core] Cleanup Map::Impl ctor
Diffstat (limited to 'src/mbgl/map/map.cpp')
-rw-r--r-- | src/mbgl/map/map.cpp | 22 |
1 files changed, 5 insertions, 17 deletions
diff --git a/src/mbgl/map/map.cpp b/src/mbgl/map/map.cpp index f545fc8095..e8237cca74 100644 --- a/src/mbgl/map/map.cpp +++ b/src/mbgl/map/map.cpp @@ -27,24 +27,14 @@ namespace mbgl { using namespace style; -Map::Map(RendererFrontend& rendererFrontend, - MapObserver& mapObserver, +Map::Map(RendererFrontend& frontend, + MapObserver& observer, const Size size, const float pixelRatio, FileSource& fileSource, Scheduler& scheduler, - const MapOptions& options) - : impl(std::make_unique<Impl>(*this, - rendererFrontend, - mapObserver, - fileSource, - scheduler, - size, - pixelRatio, - options.mapMode(), - options.constrainMode(), - options.viewportMode(), - options.crossSourceCollisions())) {} + const MapOptions& mapOptions) + : impl(std::make_unique<Impl>(frontend, observer, fileSource, scheduler, size, pixelRatio, mapOptions)) {} Map::~Map() = default; @@ -139,9 +129,7 @@ CameraOptions Map::getCameraOptions(const EdgeInsets& padding) const { } void Map::jumpTo(const CameraOptions& camera) { - impl->cameraMutated = true; - impl->transform.jumpTo(camera); - impl->onUpdate(); + impl->jumpTo(camera); } void Map::easeTo(const CameraOptions& camera, const AnimationOptions& animation) { |