gian/phpmyadmin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Avoid divide by zero error

Browse Source
This commit is contained in:
Madhura Jayaratne 2011-07-13 00:17:09 +05:30
parent be8ce3d5b6
commit 242534a78a
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
libraries/gis/pma_gis_polygon.php
View File

@ -428,13 +428,12 @@ class PMA_GIS_Polygon extends PMA_GIS_Geometry
{
// Find two consecutive distinct points.
for ($i = 0; $i < count($ring) - 1; $i++) {
if (($ring[$i]['x'] != $ring[$i + 1]['x'])
|| ($ring[$i]['y'] != $ring[$i + 1]['y'])
) {
if ($ring[$i]['y'] != $ring[$i + 1]['y']) {
$x0 = $ring[$i]['x'];
$x1 = $ring[$i + 1]['x'];
$y0 = $ring[$i]['y'];
$y1 = $ring[$i + 1]['y'];
break;
}
}
@ -462,7 +461,7 @@ class PMA_GIS_Polygon extends PMA_GIS_Geometry
// One of the points should be inside the polygon, unless epcilon chosen is too large
if (PMA_GIS_Polygon::isPointInsidePolygon($pointA, $ring)) {
return $pointA;
} else if (PMA_GIS_Polygon::isPointInsidePolygon($pointB, $ring)) {
} elseif (PMA_GIS_Polygon::isPointInsidePolygon($pointB, $ring)) {
return $pointB;
}
@ -470,6 +469,9 @@ class PMA_GIS_Polygon extends PMA_GIS_Geometry
// (reduce exponentially for faster convergance)
else {
$epsilon = pow($epsilon, 2);
if ($epsilon == 0) {
return false;
}
}
}