From c24e96f1a302f0d5d51d5c86efcd83e0fc6892c6 Mon Sep 17 00:00:00 2001
From: Jason <jason.daurus@gmail.com>
Date: Wed, 17 Jun 2015 01:50:10 +0800
Subject: Optimize logic in tbl_gis_visualization.php

Signed-off-by: Jason <jason.daurus@gmail.com>
---
 tbl_gis_visualization.php | 18 ++----------------
 1 file changed, 2 insertions(+), 16 deletions(-)

(limited to 'tbl_gis_visualization.php')

diff --git a/tbl_gis_visualization.php b/tbl_gis_visualization.php
index 7bc561709d..c6ddfb319f 100644
--- a/tbl_gis_visualization.php
+++ b/tbl_gis_visualization.php
@@ -73,15 +73,8 @@ if (isset($_REQUEST['saveToFile'])) {
     $response->disable();
     $file_name = $visualizationSettings['spatialColumn'];
     $save_format = $_REQUEST['fileFormat'];
-//    PMA_GIS_saveToFile($data, $visualizationSettings, $save_format, $file_name);
     $visualization = PMA_GIS_Visualization::get($sql_query, $visualizationSettings, $rows, $pos);
-    if ($format == 'svg') {
-        $visualization->toFileAsSvg($fileName);
-    } elseif ($format == 'png') {
-        $visualization->toFileAsPng($fileName);
-    } elseif ($format == 'pdf') {
-        $visualization->toFileAsPdf($fileName);
-    }
+    $visualization->toFile($file_name, $save_format);
     exit();
 }
 
@@ -113,14 +106,7 @@ if ($visualizationSettings != null) {
     }
 }
 
-$result = null;
-if ($format == 'svg') {
-    $result = $visualization->asSvg();
-} elseif ($format == 'png') {
-    $result = $visualization->asPng();
-} elseif ($format == 'ol') {
-    $result = $visualization->asOl();
-}
+$result = $visualization->toImage($format);
 
 /**
  * Displays the page
-- 
cgit v1.2.3