tei/MapLibreParticleLab
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Address review finding

Browse Source 
Remove unncessary condition check
This commit is contained in:
zmiao
2020-03-24 14:29:35 +02:00
parent 25ad9d184d
commit e9b99a5233
2 changed files with 14 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/mbgl/style/expression/within.cpp
View File

@@ -68,13 +68,19 @@ MultiPolygon<int64_t> getTilePolygons(const Feature::geometry_type& polygonGeoSe
}
void updatePoint(Point<int64_t>& p, WithinBBox& bbox, const WithinBBox& polyBBox, const int64_t worldSize) {
if (p.x <= polyBBox[0] || p.x >= polyBBox[2]) {
int64_t shift = 0;
shift = (p.x - polyBBox[0] > worldSize / 2) ? -worldSize : (polyBBox[0] - p.x > worldSize / 2) ? worldSize : 0;
if (shift == 0) {
shift =
(p.x - polyBBox[2] > worldSize / 2) ? -worldSize : (polyBBox[2] - p.x > worldSize / 2) ? worldSize : 0;
}
if (p.x < polyBBox[0] || p.x > polyBBox[2]) {
const auto getShift = [](Point<int64_t>& point, const int64_t polygonSide, const int64_t size) -> int64_t {
if (point.x - polygonSide > size / 2) {
return -size;
}
if (polygonSide - point.x > size / 2) {
return size;
}
return 0;
};
int64_t shift = getShift(p, polyBBox[0], worldSize);
if (shift == 0) shift = getShift(p, polyBBox[2], worldSize);
p.x += shift;
}
updateBBox(bbox, p);

2
test/style/property_expression.test.cpp
View File

@@ -390,7 +390,7 @@ TEST(PropertyExpression, WithinExpression) {
}
}
TEST(PropertyExpression, WithinExpressionAntiMeridain) {
TEST(PropertyExpression, WithinExpressionAntiMeridian) {
CanonicalTileID canonicalTileID(0, 0, 0);
// evaluation test with line geometries