sjs/gh-BertoldVdb-ZoneDetect
1
0
Fork 0
mirror of https://github.com/BertoldVdb/ZoneDetect.git synced 2026-04-27 14:57:40 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix edge case for points on border

Browse source
This commit is contained in:
Bertold Van den Bergh 2019-12-13 17:50:39 +01:00
parent 2f1bfdebe2
commit 44fc1ab2ee
1 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
library/zonedetect.c
View file

@ -691,13 +691,14 @@ static ZDLookupResult ZDPointInPolygon(const ZoneDetect *library, uint32_t polyg
b = (float)pointLat - a * (float)pointLon; b = (float)pointLat - a * (float)pointLon;
} }
int onStraight = ZDPointInBox(pointLat, latFixedPoint, prevLat, pointLon, lonFixedPoint, prevLon);
if(lineIsStraight && (onStraight || windingNeedCompare)) {
if(distanceSqrMin) *distanceSqrMin = 0;
return ZD_LOOKUP_ON_BORDER_SEGMENT;
}
/* Jumped two quadrants. */ /* Jumped two quadrants. */
if(windingNeedCompare) { if(windingNeedCompare) {
if(lineIsStraight) {
if(distanceSqrMin) *distanceSqrMin = 0;
return ZD_LOOKUP_ON_BORDER_SEGMENT;
}
/* Check if the target is on the border */ /* Check if the target is on the border */
const int32_t intersectLon = (int32_t)(((float)latFixedPoint - b) / a); const int32_t intersectLon = (int32_t)(((float)latFixedPoint - b) / a);
if(intersectLon >= lonFixedPoint-1 && intersectLon <= lonFixedPoint+1) { if(intersectLon >= lonFixedPoint-1 && intersectLon <= lonFixedPoint+1) {