diff --git a/gis_data_editor.php b/gis_data_editor.php index 9eb0e99744..ab1dc6687d 100644 --- a/gis_data_editor.php +++ b/gis_data_editor.php @@ -28,9 +28,13 @@ if (! isset($gis_data['gis_type'])) { } if (isset($_REQUEST['value']) && trim($_REQUEST['value']) != '') { $start = (substr($_REQUEST['value'], 0, 1) == "'") ? 1 : 0; - $gis_data['gis_type'] = substr($_REQUEST['value'], $start, strpos($_REQUEST['value'], "(") - $start); + $gis_data['gis_type'] = substr( + $_REQUEST['value'], $start, strpos($_REQUEST['value'], "(") - $start + ); } - if ((! isset($gis_data['gis_type'])) || (! in_array($gis_data['gis_type'], $gis_types))) { + if ((! isset($gis_data['gis_type'])) + || (! in_array($gis_data['gis_type'], $gis_types)) + ) { $gis_data['gis_type'] = $gis_types[0]; } } @@ -39,20 +43,30 @@ $geom_type = $gis_data['gis_type']; // Generate parameters from value passed. $gis_obj = PMA_GIS_Factory::factory($geom_type); if (isset($_REQUEST['value'])) { - $gis_data = array_merge($gis_data, $gis_obj->generateParams($_REQUEST['value'])); + $gis_data = array_merge( + $gis_data, $gis_obj->generateParams($_REQUEST['value']) + ); } // Generate Well Known Text -$srid = (isset($gis_data['srid']) && $gis_data['srid'] != '') ? htmlspecialchars($gis_data['srid']) : 0; +$srid = (isset($gis_data['srid']) && $gis_data['srid'] != '') + ? htmlspecialchars($gis_data['srid']) : 0; $wkt = $gis_obj->generateWkt($gis_data, 0); $wkt_with_zero = $gis_obj->generateWkt($gis_data, 0, '0'); $result = "'" . $wkt . "'," . $srid; // Generate PNG or SVG based visualization -$format = (PMA_USR_BROWSER_AGENT == 'IE' && PMA_USR_BROWSER_VER <= 8) ? 'png' : 'svg'; -$visualizationSettings = array('width' => 450, 'height' => 300, 'spatialColumn' => 'wkt'); +$format = (PMA_USR_BROWSER_AGENT == 'IE' && PMA_USR_BROWSER_VER <= 8) + ? 'png' : 'svg'; +$visualizationSettings = array( + 'width' => 450, + 'height' => 300, + 'spatialColumn' => 'wkt' +); $data = array(array('wkt' => $wkt_with_zero, 'srid' => $srid)); -$visualization = PMA_GIS_visualizationResults($data, $visualizationSettings, $format); +$visualization = PMA_GIS_visualizationResults( + $data, $visualizationSettings, $format +); $open_layers = PMA_GIS_visualizationResults($data, $visualizationSettings, 'ol'); // If the call is to update the WKT and visualization make an AJAX response @@ -72,34 +86,43 @@ ob_start();