Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/phpmyadmin/phpmyadmin.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Foellmann <foellmann@foe-services.de>2014-12-23 14:48:13 +0300
committerChristian Foellmann <foellmann@foe-services.de>2014-12-23 14:48:13 +0300
commit2bfb20e57418ebf396149782be9f98e868fe8608 (patch)
treea5ec4011410970603d3f462a535a5a359057fa77 /libraries/tbl_gis_visualization.lib.php
parent20f1bf77c8281efc675a14e0f6bf52f657dabd9a (diff)
UPDATE 4.3.34.3.3
Diffstat (limited to 'libraries/tbl_gis_visualization.lib.php')
-rw-r--r--libraries/tbl_gis_visualization.lib.php35
1 files changed, 18 insertions, 17 deletions
diff --git a/libraries/tbl_gis_visualization.lib.php b/libraries/tbl_gis_visualization.lib.php
index 8867ae5153..033619bb8c 100644
--- a/libraries/tbl_gis_visualization.lib.php
+++ b/libraries/tbl_gis_visualization.lib.php
@@ -51,7 +51,7 @@ function PMA_GIS_modifyQuery($sql_query, $visualizationSettings)
*
* @param array $data Data for the status chart
* @param array &$visualizationSettings Settings used to generate the chart
- * @param string $format Format of the visulaization
+ * @param string $format Format of the visualization
*
* @return string|void HTML and JS code for the GIS visualization
*/
@@ -63,22 +63,23 @@ function PMA_GIS_visualizationResults($data, &$visualizationSettings, $format)
if (! isset($data[0])) {
// empty data
return __('No data found for GIS visualization.');
- } else {
- $visualization = new PMA_GIS_Visualization($data, $visualizationSettings);
- if ($visualizationSettings != null) {
- foreach ($visualization->getSettings() as $setting => $val) {
- if (! isset($visualizationSettings[$setting])) {
- $visualizationSettings[$setting] = $val;
- }
+ }
+
+ $visualization = new PMA_GIS_Visualization($data, $visualizationSettings);
+ if ($visualizationSettings != null) {
+ foreach ($visualization->getSettings() as $setting => $val) {
+ if (! isset($visualizationSettings[$setting])) {
+ $visualizationSettings[$setting] = $val;
}
}
- if ($format == 'svg') {
- return $visualization->asSvg();
- } elseif ($format == 'png') {
- return $visualization->asPng();
- } elseif ($format == 'ol') {
- return $visualization->asOl();
- }
+ }
+
+ if ($format == 'svg') {
+ return $visualization->asSvg();
+ } elseif ($format == 'png') {
+ return $visualization->asPng();
+ } elseif ($format == 'ol') {
+ return $visualization->asOl();
}
}
@@ -87,7 +88,7 @@ function PMA_GIS_visualizationResults($data, &$visualizationSettings, $format)
*
* @param array $data data for the status chart
* @param array $visualizationSettings settings used to generate the chart
- * @param string $format format of the visulaization
+ * @param string $format format of the visualization
* @param string $fileName file name
*
* @return file File containing the visualization
@@ -111,7 +112,7 @@ function PMA_GIS_saveToFile($data, $visualizationSettings, $format, $fileName)
}
/**
- * Function to get html for the lebel column and spatial column
+ * Function to get html for the label column and spatial column
*
* @param string $column the column type. i.e either "labelColumn"
* or "spatialColumn"