diff options
author | Thiago Marcos P. Santos <thiago@mapbox.com> | 2016-12-23 01:54:40 -0200 |
---|---|---|
committer | Thiago Marcos P. Santos <tmpsantos@gmail.com> | 2017-01-03 16:52:24 -0200 |
commit | 003eec633e93ddea3638e4f77f01079640bed492 (patch) | |
tree | 74c649a3c65b1acec783587c9b047cba432b7d3b /platform/qt/include/qmapboxgl.hpp | |
parent | b8564299e5e76918ba0ec01eb4fb99bd9756638b (diff) | |
download | qtlocation-mapboxgl-003eec633e93ddea3638e4f77f01079640bed492.tar.gz |
[Qt] Move QMapboxGL stuff from QMapbox namespace
Diffstat (limited to 'platform/qt/include/qmapboxgl.hpp')
-rw-r--r-- | platform/qt/include/qmapboxgl.hpp | 34 |
1 files changed, 32 insertions, 2 deletions
diff --git a/platform/qt/include/qmapboxgl.hpp b/platform/qt/include/qmapboxgl.hpp index d832bc821d..c3a83610be 100644 --- a/platform/qt/include/qmapboxgl.hpp +++ b/platform/qt/include/qmapboxgl.hpp @@ -71,6 +71,14 @@ private: QString m_accessToken; }; +struct Q_DECL_EXPORT QMapboxGLCameraOptions { + QVariant center; // Coordinate + QVariant anchor; // QPointF + QVariant zoom; // double + QVariant angle; // double + QVariant pitch; // double +}; + class Q_DECL_EXPORT QMapboxGL : public QObject { Q_OBJECT @@ -86,6 +94,26 @@ class Q_DECL_EXPORT QMapboxGL : public QObject Q_PROPERTY(QMargins margins READ margins WRITE setMargins) public: + // Reflects mbgl::MapChange. + enum MapChange { + MapChangeRegionWillChange = 0, + MapChangeRegionWillChangeAnimated, + MapChangeRegionIsChanging, + MapChangeRegionDidChange, + MapChangeRegionDidChangeAnimated, + MapChangeWillStartLoadingMap, + MapChangeDidFinishLoadingMap, + MapChangeDidFailLoadingMap, + MapChangeWillStartRenderingFrame, + MapChangeDidFinishRenderingFrame, + MapChangeDidFinishRenderingFrameFullyRendered, + MapChangeWillStartRenderingMap, + MapChangeDidFinishRenderingMap, + MapChangeDidFinishRenderingMapFullyRendered, + MapChangeDidFinishLoadingStyle, + MapChangeSourceDidChange + }; + // Determines the orientation of the map. enum NorthOrientation { NorthUpwards, // Default @@ -137,7 +165,7 @@ public: void setCoordinate(const QMapbox::Coordinate &); void setCoordinateZoom(const QMapbox::Coordinate &, double zoom); - void jumpTo(const QMapbox::CameraOptions&); + void jumpTo(const QMapboxGLCameraOptions&); void setGestureInProgress(bool inProgress); @@ -209,7 +237,7 @@ public slots: signals: void needsRendering(); - void mapChanged(QMapbox::MapChange); + void mapChanged(QMapboxGL::MapChange); void copyrightsChanged(const QString ©rightsHtml); private: @@ -218,4 +246,6 @@ private: QMapboxGLPrivate *d_ptr; }; +Q_DECLARE_METATYPE(QMapboxGL::MapChange); + #endif // QMAPBOXGL_H |