diff options
Diffstat (limited to 'platform/qt/src/qmapboxgl.cpp')
| -rw-r--r-- | platform/qt/src/qmapboxgl.cpp | 44 |
1 files changed, 0 insertions, 44 deletions
diff --git a/platform/qt/src/qmapboxgl.cpp b/platform/qt/src/qmapboxgl.cpp index 7d3d722550..6df49a8247 100644 --- a/platform/qt/src/qmapboxgl.cpp +++ b/platform/qt/src/qmapboxgl.cpp @@ -71,11 +71,6 @@ static_assert(mbgl::underlying_type(QMapboxGLSettings::SharedGLContext) == mbgl: static_assert(mbgl::underlying_type(QMapboxGLSettings::Continuous) == mbgl::underlying_type(mbgl::MapMode::Continuous), "error"); static_assert(mbgl::underlying_type(QMapboxGLSettings::Static) == mbgl::underlying_type(mbgl::MapMode::Static), "error"); -// mbgl::ConstrainMode -static_assert(mbgl::underlying_type(QMapboxGLSettings::NoConstrain) == mbgl::underlying_type(mbgl::ConstrainMode::None), "error"); -static_assert(mbgl::underlying_type(QMapboxGLSettings::ConstrainHeightOnly) == mbgl::underlying_type(mbgl::ConstrainMode::HeightOnly), "error"); -static_assert(mbgl::underlying_type(QMapboxGLSettings::ConstrainWidthAndHeight) == mbgl::underlying_type(mbgl::ConstrainMode::WidthAndHeight), "error"); - // mbgl::ViewportMode static_assert(mbgl::underlying_type(QMapboxGLSettings::DefaultViewport) == mbgl::underlying_type(mbgl::ViewportMode::Default), "error"); static_assert(mbgl::underlying_type(QMapboxGLSettings::FlippedYViewport) == mbgl::underlying_type(mbgl::ViewportMode::FlippedY), "error"); @@ -213,24 +208,6 @@ std::unique_ptr<mbgl::style::Image> toStyleImage(const QString &id, const QImage */ /*! - \enum QMapboxGLSettings::ConstrainMode - - This enum determines if the map wraps. - - \value NoConstrain The map will wrap on the horizontal axis. Since it doesn't - make sense to wrap on the vertical axis in a Web Mercator projection, the map will scroll - and show some empty space. - - \value ConstrainHeightOnly The map will wrap around the horizontal axis, like a spinning - globe. This is the recommended constrain mode. - - \value ConstrainWidthAndHeight The map won't wrap and panning is restricted to the boundaries - of the map. - - \sa constrainMode() -*/ - -/*! \enum QMapboxGLSettings::ViewportMode This enum flips the map vertically. @@ -249,7 +226,6 @@ std::unique_ptr<mbgl::style::Image> toStyleImage(const QString &id, const QImage QMapboxGLSettings::QMapboxGLSettings() : m_contextMode(QMapboxGLSettings::SharedGLContext) , m_mapMode(QMapboxGLSettings::Continuous) - , m_constrainMode(QMapboxGLSettings::ConstrainHeightOnly) , m_viewportMode(QMapboxGLSettings::DefaultViewport) , m_cacheMaximumSize(mbgl::util::DEFAULT_MAX_CACHE_SIZE) , m_cacheDatabasePath(":memory:") @@ -304,25 +280,6 @@ void QMapboxGLSettings::setMapMode(MapMode mode) } /*! - Returns the constrain mode. This is used to limit the map to wrap - around the globe horizontally. - - By default, it is set to QMapboxGLSettings::ConstrainHeightOnly. -*/ -QMapboxGLSettings::ConstrainMode QMapboxGLSettings::constrainMode() const -{ - return m_constrainMode; -} - -/*! - Sets the map constrain \a mode. -*/ -void QMapboxGLSettings::setConstrainMode(ConstrainMode mode) -{ - m_constrainMode = mode; -} - -/*! Returns the viewport mode. This is used to flip the vertical orientation of the map as some devices may use inverted orientation. @@ -1767,7 +1724,6 @@ QMapboxGLPrivate::QMapboxGLPrivate(QMapboxGL *q, const QMapboxGLSettings &settin mbgl::MapOptions options; options.withMapMode(static_cast<mbgl::MapMode>(settings.mapMode())) - .withConstrainMode(static_cast<mbgl::ConstrainMode>(settings.constrainMode())) .withViewportMode(static_cast<mbgl::ViewportMode>(settings.viewportMode())); // Setup the Map object |