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

Fix exporting GIS visualization to various formats

Browse Source
This commit is contained in:
Madhura Jayaratne 2013-01-19 17:25:54 +05:30
parent b8f3224be9
commit 009a50ecb3
2 changed files with 21 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libraries/gis/pma_gis_visualization.php
View File

@ -152,9 +152,6 @@ class PMA_GIS_Visualization
private function _toFile($file_name, $type, $ext)
{
$file_name = $this->_sanitizeName($file_name, $ext);
ob_clean();
PMA_downloadHeader($file_name, $type);
}
@ -356,8 +353,6 @@ class PMA_GIS_Visualization
// sanitize file name
$file_name = $this->_sanitizeName($file_name, 'pdf');
ob_clean();
$pdf->Output($file_name, 'D');
}

44
tbl_gis_visualization.php
View File

@ -8,17 +8,6 @@
require_once 'libraries/common.inc.php';
$response = PMA_Response::getInstance();
$header = $response->getHeader();
$scripts = $header->getScripts();
$scripts->addFile('openlayers/OpenLayers.js');
$scripts->addFile('jquery/jquery.svg.js');
$scripts->addFile('tbl_gis_visualization.js');
$scripts->addFile('OpenStreetMap.js');
// Allows for resending headers even after sending some data
ob_start();
// Runs common work
require_once 'libraries/db_common.inc.php';
$url_params['goto'] = $cfg['DefaultTabDatabase'];
@ -66,6 +55,26 @@ while ($row = PMA_DBI_fetch_assoc($modified_result)) {
$data[] = $row;
}
$response = PMA_Response::getInstance();
if (isset($_REQUEST['saveToFile'])) {
$response->disable();
$file_name = $_REQUEST['fileName'];
if ($file_name == '') {
$file_name = $visualizationSettings['spatialColumn'];
}
$save_format = $_REQUEST['fileFormat'];
PMA_GIS_saveToFile($data, $visualizationSettings, $save_format, $file_name);
exit();
}
$header = $response->getHeader();
$scripts = $header->getScripts();
$scripts->addFile('openlayers/OpenLayers.js');
$scripts->addFile('jquery/jquery.svg.js');
$scripts->addFile('tbl_gis_visualization.js');
$scripts->addFile('OpenStreetMap.js');
// If all the rows contain SRID, use OpenStreetMaps on the initial loading.
if (! isset($_REQUEST['displayVisualization'])) {
$visualizationSettings['choice'] = 'useBaseLayer';
@ -77,17 +86,6 @@ if (! isset($_REQUEST['displayVisualization'])) {
}
}
if (isset($_REQUEST['saveToFile'])) {
$file_name = $_REQUEST['fileName'];
if ($file_name == '') {
$file_name = $visualizationSettings['spatialColumn'];
}
$save_format = $_REQUEST['fileFormat'];
PMA_GIS_saveToFile($data, $visualizationSettings, $save_format, $file_name);
exit();
}
$svg_support = (PMA_USR_BROWSER_AGENT == 'IE' && PMA_USR_BROWSER_VER <= 8)
? false : true;
$format = $svg_support ? 'svg' : 'png';
@ -160,7 +158,7 @@ if (isset($visualizationSettings['choice'])) {
</div>
<div style="float:left;">
<form method="post" action="tbl_gis_visualization.php">
<form method="post" class="disableAjax" action="tbl_gis_visualization.php">
<?php echo PMA_generate_common_hidden_inputs($url_params); ?>
<table class="gis_table">
<tr><td><label for="fileName"><?php echo __("File name"); ?></label></td>