From cb771052c8545ca84e63c401e5e2c282901dffdd Mon Sep 17 00:00:00 2001 From: Jason Date: Wed, 17 Jun 2015 01:10:54 +0800 Subject: Finish refactoring tbl_*.lib.php Signed-off-by: Jason --- gis_data_editor.php | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) (limited to 'gis_data_editor.php') diff --git a/gis_data_editor.php b/gis_data_editor.php index cba75e58b0..17afdd30dc 100644 --- a/gis_data_editor.php +++ b/gis_data_editor.php @@ -22,7 +22,6 @@ function escape($variable) require_once 'libraries/common.inc.php'; require_once 'libraries/gis/GIS_Factory.class.php'; require_once 'libraries/gis/GIS_Visualization.class.php'; -require_once 'libraries/tbl_gis_visualization.lib.php'; // Get data if any posted $gis_data = array(); @@ -89,10 +88,17 @@ $visualizationSettings = array( 'spatialColumn' => 'wkt' ); $data = array(array('wkt' => $wkt_with_zero, 'srid' => $srid)); -$visualization = PMA_GIS_visualizationResults( - $data, $visualizationSettings, $format -); -$open_layers = PMA_GIS_visualizationResults($data, $visualizationSettings, 'ol'); +$_visualization = PMA_GIS_Visualization::getByData($data, $visualizationSettings); +$visualization = null; +if ($format == 'svg') { + $visualization = $_visualization->asSvg(); +} elseif ($format == 'png') { + $visualization = $_visualization->asPng(); +} elseif ($format == 'ol') { + $visualization = $_visualization->asOl(); +} + +$open_layers = PMA_GIS_Visualization::getByData($data, $visualizationSettings)->asOl(); // If the call is to update the WKT and visualization make an AJAX response if (isset($_REQUEST['generate']) && $_REQUEST['generate'] == true) { -- cgit v1.2.3