diff options
| author | John Firebaugh <john.firebaugh@gmail.com> | 2018-01-10 13:32:02 -0800 |
|---|---|---|
| committer | John Firebaugh <john.firebaugh@gmail.com> | 2018-01-10 13:45:48 -0800 |
| commit | 08501d76c643ce19e3df28fc5d9417d603e64062 (patch) | |
| tree | dd56efbfe72191d313110135825b53006696b279 | |
| parent | cedda5ef4f73fccfc795e6bc48b368e48f11ad8d (diff) | |
| download | qtlocation-mapboxgl-upstream/fix-10307.tar.gz | |
[core] Account for circle-stroke-width in queryRenderedFeaturesupstream/fix-10307
| -rw-r--r-- | platform/node/test/ignores.json | 1 | ||||
| -rw-r--r-- | src/mbgl/renderer/buckets/circle_bucket.cpp | 3 | ||||
| -rw-r--r-- | src/mbgl/renderer/layers/render_circle_layer.cpp | 9 |
3 files changed, 6 insertions, 7 deletions
diff --git a/platform/node/test/ignores.json b/platform/node/test/ignores.json index 3f904c3048..a8c4562fb0 100644 --- a/platform/node/test/ignores.json +++ b/platform/node/test/ignores.json @@ -1,5 +1,4 @@ { - "query-tests/circle-stroke-width/inside": "https://github.com/mapbox/mapbox-gl-native/issues/10307", "query-tests/geometry/multilinestring": "needs investigation", "query-tests/geometry/multipolygon": "needs investigation", "query-tests/geometry/polygon": "needs investigation", diff --git a/src/mbgl/renderer/buckets/circle_bucket.cpp b/src/mbgl/renderer/buckets/circle_bucket.cpp index d23f0861f4..c442b661de 100644 --- a/src/mbgl/renderer/buckets/circle_bucket.cpp +++ b/src/mbgl/renderer/buckets/circle_bucket.cpp @@ -108,8 +108,9 @@ float CircleBucket::getQueryRadius(const RenderLayer& layer) const { auto circleLayer = layer.as<RenderCircleLayer>(); float radius = get<CircleRadius>(*circleLayer, paintPropertyBinders); + float stroke = get<CircleStrokeWidth>(*circleLayer, paintPropertyBinders); auto translate = circleLayer->evaluated.get<CircleTranslate>(); - return radius + util::length(translate[0], translate[1]); + return radius + stroke + util::length(translate[0], translate[1]); } } // namespace mbgl diff --git a/src/mbgl/renderer/layers/render_circle_layer.cpp b/src/mbgl/renderer/layers/render_circle_layer.cpp index fe2e7cd42d..6092ff5452 100644 --- a/src/mbgl/renderer/layers/render_circle_layer.cpp +++ b/src/mbgl/renderer/layers/render_circle_layer.cpp @@ -108,13 +108,12 @@ bool RenderCircleLayer::queryIntersectsFeature( bearing, pixelsToTileUnits); - // Evaluate function - auto circleRadius = evaluated.get<style::CircleRadius>() - .evaluate(feature, zoom, style::CircleRadius::defaultValue()) - * pixelsToTileUnits; + // Evaluate functions + auto radius = evaluated.evaluate<style::CircleRadius>(zoom, feature) * pixelsToTileUnits; + auto stroke = evaluated.evaluate<style::CircleStrokeWidth>(zoom, feature) * pixelsToTileUnits; // Test intersection - return util::polygonIntersectsBufferedMultiPoint(translatedQueryGeometry.value_or(queryGeometry), feature.getGeometries(), circleRadius); + return util::polygonIntersectsBufferedMultiPoint(translatedQueryGeometry.value_or(queryGeometry), feature.getGeometries(), radius + stroke); } } // namespace mbgl |