phpmyadmin / shapefile

examples/read_polygon.php

Spacing +3 added lines, -3 removed lines

@@ -5,14 +5,14 @@
 $shp->loadFromFile('data/mexico.*');
 
 $i = 1;
-foreach($shp->records as $record){
+foreach ($shp->records as $record) {
    echo "<pre>";
    echo "Record No. $i:\n\n\n";
    echo "SHP Data = ";
-   print_r($record->SHPData);   //All the data related to the poligon
+   print_r($record->SHPData); //All the data related to the poligon
    print_r("\n\n\n");
    echo "DBF Data = ";
-   print_r($record->DBFData);   //All the information related to each poligon
+   print_r($record->DBFData); //All the information related to each poligon
    print_r("\n\n\n");
    echo "</pre>";
    $i++;

examples/read_point.php

Spacing +3 added lines, -3 removed lines

@@ -5,14 +5,14 @@
 $shp->loadFromFile('data/capitals.*');
 
 $i = 1;
-foreach($shp->records as $record){
+foreach ($shp->records as $record) {
    echo "<pre>";
    echo "Record No. $i:\n\n\n";
    echo "SHP Data = ";
-   print_r($record->SHPData);   //All the data related to the point
+   print_r($record->SHPData); //All the data related to the point
    print_r("\n\n\n");
    echo "DBF Data = ";
-   print_r($record->DBFData);   //All the information related to each point
+   print_r($record->DBFData); //All the information related to each point
    print_r("\n\n\n");
    echo "</pre>";
    $i++;

examples/create_shapefile.php

Indentation +3 added lines, -3 removed lines

@@ -17,9 +17,9 @@
 $shp->addRecord($record2);
 
 $shp->setDBFHeader(array(
-						array('ID', 'N', 8, 0),
-						array('DESC', 'C', 50, 0)
-					));
+                  array('ID', 'N', 8, 0),
+                  array('DESC', 'C', 50, 0)
+               ));
 
 $shp->records[0]->DBFData['ID'] = '1';
 $shp->records[0]->DBFData['DESC'] = 'AAAAAAAAA';

src/ShapeFile.php

Doc Comments +3 added lines

@@ -334,6 +334,9 @@
       }
     }
 
+    /**
+     * @param string $error
+     */
     function setError($error) {
       $this->lastError = $error;
       return false;

Indentation +134 added lines, -134 removed lines

@@ -35,60 +35,60 @@ 
  *
  * @package bfShapeFiles
  */
-  class ShapeFile {
-    var $FileName;
+   class ShapeFile {
+      var $FileName;
 
-    var $SHPFile;
-    var $SHXFile;
-    var $DBFFile;
+      var $SHPFile;
+      var $SHXFile;
+      var $DBFFile;
 
-    var $DBFHeader;
+      var $DBFHeader;
 
-    var $lastError = "";
+      var $lastError = "";
 
-    var $boundingBox = array("xmin" => 0.0, "ymin" => 0.0, "xmax" => 0.0, "ymax" => 0.0);
-    var $fileLength = 0;
-    var $shapeType = 0;
+      var $boundingBox = array("xmin" => 0.0, "ymin" => 0.0, "xmax" => 0.0, "ymax" => 0.0);
+      var $fileLength = 0;
+      var $shapeType = 0;
 
-    var $records;
+      var $records;
 
-    public function __construct($shapeType, $boundingBox = array("xmin" => 0.0, "ymin" => 0.0, "xmax" => 0.0, "ymax" => 0.0), $FileName = NULL) {
+      public function __construct($shapeType, $boundingBox = array("xmin" => 0.0, "ymin" => 0.0, "xmax" => 0.0, "ymax" => 0.0), $FileName = NULL) {
       $this->shapeType = $shapeType;
       $this->boundingBox = $boundingBox;
       $this->FileName = $FileName;
       $this->fileLength = 50; // The value for file length is the total length of the file in 16-bit words (including the fifty 16-bit words that make up the header).
-    }
+      }
 
-    function loadFromFile($FileName) {
+      function loadFromFile($FileName) {
       $this->FileName = $FileName;
 
       if (($this->_openSHPFile()) && ($this->_openDBFFile())) {
-        $this->_loadHeaders();
-        $this->_loadRecords();
-        $this->_closeSHPFile();
-        $this->_closeDBFFile();
+         $this->_loadHeaders();
+         $this->_loadRecords();
+         $this->_closeSHPFile();
+         $this->_closeDBFFile();
       } else {
-        return false;
+         return false;
+      }
       }
-    }
 
-    function saveToFile($FileName = NULL) {
+      function saveToFile($FileName = NULL) {
       if ($FileName != NULL) $this->FileName = $FileName;
 
       if (($this->_openSHPFile(TRUE)) && ($this->_openSHXFile(TRUE)) && ($this->_openDBFFile(TRUE))) {
-        $this->_saveHeaders();
-        $this->_saveRecords();
-        $this->_closeSHPFile();
-        $this->_closeSHXFile();
-        $this->_closeDBFFile();
+         $this->_saveHeaders();
+         $this->_saveRecords();
+         $this->_closeSHPFile();
+         $this->_closeSHXFile();
+         $this->_closeDBFFile();
       } else {
-        return false;
+         return false;
+      }
       }
-    }
 
-    function addRecord($record) {
+      function addRecord($record) {
       if ((isset($this->DBFHeader)) && (is_array($this->DBFHeader))) {
-        $record->updateDBFInfo($this->DBFHeader);
+         $record->updateDBFInfo($this->DBFHeader);
       }
 
       $this->fileLength += ($record->getContentLength() + 4);
@@ -102,53 +102,53 @@ 
       if ($this->boundingBox["ymax"]==0.0 || ($this->boundingBox["ymax"]<$record->SHPData["ymax"])) $this->boundingBox["ymax"] = $record->SHPData["ymax"];
 
       if (in_array($this->shapeType,array(11,13,15,18,21,23,25,28))) {
-        if (!isset($this->boundingBox["mmin"]) || $this->boundingBox["mmin"]==0.0 || ($this->boundingBox["mmin"]>$record->SHPData["mmin"])) $this->boundingBox["mmin"] = $record->SHPData["mmin"];
-        if (!isset($this->boundingBox["mmax"]) || $this->boundingBox["mmax"]==0.0 || ($this->boundingBox["mmax"]<$record->SHPData["mmax"])) $this->boundingBox["mmax"] = $record->SHPData["mmax"];
+         if (!isset($this->boundingBox["mmin"]) || $this->boundingBox["mmin"]==0.0 || ($this->boundingBox["mmin"]>$record->SHPData["mmin"])) $this->boundingBox["mmin"] = $record->SHPData["mmin"];
+         if (!isset($this->boundingBox["mmax"]) || $this->boundingBox["mmax"]==0.0 || ($this->boundingBox["mmax"]<$record->SHPData["mmax"])) $this->boundingBox["mmax"] = $record->SHPData["mmax"];
       }
 
       if (in_array($this->shapeType,array(11,13,15,18))) {
-        if (!isset($this->boundingBox["zmin"]) || $this->boundingBox["zmin"]==0.0 || ($this->boundingBox["zmin"]>$record->SHPData["zmin"])) $this->boundingBox["zmin"] = $record->SHPData["zmin"];
-        if (!isset($this->boundingBox["zmax"]) || $this->boundingBox["zmax"]==0.0 || ($this->boundingBox["zmax"]<$record->SHPData["zmax"])) $this->boundingBox["zmax"] = $record->SHPData["zmax"];
+         if (!isset($this->boundingBox["zmin"]) || $this->boundingBox["zmin"]==0.0 || ($this->boundingBox["zmin"]>$record->SHPData["zmin"])) $this->boundingBox["zmin"] = $record->SHPData["zmin"];
+         if (!isset($this->boundingBox["zmax"]) || $this->boundingBox["zmax"]==0.0 || ($this->boundingBox["zmax"]<$record->SHPData["zmax"])) $this->boundingBox["zmax"] = $record->SHPData["zmax"];
       }
 
       return (count($this->records) - 1);
-    }
+      }
 
-    function deleteRecord($index) {
+      function deleteRecord($index) {
       if (isset($this->records[$index])) {
-        $this->fileLength -= ($this->records[$index]->getContentLength() + 4);
-        for ($i = $index; $i < (count($this->records) - 1); $i++) {
-          $this->records[$i] = $this->records[$i + 1];
-        }
-        unset($this->records[count($this->records) - 1]);
-        $this->_deleteRecordFromDBF($index);
+         $this->fileLength -= ($this->records[$index]->getContentLength() + 4);
+         for ($i = $index; $i < (count($this->records) - 1); $i++) {
+            $this->records[$i] = $this->records[$i + 1];
+         }
+         unset($this->records[count($this->records) - 1]);
+         $this->_deleteRecordFromDBF($index);
+      }
       }
-    }
 
-    function getDBFHeader() {
+      function getDBFHeader() {
       return $this->DBFHeader;
-    }
+      }
 
-    function setDBFHeader($header) {
+      function setDBFHeader($header) {
       $this->DBFHeader = $header;
 
       for ($i = 0; $i < count($this->records); $i++) {
-        $this->records[$i]->updateDBFInfo($header);
+         $this->records[$i]->updateDBFInfo($header);
+      }
       }
-    }
 
-    function getIndexFromDBFData($field, $value) {
+      function getIndexFromDBFData($field, $value) {
       $result = -1;
       for ($i = 0; $i < (count($this->records) - 1); $i++) {
-        if (isset($this->records[$i]->DBFData[$field]) && (strtoupper($this->records[$i]->DBFData[$field]) == strtoupper($value))) {
-          $result = $i;
-        }
+         if (isset($this->records[$i]->DBFData[$field]) && (strtoupper($this->records[$i]->DBFData[$field]) == strtoupper($value))) {
+            $result = $i;
+         }
       }
 
       return $result;
-    }
+      }
 
-    function _loadDBFHeader() {
+      function _loadDBFHeader() {
       $DBFFile = fopen(str_replace('.*', '.dbf', $this->FileName), 'r');
 
       $result = array();
@@ -157,40 +157,40 @@ 
       $inHeader = true;
 
       while ($inHeader) {
-        if (!feof($DBFFile)) {
-          $buff32 = fread($DBFFile, 32);
-          if ($i > 1) {
+         if (!feof($DBFFile)) {
+            $buff32 = fread($DBFFile, 32);
+            if ($i > 1) {
             if (substr($buff32, 0, 1) == chr(13)) {
-              $inHeader = false;
+               $inHeader = false;
             } else {
-              $pos = strpos(substr($buff32, 0, 10), chr(0));
-              $pos = ($pos == 0 ? 10 : $pos);
+               $pos = strpos(substr($buff32, 0, 10), chr(0));
+               $pos = ($pos == 0 ? 10 : $pos);
 
-              $fieldName = substr($buff32, 0, $pos);
-              $fieldType = substr($buff32, 11, 1);
-              $fieldLen = ord(substr($buff32, 16, 1));
-              $fieldDec = ord(substr($buff32, 17, 1));
+               $fieldName = substr($buff32, 0, $pos);
+               $fieldType = substr($buff32, 11, 1);
+               $fieldLen = ord(substr($buff32, 16, 1));
+               $fieldDec = ord(substr($buff32, 17, 1));
 
-              array_push($result, array($fieldName, $fieldType, $fieldLen, $fieldDec));
+               array_push($result, array($fieldName, $fieldType, $fieldLen, $fieldDec));
+            }
             }
-          }
-          $i++;
-        } else {
-          $inHeader = false;
-        }
+            $i++;
+         } else {
+            $inHeader = false;
+         }
       }
 
       fclose($DBFFile);
       return($result);
-    }
+      }
 
-    function _deleteRecordFromDBF($index) {
+      function _deleteRecordFromDBF($index) {
       if (@dbase_delete_record($this->DBFFile, $index)) {
-        @dbase_pack($this->DBFFile);
+         @dbase_pack($this->DBFFile);
+      }
       }
-    }
 
-    function _loadHeaders() {
+      function _loadHeaders() {
       fseek($this->SHPFile, 24, SEEK_SET);
       $this->fileLength = Util::loadData("N", fread($this->SHPFile, 4));
 
@@ -208,9 +208,9 @@ 
       $this->boundingBox["mmax"] = Util::loadData("d", fread($this->SHPFile, 8));
 
       $this->DBFHeader = $this->_loadDBFHeader();
-    }
+      }
 
-    function _saveHeaders() {
+      function _saveHeaders() {
       fwrite($this->SHPFile, pack("NNNNNN", 9994, 0, 0, 0, 0, 0));
       fwrite($this->SHPFile, pack("N", $this->fileLength));
       fwrite($this->SHPFile, pack("V", 1000));
@@ -236,107 +236,107 @@ 
       fwrite($this->SHXFile, Util::packDouble(isset($this->boundingBox['zmax'])?$this->boundingBox['zmax']:0));
       fwrite($this->SHXFile, Util::packDouble(isset($this->boundingBox['mmin'])?$this->boundingBox['mmin']:0));
       fwrite($this->SHXFile, Util::packDouble(isset($this->boundingBox['mmax'])?$this->boundingBox['mmax']:0));
-    }
+      }
 
-    function _loadRecords() {
+      function _loadRecords() {
       fseek($this->SHPFile, 100);
       while (!feof($this->SHPFile)) {
-        $bByte = ftell($this->SHPFile);
-        $record = new ShapeRecord(-1);
-        $record->loadFromFile($this->SHPFile, $this->DBFFile);
-        $eByte = ftell($this->SHPFile);
-        if (($eByte <= $bByte) || ($record->lastError != "")) {
-          return false;
-        }
-
-        $this->records[] = $record;
+         $bByte = ftell($this->SHPFile);
+         $record = new ShapeRecord(-1);
+         $record->loadFromFile($this->SHPFile, $this->DBFFile);
+         $eByte = ftell($this->SHPFile);
+         if (($eByte <= $bByte) || ($record->lastError != "")) {
+            return false;
+         }
+
+         $this->records[] = $record;
+      }
       }
-    }
 
-    function _saveRecords() {
+      function _saveRecords() {
       if (file_exists(str_replace('.*', '.dbf', $this->FileName))) {
-        @unlink(str_replace('.*', '.dbf', $this->FileName));
+         @unlink(str_replace('.*', '.dbf', $this->FileName));
       }
       if (!($this->DBFFile = @dbase_create(str_replace('.*', '.dbf', $this->FileName), $this->DBFHeader))) {
-        return $this->setError(sprintf("It wasn't possible to create the DBase file '%s'", str_replace('.*', '.dbf', $this->FileName)));
+         return $this->setError(sprintf("It wasn't possible to create the DBase file '%s'", str_replace('.*', '.dbf', $this->FileName)));
       }
 
       $offset = 50;
       if (is_array($this->records) && (count($this->records) > 0)) {
-        reset($this->records);
-        while (list($index, $record) = each($this->records)) {
-          //Save the record to the .shp file
-          $record->saveToFile($this->SHPFile, $this->DBFFile, $index + 1);
-
-          //Save the record to the .shx file
-          fwrite($this->SHXFile, pack("N", $offset));
-          fwrite($this->SHXFile, pack("N", $record->getContentLength()));
-          $offset += (4 + $record->getContentLength());
-        }
+         reset($this->records);
+         while (list($index, $record) = each($this->records)) {
+            //Save the record to the .shp file
+            $record->saveToFile($this->SHPFile, $this->DBFFile, $index + 1);
+
+            //Save the record to the .shx file
+            fwrite($this->SHXFile, pack("N", $offset));
+            fwrite($this->SHXFile, pack("N", $record->getContentLength()));
+            $offset += (4 + $record->getContentLength());
+         }
       }
       @dbase_pack($this->DBFFile);
-    }
+      }
 
-    function _openSHPFile($toWrite = false) {
+      function _openSHPFile($toWrite = false) {
       $this->SHPFile = @fopen(str_replace('.*', '.shp', $this->FileName), ($toWrite ? "wb+" : "rb"));
       if (!$this->SHPFile) {
-        return $this->setError(sprintf("It wasn't possible to open the Shape file '%s'", str_replace('.*', '.shp', $this->FileName)));
+         return $this->setError(sprintf("It wasn't possible to open the Shape file '%s'", str_replace('.*', '.shp', $this->FileName)));
       }
 
       return TRUE;
-    }
+      }
 
-    function _closeSHPFile() {
+      function _closeSHPFile() {
       if ($this->SHPFile) {
-        fclose($this->SHPFile);
-        $this->SHPFile = NULL;
+         fclose($this->SHPFile);
+         $this->SHPFile = NULL;
+      }
       }
-    }
 
-    function _openSHXFile($toWrite = false) {
+      function _openSHXFile($toWrite = false) {
       $this->SHXFile = @fopen(str_replace('.*', '.shx', $this->FileName), ($toWrite ? "wb+" : "rb"));
       if (!$this->SHXFile) {
-        return $this->setError(sprintf("It wasn't possible to open the Index file '%s'", str_replace('.*', '.shx', $this->FileName)));
+         return $this->setError(sprintf("It wasn't possible to open the Index file '%s'", str_replace('.*', '.shx', $this->FileName)));
       }
 
       return TRUE;
-    }
+      }
 
-    function _closeSHXFile() {
+      function _closeSHXFile() {
       if ($this->SHXFile) {
-        fclose($this->SHXFile);
-        $this->SHXFile = NULL;
+         fclose($this->SHXFile);
+         $this->SHXFile = NULL;
+      }
       }
-    }
 
-    function _openDBFFile($toWrite = false) {
+      function _openDBFFile($toWrite = false) {
       $checkFunction = $toWrite ? "is_writable" : "is_readable";
       if (($toWrite) && (!file_exists(str_replace('.*', '.dbf', $this->FileName)))) {
-        if (!@dbase_create(str_replace('.*', '.dbf', $this->FileName), $this->DBFHeader)) {
-          return $this->setError(sprintf("It wasn't possible to create the DBase file '%s'", str_replace('.*', '.dbf', $this->FileName)));
-        }
+         if (!@dbase_create(str_replace('.*', '.dbf', $this->FileName), $this->DBFHeader)) {
+            return $this->setError(sprintf("It wasn't possible to create the DBase file '%s'", str_replace('.*', '.dbf', $this->FileName)));
+         }
       }
       if ($checkFunction(str_replace('.*', '.dbf', $this->FileName))) {
-        $this->DBFFile = dbase_open(str_replace('.*', '.dbf', $this->FileName), ($toWrite ? 2 : 0));
-        if (!$this->DBFFile) {
-          return $this->setError(sprintf("It wasn't possible to open the DBase file '%s'", str_replace('.*', '.dbf', $this->FileName)));
-        }
+         $this->DBFFile = dbase_open(str_replace('.*', '.dbf', $this->FileName), ($toWrite ? 2 : 0));
+         if (!$this->DBFFile) {
+            return $this->setError(sprintf("It wasn't possible to open the DBase file '%s'", str_replace('.*', '.dbf', $this->FileName)));
+         }
       } else {
-        return $this->setError(sprintf("It wasn't possible to find the DBase file '%s'", str_replace('.*', '.dbf', $this->FileName)));
+         return $this->setError(sprintf("It wasn't possible to find the DBase file '%s'", str_replace('.*', '.dbf', $this->FileName)));
       }
       return TRUE;
-    }
+      }
 
-    function _closeDBFFile() {
+      function _closeDBFFile() {
       if ($this->DBFFile) {
-        dbase_close($this->DBFFile);
-        $this->DBFFile = NULL;
+         dbase_close($this->DBFFile);
+         $this->DBFFile = NULL;
+      }
       }
-    }
 
-    function setError($error) {
+      function setError($error) {
       $this->lastError = $error;
       return false;
-    }
-  }
+      }
+   }
 

Spacing +19 added lines, -19 removed lines

@@ -95,20 +95,20 @@ 
       $this->records[] = $record;
       $this->records[count($this->records) - 1]->recordNumber = count($this->records);
 
-      if ($this->boundingBox["xmin"]==0.0 || ($this->boundingBox["xmin"]>$record->SHPData["xmin"])) $this->boundingBox["xmin"] = $record->SHPData["xmin"];
-      if ($this->boundingBox["xmax"]==0.0 || ($this->boundingBox["xmax"]<$record->SHPData["xmax"])) $this->boundingBox["xmax"] = $record->SHPData["xmax"];
+      if ($this->boundingBox["xmin"] == 0.0 || ($this->boundingBox["xmin"] > $record->SHPData["xmin"])) $this->boundingBox["xmin"] = $record->SHPData["xmin"];
+      if ($this->boundingBox["xmax"] == 0.0 || ($this->boundingBox["xmax"] < $record->SHPData["xmax"])) $this->boundingBox["xmax"] = $record->SHPData["xmax"];
 
-      if ($this->boundingBox["ymin"]==0.0 || ($this->boundingBox["ymin"]>$record->SHPData["ymin"])) $this->boundingBox["ymin"] = $record->SHPData["ymin"];
-      if ($this->boundingBox["ymax"]==0.0 || ($this->boundingBox["ymax"]<$record->SHPData["ymax"])) $this->boundingBox["ymax"] = $record->SHPData["ymax"];
+      if ($this->boundingBox["ymin"] == 0.0 || ($this->boundingBox["ymin"] > $record->SHPData["ymin"])) $this->boundingBox["ymin"] = $record->SHPData["ymin"];
+      if ($this->boundingBox["ymax"] == 0.0 || ($this->boundingBox["ymax"] < $record->SHPData["ymax"])) $this->boundingBox["ymax"] = $record->SHPData["ymax"];
 
-      if (in_array($this->shapeType,array(11,13,15,18,21,23,25,28))) {
-        if (!isset($this->boundingBox["mmin"]) || $this->boundingBox["mmin"]==0.0 || ($this->boundingBox["mmin"]>$record->SHPData["mmin"])) $this->boundingBox["mmin"] = $record->SHPData["mmin"];
-        if (!isset($this->boundingBox["mmax"]) || $this->boundingBox["mmax"]==0.0 || ($this->boundingBox["mmax"]<$record->SHPData["mmax"])) $this->boundingBox["mmax"] = $record->SHPData["mmax"];
+      if (in_array($this->shapeType, array(11, 13, 15, 18, 21, 23, 25, 28))) {
+        if (!isset($this->boundingBox["mmin"]) || $this->boundingBox["mmin"] == 0.0 || ($this->boundingBox["mmin"] > $record->SHPData["mmin"])) $this->boundingBox["mmin"] = $record->SHPData["mmin"];
+        if (!isset($this->boundingBox["mmax"]) || $this->boundingBox["mmax"] == 0.0 || ($this->boundingBox["mmax"] < $record->SHPData["mmax"])) $this->boundingBox["mmax"] = $record->SHPData["mmax"];
       }
 
-      if (in_array($this->shapeType,array(11,13,15,18))) {
-        if (!isset($this->boundingBox["zmin"]) || $this->boundingBox["zmin"]==0.0 || ($this->boundingBox["zmin"]>$record->SHPData["zmin"])) $this->boundingBox["zmin"] = $record->SHPData["zmin"];
-        if (!isset($this->boundingBox["zmax"]) || $this->boundingBox["zmax"]==0.0 || ($this->boundingBox["zmax"]<$record->SHPData["zmax"])) $this->boundingBox["zmax"] = $record->SHPData["zmax"];
+      if (in_array($this->shapeType, array(11, 13, 15, 18))) {
+        if (!isset($this->boundingBox["zmin"]) || $this->boundingBox["zmin"] == 0.0 || ($this->boundingBox["zmin"] > $record->SHPData["zmin"])) $this->boundingBox["zmin"] = $record->SHPData["zmin"];
+        if (!isset($this->boundingBox["zmax"]) || $this->boundingBox["zmax"] == 0.0 || ($this->boundingBox["zmax"] < $record->SHPData["zmax"])) $this->boundingBox["zmax"] = $record->SHPData["zmax"];
       }
 
       return (count($this->records) - 1);
@@ -219,23 +219,23 @@ 
       fwrite($this->SHPFile, Util::packDouble($this->boundingBox['ymin']));
       fwrite($this->SHPFile, Util::packDouble($this->boundingBox['xmax']));
       fwrite($this->SHPFile, Util::packDouble($this->boundingBox['ymax']));
-      fwrite($this->SHPFile, Util::packDouble(isset($this->boundingBox['zmin'])?$this->boundingBox['zmin']:0));
-      fwrite($this->SHPFile, Util::packDouble(isset($this->boundingBox['zmax'])?$this->boundingBox['zmax']:0));
-      fwrite($this->SHPFile, Util::packDouble(isset($this->boundingBox['mmin'])?$this->boundingBox['mmin']:0));
-      fwrite($this->SHPFile, Util::packDouble(isset($this->boundingBox['mmax'])?$this->boundingBox['mmax']:0));
+      fwrite($this->SHPFile, Util::packDouble(isset($this->boundingBox['zmin']) ? $this->boundingBox['zmin'] : 0));
+      fwrite($this->SHPFile, Util::packDouble(isset($this->boundingBox['zmax']) ? $this->boundingBox['zmax'] : 0));
+      fwrite($this->SHPFile, Util::packDouble(isset($this->boundingBox['mmin']) ? $this->boundingBox['mmin'] : 0));
+      fwrite($this->SHPFile, Util::packDouble(isset($this->boundingBox['mmax']) ? $this->boundingBox['mmax'] : 0));
 
       fwrite($this->SHXFile, pack("NNNNNN", 9994, 0, 0, 0, 0, 0));
-      fwrite($this->SHXFile, pack("N", 50 + 4*count($this->records)));
+      fwrite($this->SHXFile, pack("N", 50 + 4 * count($this->records)));
       fwrite($this->SHXFile, pack("V", 1000));
       fwrite($this->SHXFile, pack("V", $this->shapeType));
       fwrite($this->SHXFile, Util::packDouble($this->boundingBox['xmin']));
       fwrite($this->SHXFile, Util::packDouble($this->boundingBox['ymin']));
       fwrite($this->SHXFile, Util::packDouble($this->boundingBox['xmax']));
       fwrite($this->SHXFile, Util::packDouble($this->boundingBox['ymax']));
-      fwrite($this->SHXFile, Util::packDouble(isset($this->boundingBox['zmin'])?$this->boundingBox['zmin']:0));
-      fwrite($this->SHXFile, Util::packDouble(isset($this->boundingBox['zmax'])?$this->boundingBox['zmax']:0));
-      fwrite($this->SHXFile, Util::packDouble(isset($this->boundingBox['mmin'])?$this->boundingBox['mmin']:0));
-      fwrite($this->SHXFile, Util::packDouble(isset($this->boundingBox['mmax'])?$this->boundingBox['mmax']:0));
+      fwrite($this->SHXFile, Util::packDouble(isset($this->boundingBox['zmin']) ? $this->boundingBox['zmin'] : 0));
+      fwrite($this->SHXFile, Util::packDouble(isset($this->boundingBox['zmax']) ? $this->boundingBox['zmax'] : 0));
+      fwrite($this->SHXFile, Util::packDouble(isset($this->boundingBox['mmin']) ? $this->boundingBox['mmin'] : 0));
+      fwrite($this->SHXFile, Util::packDouble(isset($this->boundingBox['mmax']) ? $this->boundingBox['mmax'] : 0));
     }
 
     function _loadRecords() {

Braces +27 added lines, -9 removed lines

@@ -73,7 +73,9 @@ 
     }
 
     function saveToFile($FileName = NULL) {
-      if ($FileName != NULL) $this->FileName = $FileName;
+      if ($FileName != NULL) {
+         $this->FileName = $FileName;
+      }
 
       if (($this->_openSHPFile(TRUE)) && ($this->_openSHXFile(TRUE)) && ($this->_openDBFFile(TRUE))) {
         $this->_saveHeaders();
@@ -95,20 +97,36 @@ 
       $this->records[] = $record;
       $this->records[count($this->records) - 1]->recordNumber = count($this->records);
 
-      if ($this->boundingBox["xmin"]==0.0 || ($this->boundingBox["xmin"]>$record->SHPData["xmin"])) $this->boundingBox["xmin"] = $record->SHPData["xmin"];
-      if ($this->boundingBox["xmax"]==0.0 || ($this->boundingBox["xmax"]<$record->SHPData["xmax"])) $this->boundingBox["xmax"] = $record->SHPData["xmax"];
+      if ($this->boundingBox["xmin"]==0.0 || ($this->boundingBox["xmin"]>$record->SHPData["xmin"])) {
+         $this->boundingBox["xmin"] = $record->SHPData["xmin"];
+      }
+      if ($this->boundingBox["xmax"]==0.0 || ($this->boundingBox["xmax"]<$record->SHPData["xmax"])) {
+         $this->boundingBox["xmax"] = $record->SHPData["xmax"];
+      }
 
-      if ($this->boundingBox["ymin"]==0.0 || ($this->boundingBox["ymin"]>$record->SHPData["ymin"])) $this->boundingBox["ymin"] = $record->SHPData["ymin"];
-      if ($this->boundingBox["ymax"]==0.0 || ($this->boundingBox["ymax"]<$record->SHPData["ymax"])) $this->boundingBox["ymax"] = $record->SHPData["ymax"];
+      if ($this->boundingBox["ymin"]==0.0 || ($this->boundingBox["ymin"]>$record->SHPData["ymin"])) {
+         $this->boundingBox["ymin"] = $record->SHPData["ymin"];
+      }
+      if ($this->boundingBox["ymax"]==0.0 || ($this->boundingBox["ymax"]<$record->SHPData["ymax"])) {
+         $this->boundingBox["ymax"] = $record->SHPData["ymax"];
+      }
 
       if (in_array($this->shapeType,array(11,13,15,18,21,23,25,28))) {
-        if (!isset($this->boundingBox["mmin"]) || $this->boundingBox["mmin"]==0.0 || ($this->boundingBox["mmin"]>$record->SHPData["mmin"])) $this->boundingBox["mmin"] = $record->SHPData["mmin"];
-        if (!isset($this->boundingBox["mmax"]) || $this->boundingBox["mmax"]==0.0 || ($this->boundingBox["mmax"]<$record->SHPData["mmax"])) $this->boundingBox["mmax"] = $record->SHPData["mmax"];
+        if (!isset($this->boundingBox["mmin"]) || $this->boundingBox["mmin"]==0.0 || ($this->boundingBox["mmin"]>$record->SHPData["mmin"])) {
+           $this->boundingBox["mmin"] = $record->SHPData["mmin"];
+        }
+        if (!isset($this->boundingBox["mmax"]) || $this->boundingBox["mmax"]==0.0 || ($this->boundingBox["mmax"]<$record->SHPData["mmax"])) {
+           $this->boundingBox["mmax"] = $record->SHPData["mmax"];
+        }
       }
 
       if (in_array($this->shapeType,array(11,13,15,18))) {
-        if (!isset($this->boundingBox["zmin"]) || $this->boundingBox["zmin"]==0.0 || ($this->boundingBox["zmin"]>$record->SHPData["zmin"])) $this->boundingBox["zmin"] = $record->SHPData["zmin"];
-        if (!isset($this->boundingBox["zmax"]) || $this->boundingBox["zmax"]==0.0 || ($this->boundingBox["zmax"]<$record->SHPData["zmax"])) $this->boundingBox["zmax"] = $record->SHPData["zmax"];
+        if (!isset($this->boundingBox["zmin"]) || $this->boundingBox["zmin"]==0.0 || ($this->boundingBox["zmin"]>$record->SHPData["zmin"])) {
+           $this->boundingBox["zmin"] = $record->SHPData["zmin"];
+        }
+        if (!isset($this->boundingBox["zmax"]) || $this->boundingBox["zmax"]==0.0 || ($this->boundingBox["zmax"]<$record->SHPData["zmax"])) {
+           $this->boundingBox["zmax"] = $record->SHPData["zmax"];
+        }
       }
 
       return (count($this->records) - 1);

src/ShapeRecord.php

Doc Comments +18 added lines

@@ -42,6 +42,9 @@ 
     var $SHPData = array();
     var $DBFData = array();
 
+    /**
+     * @param integer $shapeType
+     */
     public function __construct($shapeType) {
       $this->shapeType = $shapeType;
     }
@@ -275,6 +278,9 @@ 
       }
     }
 
+    /**
+     * @param string $type
+     */
     function _loadMultiPointMZRecord( $type ) {
 
       $this->SHPData[$type."min"] = Util::loadData("d", fread($this->SHPFile, 8));
@@ -308,6 +314,9 @@ 
       }
     }
 
+    /**
+     * @param string $type
+     */
     function _saveMultiPointMZRecord( $type ) {
 
       fwrite($this->SHPFile, pack("dd", $this->SHPData[$type."min"], $this->SHPData[$type."max"]));
@@ -361,6 +370,9 @@ 
       fseek($this->SHPFile, $firstIndex + ($readPoints*16));
     }
 
+    /**
+     * @param string $type
+     */
     function _loadPolyLineMZRecord( $type ) {
 
       $this->SHPData[$type."min"] = Util::loadData("d", fread($this->SHPFile, 8));
@@ -409,6 +421,9 @@ 
       }
     }
 
+    /**
+     * @param string $type
+     */
     function _savePolyLineMZRecord( $type ) {
       fwrite($this->SHPFile, pack("dd", $this->SHPData[$type."min"], $this->SHPData[$type."max"]));
 
@@ -641,6 +656,9 @@ 
       }
     }
 
+    /**
+     * @param string $error
+     */
     function setError($error) {
       $this->lastError = $error;
       return false;

Indentation +285 added lines, -285 removed lines

@@ -30,159 +30,159 @@ 
  */
 namespace ShapeFile;
 
-  class ShapeRecord {
-    var $SHPFile = NULL;
-    var $DBFFile = NULL;
+   class ShapeRecord {
+      var $SHPFile = NULL;
+      var $DBFFile = NULL;
 
-    var $recordNumber = NULL;
-    var $shapeType = NULL;
+      var $recordNumber = NULL;
+      var $shapeType = NULL;
 
-    var $lastError = "";
+      var $lastError = "";
 
-    var $SHPData = array();
-    var $DBFData = array();
+      var $SHPData = array();
+      var $DBFData = array();
 
-    public function __construct($shapeType) {
+      public function __construct($shapeType) {
       $this->shapeType = $shapeType;
-    }
+      }
 
-    function loadFromFile(&$SHPFile, &$DBFFile) {
+      function loadFromFile(&$SHPFile, &$DBFFile) {
       $this->SHPFile = $SHPFile;
       $this->DBFFile = $DBFFile;
       $this->_loadHeaders();
 
       switch ($this->shapeType) {
-        case 0:
+         case 0:
           $this->_loadNullRecord();
-        break;
-        case 1:
+         break;
+         case 1:
           $this->_loadPointRecord();
-        break;
-        case 21:
+         break;
+         case 21:
           $this->_loadPointMRecord();
-        break;
-        case 11:
+         break;
+         case 11:
           $this->_loadPointZRecord();
-        break;
-        case 3:
+         break;
+         case 3:
           $this->_loadPolyLineRecord();
-        break;
-        case 23:
+         break;
+         case 23:
           $this->_loadPolyLineMRecord();
-        break;
-        case 13:
+         break;
+         case 13:
           $this->_loadPolyLineZRecord();
-        break;
-        case 5:
+         break;
+         case 5:
           $this->_loadPolygonRecord();
-        break;
-        case 25:
+         break;
+         case 25:
           $this->_loadPolygonMRecord();
-        break;
-        case 15:
+         break;
+         case 15:
           $this->_loadPolygonZRecord();
-        break;
-        case 8:
+         break;
+         case 8:
           $this->_loadMultiPointRecord();
-        break;
-        case 28:
+         break;
+         case 28:
           $this->_loadMultiPointMRecord();
-        break;
-        case 18:
+         break;
+         case 18:
           $this->_loadMultiPointZRecord();
-        break;
-        default:
+         break;
+         default:
           $this->setError(sprintf("The Shape Type '%s' is not supported.", $this->shapeType));
-        break;
+         break;
       }
       $this->_loadDBFData();
-    }
+      }
 
-    function saveToFile(&$SHPFile, &$DBFFile, $recordNumber) {
+      function saveToFile(&$SHPFile, &$DBFFile, $recordNumber) {
       $this->SHPFile = $SHPFile;
       $this->DBFFile = $DBFFile;
       $this->recordNumber = $recordNumber;
       $this->_saveHeaders();
 
       switch ($this->shapeType) {
-        case 0:
+         case 0:
           $this->_saveNullRecord();
-        break;
-        case 1:
+         break;
+         case 1:
           $this->_savePointRecord();
-        break;
-        case 21:
+         break;
+         case 21:
           $this->_savePointMRecord();
-        break;
-        case 11:
+         break;
+         case 11:
           $this->_savePointZRecord();
-        break;
-        case 3:
+         break;
+         case 3:
           $this->_savePolyLineRecord();
-        break;
-        case 23:
+         break;
+         case 23:
           $this->_savePolyLineMRecord();
-        break;
-        case 13:
+         break;
+         case 13:
           $this->_savePolyLineZRecord();
-        break;
-        case 5:
+         break;
+         case 5:
           $this->_savePolygonRecord();
-        break;
-        case 25:
+         break;
+         case 25:
           $this->_savePolygonMRecord();
-        break;
-        case 15:
+         break;
+         case 15:
           $this->_savePolygonZRecord();
-        break;
-        case 8:
+         break;
+         case 8:
           $this->_saveMultiPointRecord();
-        break;
-        case 28:
+         break;
+         case 28:
           $this->_saveMultiPointMRecord();
-        break;
-        case 18:
+         break;
+         case 18:
           $this->_saveMultiPointZRecord();
-        break;
-        default:
+         break;
+         default:
           $this->setError(sprintf("The Shape Type '%s' is not supported.", $this->shapeType));
-        break;
+         break;
       }
       $this->_saveDBFData();
-    }
+      }
 
-    function updateDBFInfo($header) {
+      function updateDBFInfo($header) {
       $tmp = $this->DBFData;
       unset($this->DBFData);
       $this->DBFData = array();
       reset($header);
       while (list($key, $value) = each($header)) {
-        $this->DBFData[$value[0]] = (isset($tmp[$value[0]])) ? $tmp[$value[0]] : "";
+         $this->DBFData[$value[0]] = (isset($tmp[$value[0]])) ? $tmp[$value[0]] : "";
+      }
       }
-    }
 
-    function _loadHeaders() {
+      function _loadHeaders() {
       $this->recordNumber = Util::loadData("N", fread($this->SHPFile, 4));
       $tmp = Util::loadData("N", fread($this->SHPFile, 4)); //We read the length of the record
       $this->shapeType = Util::loadData("V", fread($this->SHPFile, 4));
-    }
+      }
 
-    function _saveHeaders() {
+      function _saveHeaders() {
       fwrite($this->SHPFile, pack("N", $this->recordNumber));
       fwrite($this->SHPFile, pack("N", $this->getContentLength()));
       fwrite($this->SHPFile, pack("V", $this->shapeType));
-    }
+      }
 
-    function _loadPoint() {
+      function _loadPoint() {
       $data = array();
 
       $data["x"] = Util::loadData("d", fread($this->SHPFile, 8));
       $data["y"] = Util::loadData("d", fread($this->SHPFile, 8));
 
       return $data;
-    }
+      }
 
-    function _loadPointM() {
+      function _loadPointM() {
       $data = array();
 
       $data["x"] = Util::loadData("d", fread($this->SHPFile, 8));
@@ -190,9 +190,9 @@ 
       $data["m"] = Util::loadData("d", fread($this->SHPFile, 8));
 
       return $data;
-    }
+      }
 
-    function _loadPointZ() {
+      function _loadPointZ() {
       $data = array();
 
       $data["x"] = Util::loadData("d", fread($this->SHPFile, 8));
@@ -201,67 +201,67 @@ 
       $data["m"] = Util::loadData("d", fread($this->SHPFile, 8));
 
       return $data;
-    }
+      }
 
-    function _savePoint($data) {
+      function _savePoint($data) {
       fwrite($this->SHPFile, Util::packDouble($data["x"]));
       fwrite($this->SHPFile, Util::packDouble($data["y"]));
-    }
+      }
 
-    function _savePointM($data) {
+      function _savePointM($data) {
       fwrite($this->SHPFile, Util::packDouble($data["x"]));
       fwrite($this->SHPFile, Util::packDouble($data["y"]));
       fwrite($this->SHPFile, Util::packDouble($data["m"]));
-    }
+      }
 
-    function _savePointZ($data) {
+      function _savePointZ($data) {
       fwrite($this->SHPFile, Util::packDouble($data["x"]));
       fwrite($this->SHPFile, Util::packDouble($data["y"]));
       fwrite($this->SHPFile, Util::packDouble($data["z"]));
       fwrite($this->SHPFile, Util::packDouble($data["m"]));
-    }
+      }
 
-    function _saveMeasure($data) {
+      function _saveMeasure($data) {
       fwrite($this->SHPFile, Util::packDouble($data["m"]));
-    }
+      }
 
-    function _saveZCoordinate($data) {
+      function _saveZCoordinate($data) {
       fwrite($this->SHPFile, Util::packDouble($data["z"]));
-    }
+      }
 
-    function _loadNullRecord() {
+      function _loadNullRecord() {
       $this->SHPData = array();
-    }
+      }
 
-    function _saveNullRecord() {
+      function _saveNullRecord() {
       //Don't save anything
-    }
+      }
 
-    function _loadPointRecord() {
+      function _loadPointRecord() {
       $this->SHPData = $this->_loadPoint();
-    }
+      }
 
-    function _loadPointMRecord() {
+      function _loadPointMRecord() {
       $this->SHPData = $this->_loadPointM();
-    }
+      }
 
-    function _loadPointZRecord() {
+      function _loadPointZRecord() {
       $this->SHPData = $this->_loadPointZ();
-    }
+      }
 
-    function _savePointRecord() {
+      function _savePointRecord() {
       $this->_savePoint($this->SHPData);
-    }
+      }
 
-    function _savePointMRecord() {
+      function _savePointMRecord() {
       $this->_savePointM($this->SHPData);
-    }
+      }
 
-    function _savePointZRecord() {
+      function _savePointZRecord() {
       $this->_savePointZ($this->SHPData);
-    }
+      }
 
-    function _loadMultiPointRecord() {
+      function _loadMultiPointRecord() {
       $this->SHPData = array();
       $this->SHPData["xmin"] = Util::loadData("d", fread($this->SHPFile, 8));
       $this->SHPData["ymin"] = Util::loadData("d", fread($this->SHPFile, 8));
@@ -271,66 +271,66 @@ 
       $this->SHPData["numpoints"] = Util::loadData("V", fread($this->SHPFile, 4));
 
       for ($i = 0; $i <= $this->SHPData["numpoints"]; $i++) {
-        $this->SHPData["points"][] = $this->_loadPoint();
+         $this->SHPData["points"][] = $this->_loadPoint();
+      }
       }
-    }
 
-    function _loadMultiPointMZRecord( $type ) {
+      function _loadMultiPointMZRecord( $type ) {
 
       $this->SHPData[$type."min"] = Util::loadData("d", fread($this->SHPFile, 8));
       $this->SHPData[$type."max"] = Util::loadData("d", fread($this->SHPFile, 8));
 
       for ($i = 0; $i <= $this->SHPData["numpoints"]; $i++) {
-        $this->SHPData["points"][$i][$type] = Util::loadData("d", fread($this->SHPFile, 8));
+         $this->SHPData["points"][$i][$type] = Util::loadData("d", fread($this->SHPFile, 8));
+      }
       }
-    }
 
-    function _loadMultiPointMRecord() {
+      function _loadMultiPointMRecord() {
       $this->_loadMultiPointRecord();
 
       $this->_loadMultiPointMZRecord("m");
-    }
+      }
 
-    function _loadMultiPointZRecord() {
+      function _loadMultiPointZRecord() {
       $this->_loadMultiPointRecord();
 
       $this->_loadMultiPointMZRecord("z");
       $this->_loadMultiPointMZRecord("m");
-    }
+      }
 
-    function _saveMultiPointRecord() {
+      function _saveMultiPointRecord() {
       fwrite($this->SHPFile, pack("dddd", $this->SHPData["xmin"], $this->SHPData["ymin"], $this->SHPData["xmax"], $this->SHPData["ymax"]));
 
       fwrite($this->SHPFile, pack("V", $this->SHPData["numpoints"]));
 
       for ($i = 0; $i <= $this->SHPData["numpoints"]; $i++) {
-        $this->_savePoint($this->SHPData["points"][$i]);
+         $this->_savePoint($this->SHPData["points"][$i]);
+      }
       }
-    }
 
-    function _saveMultiPointMZRecord( $type ) {
+      function _saveMultiPointMZRecord( $type ) {
 
       fwrite($this->SHPFile, pack("dd", $this->SHPData[$type."min"], $this->SHPData[$type."max"]));
 
       for ($i = 0; $i <= $this->SHPData["numpoints"]; $i++) {
-        fwrite($this->SHPFile, Util::packDouble($this->SHPData["points"][$type]));
+         fwrite($this->SHPFile, Util::packDouble($this->SHPData["points"][$type]));
+      }
       }
-    }
 
-    function _saveMultiPointMRecord() {
+      function _saveMultiPointMRecord() {
       $this->_saveMultiPointRecord();
 
       $this->_saveMultiPointMZRecord("m");
-    }
+      }
 
-    function _saveMultiPointZRecord() {
+      function _saveMultiPointZRecord() {
       $this->_saveMultiPointRecord();
 
       $this->_saveMultiPointMZRecord("z");
       $this->_saveMultiPointMZRecord("m");
-    }
+      }
 
-    function _loadPolyLineRecord() {
+      function _loadPolyLineRecord() {
       $this->SHPData = array();
       $this->SHPData["xmin"] = Util::loadData("d", fread($this->SHPFile, 8));
       $this->SHPData["ymin"] = Util::loadData("d", fread($this->SHPFile, 8));
@@ -341,27 +341,27 @@ 
       $this->SHPData["numpoints"] = Util::loadData("V", fread($this->SHPFile, 4));
 
       for ($i = 0; $i < $this->SHPData["numparts"]; $i++) {
-        $this->SHPData["parts"][$i] = Util::loadData("V", fread($this->SHPFile, 4));
+         $this->SHPData["parts"][$i] = Util::loadData("V", fread($this->SHPFile, 4));
       }
 
       $firstIndex = ftell($this->SHPFile);
       $readPoints = 0;
       reset($this->SHPData["parts"]);
       while (list($partIndex, $partData) = each($this->SHPData["parts"])) {
-        if (!isset($this->SHPData["parts"][$partIndex]["points"]) || !is_array($this->SHPData["parts"][$partIndex]["points"])) {
-          $this->SHPData["parts"][$partIndex] = array();
-          $this->SHPData["parts"][$partIndex]["points"] = array();
-        }
-        while (!in_array($readPoints, $this->SHPData["parts"]) && ($readPoints < ($this->SHPData["numpoints"])) && !feof($this->SHPFile)) {
-          $this->SHPData["parts"][$partIndex]["points"][] = $this->_loadPoint();
-          $readPoints++;
-        }
+         if (!isset($this->SHPData["parts"][$partIndex]["points"]) || !is_array($this->SHPData["parts"][$partIndex]["points"])) {
+            $this->SHPData["parts"][$partIndex] = array();
+            $this->SHPData["parts"][$partIndex]["points"] = array();
+         }
+         while (!in_array($readPoints, $this->SHPData["parts"]) && ($readPoints < ($this->SHPData["numpoints"])) && !feof($this->SHPFile)) {
+            $this->SHPData["parts"][$partIndex]["points"][] = $this->_loadPoint();
+            $readPoints++;
+         }
       }
 
       fseek($this->SHPFile, $firstIndex + ($readPoints*16));
-    }
+      }
 
-    function _loadPolyLineMZRecord( $type ) {
+      function _loadPolyLineMZRecord( $type ) {
 
       $this->SHPData[$type."min"] = Util::loadData("d", fread($this->SHPFile, 8));
       $this->SHPData[$type."max"] = Util::loadData("d", fread($this->SHPFile, 8));
@@ -370,170 +370,170 @@ 
       $readPoints = 0;
       reset($this->SHPData["parts"]);
       while (list($partIndex, $partData) = each($this->SHPData["parts"])) {
-        while (!in_array($readPoints, $this->SHPData["parts"]) && ($readPoints < ($this->SHPData["numpoints"])) && !feof($this->SHPFile)) {
-          $this->SHPData["parts"][$partIndex]["points"][$readPoints][$type] = Util::loadData("d", fread($this->SHPFile, 8));
-          $readPoints++;
-        }
+         while (!in_array($readPoints, $this->SHPData["parts"]) && ($readPoints < ($this->SHPData["numpoints"])) && !feof($this->SHPFile)) {
+            $this->SHPData["parts"][$partIndex]["points"][$readPoints][$type] = Util::loadData("d", fread($this->SHPFile, 8));
+            $readPoints++;
+         }
       }
 
       fseek($this->SHPFile, $firstIndex + ($readPoints*24));
-    }
+      }
 
-    function _loadPolyLineMRecord() {
+      function _loadPolyLineMRecord() {
       $this->_loadPolyLineRecord();
 
       $this->_loadPolyLineMZRecord("m");
-    }
+      }
 
-    function _loadPolyLineZRecord() {
+      function _loadPolyLineZRecord() {
       $this->_loadPolyLineRecord();
 
       $this->_loadPolyLineMZRecord("z");
       $this->_loadPolyLineMZRecord("m");
-    }
+      }
 
-    function _savePolyLineRecord() {
+      function _savePolyLineRecord() {
       fwrite($this->SHPFile, pack("dddd", $this->SHPData["xmin"], $this->SHPData["ymin"], $this->SHPData["xmax"], $this->SHPData["ymax"]));
 
       fwrite($this->SHPFile, pack("VV", $this->SHPData["numparts"], $this->SHPData["numpoints"]));
 
       for ($i = 0; $i < $this->SHPData["numparts"]; $i++) {
-        fwrite($this->SHPFile, pack("V", count($this->SHPData["parts"][$i])-1));
+         fwrite($this->SHPFile, pack("V", count($this->SHPData["parts"][$i])-1));
       }
 
       foreach ($this->SHPData["parts"] as $partData){
-        reset($partData["points"]);
-        while (list($pointIndex, $pointData) = each($partData["points"])) {
-          $this->_savePoint($pointData);
-        }
+         reset($partData["points"]);
+         while (list($pointIndex, $pointData) = each($partData["points"])) {
+            $this->_savePoint($pointData);
+         }
+      }
       }
-    }
 
-    function _savePolyLineMZRecord( $type ) {
+      function _savePolyLineMZRecord( $type ) {
       fwrite($this->SHPFile, pack("dd", $this->SHPData[$type."min"], $this->SHPData[$type."max"]));
 
       foreach ($this->SHPData["parts"] as $partData){
-        reset($partData["points"]);
-        while (list($pointIndex, $pointData) = each($partData["points"])) {
-          fwrite($this->SHPFile, Util::packDouble($pointData[$type]));
-        }
+         reset($partData["points"]);
+         while (list($pointIndex, $pointData) = each($partData["points"])) {
+            fwrite($this->SHPFile, Util::packDouble($pointData[$type]));
+         }
+      }
       }
-    }
 
-    function _savePolyLineMRecord() {
+      function _savePolyLineMRecord() {
       $this->_savePolyLineRecord();
 
       $this->_savePolyLineMZRecord("m");
-    }
+      }
 
-    function _savePolyLineZRecord() {
+      function _savePolyLineZRecord() {
       $this->_savePolyLineRecord();
 
       $this->_savePolyLineMZRecord("z");
       $this->_savePolyLineMZRecord("m");
-    }
+      }
 
-    function _loadPolygonRecord() {
+      function _loadPolygonRecord() {
       $this->_loadPolyLineRecord();
-    }
+      }
 
-    function _loadPolygonMRecord() {
+      function _loadPolygonMRecord() {
       $this->_loadPolyLineMRecord();
-    }
+      }
 
-    function _loadPolygonZRecord() {
+      function _loadPolygonZRecord() {
       $this->_loadPolyLineZRecord();
-    }
+      }
 
-    function _savePolygonRecord() {
+      function _savePolygonRecord() {
       $this->_savePolyLineRecord();
-    }
+      }
 
-    function _savePolygonMRecord() {
+      function _savePolygonMRecord() {
       $this->_savePolyLineMRecord();
-    }
+      }
 
-    function _savePolygonZRecord() {
+      function _savePolygonZRecord() {
       $this->_savePolyLineZRecord();
-    }
+      }
 
-    function addPoint($point, $partIndex = 0) {
+      function addPoint($point, $partIndex = 0) {
       switch ($this->shapeType) {
-        case 0:
+         case 0:
           //Don't add anything
         break;
-        case 1:
+         case 1:
         case 11:
         case 21:
           if (in_array($this->shapeType,array(11,21)) && !isset($point["m"])) $point["m"] = 0.0; // no_value
-          if (in_array($this->shapeType,array(11)) && !isset($point["z"])) $point["z"] = 0.0; // no_value
-          //Substitutes the value of the current point
-          $this->SHPData = $point;
-        break;
-        case 3:
+            if (in_array($this->shapeType,array(11)) && !isset($point["z"])) $point["z"] = 0.0; // no_value
+            //Substitutes the value of the current point
+            $this->SHPData = $point;
+         break;
+         case 3:
         case 5:
         case 13:
         case 15:
         case 23:
         case 25:
           if (in_array($this->shapeType,array(13,15,23,25)) && !isset($point["m"])) $point["m"] = 0.0; // no_value
-          if (in_array($this->shapeType,array(13,15)) && !isset($point["z"])) $point["z"] = 0.0; // no_value
-
-          //Adds a new point to the selected part
-          if (!isset($this->SHPData["xmin"]) || ($this->SHPData["xmin"] > $point["x"])) $this->SHPData["xmin"] = $point["x"];
-          if (!isset($this->SHPData["ymin"]) || ($this->SHPData["ymin"] > $point["y"])) $this->SHPData["ymin"] = $point["y"];
-          if (isset($point["m"]) && (!isset($this->SHPData["mmin"]) || ($this->SHPData["mmin"] > $point["m"]))) $this->SHPData["mmin"] = $point["m"];
-          if (isset($point["z"]) && (!isset($this->SHPData["zmin"]) || ($this->SHPData["zmin"] > $point["z"]))) $this->SHPData["zmin"] = $point["z"];
-          if (!isset($this->SHPData["xmax"]) || ($this->SHPData["xmax"] < $point["x"])) $this->SHPData["xmax"] = $point["x"];
-          if (!isset($this->SHPData["ymax"]) || ($this->SHPData["ymax"] < $point["y"])) $this->SHPData["ymax"] = $point["y"];
-          if (isset($point["m"]) && (!isset($this->SHPData["mmax"]) || ($this->SHPData["mmax"] < $point["m"]))) $this->SHPData["mmax"] = $point["m"];
-          if (isset($point["z"]) && (!isset($this->SHPData["zmax"]) || ($this->SHPData["zmax"] < $point["z"]))) $this->SHPData["zmax"] = $point["z"];
-
-          $this->SHPData["parts"][$partIndex]["points"][] = $point;
-
-          $this->SHPData["numparts"] = count($this->SHPData["parts"]);
-          $this->SHPData["numpoints"] = 1 + (isset($this->SHPData["numpoints"])?$this->SHPData["numpoints"]:0);
-        break;
-        case 8:
+            if (in_array($this->shapeType,array(13,15)) && !isset($point["z"])) $point["z"] = 0.0; // no_value
+
+            //Adds a new point to the selected part
+            if (!isset($this->SHPData["xmin"]) || ($this->SHPData["xmin"] > $point["x"])) $this->SHPData["xmin"] = $point["x"];
+            if (!isset($this->SHPData["ymin"]) || ($this->SHPData["ymin"] > $point["y"])) $this->SHPData["ymin"] = $point["y"];
+            if (isset($point["m"]) && (!isset($this->SHPData["mmin"]) || ($this->SHPData["mmin"] > $point["m"]))) $this->SHPData["mmin"] = $point["m"];
+            if (isset($point["z"]) && (!isset($this->SHPData["zmin"]) || ($this->SHPData["zmin"] > $point["z"]))) $this->SHPData["zmin"] = $point["z"];
+            if (!isset($this->SHPData["xmax"]) || ($this->SHPData["xmax"] < $point["x"])) $this->SHPData["xmax"] = $point["x"];
+            if (!isset($this->SHPData["ymax"]) || ($this->SHPData["ymax"] < $point["y"])) $this->SHPData["ymax"] = $point["y"];
+            if (isset($point["m"]) && (!isset($this->SHPData["mmax"]) || ($this->SHPData["mmax"] < $point["m"]))) $this->SHPData["mmax"] = $point["m"];
+            if (isset($point["z"]) && (!isset($this->SHPData["zmax"]) || ($this->SHPData["zmax"] < $point["z"]))) $this->SHPData["zmax"] = $point["z"];
+
+            $this->SHPData["parts"][$partIndex]["points"][] = $point;
+
+            $this->SHPData["numparts"] = count($this->SHPData["parts"]);
+            $this->SHPData["numpoints"] = 1 + (isset($this->SHPData["numpoints"])?$this->SHPData["numpoints"]:0);
+         break;
+         case 8:
         case 18:
         case 28:
           if (in_array($this->shapeType,array(18,28)) && !isset($point["m"])) $point["m"] = 0.0; // no_value
-          if (in_array($this->shapeType,array(18)) && !isset($point["z"])) $point["z"] = 0.0; // no_value
-
-          //Adds a new point
-          if (!isset($this->SHPData["xmin"]) || ($this->SHPData["xmin"] > $point["x"])) $this->SHPData["xmin"] = $point["x"];
-          if (!isset($this->SHPData["ymin"]) || ($this->SHPData["ymin"] > $point["y"])) $this->SHPData["ymin"] = $point["y"];
-          if (isset($point["m"]) && (!isset($this->SHPData["mmin"]) || ($this->SHPData["mmin"] > $point["m"]))) $this->SHPData["mmin"] = $point["m"];
-          if (isset($point["z"]) && (!isset($this->SHPData["zmin"]) || ($this->SHPData["zmin"] > $point["z"]))) $this->SHPData["zmin"] = $point["z"];
-          if (!isset($this->SHPData["xmax"]) || ($this->SHPData["xmax"] < $point["x"])) $this->SHPData["xmax"] = $point["x"];
-          if (!isset($this->SHPData["ymax"]) || ($this->SHPData["ymax"] < $point["y"])) $this->SHPData["ymax"] = $point["y"];
-          if (isset($point["m"]) && (!isset($this->SHPData["mmax"]) || ($this->SHPData["mmax"] < $point["m"]))) $this->SHPData["mmax"] = $point["m"];
-          if (isset($point["z"]) && (!isset($this->SHPData["zmax"]) || ($this->SHPData["zmax"] < $point["z"]))) $this->SHPData["zmax"] = $point["z"];
-
-          $this->SHPData["points"][] = $point;
-          $this->SHPData["numpoints"] = 1 + (isset($this->SHPData["numpoints"])?$this->SHPData["numpoints"]:0);
-        break;
-        default:
+            if (in_array($this->shapeType,array(18)) && !isset($point["z"])) $point["z"] = 0.0; // no_value
+
+            //Adds a new point
+            if (!isset($this->SHPData["xmin"]) || ($this->SHPData["xmin"] > $point["x"])) $this->SHPData["xmin"] = $point["x"];
+            if (!isset($this->SHPData["ymin"]) || ($this->SHPData["ymin"] > $point["y"])) $this->SHPData["ymin"] = $point["y"];
+            if (isset($point["m"]) && (!isset($this->SHPData["mmin"]) || ($this->SHPData["mmin"] > $point["m"]))) $this->SHPData["mmin"] = $point["m"];
+            if (isset($point["z"]) && (!isset($this->SHPData["zmin"]) || ($this->SHPData["zmin"] > $point["z"]))) $this->SHPData["zmin"] = $point["z"];
+            if (!isset($this->SHPData["xmax"]) || ($this->SHPData["xmax"] < $point["x"])) $this->SHPData["xmax"] = $point["x"];
+            if (!isset($this->SHPData["ymax"]) || ($this->SHPData["ymax"] < $point["y"])) $this->SHPData["ymax"] = $point["y"];
+            if (isset($point["m"]) && (!isset($this->SHPData["mmax"]) || ($this->SHPData["mmax"] < $point["m"]))) $this->SHPData["mmax"] = $point["m"];
+            if (isset($point["z"]) && (!isset($this->SHPData["zmax"]) || ($this->SHPData["zmax"] < $point["z"]))) $this->SHPData["zmax"] = $point["z"];
+
+            $this->SHPData["points"][] = $point;
+            $this->SHPData["numpoints"] = 1 + (isset($this->SHPData["numpoints"])?$this->SHPData["numpoints"]:0);
+         break;
+         default:
           $this->setError(sprintf("The Shape Type '%s' is not supported.", $this->shapeType));
-        break;
+         break;
+      }
       }
-    }
 
-    function deletePoint($pointIndex = 0, $partIndex = 0) {
+      function deletePoint($pointIndex = 0, $partIndex = 0) {
       switch ($this->shapeType) {
-        case 0:
+         case 0:
           //Don't delete anything
         break;
-        case 1:
+         case 1:
         case 11:
         case 21:
           //Sets the value of the point to zero
           $this->SHPData["x"] = 0.0;
-          $this->SHPData["y"] = 0.0;
-          if (in_array($this->shapeType,array(11,21))) $this->SHPData["m"] = 0.0;
-          if (in_array($this->shapeType,array(11))) $this->SHPData["z"] = 0.0;
-        break;
-        case 3:
+            $this->SHPData["y"] = 0.0;
+            if (in_array($this->shapeType,array(11,21))) $this->SHPData["m"] = 0.0;
+            if (in_array($this->shapeType,array(11))) $this->SHPData["z"] = 0.0;
+         break;
+         case 3:
         case 5:
         case 13:
         case 15:
@@ -542,107 +542,107 @@ 
           //Deletes the point from the selected part, if exists
           if (isset($this->SHPData["parts"][$partIndex]) && isset($this->SHPData["parts"][$partIndex]["points"][$pointIndex])) {
             for ($i = $pointIndex; $i < (count($this->SHPData["parts"][$partIndex]["points"]) - 1); $i++) {
-              $this->SHPData["parts"][$partIndex]["points"][$i] = $this->SHPData["parts"][$partIndex]["points"][$i + 1];
+               $this->SHPData["parts"][$partIndex]["points"][$i] = $this->SHPData["parts"][$partIndex]["points"][$i + 1];
             }
             unset($this->SHPData["parts"][$partIndex]["points"][count($this->SHPData["parts"][$partIndex]["points"]) - 1]);
 
             $this->SHPData["numparts"] = count($this->SHPData["parts"]);
             $this->SHPData["numpoints"]--;
-          }
-        break;
-        case 8:
+            }
+         break;
+         case 8:
         case 18:
         case 28:
           //Deletes the point, if exists
           if (isset($this->SHPData["points"][$pointIndex])) {
             for ($i = $pointIndex; $i < (count($this->SHPData["points"]) - 1); $i++) {
-              $this->SHPData["points"][$i] = $this->SHPData["points"][$i + 1];
+               $this->SHPData["points"][$i] = $this->SHPData["points"][$i + 1];
             }
             unset($this->SHPData["points"][count($this->SHPData["points"]) - 1]);
 
             $this->SHPData["numpoints"]--;
-          }
-        break;
-        default:
+            }
+         break;
+         default:
           $this->setError(sprintf("The Shape Type '%s' is not supported.", $this->shapeType));
-        break;
+         break;
+      }
       }
-    }
 
-    function getContentLength() {
+      function getContentLength() {
       // The content length for a record is the length of the record contents section measured in 16-bit words.
       // one coordinate makes 4 16-bit words (64 bit double)
       switch ($this->shapeType) {
-        case 0:
+         case 0:
           $result = 0;
-        break;
-        case 1:
+         break;
+         case 1:
           $result = 10;
-        break;
-        case 21:
+         break;
+         case 21:
           $result = 10 + 4;
-        break;
-        case 11:
+         break;
+         case 11:
           $result = 10 + 8;
-        break;
-        case 3:
+         break;
+         case 3:
         case 5:
           $result = 22 + 2*count($this->SHPData["parts"]);
-          for ($i = 0; $i < count($this->SHPData["parts"]); $i++) {
+            for ($i = 0; $i < count($this->SHPData["parts"]); $i++) {
             $result += 8*count($this->SHPData["parts"][$i]["points"]);
-          }
-        break;
-        case 23:
+            }
+         break;
+         case 23:
         case 25:
           $result = 22 + (2*4) + 2*count($this->SHPData["parts"]);
-          for ($i = 0; $i < count($this->SHPData["parts"]); $i++) {
+            for ($i = 0; $i < count($this->SHPData["parts"]); $i++) {
             $result += (8+4)*count($this->SHPData["parts"][$i]["points"]);
-          }
-        break;
-        case 13:
+            }
+         break;
+         case 13:
         case 15:
           $result = 22 + (4*4) + 2*count($this->SHPData["parts"]);
-          for ($i = 0; $i < count($this->SHPData["parts"]); $i++) {
+            for ($i = 0; $i < count($this->SHPData["parts"]); $i++) {
             $result += (8+8)*count($this->SHPData["parts"][$i]["points"]);
-          }
-        break;
-        case 8:
+            }
+         break;
+         case 8:
           $result = 20 + 8*count($this->SHPData["points"]);
-        break;
-        case 28:
+         break;
+         case 28:
           $result = 20 + (2*4) + (8+4)*count($this->SHPData["points"]);
-        break;
-        case 18:
+         break;
+         case 18:
           $result = 20 + (4*4) + (8+8)*count($this->SHPData["points"]);
-        break;
-        default:
+         break;
+         default:
           $result = false;
-          $this->setError(sprintf("The Shape Type '%s' is not supported.", $this->shapeType));
-        break;
+            $this->setError(sprintf("The Shape Type '%s' is not supported.", $this->shapeType));
+         break;
       }
       return $result;
-    }
+      }
 
-    function _loadDBFData() {
+      function _loadDBFData() {
       $this->DBFData = @dbase_get_record_with_names($this->DBFFile, $this->recordNumber);
       unset($this->DBFData["deleted"]);
-    }
+      }
 
-    function _saveDBFData() {
+      function _saveDBFData() {
       unset($this->DBFData["deleted"]);
       if ($this->recordNumber <= dbase_numrecords($this->DBFFile)) {
-        if (!dbase_replace_record($this->DBFFile, array_values($this->DBFData), $this->recordNumber)) {
-          $this->setError("I wasn't possible to update the information in the DBF file.");
-        }
+         if (!dbase_replace_record($this->DBFFile, array_values($this->DBFData), $this->recordNumber)) {
+            $this->setError("I wasn't possible to update the information in the DBF file.");
+         }
       } else {
-        if (!dbase_add_record($this->DBFFile, array_values($this->DBFData))) {
-          $this->setError("I wasn't possible to add the information to the DBF file.");
-        }
+         if (!dbase_add_record($this->DBFFile, array_values($this->DBFData))) {
+            $this->setError("I wasn't possible to add the information to the DBF file.");
+         }
+      }
       }
-    }
 
-    function setError($error) {
+      function setError($error) {
       $this->lastError = $error;
       return false;
-    }
-  }
+      }
+   }

Spacing +28 added lines, -28 removed lines

@@ -275,7 +275,7 @@ 
       }
     }
 
-    function _loadMultiPointMZRecord( $type ) {
+    function _loadMultiPointMZRecord($type) {
 
       $this->SHPData[$type."min"] = Util::loadData("d", fread($this->SHPFile, 8));
       $this->SHPData[$type."max"] = Util::loadData("d", fread($this->SHPFile, 8));
@@ -308,7 +308,7 @@ 
       }
     }
 
-    function _saveMultiPointMZRecord( $type ) {
+    function _saveMultiPointMZRecord($type) {
 
       fwrite($this->SHPFile, pack("dd", $this->SHPData[$type."min"], $this->SHPData[$type."max"]));
 
@@ -358,10 +358,10 @@ 
         }
       }
 
-      fseek($this->SHPFile, $firstIndex + ($readPoints*16));
+      fseek($this->SHPFile, $firstIndex + ($readPoints * 16));
     }
 
-    function _loadPolyLineMZRecord( $type ) {
+    function _loadPolyLineMZRecord($type) {
 
       $this->SHPData[$type."min"] = Util::loadData("d", fread($this->SHPFile, 8));
       $this->SHPData[$type."max"] = Util::loadData("d", fread($this->SHPFile, 8));
@@ -376,7 +376,7 @@ 
         }
       }
 
-      fseek($this->SHPFile, $firstIndex + ($readPoints*24));
+      fseek($this->SHPFile, $firstIndex + ($readPoints * 24));
     }
 
     function _loadPolyLineMRecord() {
@@ -398,10 +398,10 @@ 
       fwrite($this->SHPFile, pack("VV", $this->SHPData["numparts"], $this->SHPData["numpoints"]));
 
       for ($i = 0; $i < $this->SHPData["numparts"]; $i++) {
-        fwrite($this->SHPFile, pack("V", count($this->SHPData["parts"][$i])-1));
+        fwrite($this->SHPFile, pack("V", count($this->SHPData["parts"][$i]) - 1));
       }
 
-      foreach ($this->SHPData["parts"] as $partData){
+      foreach ($this->SHPData["parts"] as $partData) {
         reset($partData["points"]);
         while (list($pointIndex, $pointData) = each($partData["points"])) {
           $this->_savePoint($pointData);
@@ -409,10 +409,10 @@ 
       }
     }
 
-    function _savePolyLineMZRecord( $type ) {
+    function _savePolyLineMZRecord($type) {
       fwrite($this->SHPFile, pack("dd", $this->SHPData[$type."min"], $this->SHPData[$type."max"]));
 
-      foreach ($this->SHPData["parts"] as $partData){
+      foreach ($this->SHPData["parts"] as $partData) {
         reset($partData["points"]);
         while (list($pointIndex, $pointData) = each($partData["points"])) {
           fwrite($this->SHPFile, Util::packDouble($pointData[$type]));
@@ -465,8 +465,8 @@ 
         case 1:
         case 11:
         case 21:
-          if (in_array($this->shapeType,array(11,21)) && !isset($point["m"])) $point["m"] = 0.0; // no_value
-          if (in_array($this->shapeType,array(11)) && !isset($point["z"])) $point["z"] = 0.0; // no_value
+          if (in_array($this->shapeType, array(11, 21)) && !isset($point["m"])) $point["m"] = 0.0; // no_value
+          if (in_array($this->shapeType, array(11)) && !isset($point["z"])) $point["z"] = 0.0; // no_value
           //Substitutes the value of the current point
           $this->SHPData = $point;
         break;
@@ -476,8 +476,8 @@ 
         case 15:
         case 23:
         case 25:
-          if (in_array($this->shapeType,array(13,15,23,25)) && !isset($point["m"])) $point["m"] = 0.0; // no_value
-          if (in_array($this->shapeType,array(13,15)) && !isset($point["z"])) $point["z"] = 0.0; // no_value
+          if (in_array($this->shapeType, array(13, 15, 23, 25)) && !isset($point["m"])) $point["m"] = 0.0; // no_value
+          if (in_array($this->shapeType, array(13, 15)) && !isset($point["z"])) $point["z"] = 0.0; // no_value
 
           //Adds a new point to the selected part
           if (!isset($this->SHPData["xmin"]) || ($this->SHPData["xmin"] > $point["x"])) $this->SHPData["xmin"] = $point["x"];
@@ -492,13 +492,13 @@ 
           $this->SHPData["parts"][$partIndex]["points"][] = $point;
 
           $this->SHPData["numparts"] = count($this->SHPData["parts"]);
-          $this->SHPData["numpoints"] = 1 + (isset($this->SHPData["numpoints"])?$this->SHPData["numpoints"]:0);
+          $this->SHPData["numpoints"] = 1 + (isset($this->SHPData["numpoints"]) ? $this->SHPData["numpoints"] : 0);
         break;
         case 8:
         case 18:
         case 28:
-          if (in_array($this->shapeType,array(18,28)) && !isset($point["m"])) $point["m"] = 0.0; // no_value
-          if (in_array($this->shapeType,array(18)) && !isset($point["z"])) $point["z"] = 0.0; // no_value
+          if (in_array($this->shapeType, array(18, 28)) && !isset($point["m"])) $point["m"] = 0.0; // no_value
+          if (in_array($this->shapeType, array(18)) && !isset($point["z"])) $point["z"] = 0.0; // no_value
 
           //Adds a new point
           if (!isset($this->SHPData["xmin"]) || ($this->SHPData["xmin"] > $point["x"])) $this->SHPData["xmin"] = $point["x"];
@@ -511,7 +511,7 @@ 
           if (isset($point["z"]) && (!isset($this->SHPData["zmax"]) || ($this->SHPData["zmax"] < $point["z"]))) $this->SHPData["zmax"] = $point["z"];
 
           $this->SHPData["points"][] = $point;
-          $this->SHPData["numpoints"] = 1 + (isset($this->SHPData["numpoints"])?$this->SHPData["numpoints"]:0);
+          $this->SHPData["numpoints"] = 1 + (isset($this->SHPData["numpoints"]) ? $this->SHPData["numpoints"] : 0);
         break;
         default:
           $this->setError(sprintf("The Shape Type '%s' is not supported.", $this->shapeType));
@@ -530,8 +530,8 @@ 
           //Sets the value of the point to zero
           $this->SHPData["x"] = 0.0;
           $this->SHPData["y"] = 0.0;
-          if (in_array($this->shapeType,array(11,21))) $this->SHPData["m"] = 0.0;
-          if (in_array($this->shapeType,array(11))) $this->SHPData["z"] = 0.0;
+          if (in_array($this->shapeType, array(11, 21))) $this->SHPData["m"] = 0.0;
+          if (in_array($this->shapeType, array(11))) $this->SHPData["z"] = 0.0;
         break;
         case 3:
         case 5:
@@ -587,33 +587,33 @@ 
         break;
         case 3:
         case 5:
-          $result = 22 + 2*count($this->SHPData["parts"]);
+          $result = 22 + 2 * count($this->SHPData["parts"]);
           for ($i = 0; $i < count($this->SHPData["parts"]); $i++) {
-            $result += 8*count($this->SHPData["parts"][$i]["points"]);
+            $result += 8 * count($this->SHPData["parts"][$i]["points"]);
           }
         break;
         case 23:
         case 25:
-          $result = 22 + (2*4) + 2*count($this->SHPData["parts"]);
+          $result = 22 + (2 * 4) + 2 * count($this->SHPData["parts"]);
           for ($i = 0; $i < count($this->SHPData["parts"]); $i++) {
-            $result += (8+4)*count($this->SHPData["parts"][$i]["points"]);
+            $result += (8 + 4) * count($this->SHPData["parts"][$i]["points"]);
           }
         break;
         case 13:
         case 15:
-          $result = 22 + (4*4) + 2*count($this->SHPData["parts"]);
+          $result = 22 + (4 * 4) + 2 * count($this->SHPData["parts"]);
           for ($i = 0; $i < count($this->SHPData["parts"]); $i++) {
-            $result += (8+8)*count($this->SHPData["parts"][$i]["points"]);
+            $result += (8 + 8) * count($this->SHPData["parts"][$i]["points"]);
           }
         break;
         case 8:
-          $result = 20 + 8*count($this->SHPData["points"]);
+          $result = 20 + 8 * count($this->SHPData["points"]);
         break;
         case 28:
-          $result = 20 + (2*4) + (8+4)*count($this->SHPData["points"]);
+          $result = 20 + (2 * 4) + (8 + 4) * count($this->SHPData["points"]);
         break;
         case 18:
-          $result = 20 + (4*4) + (8+8)*count($this->SHPData["points"]);
+          $result = 20 + (4 * 4) + (8 + 8) * count($this->SHPData["points"]);
         break;
         default:
           $result = false;

Braces +78 added lines, -24 removed lines

@@ -465,8 +465,14 @@ 
         case 1:
         case 11:
         case 21:
-          if (in_array($this->shapeType,array(11,21)) && !isset($point["m"])) $point["m"] = 0.0; // no_value
-          if (in_array($this->shapeType,array(11)) && !isset($point["z"])) $point["z"] = 0.0; // no_value
+          if (in_array($this->shapeType,array(11,21)) && !isset($point["m"])) {
+             $point["m"] = 0.0;
+          }
+          // no_value
+          if (in_array($this->shapeType,array(11)) && !isset($point["z"])) {
+             $point["z"] = 0.0;
+          }
+          // no_value
           //Substitutes the value of the current point
           $this->SHPData = $point;
         break;
@@ -476,18 +482,40 @@ 
         case 15:
         case 23:
         case 25:
-          if (in_array($this->shapeType,array(13,15,23,25)) && !isset($point["m"])) $point["m"] = 0.0; // no_value
-          if (in_array($this->shapeType,array(13,15)) && !isset($point["z"])) $point["z"] = 0.0; // no_value
+          if (in_array($this->shapeType,array(13,15,23,25)) && !isset($point["m"])) {
+             $point["m"] = 0.0;
+          }
+          // no_value
+          if (in_array($this->shapeType,array(13,15)) && !isset($point["z"])) {
+             $point["z"] = 0.0;
+          }
+          // no_value
 
           //Adds a new point to the selected part
-          if (!isset($this->SHPData["xmin"]) || ($this->SHPData["xmin"] > $point["x"])) $this->SHPData["xmin"] = $point["x"];
-          if (!isset($this->SHPData["ymin"]) || ($this->SHPData["ymin"] > $point["y"])) $this->SHPData["ymin"] = $point["y"];
-          if (isset($point["m"]) && (!isset($this->SHPData["mmin"]) || ($this->SHPData["mmin"] > $point["m"]))) $this->SHPData["mmin"] = $point["m"];
-          if (isset($point["z"]) && (!isset($this->SHPData["zmin"]) || ($this->SHPData["zmin"] > $point["z"]))) $this->SHPData["zmin"] = $point["z"];
-          if (!isset($this->SHPData["xmax"]) || ($this->SHPData["xmax"] < $point["x"])) $this->SHPData["xmax"] = $point["x"];
-          if (!isset($this->SHPData["ymax"]) || ($this->SHPData["ymax"] < $point["y"])) $this->SHPData["ymax"] = $point["y"];
-          if (isset($point["m"]) && (!isset($this->SHPData["mmax"]) || ($this->SHPData["mmax"] < $point["m"]))) $this->SHPData["mmax"] = $point["m"];
-          if (isset($point["z"]) && (!isset($this->SHPData["zmax"]) || ($this->SHPData["zmax"] < $point["z"]))) $this->SHPData["zmax"] = $point["z"];
+          if (!isset($this->SHPData["xmin"]) || ($this->SHPData["xmin"] > $point["x"])) {
+             $this->SHPData["xmin"] = $point["x"];
+          }
+          if (!isset($this->SHPData["ymin"]) || ($this->SHPData["ymin"] > $point["y"])) {
+             $this->SHPData["ymin"] = $point["y"];
+          }
+          if (isset($point["m"]) && (!isset($this->SHPData["mmin"]) || ($this->SHPData["mmin"] > $point["m"]))) {
+             $this->SHPData["mmin"] = $point["m"];
+          }
+          if (isset($point["z"]) && (!isset($this->SHPData["zmin"]) || ($this->SHPData["zmin"] > $point["z"]))) {
+             $this->SHPData["zmin"] = $point["z"];
+          }
+          if (!isset($this->SHPData["xmax"]) || ($this->SHPData["xmax"] < $point["x"])) {
+             $this->SHPData["xmax"] = $point["x"];
+          }
+          if (!isset($this->SHPData["ymax"]) || ($this->SHPData["ymax"] < $point["y"])) {
+             $this->SHPData["ymax"] = $point["y"];
+          }
+          if (isset($point["m"]) && (!isset($this->SHPData["mmax"]) || ($this->SHPData["mmax"] < $point["m"]))) {
+             $this->SHPData["mmax"] = $point["m"];
+          }
+          if (isset($point["z"]) && (!isset($this->SHPData["zmax"]) || ($this->SHPData["zmax"] < $point["z"]))) {
+             $this->SHPData["zmax"] = $point["z"];
+          }
 
           $this->SHPData["parts"][$partIndex]["points"][] = $point;
 
@@ -497,18 +525,40 @@ 
         case 8:
         case 18:
         case 28:
-          if (in_array($this->shapeType,array(18,28)) && !isset($point["m"])) $point["m"] = 0.0; // no_value
-          if (in_array($this->shapeType,array(18)) && !isset($point["z"])) $point["z"] = 0.0; // no_value
+          if (in_array($this->shapeType,array(18,28)) && !isset($point["m"])) {
+             $point["m"] = 0.0;
+          }
+          // no_value
+          if (in_array($this->shapeType,array(18)) && !isset($point["z"])) {
+             $point["z"] = 0.0;
+          }
+          // no_value
 
           //Adds a new point
-          if (!isset($this->SHPData["xmin"]) || ($this->SHPData["xmin"] > $point["x"])) $this->SHPData["xmin"] = $point["x"];
-          if (!isset($this->SHPData["ymin"]) || ($this->SHPData["ymin"] > $point["y"])) $this->SHPData["ymin"] = $point["y"];
-          if (isset($point["m"]) && (!isset($this->SHPData["mmin"]) || ($this->SHPData["mmin"] > $point["m"]))) $this->SHPData["mmin"] = $point["m"];
-          if (isset($point["z"]) && (!isset($this->SHPData["zmin"]) || ($this->SHPData["zmin"] > $point["z"]))) $this->SHPData["zmin"] = $point["z"];
-          if (!isset($this->SHPData["xmax"]) || ($this->SHPData["xmax"] < $point["x"])) $this->SHPData["xmax"] = $point["x"];
-          if (!isset($this->SHPData["ymax"]) || ($this->SHPData["ymax"] < $point["y"])) $this->SHPData["ymax"] = $point["y"];
-          if (isset($point["m"]) && (!isset($this->SHPData["mmax"]) || ($this->SHPData["mmax"] < $point["m"]))) $this->SHPData["mmax"] = $point["m"];
-          if (isset($point["z"]) && (!isset($this->SHPData["zmax"]) || ($this->SHPData["zmax"] < $point["z"]))) $this->SHPData["zmax"] = $point["z"];
+          if (!isset($this->SHPData["xmin"]) || ($this->SHPData["xmin"] > $point["x"])) {
+             $this->SHPData["xmin"] = $point["x"];
+          }
+          if (!isset($this->SHPData["ymin"]) || ($this->SHPData["ymin"] > $point["y"])) {
+             $this->SHPData["ymin"] = $point["y"];
+          }
+          if (isset($point["m"]) && (!isset($this->SHPData["mmin"]) || ($this->SHPData["mmin"] > $point["m"]))) {
+             $this->SHPData["mmin"] = $point["m"];
+          }
+          if (isset($point["z"]) && (!isset($this->SHPData["zmin"]) || ($this->SHPData["zmin"] > $point["z"]))) {
+             $this->SHPData["zmin"] = $point["z"];
+          }
+          if (!isset($this->SHPData["xmax"]) || ($this->SHPData["xmax"] < $point["x"])) {
+             $this->SHPData["xmax"] = $point["x"];
+          }
+          if (!isset($this->SHPData["ymax"]) || ($this->SHPData["ymax"] < $point["y"])) {
+             $this->SHPData["ymax"] = $point["y"];
+          }
+          if (isset($point["m"]) && (!isset($this->SHPData["mmax"]) || ($this->SHPData["mmax"] < $point["m"]))) {
+             $this->SHPData["mmax"] = $point["m"];
+          }
+          if (isset($point["z"]) && (!isset($this->SHPData["zmax"]) || ($this->SHPData["zmax"] < $point["z"]))) {
+             $this->SHPData["zmax"] = $point["z"];
+          }
 
           $this->SHPData["points"][] = $point;
           $this->SHPData["numpoints"] = 1 + (isset($this->SHPData["numpoints"])?$this->SHPData["numpoints"]:0);
@@ -530,8 +580,12 @@ 
           //Sets the value of the point to zero
           $this->SHPData["x"] = 0.0;
           $this->SHPData["y"] = 0.0;
-          if (in_array($this->shapeType,array(11,21))) $this->SHPData["m"] = 0.0;
-          if (in_array($this->shapeType,array(11))) $this->SHPData["z"] = 0.0;
+          if (in_array($this->shapeType,array(11,21))) {
+             $this->SHPData["m"] = 0.0;
+          }
+          if (in_array($this->shapeType,array(11))) {
+             $this->SHPData["z"] = 0.0;
+          }
         break;
         case 3:
         case 5:

src/Util.php

Indentation +19 added lines, -19 removed lines

@@ -31,27 +31,27 @@ 
 namespace ShapeFile;
 
 class Util {
-  public static function loadData($type, $data) {
-    if (!$data) return $data;
-    $tmp = unpack($type, $data);
-    return current($tmp);
-  }
+   public static function loadData($type, $data) {
+      if (!$data) return $data;
+      $tmp = unpack($type, $data);
+      return current($tmp);
+   }
 
-  public static function swap($binValue) {
-    $result = $binValue{strlen($binValue) - 1};
-    for($i = strlen($binValue) - 2; $i >= 0 ; $i--) {
+   public static function swap($binValue) {
+      $result = $binValue{strlen($binValue) - 1};
+      for($i = strlen($binValue) - 2; $i >= 0 ; $i--) {
       $result .= $binValue{$i};
-    }
+      }
 
-    return $result;
-  }
+      return $result;
+   }
 
-  public static function packDouble($value, $mode = 'LE') {
-    $value = (double)$value;
-    $bin = pack("d", $value);
+   public static function packDouble($value, $mode = 'LE') {
+      $value = (double)$value;
+      $bin = pack("d", $value);
 
-    //We test if the conversion of an integer (1) is done as LE or BE by default
-    switch (pack ('L', 1)) {
+      //We test if the conversion of an integer (1) is done as LE or BE by default
+      switch (pack ('L', 1)) {
       case pack ('V', 1): //Little Endian
         $result = ($mode == 'LE') ? $bin : self::swap($bin);
       break;
@@ -60,8 +60,8 @@ 
       break;
       default: //Some other thing, we just return false
         $result = FALSE;
-    }
+      }
 
-    return $result;
-  }
+      return $result;
+   }
 }

Spacing +5 added lines, -5 removed lines

@@ -39,7 +39,7 @@ 
 
   public static function swap($binValue) {
     $result = $binValue{strlen($binValue) - 1};
-    for($i = strlen($binValue) - 2; $i >= 0 ; $i--) {
+    for ($i = strlen($binValue) - 2; $i >= 0; $i--) {
       $result .= $binValue{$i};
     }
 
@@ -47,15 +47,15 @@ 
   }
 
   public static function packDouble($value, $mode = 'LE') {
-    $value = (double)$value;
+    $value = (double) $value;
     $bin = pack("d", $value);
 
     //We test if the conversion of an integer (1) is done as LE or BE by default
-    switch (pack ('L', 1)) {
-      case pack ('V', 1): //Little Endian
+    switch (pack('L', 1)) {
+      case pack('V', 1): //Little Endian
         $result = ($mode == 'LE') ? $bin : self::swap($bin);
       break;
-      case pack ('N', 1): //Big Endian
+      case pack('N', 1): //Big Endian
         $result = ($mode == 'BE') ? $bin : self::swap($bin);
       break;
       default: //Some other thing, we just return false

Braces +3 added lines, -1 removed lines

@@ -32,7 +32,9 @@
 
 class Util {
   public static function loadData($type, $data) {
-    if (!$data) return $data;
+    if (!$data) {
+       return $data;
+    }
     $tmp = unpack($type, $data);
     return current($tmp);
   }