diff options
author | John Firebaugh <john.firebaugh@gmail.com> | 2017-04-26 14:55:18 -0700 |
---|---|---|
committer | John Firebaugh <john.firebaugh@gmail.com> | 2017-05-10 14:22:01 -0700 |
commit | c130d470a10fc6c43696d0a6fe720dac6da12e3a (patch) | |
tree | ec3700ed4d7a87e90f1efb6be68366f74c3730f7 /platform/qt/app | |
parent | b7b6706576dc196fa74bb2089d3efdf2a2b4c357 (diff) | |
download | qtlocation-mapboxgl-c130d470a10fc6c43696d0a6fe720dac6da12e3a.tar.gz |
[core] Remove StyleSourcedAnnotation support
The functionality this provided has been subsumed by the runtime styling API.
Diffstat (limited to 'platform/qt/app')
-rw-r--r-- | platform/qt/app/mapwindow.cpp | 15 | ||||
-rw-r--r-- | platform/qt/app/mapwindow.hpp | 1 |
2 files changed, 0 insertions, 16 deletions
diff --git a/platform/qt/app/mapwindow.cpp b/platform/qt/app/mapwindow.cpp index a72faf005e..5bb9ad1261 100644 --- a/platform/qt/app/mapwindow.cpp +++ b/platform/qt/app/mapwindow.cpp @@ -277,21 +277,6 @@ void MapWindow::keyPressEvent(QKeyEvent *ev) } } break; - case Qt::Key_4: { - if (m_styleSourcedAnnotationId.isNull()) { - QMapbox::Coordinate topLeft = m_map->coordinateForPixel({ 0, 0 }); - QMapbox::Coordinate topRight = m_map->coordinateForPixel({ 0, qreal(size().height()) }); - QMapbox::Coordinate bottomLeft = m_map->coordinateForPixel({ qreal(size().width()), 0 }); - QMapbox::Coordinate bottomRight = m_map->coordinateForPixel({ qreal(size().width()), qreal(size().height()) }); - QMapbox::CoordinatesCollections geometry { { { bottomLeft, bottomRight, topRight, topLeft, bottomLeft } } }; - QMapbox::StyleSourcedAnnotation styleSourced { { QMapbox::ShapeAnnotationGeometry::PolygonType, geometry }, "water" }; - m_styleSourcedAnnotationId = m_map->addAnnotation(QVariant::fromValue<QMapbox::StyleSourcedAnnotation>(styleSourced)); - } else { - m_map->removeAnnotation(m_styleSourcedAnnotationId.toUInt()); - m_styleSourcedAnnotationId.clear(); - } - } - break; case Qt::Key_5: { if (m_map->layerExists("circleLayer")) { m_map->removeLayer("circleLayer"); diff --git a/platform/qt/app/mapwindow.hpp b/platform/qt/app/mapwindow.hpp index 6b4b7fd1cc..c484114ec0 100644 --- a/platform/qt/app/mapwindow.hpp +++ b/platform/qt/app/mapwindow.hpp @@ -64,7 +64,6 @@ private: QVariant m_symbolAnnotationId; QVariant m_lineAnnotationId; QVariant m_fillAnnotationId; - QVariant m_styleSourcedAnnotationId; bool m_sourceAdded = false; }; |