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 /include | |
| parent | 57fcfabd77a834245e7ae62d4e11439d114eaf71 (diff) | |
| download | qtlocation-mapboxgl-8ec0b70722c704545c4c1953799c43481a038489.tar.gz | |
[core] Use mapbox::geometry::box in queryRenderedFeatures
Diffstat (limited to 'include')
| -rw-r--r-- | include/mbgl/map/map.hpp | 4 | ||||
| -rw-r--r-- | include/mbgl/util/geo.hpp | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/include/mbgl/map/map.hpp b/include/mbgl/map/map.hpp index 885fc6716c..39f0c86959 100644 --- a/include/mbgl/map/map.hpp +++ b/include/mbgl/map/map.hpp @@ -165,8 +165,8 @@ public: void removeCustomLayer(const std::string& id); // Feature queries - std::vector<Feature> queryRenderedFeatures(const ScreenCoordinate&, const optional<std::vector<std::string>>& layerIDs = {}); - std::vector<Feature> queryRenderedFeatures(const std::array<ScreenCoordinate, 2>&, const optional<std::vector<std::string>>& layerIDs = {}); + std::vector<Feature> queryRenderedFeatures(const ScreenCoordinate&, const optional<std::vector<std::string>>& layerIDs = {}); + std::vector<Feature> queryRenderedFeatures(const ScreenBox&, const optional<std::vector<std::string>>& layerIDs = {}); // Memory void setSourceTileCacheSize(size_t); diff --git a/include/mbgl/util/geo.hpp b/include/mbgl/util/geo.hpp index d88d8f3e8b..0fa782e06a 100644 --- a/include/mbgl/util/geo.hpp +++ b/include/mbgl/util/geo.hpp @@ -6,6 +6,7 @@ #include <mapbox/geometry/point.hpp> #include <mapbox/geometry/point_arithmetic.hpp> +#include <mapbox/geometry/box.hpp> #include <cmath> @@ -15,6 +16,7 @@ class CanonicalTileID; class UnwrappedTileID; using ScreenCoordinate = mapbox::geometry::point<double>; +using ScreenBox = mapbox::geometry::box<double>; class LatLng { public: |