diff --git a/gis_data_editor.php b/gis_data_editor.php index d016b510fd..7614aba536 100644 --- a/gis_data_editor.php +++ b/gis_data_editor.php @@ -55,8 +55,8 @@ $result = "'" . $wkt . "'," . $srid; $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_visualization_results($data, $visualizationSettings, $format); -$open_layers = PMA_GIS_visualization_results($data, $visualizationSettings, 'ol'); +$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 if(isset($_REQUEST['generate']) && $_REQUEST['generate'] == true) { diff --git a/libraries/gis_visualization.lib.php b/libraries/gis_visualization.lib.php index 388d1830e9..537d27ab44 100644 --- a/libraries/gis_visualization.lib.php +++ b/libraries/gis_visualization.lib.php @@ -16,7 +16,7 @@ * * @return the modified sql query. */ -function PMA_GIS_modify_query($sql_query, $visualizationSettings) +function PMA_GIS_modifyQuery($sql_query, $visualizationSettings) { $modified_query = 'SELECT '; @@ -121,7 +121,7 @@ function sanitize($select) * * @return string HTML and JS code for the GIS visualization */ -function PMA_GIS_visualization_results($data, &$visualizationSettings, $format) +function PMA_GIS_visualizationResults($data, &$visualizationSettings, $format) { include_once './libraries/gis/pma_gis_visualization.php'; include_once './libraries/gis/pma_gis_factory.php'; @@ -158,7 +158,7 @@ function PMA_GIS_visualization_results($data, &$visualizationSettings, $format) * * @return file File containing the visualization */ -function PMA_GIS_save_to_file($data, $visualizationSettings, $format, $fileName) +function PMA_GIS_saveToFile($data, $visualizationSettings, $format, $fileName) { include_once './libraries/gis/pma_gis_visualization.php'; include_once './libraries/gis/pma_gis_factory.php'; diff --git a/tbl_gis_visualization.php b/tbl_gis_visualization.php index 60ec2c26e1..31bcd81e4f 100644 --- a/tbl_gis_visualization.php +++ b/tbl_gis_visualization.php @@ -64,7 +64,7 @@ if (! isset($visualizationSettings['spatialColumn'])) { } // Convert geometric columns from bytes to text. -$modified_query = PMA_GIS_modify_query($sql_query, $visualizationSettings); +$modified_query = PMA_GIS_modifyQuery($sql_query, $visualizationSettings); $modified_result = PMA_DBI_try_query($modified_query); $data = array(); @@ -90,7 +90,7 @@ if (isset($_REQUEST['saveToFile'])) { } $save_format = $_REQUEST['fileFormat']; - PMA_GIS_save_to_file($data, $visualizationSettings, $save_format, $file_name); + PMA_GIS_saveToFile($data, $visualizationSettings, $save_format, $file_name); exit(); } @@ -98,7 +98,7 @@ $svg_support = (PMA_USR_BROWSER_AGENT == 'IE' && PMA_USR_BROWSER_VER <= 8) ? fal $format = $svg_support ? 'svg' : 'png'; // get the chart and settings after chart generation -$visualization = PMA_GIS_visualization_results($data, $visualizationSettings, $format); +$visualization = PMA_GIS_visualizationResults($data, $visualizationSettings, $format); /** * Displays the page @@ -118,7 +118,7 @@ $visualization = PMA_GIS_visualization_results($data, $visualizationSettings, $f