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

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Michal Čihař 2012-05-08 19:20:16 +02:00
commit 8ae1d64b58
1 changed files with 26 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
libraries/gis/pma_gis_multipoint.php
View File

@ -313,5 +313,31 @@ class PMA_GIS_Multipoint extends PMA_GIS_Geometry
return $params;
}
/**
* Overidden to make sure that only the points having valid values
* for x and y coordinates are added.
*
* @param array $points_arr x and y coordinates for each point
* @param string $srid spatial reference id
*
* @return string JavaScript for adding an array of points to OpenLayers
* @access protected
*/
protected function getPointsArrayForOpenLayers($points_arr, $srid)
{
$ol_array = 'new Array(';
foreach ($points_arr as $point) {
if ($point[0] != '' && $point[1] != '') {
$ol_array .= $this->getPointForOpenLayers($point, $srid) . ', ';
}
}
if (substr($ol_array, strlen($ol_array) - 2) == ', ') {
$ol_array = substr($ol_array, 0, strlen($ol_array) - 2);
}
$ol_array .= ')';
return $ol_array;
}
}
?>