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

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Weblate 2015-11-03 00:15:05 +01:00
commit 424d634a60
1 changed files with 16 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
libraries/gis/GISFactory.php
View File

@ -34,33 +34,22 @@ class GISFactory
*/
public static function factory($type)
{
$type_lower = strtolower($type);
$file = './libraries/gis/GIS' . ucfirst($type_lower) . '.php';
if (!PMA_isValid($type_lower, PMA\libraries\Util::getGISDatatypes())
|| !file_exists($file)
) {
return false;
}
if (include_once $file) {
switch (strtoupper($type)) {
case 'MULTIPOLYGON' :
return GISMultipolygon::singleton();
case 'POLYGON' :
return GISPolygon::singleton();
case 'MULTIPOINT' :
return GISMultipoint::singleton();
case 'POINT' :
return GISPoint::singleton();
case 'MULTILINESTRING' :
return GISMultilinestring::singleton();
case 'LINESTRING' :
return GISLinestring::singleton();
case 'GEOMETRYCOLLECTION' :
return GISGeometrycollection::singleton();
default :
return false;
}
} else {
switch (strtoupper($type)) {
case 'MULTIPOLYGON' :
return GISMultipolygon::singleton();
case 'POLYGON' :
return GISPolygon::singleton();
case 'MULTIPOINT' :
return GISMultipoint::singleton();
case 'POINT' :
return GISPoint::singleton();
case 'MULTILINESTRING' :
return GISMultilinestring::singleton();
case 'LINESTRING' :
return GISLinestring::singleton();
case 'GEOMETRYCOLLECTION' :
return GISGeometrycollection::singleton();
default :
return false;
}
}