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

Use ShapeFile library naming of shapes

Browse Source 
Signed-off-by: Michal Čihař <michal@cihar.com>
This commit is contained in:
Michal Čihař 2016-06-24 16:16:12 +02:00
parent 76189e0e43
commit d85b701c9b
1 changed files with 4 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
libraries/plugins/import/ImportShp.php
View File

@ -154,23 +154,6 @@ class ImportShp extends ImportPlugin
unlink($dbf_file_path);
}
$esri_types = array(
0 => 'Null Shape',
1 => 'Point',
3 => 'PolyLine',
5 => 'Polygon',
8 => 'MultiPoint',
11 => 'PointZ',
13 => 'PolyLineZ',
15 => 'PolygonZ',
18 => 'MultiPointZ',
21 => 'PointM',
23 => 'PolyLineM',
25 => 'PolygonM',
28 => 'MultiPointM',
31 => 'MultiPatch',
);
switch ($shp->shapeType) {
// ESRI Null Shape
case 0:
@ -193,20 +176,10 @@ class ImportShp extends ImportPlugin
break;
default:
$error = true;
if (!isset($esri_types[$shp->shapeType])) {
$message = PMA\libraries\Message::error(
__(
'You tried to import an invalid file or the imported file'
. ' contains invalid data!'
)
);
} else {
$message = PMA\libraries\Message::error(
__('MySQL Spatial Extension does not support ESRI type "%s".')
);
$message->addParam($esri_types[$shp->shapeType]);
}
$message = PMA\libraries\Message::error(
__('MySQL Spatial Extension does not support ESRI type "%s".')
);
$message->addParam($shp->getShapeName());
return;
}