diff options
Diffstat (limited to 'libraries/gis/GIS_Multilinestring.class.php')
| -rw-r--r-- | libraries/gis/GIS_Multilinestring.class.php | 68 |
1 files changed, 22 insertions, 46 deletions
diff --git a/libraries/gis/GIS_Multilinestring.class.php b/libraries/gis/GIS_Multilinestring.class.php index 54d716c82e..59c2aa795f 100644 --- a/libraries/gis/GIS_Multilinestring.class.php +++ b/libraries/gis/GIS_Multilinestring.class.php @@ -57,14 +57,11 @@ class PMA_GIS_Multilinestring extends PMA_GIS_Geometry { $min_max = array(); - /** @var PMA_String $pmaString */ - $pmaString = $GLOBALS['PMA_String']; - // Trim to remove leading 'MULTILINESTRING((' and trailing '))' - $multilinestirng = $pmaString->substr( + $multilinestirng = /*overload*/mb_substr( $spatial, 17, - $pmaString->strlen($spatial) - 19 + /*overload*/mb_strlen($spatial) - 19 ); // Separate each linestring $linestirngs = explode("),(", $multilinestirng); @@ -91,21 +88,18 @@ class PMA_GIS_Multilinestring extends PMA_GIS_Geometry public function prepareRowAsPng($spatial, $label, $line_color, $scale_data, $image ) { - /** @var PMA_String $pmaString */ - $pmaString = $GLOBALS['PMA_String']; - // allocate colors $black = imagecolorallocate($image, 0, 0, 0); - $red = hexdec($pmaString->substr($line_color, 1, 2)); - $green = hexdec($pmaString->substr($line_color, 3, 2)); - $blue = hexdec($pmaString->substr($line_color, 4, 2)); + $red = hexdec(/*overload*/mb_substr($line_color, 1, 2)); + $green = hexdec(/*overload*/mb_substr($line_color, 3, 2)); + $blue = hexdec(/*overload*/mb_substr($line_color, 4, 2)); $color = imagecolorallocate($image, $red, $green, $blue); // Trim to remove leading 'MULTILINESTRING((' and trailing '))' - $multilinestirng = $pmaString->substr( + $multilinestirng = /*overload*/mb_substr( $spatial, 17, - $pmaString->strlen($spatial) - 19 + /*overload*/mb_strlen($spatial) - 19 ); // Separate each linestring $linestirngs = explode("),(", $multilinestirng); @@ -152,19 +146,16 @@ class PMA_GIS_Multilinestring extends PMA_GIS_Geometry */ public function prepareRowAsPdf($spatial, $label, $line_color, $scale_data, $pdf) { - /** @var PMA_String $pmaString */ - $pmaString = $GLOBALS['PMA_String']; - // allocate colors - $red = hexdec($pmaString->substr($line_color, 1, 2)); - $green = hexdec($pmaString->substr($line_color, 3, 2)); - $blue = hexdec($pmaString->substr($line_color, 4, 2)); + $red = hexdec(/*overload*/mb_substr($line_color, 1, 2)); + $green = hexdec(/*overload*/mb_substr($line_color, 3, 2)); + $blue = hexdec(/*overload*/mb_substr($line_color, 4, 2)); $line = array('width' => 1.5, 'color' => array($red, $green, $blue)); // Trim to remove leading 'MULTILINESTRING((' and trailing '))' - $multilinestirng = $pmaString->substr( + $multilinestirng = /*overload*/mb_substr( $spatial, - 17, $pmaString->strlen($spatial) - 19 + 17, /*overload*/mb_strlen($spatial) - 19 ); // Separate each linestring $linestirngs = explode("),(", $multilinestirng); @@ -216,14 +207,11 @@ class PMA_GIS_Multilinestring extends PMA_GIS_Geometry 'stroke-width'=> 2, ); - /** @var PMA_String $pmaString */ - $pmaString = $GLOBALS['PMA_String']; - // Trim to remove leading 'MULTILINESTRING((' and trailing '))' - $multilinestirng = $pmaString->substr( + $multilinestirng = /*overload*/mb_substr( $spatial, 17, - $pmaString->strlen($spatial) - 19 + /*overload*/mb_strlen($spatial) - 19 ); // Separate each linestring $linestirngs = explode("),(", $multilinestirng); @@ -273,14 +261,11 @@ class PMA_GIS_Multilinestring extends PMA_GIS_Geometry } $row = $this->getBoundsForOl($srid, $scale_data); - /** @var PMA_String $pmaString */ - $pmaString = $GLOBALS['PMA_String']; - // Trim to remove leading 'MULTILINESTRING((' and trailing '))' - $multilinestirng = $pmaString->substr( + $multilinestirng = /*overload*/mb_substr( $spatial, 17, - $pmaString->strlen($spatial) - 19 + /*overload*/mb_strlen($spatial) - 19 ); // Separate each linestring $linestirngs = explode("),(", $multilinestirng); @@ -312,9 +297,6 @@ class PMA_GIS_Multilinestring extends PMA_GIS_Geometry $no_of_lines = 1; } - /** @var PMA_String $pmaString */ - $pmaString = $GLOBALS['PMA_String']; - $wkt = 'MULTILINESTRING('; for ($i = 0; $i < $no_of_lines; $i++) { $no_of_points = isset($data_row[$i]['no_of_points']) @@ -331,10 +313,10 @@ class PMA_GIS_Multilinestring extends PMA_GIS_Geometry && trim($data_row[$i][$j]['y']) != '') ? $data_row[$i][$j]['y'] : $empty) . ','; } - $wkt = $pmaString->substr($wkt, 0, $pmaString->strlen($wkt) - 1); + $wkt = /*overload*/mb_substr($wkt, 0, /*overload*/mb_strlen($wkt) - 1); $wkt .= '),'; } - $wkt = $pmaString->substr($wkt, 0, $pmaString->strlen($wkt) - 1); + $wkt = /*overload*/mb_substr($wkt, 0, /*overload*/mb_strlen($wkt) - 1); $wkt .= ')'; return $wkt; } @@ -349,19 +331,16 @@ class PMA_GIS_Multilinestring extends PMA_GIS_Geometry */ public function getShape($row_data) { - /** @var PMA_String $pmaString */ - $pmaString = $GLOBALS['PMA_String']; - $wkt = 'MULTILINESTRING('; for ($i = 0; $i < $row_data['numparts']; $i++) { $wkt .= '('; foreach ($row_data['parts'][$i]['points'] as $point) { $wkt .= $point['x'] . ' ' . $point['y'] . ','; } - $wkt = $pmaString->substr($wkt, 0, $pmaString->strlen($wkt) - 1); + $wkt = /*overload*/mb_substr($wkt, 0, /*overload*/mb_strlen($wkt) - 1); $wkt .= '),'; } - $wkt = $pmaString->substr($wkt, 0, $pmaString->strlen($wkt) - 1); + $wkt = /*overload*/mb_substr($wkt, 0, /*overload*/mb_strlen($wkt) - 1); $wkt .= ')'; return $wkt; } @@ -388,14 +367,11 @@ class PMA_GIS_Multilinestring extends PMA_GIS_Geometry $wkt = $value; } - /** @var PMA_String $pmaString */ - $pmaString = $GLOBALS['PMA_String']; - // Trim to remove leading 'MULTILINESTRING((' and trailing '))' - $multilinestirng = $pmaString->substr( + $multilinestirng = /*overload*/mb_substr( $wkt, 17, - $pmaString->strlen($wkt) - 19 + /*overload*/mb_strlen($wkt) - 19 ); // Seperate each linestring $linestirngs = explode("),(", $multilinestirng); |