summaryrefslogtreecommitdiff
path: root/platform/node
diff options
context:
space:
mode:
authorJohn Firebaugh <john.firebaugh@gmail.com>2016-05-12 14:27:12 -0700
committerJohn Firebaugh <john.firebaugh@gmail.com>2016-05-13 09:01:32 -0700
commit8ec0b70722c704545c4c1953799c43481a038489 (patch)
tree6ebe4c9eaa09629c39a1be1ab4bfc53b8a0176bf /platform/node
parent57fcfabd77a834245e7ae62d4e11439d114eaf71 (diff)
downloadqtlocation-mapboxgl-8ec0b70722c704545c4c1953799c43481a038489.tar.gz
[core] Use mapbox::geometry::box in queryRenderedFeatures
Diffstat (limited to 'platform/node')
-rw-r--r--platform/node/src/node_map.cpp13
1 files changed, 7 insertions, 6 deletions
diff --git a/platform/node/src/node_map.cpp b/platform/node/src/node_map.cpp
index b139e4252c..7ed826275f 100644
--- a/platform/node/src/node_map.cpp
+++ b/platform/node/src/node_map.cpp
@@ -473,20 +473,21 @@ NAN_METHOD(NodeMap::QueryRenderedFeatures) {
auto pos0 = Nan::Get(posOrBox, 0).ToLocalChecked().As<v8::Array>();
auto pos1 = Nan::Get(posOrBox, 1).ToLocalChecked().As<v8::Array>();
- std::array<mbgl::ScreenCoordinate, 2> queryBox = {{{
+ result = nodeMap->map->queryRenderedFeatures(mbgl::ScreenBox {
+ {
Nan::Get(pos0, 0).ToLocalChecked()->NumberValue(),
Nan::Get(pos0, 1).ToLocalChecked()->NumberValue()
}, {
Nan::Get(pos1, 0).ToLocalChecked()->NumberValue(),
Nan::Get(pos1, 1).ToLocalChecked()->NumberValue()
- }}};
- result = nodeMap->map->queryRenderedFeatures(queryBox);
+ }
+ });
} else {
- mbgl::ScreenCoordinate queryPoint(
+ result = nodeMap->map->queryRenderedFeatures(mbgl::ScreenCoordinate {
Nan::Get(posOrBox, 0).ToLocalChecked()->NumberValue(),
- Nan::Get(posOrBox, 1).ToLocalChecked()->NumberValue());
- result = nodeMap->map->queryRenderedFeatures(queryPoint);
+ Nan::Get(posOrBox, 1).ToLocalChecked()->NumberValue()
+ });
}
auto array = Nan::New<v8::Array>();