summaryrefslogtreecommitdiff
path: root/platform/qt/src/qmapboxgl.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'platform/qt/src/qmapboxgl.cpp')
-rw-r--r--platform/qt/src/qmapboxgl.cpp30
1 files changed, 5 insertions, 25 deletions
diff --git a/platform/qt/src/qmapboxgl.cpp b/platform/qt/src/qmapboxgl.cpp
index 18e9a9f4da..d6111839f3 100644
--- a/platform/qt/src/qmapboxgl.cpp
+++ b/platform/qt/src/qmapboxgl.cpp
@@ -81,26 +81,6 @@ auto fromQMapboxGLShapeAnnotation(const ShapeAnnotation &shapeAnnotation) {
return mbgl::StyleSourcedAnnotation { std::move(mbglLineString), styleLayer.toStdString() };
}
-auto fromQMapboxTransitionOptions(const QMapbox::TransitionOptions &options) {
- auto convert = [](auto& value) -> mbgl::optional<mbgl::Duration> {
- if (value.isValid()) {
- return std::chrono::duration_cast<mbgl::Duration>(mbgl::Milliseconds(value.template value<qint64>()));
- };
- return {};
- };
- return mbgl::style::TransitionOptions { convert(options.duration), convert(options.delay) };
-}
-
-auto toQMapboxTransitionOptions(const mbgl::style::TransitionOptions &options) {
- auto convert = [](auto& value) -> QVariant {
- if (value) {
- return qint64(std::chrono::duration_cast<mbgl::Milliseconds>(*value).count());
- }
- return {};
- };
- return QMapbox::TransitionOptions { convert(options.duration), convert(options.delay) };
-}
-
auto fromQStringList(const QStringList &list)
{
std::vector<std::string> strings;
@@ -485,12 +465,12 @@ QStringList QMapboxGL::getClasses() const
return classNames;
}
-QMapbox::TransitionOptions QMapboxGL::getTransitionOptions() const {
- return toQMapboxTransitionOptions(d_ptr->mapObj->getTransitionOptions());
-}
+void QMapboxGL::setTransitionOptions(qint64 duration, qint64 delay) {
+ static auto convert = [](qint64 value) -> mbgl::optional<mbgl::Duration> {
+ return std::chrono::duration_cast<mbgl::Duration>(mbgl::Milliseconds(value));
+ };
-void QMapboxGL::setTransitionOptions(const QMapbox::TransitionOptions &options) {
- d_ptr->mapObj->setTransitionOptions(fromQMapboxTransitionOptions(options));
+ d_ptr->mapObj->setTransitionOptions(mbgl::style::TransitionOptions{ convert(duration), convert(delay) });
}
mbgl::Annotation fromPointAnnotation(const PointAnnotation &pointAnnotation) {