Finish refactoring tbl_*.lib.php

Signed-off-by: Jason <jason.daurus@gmail.com>
phpmyadmin · Jun 16, 2015 · cb77105 · cb77105
1 parent 4076c6b
commit cb77105
Show file tree

Hide file tree

Showing 37 changed files with 2,212 additions and 3,440 deletions.
diff --git a/db_central_columns.php b/db_central_columns.php
@@ -10,7 +10,6 @@
  * Gets some core libraries
  */
 require_once 'libraries/common.inc.php';
-require_once 'libraries/tbl_columns_definition_form.lib.php';
 require_once 'libraries/central_columns.lib.php';
 
 if (isset($_POST['edit_save']) || isset($_POST['add_new_column'])) {

diff --git 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 @@ function escape($variable)
     '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) {

diff --git a/libraries/Table.class.php b/libraries/Table.class.php