diff options
author | Bruno de Oliveira Abinader <bruno@mapbox.com> | 2017-03-13 16:16:38 +0200 |
---|---|---|
committer | Bruno de Oliveira Abinader <bruno@mapbox.com> | 2017-03-15 14:53:32 +0200 |
commit | fc70cbf1e12e27737c7a256682524cd617d18f71 (patch) | |
tree | 10bf1b6c629bb4c642d060182ab1443cdf0084a4 /src/mbgl/map/transform.hpp | |
parent | 98f5b71e6db748a2576e9fc6f17b9e76505df1aa (diff) | |
download | qtlocation-mapboxgl-fc70cbf1e12e27737c7a256682524cd617d18f71.tar.gz |
[core] Replace MapChange enum with MapObserver
Diffstat (limited to 'src/mbgl/map/transform.hpp')
-rw-r--r-- | src/mbgl/map/transform.hpp | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/src/mbgl/map/transform.hpp b/src/mbgl/map/transform.hpp index 66c9915715..087ae8e690 100644 --- a/src/mbgl/map/transform.hpp +++ b/src/mbgl/map/transform.hpp @@ -1,8 +1,8 @@ #pragma once #include <mbgl/map/camera.hpp> +#include <mbgl/map/map_observer.hpp> #include <mbgl/map/mode.hpp> -#include <mbgl/map/change.hpp> #include <mbgl/map/transform_state.hpp> #include <mbgl/map/update.hpp> #include <mbgl/util/chrono.hpp> @@ -18,7 +18,7 @@ namespace mbgl { class Transform : private util::noncopyable { public: - Transform(std::function<void(MapChange)> = nullptr, + Transform(MapObserver& = MapObserver::nullObserver(), ConstrainMode = ConstrainMode::HeightOnly, ViewportMode = ViewportMode::Default); @@ -163,8 +163,7 @@ public: LatLng screenCoordinateToLatLng(const ScreenCoordinate&) const; private: - std::function<void(MapChange)> callback; - + MapObserver& observer; TransformState state; void startTransition(const CameraOptions&, |