Merge pull request #17 from nijel/dbf-header

Correctly work withou configured dbf header
phpmyadmin · Nov 16, 2016 · 3425cba · 3425cba
2 parents a6a4661 + b5cff4a
commit 3425cba
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/src/ShapeFile.php b/src/ShapeFile.php
@@ -33,10 +33,7 @@ class ShapeFile {
     private $SHXFile = null;
     private $DBFFile = null;
 
-    public $DBFHeader = array(
-        array('ID', 'N', 19, 0),
-        array('DESC', 'C', 14, 0),
-    );
+    public $DBFHeader;
 
     public $lastError = '';
 
@@ -430,6 +427,9 @@ private function _closeSHXFile() {
      */
     private function _createDBFFile()
     {
+        if (count($this->DBFHeader) == 0) {
+            return null;
+        }
         $dbf_name = $this->_getFilename('.dbf');
         $result = @dbase_create($dbf_name, $this->DBFHeader);
         if ($result === false) {

diff --git a/tests/ShapeFileTest.php b/tests/ShapeFileTest.php
@@ -251,6 +251,10 @@ public function testShapeSaveLoad($type, $points)
     {
         $filename = "./data/test_shape-$type.*";
         $shp = new ShapeFile($type);
+        $shp->setDBFHeader(array(
+            array('ID', 'N', 19, 0),
+            array('DESC', 'C', 14, 0),
+        ));
 
         $record0 = new ShapeRecord($type);