diff options
| author | John Firebaugh <john.firebaugh@gmail.com> | 2016-05-12 14:27:12 -0700 |
|---|---|---|
| committer | John Firebaugh <john.firebaugh@gmail.com> | 2016-05-13 09:01:32 -0700 |
| commit | 8ec0b70722c704545c4c1953799c43481a038489 (patch) | |
| tree | 6ebe4c9eaa09629c39a1be1ab4bfc53b8a0176bf /src | |
| parent | 57fcfabd77a834245e7ae62d4e11439d114eaf71 (diff) | |
| download | qtlocation-mapboxgl-8ec0b70722c704545c4c1953799c43481a038489.tar.gz | |
[core] Use mapbox::geometry::box in queryRenderedFeatures
Diffstat (limited to 'src')
| -rw-r--r-- | src/mbgl/map/map.cpp | 26 |
1 files changed, 16 insertions, 10 deletions
diff --git a/src/mbgl/map/map.cpp b/src/mbgl/map/map.cpp index a4f9422184..2c2b9f910c 100644 --- a/src/mbgl/map/map.cpp +++ b/src/mbgl/map/map.cpp @@ -736,23 +736,29 @@ std::vector<TileCoordinate> pointsToCoordinates(const std::vector<ScreenCoordina std::vector<Feature> Map::queryRenderedFeatures(const ScreenCoordinate& point, const optional<std::vector<std::string>>& layerIDs) { if (!impl->style) return {}; - auto queryGeometry = pointsToCoordinates({ point }, impl->transform.getState()); - return impl->style->queryRenderedFeatures(queryGeometry, impl->transform.getZoom(), impl->transform.getAngle(), layerIDs); + return impl->style->queryRenderedFeatures( + pointsToCoordinates({ point }, impl->transform.getState()), + impl->transform.getZoom(), + impl->transform.getAngle(), + layerIDs); } -std::vector<Feature> Map::queryRenderedFeatures(const std::array<ScreenCoordinate, 2>& box, const optional<std::vector<std::string>>& layerIDs) { +std::vector<Feature> Map::queryRenderedFeatures(const ScreenBox& box, const optional<std::vector<std::string>>& layerIDs) { if (!impl->style) return {}; std::vector<ScreenCoordinate> queryPoints { - { box[0].x, box[0].y }, - { box[1].x, box[0].y }, - { box[1].x, box[1].y }, - { box[0].x, box[1].y }, - { box[0].x, box[0].y } + box.min, + { box.max.x, box.min.y }, + box.max, + { box.min.x, box.max.y }, + box.min }; - auto queryGeometry = pointsToCoordinates(queryPoints, impl->transform.getState()); - return impl->style->queryRenderedFeatures(queryGeometry, impl->transform.getZoom(), impl->transform.getAngle(), layerIDs); + return impl->style->queryRenderedFeatures( + pointsToCoordinates(queryPoints, impl->transform.getState()), + impl->transform.getZoom(), + impl->transform.getAngle(), + layerIDs); } |