summaryrefslogtreecommitdiff
path: root/src/mbgl/tile/vector_tile_data.cpp
diff options
context:
space:
mode:
authorJohn Firebaugh <john.firebaugh@gmail.com>2016-05-16 17:44:12 -0700
committerJohn Firebaugh <john.firebaugh@gmail.com>2016-05-17 13:20:25 -0700
commite66f9b283022f3a4e56b3498721ab81670ba8690 (patch)
treec9ed621dde59dfd2cc0c17bc165d2a86a6e1cebf /src/mbgl/tile/vector_tile_data.cpp
parent3173b464180fa0c6d10ffb1daeec727099d8044f (diff)
downloadqtlocation-mapboxgl-e66f9b283022f3a4e56b3498721ab81670ba8690.tar.gz
[core] Simplify parameters
Diffstat (limited to 'src/mbgl/tile/vector_tile_data.cpp')
-rw-r--r--src/mbgl/tile/vector_tile_data.cpp16
1 files changed, 11 insertions, 5 deletions
diff --git a/src/mbgl/tile/vector_tile_data.cpp b/src/mbgl/tile/vector_tile_data.cpp
index 64236c4ce8..457ffd4171 100644
--- a/src/mbgl/tile/vector_tile_data.cpp
+++ b/src/mbgl/tile/vector_tile_data.cpp
@@ -7,6 +7,7 @@
#include <mbgl/storage/file_source.hpp>
#include <mbgl/geometry/feature_index.hpp>
#include <mbgl/text/collision_tile.hpp>
+#include <mbgl/map/transform_state.hpp>
namespace mbgl {
@@ -192,15 +193,20 @@ void VectorTileData::redoPlacement(const std::function<void()>& callback) {
void VectorTileData::queryRenderedFeatures(
std::unordered_map<std::string, std::vector<Feature>>& result,
- const GeometryCollection& queryGeometry,
- const double bearing,
- const double tileSize,
- const double scale,
+ const GeometryCoordinates& queryGeometry,
+ const TransformState& transformState,
const optional<std::vector<std::string>>& layerIDs) {
if (!featureIndex || !geometryTile) return;
- featureIndex->query(result, queryGeometry, bearing, tileSize, scale, layerIDs, *geometryTile, style);
+ featureIndex->query(result,
+ { queryGeometry },
+ transformState.getAngle(),
+ util::tileSize * id.overscaleFactor(),
+ std::pow(2, transformState.getZoom() - id.overscaledZ),
+ layerIDs,
+ *geometryTile,
+ style);
}
void VectorTileData::cancel() {