Inspection of "Define visibility for class attributes" - phpmyadmin/shapefile - Measure and Improve Code Quality continuously with Scrutinizer

Completed

Push — master ( 965bc2...b47f29 )

by Michal

created 2016-06-14 10:30 UTC

Status

Indentation +10 added lines, -10 removed lines patch added patch discarded remove patch

@@ -8,16 +8,16 @@
 block discarded – undo
 
 $i = 1;
 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("\n\n\n");
-    echo "DBF Data = ";
-    print_r($record->DBFData);   //All the information related to each poligon
-    print_r("\n\n\n");
-    echo "</pre>";
-    $i++;
+      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("\n\n\n");
+      echo "DBF Data = ";
+      print_r($record->DBFData);   //All the information related to each poligon
+      print_r("\n\n\n");
+      echo "</pre>";
+      $i++;
 }
 
 echo "The ShapeFile was completely readed.<br />\n";

Please login to merge, or discard this patch.

Spacing +3 added lines, -3 removed lines patch added patch discarded remove patch

@@ -7,14 +7,14 @@
 block discarded – undo
 $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++;

Please login to merge, or discard this patch.

examples/read_point.php 2 patches

Indentation +10 added lines, -10 removed lines patch added patch discarded remove patch

@@ -8,16 +8,16 @@
 block discarded – undo
 
 $i = 1;
 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("\n\n\n");
-    echo "DBF Data = ";
-    print_r($record->DBFData);   //All the information related to each point
-    print_r("\n\n\n");
-    echo "</pre>";
-    $i++;
+      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("\n\n\n");
+      echo "DBF Data = ";
+      print_r($record->DBFData);   //All the information related to each point
+      print_r("\n\n\n");
+      echo "</pre>";
+      $i++;
 }
 
 echo "The ShapeFile was completely readed.<br />\n";

Please login to merge, or discard this patch.

Spacing +3 added lines, -3 removed lines patch added patch discarded remove patch

@@ -7,14 +7,14 @@
 block discarded – undo
 $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++;

Please login to merge, or discard this patch.

examples/create_shapefile.php 1 patch

Indentation +4 added lines, -4 removed lines patch added patch discarded remove patch

		@@ -20,10 +20,10 @@
		block discarded – undo
20	20	$shp->addRecord($record2);
21	21
22	22	$shp->setDBFHeader(
23		- array(
24		- array('ID', 'N', 8, 0),
25		- array('DESC', 'C', 50, 0)
26		- )
	23	+ array(
	24	+ array('ID', 'N', 8, 0),
	25	+ array('DESC', 'C', 50, 0)
	26	+ )
27	27	);
28	28
29	29	$shp->records[0]->DBFData['ID'] = '1';

Please login to merge, or discard this patch.

src/ShapeFile.php 2 patches

Spacing +19 added lines, -19 removed lines patch added patch discarded remove patch

@@ -95,20 +95,20 @@  discard block
 block discarded – undo
         $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 @@  discard block
 block discarded – undo
         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));
     }
 
     private function _loadRecords() {

Please login to merge, or discard this patch.

Indentation +197 added lines, -197 removed lines patch added patch discarded remove patch

@@ -36,133 +36,133 @@  discard block
 block discarded – undo
  * @package bfShapeFiles
  */
 class ShapeFile {
-    private $FileName;
+      private $FileName;
 
-    private $SHPFile;
-    private $SHXFile;
-    private $DBFFile;
+      private $SHPFile;
+      private $SHXFile;
+      private $DBFFile;
 
-    private $DBFHeader;
+      private $DBFHeader;
 
-    public $lastError = "";
+      public $lastError = "";
 
-    private $boundingBox = array("xmin" => 0.0, "ymin" => 0.0, "xmax" => 0.0, "ymax" => 0.0);
-    private $fileLength = 0;
-    private $shapeType = 0;
+      private $boundingBox = array("xmin" => 0.0, "ymin" => 0.0, "xmax" => 0.0, "ymax" => 0.0);
+      private $fileLength = 0;
+      private $shapeType = 0;
 
-    public $records;
+      public $records;
 
-    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).
-    }
+      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).
+      }
 
-    public function loadFromFile($FileName) {
-        $this->FileName = $FileName;
+      public function loadFromFile($FileName) {
+         $this->FileName = $FileName;
 
-        if (($this->_openSHPFile()) && ($this->_openDBFFile())) {
+         if (($this->_openSHPFile()) && ($this->_openDBFFile())) {
             $this->_loadHeaders();
             $this->_loadRecords();
             $this->_closeSHPFile();
             $this->_closeDBFFile();
-        } else {
+         } else {
             return false;
-        }
-    }
+         }
+      }
 
-    public function saveToFile($FileName = NULL) {
-        if ($FileName != NULL) $this->FileName = $FileName;
+      public function saveToFile($FileName = NULL) {
+         if ($FileName != NULL) $this->FileName = $FileName;
 
-        if (($this->_openSHPFile(TRUE)) && ($this->_openSHXFile(TRUE)) && ($this->_openDBFFile(TRUE))) {
+         if (($this->_openSHPFile(TRUE)) && ($this->_openSHXFile(TRUE)) && ($this->_openDBFFile(TRUE))) {
             $this->_saveHeaders();
             $this->_saveRecords();
             $this->_closeSHPFile();
             $this->_closeSHXFile();
             $this->_closeDBFFile();
-        } else {
+         } else {
             return false;
-        }
-    }
+         }
+      }
 
-    public function addRecord($record) {
-        if ((isset($this->DBFHeader)) && (is_array($this->DBFHeader))) {
+      public function addRecord($record) {
+         if ((isset($this->DBFHeader)) && (is_array($this->DBFHeader))) {
             $record->updateDBFInfo($this->DBFHeader);
-        }
+         }
 
-        $this->fileLength += ($record->getContentLength() + 4);
-        $this->records[] = $record;
-        $this->records[count($this->records) - 1]->recordNumber = count($this->records);
+         $this->fileLength += ($record->getContentLength() + 4);
+         $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 (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 (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);
-    }
+         return (count($this->records) - 1);
+      }
 
-    public function deleteRecord($index) {
-        if (isset($this->records[$index])) {
+      public 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];
+                  $this->records[$i] = $this->records[$i + 1];
             }
             unset($this->records[count($this->records) - 1]);
             $this->_deleteRecordFromDBF($index);
-        }
-    }
+         }
+      }
 
-    public function getDBFHeader() {
-        return $this->DBFHeader;
-    }
+      public function getDBFHeader() {
+         return $this->DBFHeader;
+      }
 
-    public function setDBFHeader($header) {
-        $this->DBFHeader = $header;
+      public function setDBFHeader($header) {
+         $this->DBFHeader = $header;
 
-        for ($i = 0; $i < count($this->records); $i++) {
+         for ($i = 0; $i < count($this->records); $i++) {
             $this->records[$i]->updateDBFInfo($header);
-        }
-    }
+         }
+      }
 
-    public function getIndexFromDBFData($field, $value) {
-        $result = -1;
-        for ($i = 0; $i < (count($this->records) - 1); $i++) {
+      public 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;
+                  $result = $i;
             }
-        }
+         }
 
-        return $result;
-    }
+         return $result;
+      }
 
-    private function _loadDBFHeader() {
-        $DBFFile = fopen(str_replace('.*', '.dbf', $this->FileName), 'r');
+      private function _loadDBFHeader() {
+         $DBFFile = fopen(str_replace('.*', '.dbf', $this->FileName), 'r');
 
-        $result = array();
-        $buff32 = array();
-        $i = 1;
-        $inHeader = true;
+         $result = array();
+         $buff32 = array();
+         $i = 1;
+         $inHeader = true;
 
-        while ($inHeader) {
+         while ($inHeader) {
             if (!feof($DBFFile)) {
-                $buff32 = fread($DBFFile, 32);
-                if ($i > 1) {
-                    if (substr($buff32, 0, 1) == chr(13)) {
+                  $buff32 = fread($DBFFile, 32);
+                  if ($i > 1) {
+                     if (substr($buff32, 0, 1) == chr(13)) {
                         $inHeader = false;
-                    } else {
+                     } else {
                         $pos = strpos(substr($buff32, 0, 10), chr(0));
                         $pos = ($pos == 0 ? 10 : $pos);
 
@@ -172,171 +172,171 @@  discard block
 block discarded – undo
                         $fieldDec = ord(substr($buff32, 17, 1));
 
                         array_push($result, array($fieldName, $fieldType, $fieldLen, $fieldDec));
-                    }
-                }
-                $i++;
+                     }
+                  }
+                  $i++;
             } else {
-                $inHeader = false;
+                  $inHeader = false;
             }
-        }
+         }
 
-        fclose($DBFFile);
-        return($result);
-    }
+         fclose($DBFFile);
+         return($result);
+      }
 
-    private function _deleteRecordFromDBF($index) {
-        if (@dbase_delete_record($this->DBFFile, $index)) {
+      private function _deleteRecordFromDBF($index) {
+         if (@dbase_delete_record($this->DBFFile, $index)) {
             @dbase_pack($this->DBFFile);
-        }
-    }
-
-    private function _loadHeaders() {
-        fseek($this->SHPFile, 24, SEEK_SET);
-        $this->fileLength = Util::loadData("N", fread($this->SHPFile, 4));
-
-        fseek($this->SHPFile, 32, SEEK_SET);
-        $this->shapeType = Util::loadData("V", fread($this->SHPFile, 4));
-
-        $this->boundingBox = array();
-        $this->boundingBox["xmin"] = Util::loadData("d", fread($this->SHPFile, 8));
-        $this->boundingBox["ymin"] = Util::loadData("d", fread($this->SHPFile, 8));
-        $this->boundingBox["xmax"] = Util::loadData("d", fread($this->SHPFile, 8));
-        $this->boundingBox["ymax"] = Util::loadData("d", fread($this->SHPFile, 8));
-        $this->boundingBox["zmin"] = Util::loadData("d", fread($this->SHPFile, 8));
-        $this->boundingBox["zmax"] = Util::loadData("d", fread($this->SHPFile, 8));
-        $this->boundingBox["mmin"] = Util::loadData("d", fread($this->SHPFile, 8));
-        $this->boundingBox["mmax"] = Util::loadData("d", fread($this->SHPFile, 8));
-
-        $this->DBFHeader = $this->_loadDBFHeader();
-    }
-
-    private 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));
-        fwrite($this->SHPFile, pack("V", $this->shapeType));
-        fwrite($this->SHPFile, Util::packDouble($this->boundingBox['xmin']));
-        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->SHXFile, pack("NNNNNN", 9994, 0, 0, 0, 0, 0));
-        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));
-    }
-
-    private function _loadRecords() {
-        fseek($this->SHPFile, 100);
-        while (!feof($this->SHPFile)) {
+         }
+      }
+
+      private function _loadHeaders() {
+         fseek($this->SHPFile, 24, SEEK_SET);
+         $this->fileLength = Util::loadData("N", fread($this->SHPFile, 4));
+
+         fseek($this->SHPFile, 32, SEEK_SET);
+         $this->shapeType = Util::loadData("V", fread($this->SHPFile, 4));
+
+         $this->boundingBox = array();
+         $this->boundingBox["xmin"] = Util::loadData("d", fread($this->SHPFile, 8));
+         $this->boundingBox["ymin"] = Util::loadData("d", fread($this->SHPFile, 8));
+         $this->boundingBox["xmax"] = Util::loadData("d", fread($this->SHPFile, 8));
+         $this->boundingBox["ymax"] = Util::loadData("d", fread($this->SHPFile, 8));
+         $this->boundingBox["zmin"] = Util::loadData("d", fread($this->SHPFile, 8));
+         $this->boundingBox["zmax"] = Util::loadData("d", fread($this->SHPFile, 8));
+         $this->boundingBox["mmin"] = Util::loadData("d", fread($this->SHPFile, 8));
+         $this->boundingBox["mmax"] = Util::loadData("d", fread($this->SHPFile, 8));
+
+         $this->DBFHeader = $this->_loadDBFHeader();
+      }
+
+      private 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));
+         fwrite($this->SHPFile, pack("V", $this->shapeType));
+         fwrite($this->SHPFile, Util::packDouble($this->boundingBox['xmin']));
+         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->SHXFile, pack("NNNNNN", 9994, 0, 0, 0, 0, 0));
+         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));
+      }
+
+      private 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;
+                  return false;
             }
 
             $this->records[] = $record;
-        }
-    }
+         }
+      }
 
-    private function _saveRecords() {
-        if (file_exists(str_replace('.*', '.dbf', $this->FileName))) {
+      private function _saveRecords() {
+         if (file_exists(str_replace('.*', '.dbf', $this->FileName))) {
             @unlink(str_replace('.*', '.dbf', $this->FileName));
-        }
-        if (!($this->DBFFile = @dbase_create(str_replace('.*', '.dbf', $this->FileName), $this->DBFHeader))) {
+         }
+         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)));
-        }
+         }
 
-        $offset = 50;
-        if (is_array($this->records) && (count($this->records) > 0)) {
+         $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 .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());
+                  //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);
-    }
+         }
+         @dbase_pack($this->DBFFile);
+      }
 
-    private function _openSHPFile($toWrite = false) {
-        $this->SHPFile = @fopen(str_replace('.*', '.shp', $this->FileName), ($toWrite ? "wb+" : "rb"));
-        if (!$this->SHPFile) {
+      private 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 TRUE;
-    }
+         return TRUE;
+      }
 
-    private function _closeSHPFile() {
-        if ($this->SHPFile) {
+      private function _closeSHPFile() {
+         if ($this->SHPFile) {
             fclose($this->SHPFile);
             $this->SHPFile = NULL;
-        }
-    }
+         }
+      }
 
-    private function _openSHXFile($toWrite = false) {
-        $this->SHXFile = @fopen(str_replace('.*', '.shx', $this->FileName), ($toWrite ? "wb+" : "rb"));
-        if (!$this->SHXFile) {
+      private 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 TRUE;
-    }
+         return TRUE;
+      }
 
-    private function _closeSHXFile() {
-        if ($this->SHXFile) {
+      private function _closeSHXFile() {
+         if ($this->SHXFile) {
             fclose($this->SHXFile);
             $this->SHXFile = NULL;
-        }
-    }
+         }
+      }
 
-    private function _openDBFFile($toWrite = false) {
-        $checkFunction = $toWrite ? "is_writable" : "is_readable";
-        if (($toWrite) && (!file_exists(str_replace('.*', '.dbf', $this->FileName)))) {
+      private 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)));
+                  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))) {
+         }
+         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)));
+                  return $this->setError(sprintf("It wasn't possible to open the DBase file '%s'", str_replace('.*', '.dbf', $this->FileName)));
             }
-        } else {
+         } else {
             return $this->setError(sprintf("It wasn't possible to find the DBase file '%s'", str_replace('.*', '.dbf', $this->FileName)));
-        }
-        return TRUE;
-    }
+         }
+         return TRUE;
+      }
 
-    private function _closeDBFFile() {
-        if ($this->DBFFile) {
+      private function _closeDBFFile() {
+         if ($this->DBFFile) {
             dbase_close($this->DBFFile);
             $this->DBFFile = NULL;
-        }
-    }
+         }
+      }
 
-    public function setError($error) {
-        $this->lastError = $error;
-        return false;
-    }
+      public function setError($error) {
+         $this->lastError = $error;
+         return false;
+      }
 }
 

Please login to merge, or discard this patch.

src/Util.php 2 patches

Indentation +21 added lines, -21 removed lines patch added patch discarded remove patch

@@ -31,37 +31,37 @@
 block discarded – undo
 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;
+                  break;
             case pack ('N', 1): //Big Endian
                 $result = ($mode == 'BE') ? $bin : self::swap($bin);
-                break;
+                  break;
             default: //Some other thing, we just return false
                 $result = FALSE;
-        }
+         }
 
-        return $result;
-    }
+         return $result;
+      }
 }

Please login to merge, or discard this patch.

Spacing +5 added lines, -5 removed lines patch added patch discarded remove patch

@@ -39,7 +39,7 @@  discard block
 block discarded – undo
 
     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 @@  discard block
 block discarded – undo
     }
 
     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

Please login to merge, or discard this patch.

src/ShapeRecord.php 2 patches

Spacing +28 added lines, -28 removed lines patch added patch discarded remove patch

@@ -275,7 +275,7 @@  discard block
 block discarded – undo
         }
     }
 
-    private function _loadMultiPointMZRecord( $type ) {
+    private 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 @@  discard block
 block discarded – undo
         }
     }
 
-    private function _saveMultiPointMZRecord( $type ) {
+    private function _saveMultiPointMZRecord($type) {
 
         fwrite($this->SHPFile, pack("dd", $this->SHPData[$type."min"], $this->SHPData[$type."max"]));
 
@@ -358,10 +358,10 @@  discard block
 block discarded – undo
             }
         }
 
-        fseek($this->SHPFile, $firstIndex + ($readPoints*16));
+        fseek($this->SHPFile, $firstIndex + ($readPoints * 16));
     }
 
-    private function _loadPolyLineMZRecord( $type ) {
+    private 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 @@  discard block
 block discarded – undo
             }
         }
 
-        fseek($this->SHPFile, $firstIndex + ($readPoints*24));
+        fseek($this->SHPFile, $firstIndex + ($readPoints * 24));
     }
 
     private function _loadPolyLineMRecord() {
@@ -398,10 +398,10 @@  discard block
 block discarded – undo
         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 @@  discard block
 block discarded – undo
         }
     }
 
-    private function _savePolyLineMZRecord( $type ) {
+    private 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 @@  discard block
 block discarded – undo
             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 @@  discard block
 block discarded – undo
             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 @@  discard block
 block discarded – undo
                 $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 @@  discard block
 block discarded – undo
                 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 @@  discard block
 block discarded – undo
                 //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 @@  discard block
 block discarded – undo
                 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;

Please login to merge, or discard this patch.

Indentation +405 added lines, -405 removed lines patch added patch discarded remove patch

@@ -31,434 +31,434 @@  discard block
 block discarded – undo
 namespace ShapeFile;
 
 class ShapeRecord {
-    private $SHPFile = NULL;
-    private $DBFFile = NULL;
+      private $SHPFile = NULL;
+      private $DBFFile = NULL;
 
-    private $recordNumber = NULL;
-    private $shapeType = NULL;
+      private $recordNumber = NULL;
+      private $shapeType = NULL;
 
-    public $lastError = "";
+      public $lastError = "";
 
-    private $SHPData = array();
-    private $DBFData = array();
+      private $SHPData = array();
+      private $DBFData = array();
 
-    public function __construct($shapeType) {
-        $this->shapeType = $shapeType;
-    }
+      public function __construct($shapeType) {
+         $this->shapeType = $shapeType;
+      }
 
-    public function loadFromFile(&$SHPFile, &$DBFFile) {
-        $this->SHPFile = $SHPFile;
-        $this->DBFFile = $DBFFile;
-        $this->_loadHeaders();
+      public function loadFromFile(&$SHPFile, &$DBFFile) {
+         $this->SHPFile = $SHPFile;
+         $this->DBFFile = $DBFFile;
+         $this->_loadHeaders();
 
-        switch ($this->shapeType) {
+         switch ($this->shapeType) {
             case 0:
                 $this->_loadNullRecord();
-                break;
+                  break;
             case 1:
                 $this->_loadPointRecord();
-                break;
+                  break;
             case 21:
                 $this->_loadPointMRecord();
-                break;
+                  break;
             case 11:
                 $this->_loadPointZRecord();
-                break;
+                  break;
             case 3:
                 $this->_loadPolyLineRecord();
-                break;
+                  break;
             case 23:
                 $this->_loadPolyLineMRecord();
-                break;
+                  break;
             case 13:
                 $this->_loadPolyLineZRecord();
-                break;
+                  break;
             case 5:
                 $this->_loadPolygonRecord();
-                break;
+                  break;
             case 25:
                 $this->_loadPolygonMRecord();
-                break;
+                  break;
             case 15:
                 $this->_loadPolygonZRecord();
-                break;
+                  break;
             case 8:
                 $this->_loadMultiPointRecord();
-                break;
+                  break;
             case 28:
                 $this->_loadMultiPointMRecord();
-                break;
+                  break;
             case 18:
                 $this->_loadMultiPointZRecord();
-                break;
+                  break;
             default:
                 $this->setError(sprintf("The Shape Type '%s' is not supported.", $this->shapeType));
-                break;
-        }
-        $this->_loadDBFData();
-    }
-
-    public function saveToFile(&$SHPFile, &$DBFFile, $recordNumber) {
-        $this->SHPFile = $SHPFile;
-        $this->DBFFile = $DBFFile;
-        $this->recordNumber = $recordNumber;
-        $this->_saveHeaders();
-
-        switch ($this->shapeType) {
+                  break;
+         }
+         $this->_loadDBFData();
+      }
+
+      public function saveToFile(&$SHPFile, &$DBFFile, $recordNumber) {
+         $this->SHPFile = $SHPFile;
+         $this->DBFFile = $DBFFile;
+         $this->recordNumber = $recordNumber;
+         $this->_saveHeaders();
+
+         switch ($this->shapeType) {
             case 0:
                 $this->_saveNullRecord();
-                break;
+                  break;
             case 1:
                 $this->_savePointRecord();
-                break;
+                  break;
             case 21:
                 $this->_savePointMRecord();
-                break;
+                  break;
             case 11:
                 $this->_savePointZRecord();
-                break;
+                  break;
             case 3:
                 $this->_savePolyLineRecord();
-                break;
+                  break;
             case 23:
                 $this->_savePolyLineMRecord();
-                break;
+                  break;
             case 13:
                 $this->_savePolyLineZRecord();
-                break;
+                  break;
             case 5:
                 $this->_savePolygonRecord();
-                break;
+                  break;
             case 25:
                 $this->_savePolygonMRecord();
-                break;
+                  break;
             case 15:
                 $this->_savePolygonZRecord();
-                break;
+                  break;
             case 8:
                 $this->_saveMultiPointRecord();
-                break;
+                  break;
             case 28:
                 $this->_saveMultiPointMRecord();
-                break;
+                  break;
             case 18:
                 $this->_saveMultiPointZRecord();
-                break;
+                  break;
             default:
                 $this->setError(sprintf("The Shape Type '%s' is not supported.", $this->shapeType));
-                break;
-        }
-        $this->_saveDBFData();
-    }
-
-    public function updateDBFInfo($header) {
-        $tmp = $this->DBFData;
-        unset($this->DBFData);
-        $this->DBFData = array();
-        reset($header);
-        while (list($key, $value) = each($header)) {
+                  break;
+         }
+         $this->_saveDBFData();
+      }
+
+      public 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]] : "";
-        }
-    }
+         }
+      }
 
-    private 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));
-    }
-
-    private function _saveHeaders() {
-        fwrite($this->SHPFile, pack("N", $this->recordNumber));
-        fwrite($this->SHPFile, pack("N", $this->getContentLength()));
-        fwrite($this->SHPFile, pack("V", $this->shapeType));
-    }
-
-    private function _loadPoint() {
-        $data = array();
-
-        $data["x"] = Util::loadData("d", fread($this->SHPFile, 8));
-        $data["y"] = Util::loadData("d", fread($this->SHPFile, 8));
-
-        return $data;
-    }
-
-    private function _loadPointM() {
-        $data = array();
-
-        $data["x"] = Util::loadData("d", fread($this->SHPFile, 8));
-        $data["y"] = Util::loadData("d", fread($this->SHPFile, 8));
-        $data["m"] = Util::loadData("d", fread($this->SHPFile, 8));
-
-        return $data;
-    }
-
-    private function _loadPointZ() {
-        $data = array();
-
-        $data["x"] = Util::loadData("d", fread($this->SHPFile, 8));
-        $data["y"] = Util::loadData("d", fread($this->SHPFile, 8));
-        $data["z"] = Util::loadData("d", fread($this->SHPFile, 8));
-        $data["m"] = Util::loadData("d", fread($this->SHPFile, 8));
-
-        return $data;
-    }
-
-    private function _savePoint($data) {
-        fwrite($this->SHPFile, Util::packDouble($data["x"]));
-        fwrite($this->SHPFile, Util::packDouble($data["y"]));
-    }
-
-    private function _savePointM($data) {
-        fwrite($this->SHPFile, Util::packDouble($data["x"]));
-        fwrite($this->SHPFile, Util::packDouble($data["y"]));
-        fwrite($this->SHPFile, Util::packDouble($data["m"]));
-    }
-
-    private 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"]));
-    }
-
-    private function _saveMeasure($data) {
-        fwrite($this->SHPFile, Util::packDouble($data["m"]));
-    }
-
-    private function _saveZCoordinate($data) {
-        fwrite($this->SHPFile, Util::packDouble($data["z"]));
-    }
-
-    private function _loadNullRecord() {
-        $this->SHPData = array();
-    }
-
-    private function _saveNullRecord() {
-        //Don't save anything
-    }
-
-    private function _loadPointRecord() {
-        $this->SHPData = $this->_loadPoint();
-    }
-
-    private function _loadPointMRecord() {
-        $this->SHPData = $this->_loadPointM();
-    }
-
-    private function _loadPointZRecord() {
-        $this->SHPData = $this->_loadPointZ();
-    }
-
-    private function _savePointRecord() {
-        $this->_savePoint($this->SHPData);
-    }
-
-    private function _savePointMRecord() {
-        $this->_savePointM($this->SHPData);
-    }
-
-    private function _savePointZRecord() {
-        $this->_savePointZ($this->SHPData);
-    }
+      private 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));
+      }
+
+      private function _saveHeaders() {
+         fwrite($this->SHPFile, pack("N", $this->recordNumber));
+         fwrite($this->SHPFile, pack("N", $this->getContentLength()));
+         fwrite($this->SHPFile, pack("V", $this->shapeType));
+      }
+
+      private function _loadPoint() {
+         $data = array();
+
+         $data["x"] = Util::loadData("d", fread($this->SHPFile, 8));
+         $data["y"] = Util::loadData("d", fread($this->SHPFile, 8));
+
+         return $data;
+      }
+
+      private function _loadPointM() {
+         $data = array();
+
+         $data["x"] = Util::loadData("d", fread($this->SHPFile, 8));
+         $data["y"] = Util::loadData("d", fread($this->SHPFile, 8));
+         $data["m"] = Util::loadData("d", fread($this->SHPFile, 8));
+
+         return $data;
+      }
+
+      private function _loadPointZ() {
+         $data = array();
+
+         $data["x"] = Util::loadData("d", fread($this->SHPFile, 8));
+         $data["y"] = Util::loadData("d", fread($this->SHPFile, 8));
+         $data["z"] = Util::loadData("d", fread($this->SHPFile, 8));
+         $data["m"] = Util::loadData("d", fread($this->SHPFile, 8));
+
+         return $data;
+      }
+
+      private function _savePoint($data) {
+         fwrite($this->SHPFile, Util::packDouble($data["x"]));
+         fwrite($this->SHPFile, Util::packDouble($data["y"]));
+      }
+
+      private function _savePointM($data) {
+         fwrite($this->SHPFile, Util::packDouble($data["x"]));
+         fwrite($this->SHPFile, Util::packDouble($data["y"]));
+         fwrite($this->SHPFile, Util::packDouble($data["m"]));
+      }
+
+      private 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"]));
+      }
+
+      private function _saveMeasure($data) {
+         fwrite($this->SHPFile, Util::packDouble($data["m"]));
+      }
+
+      private function _saveZCoordinate($data) {
+         fwrite($this->SHPFile, Util::packDouble($data["z"]));
+      }
+
+      private function _loadNullRecord() {
+         $this->SHPData = array();
+      }
+
+      private function _saveNullRecord() {
+         //Don't save anything
+      }
+
+      private function _loadPointRecord() {
+         $this->SHPData = $this->_loadPoint();
+      }
+
+      private function _loadPointMRecord() {
+         $this->SHPData = $this->_loadPointM();
+      }
+
+      private function _loadPointZRecord() {
+         $this->SHPData = $this->_loadPointZ();
+      }
+
+      private function _savePointRecord() {
+         $this->_savePoint($this->SHPData);
+      }
+
+      private function _savePointMRecord() {
+         $this->_savePointM($this->SHPData);
+      }
+
+      private function _savePointZRecord() {
+         $this->_savePointZ($this->SHPData);
+      }
 
-    private 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));
-        $this->SHPData["xmax"] = Util::loadData("d", fread($this->SHPFile, 8));
-        $this->SHPData["ymax"] = Util::loadData("d", fread($this->SHPFile, 8));
-
-        $this->SHPData["numpoints"] = Util::loadData("V", fread($this->SHPFile, 4));
+      private 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));
+         $this->SHPData["xmax"] = Util::loadData("d", fread($this->SHPFile, 8));
+         $this->SHPData["ymax"] = Util::loadData("d", fread($this->SHPFile, 8));
+
+         $this->SHPData["numpoints"] = Util::loadData("V", fread($this->SHPFile, 4));
 
-        for ($i = 0; $i <= $this->SHPData["numpoints"]; $i++) {
+         for ($i = 0; $i <= $this->SHPData["numpoints"]; $i++) {
             $this->SHPData["points"][] = $this->_loadPoint();
-        }
-    }
+         }
+      }
 
-    private function _loadMultiPointMZRecord( $type ) {
+      private 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));
+         $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++) {
+         for ($i = 0; $i <= $this->SHPData["numpoints"]; $i++) {
             $this->SHPData["points"][$i][$type] = Util::loadData("d", fread($this->SHPFile, 8));
-        }
-    }
+         }
+      }
 
-    private function _loadMultiPointMRecord() {
-        $this->_loadMultiPointRecord();
+      private function _loadMultiPointMRecord() {
+         $this->_loadMultiPointRecord();
 
-        $this->_loadMultiPointMZRecord("m");
-    }
+         $this->_loadMultiPointMZRecord("m");
+      }
 
-    private function _loadMultiPointZRecord() {
-        $this->_loadMultiPointRecord();
+      private function _loadMultiPointZRecord() {
+         $this->_loadMultiPointRecord();
 
-        $this->_loadMultiPointMZRecord("z");
-        $this->_loadMultiPointMZRecord("m");
-    }
+         $this->_loadMultiPointMZRecord("z");
+         $this->_loadMultiPointMZRecord("m");
+      }
 
-    private function _saveMultiPointRecord() {
-        fwrite($this->SHPFile, pack("dddd", $this->SHPData["xmin"], $this->SHPData["ymin"], $this->SHPData["xmax"], $this->SHPData["ymax"]));
+      private 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"]));
+         fwrite($this->SHPFile, pack("V", $this->SHPData["numpoints"]));
 
-        for ($i = 0; $i <= $this->SHPData["numpoints"]; $i++) {
+         for ($i = 0; $i <= $this->SHPData["numpoints"]; $i++) {
             $this->_savePoint($this->SHPData["points"][$i]);
-        }
-    }
+         }
+      }
 
-    private function _saveMultiPointMZRecord( $type ) {
+      private function _saveMultiPointMZRecord( $type ) {
 
-        fwrite($this->SHPFile, pack("dd", $this->SHPData[$type."min"], $this->SHPData[$type."max"]));
+         fwrite($this->SHPFile, pack("dd", $this->SHPData[$type."min"], $this->SHPData[$type."max"]));
 
-        for ($i = 0; $i <= $this->SHPData["numpoints"]; $i++) {
+         for ($i = 0; $i <= $this->SHPData["numpoints"]; $i++) {
             fwrite($this->SHPFile, Util::packDouble($this->SHPData["points"][$type]));
-        }
-    }
+         }
+      }
 
-    private function _saveMultiPointMRecord() {
-        $this->_saveMultiPointRecord();
+      private function _saveMultiPointMRecord() {
+         $this->_saveMultiPointRecord();
 
-        $this->_saveMultiPointMZRecord("m");
-    }
+         $this->_saveMultiPointMZRecord("m");
+      }
 
-    private function _saveMultiPointZRecord() {
-        $this->_saveMultiPointRecord();
+      private function _saveMultiPointZRecord() {
+         $this->_saveMultiPointRecord();
 
-        $this->_saveMultiPointMZRecord("z");
-        $this->_saveMultiPointMZRecord("m");
-    }
+         $this->_saveMultiPointMZRecord("z");
+         $this->_saveMultiPointMZRecord("m");
+      }
 
-    private 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));
-        $this->SHPData["xmax"] = Util::loadData("d", fread($this->SHPFile, 8));
-        $this->SHPData["ymax"] = Util::loadData("d", fread($this->SHPFile, 8));
+      private 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));
+         $this->SHPData["xmax"] = Util::loadData("d", fread($this->SHPFile, 8));
+         $this->SHPData["ymax"] = Util::loadData("d", fread($this->SHPFile, 8));
 
-        $this->SHPData["numparts"]  = Util::loadData("V", fread($this->SHPFile, 4));
-        $this->SHPData["numpoints"] = Util::loadData("V", fread($this->SHPFile, 4));
+         $this->SHPData["numparts"]  = Util::loadData("V", fread($this->SHPFile, 4));
+         $this->SHPData["numpoints"] = Util::loadData("V", fread($this->SHPFile, 4));
 
-        for ($i = 0; $i < $this->SHPData["numparts"]; $i++) {
+         for ($i = 0; $i < $this->SHPData["numparts"]; $i++) {
             $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"])) {
+         $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();
+                  $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++;
+                  $this->SHPData["parts"][$partIndex]["points"][] = $this->_loadPoint();
+                  $readPoints++;
             }
-        }
+         }
 
-        fseek($this->SHPFile, $firstIndex + ($readPoints*16));
-    }
+         fseek($this->SHPFile, $firstIndex + ($readPoints*16));
+      }
 
-    private function _loadPolyLineMZRecord( $type ) {
+      private 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));
+         $this->SHPData[$type."min"] = Util::loadData("d", fread($this->SHPFile, 8));
+         $this->SHPData[$type."max"] = Util::loadData("d", fread($this->SHPFile, 8));
 
-        $firstIndex = ftell($this->SHPFile);
-        $readPoints = 0;
-        reset($this->SHPData["parts"]);
-        while (list($partIndex, $partData) = each($this->SHPData["parts"])) {
+         $firstIndex = ftell($this->SHPFile);
+         $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++;
+                  $this->SHPData["parts"][$partIndex]["points"][$readPoints][$type] = Util::loadData("d", fread($this->SHPFile, 8));
+                  $readPoints++;
             }
-        }
+         }
 
-        fseek($this->SHPFile, $firstIndex + ($readPoints*24));
-    }
+         fseek($this->SHPFile, $firstIndex + ($readPoints*24));
+      }
 
-    private function _loadPolyLineMRecord() {
-        $this->_loadPolyLineRecord();
+      private function _loadPolyLineMRecord() {
+         $this->_loadPolyLineRecord();
 
-        $this->_loadPolyLineMZRecord("m");
-    }
+         $this->_loadPolyLineMZRecord("m");
+      }
 
-    private function _loadPolyLineZRecord() {
-        $this->_loadPolyLineRecord();
+      private function _loadPolyLineZRecord() {
+         $this->_loadPolyLineRecord();
 
-        $this->_loadPolyLineMZRecord("z");
-        $this->_loadPolyLineMZRecord("m");
-    }
+         $this->_loadPolyLineMZRecord("z");
+         $this->_loadPolyLineMZRecord("m");
+      }
 
-    private function _savePolyLineRecord() {
-        fwrite($this->SHPFile, pack("dddd", $this->SHPData["xmin"], $this->SHPData["ymin"], $this->SHPData["xmax"], $this->SHPData["ymax"]));
+      private 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"]));
+         fwrite($this->SHPFile, pack("VV", $this->SHPData["numparts"], $this->SHPData["numpoints"]));
 
-        for ($i = 0; $i < $this->SHPData["numparts"]; $i++) {
+         for ($i = 0; $i < $this->SHPData["numparts"]; $i++) {
             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);
+                  $this->_savePoint($pointData);
             }
-        }
-    }
+         }
+      }
 
-    private function _savePolyLineMZRecord( $type ) {
-        fwrite($this->SHPFile, pack("dd", $this->SHPData[$type."min"], $this->SHPData[$type."max"]));
+      private 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]));
+                  fwrite($this->SHPFile, Util::packDouble($pointData[$type]));
             }
-        }
-    }
+         }
+      }
 
-    private function _savePolyLineMRecord() {
-        $this->_savePolyLineRecord();
+      private function _savePolyLineMRecord() {
+         $this->_savePolyLineRecord();
 
-        $this->_savePolyLineMZRecord("m");
-    }
+         $this->_savePolyLineMZRecord("m");
+      }
 
-    private function _savePolyLineZRecord() {
-        $this->_savePolyLineRecord();
+      private function _savePolyLineZRecord() {
+         $this->_savePolyLineRecord();
 
-        $this->_savePolyLineMZRecord("z");
-        $this->_savePolyLineMZRecord("m");
-    }
+         $this->_savePolyLineMZRecord("z");
+         $this->_savePolyLineMZRecord("m");
+      }
 
-    private function _loadPolygonRecord() {
-        $this->_loadPolyLineRecord();
-    }
+      private function _loadPolygonRecord() {
+         $this->_loadPolyLineRecord();
+      }
 
-    private function _loadPolygonMRecord() {
-        $this->_loadPolyLineMRecord();
-    }
+      private function _loadPolygonMRecord() {
+         $this->_loadPolyLineMRecord();
+      }
 
-    private function _loadPolygonZRecord() {
-        $this->_loadPolyLineZRecord();
-    }
+      private function _loadPolygonZRecord() {
+         $this->_loadPolyLineZRecord();
+      }
 
-    private function _savePolygonRecord() {
-        $this->_savePolyLineRecord();
-    }
+      private function _savePolygonRecord() {
+         $this->_savePolyLineRecord();
+      }
 
-    private function _savePolygonMRecord() {
-        $this->_savePolyLineMRecord();
-    }
+      private function _savePolygonMRecord() {
+         $this->_savePolyLineMRecord();
+      }
 
-    private function _savePolygonZRecord() {
-        $this->_savePolyLineZRecord();
-    }
+      private function _savePolygonZRecord() {
+         $this->_savePolyLineZRecord();
+      }
 
-    public function addPoint($point, $partIndex = 0) {
-        switch ($this->shapeType) {
+      public function addPoint($point, $partIndex = 0) {
+         switch ($this->shapeType) {
             case 0:
                 //Don't add anything
                 break;
@@ -466,10 +466,10 @@  discard block
 block discarded – undo
             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;
+                  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:
@@ -477,50 +477,50 @@  discard block
 block discarded – undo
             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;
+                  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;
+                  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;
+         }
+      }
 
-    public function deletePoint($pointIndex = 0, $partIndex = 0) {
-        switch ($this->shapeType) {
+      public function deletePoint($pointIndex = 0, $partIndex = 0) {
+         switch ($this->shapeType) {
             case 0:
                 //Don't delete anything
                 break;
@@ -529,10 +529,10 @@  discard block
 block discarded – undo
             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;
+                  $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:
@@ -541,108 +541,108 @@  discard block
 block discarded – undo
             case 25:
                 //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++) {
+                     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];
-                    }
-                    unset($this->SHPData["parts"][$partIndex]["points"][count($this->SHPData["parts"][$partIndex]["points"]) - 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;
+                     $this->SHPData["numparts"] = count($this->SHPData["parts"]);
+                     $this->SHPData["numpoints"]--;
+                  }
+                  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++) {
+                     for ($i = $pointIndex; $i < (count($this->SHPData["points"]) - 1); $i++) {
                         $this->SHPData["points"][$i] = $this->SHPData["points"][$i + 1];
-                    }
-                    unset($this->SHPData["points"][count($this->SHPData["points"]) - 1]);
+                     }
+                     unset($this->SHPData["points"][count($this->SHPData["points"]) - 1]);
 
-                    $this->SHPData["numpoints"]--;
-                }
-                break;
+                     $this->SHPData["numpoints"]--;
+                  }
+                  break;
             default:
                 $this->setError(sprintf("The Shape Type '%s' is not supported.", $this->shapeType));
-                break;
-        }
-    }
-
-    public 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) {
+                  break;
+         }
+      }
+
+      public 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:
                 $result = 0;
-                break;
+                  break;
             case 1:
                 $result = 10;
-                break;
+                  break;
             case 21:
                 $result = 10 + 4;
-                break;
+                  break;
             case 11:
                 $result = 10 + 8;
-                break;
+                  break;
             case 3:
             case 5:
                 $result = 22 + 2*count($this->SHPData["parts"]);
-                for ($i = 0; $i < count($this->SHPData["parts"]); $i++) {
-                    $result += 8*count($this->SHPData["parts"][$i]["points"]);
-                }
-                break;
+                  for ($i = 0; $i < count($this->SHPData["parts"]); $i++) {
+                     $result += 8*count($this->SHPData["parts"][$i]["points"]);
+                  }
+                  break;
             case 23:
             case 25:
                 $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"]);
-                }
-                break;
+                  for ($i = 0; $i < count($this->SHPData["parts"]); $i++) {
+                     $result += (8+4)*count($this->SHPData["parts"][$i]["points"]);
+                  }
+                  break;
             case 13:
             case 15:
                 $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"]);
-                }
-                break;
+                  for ($i = 0; $i < count($this->SHPData["parts"]); $i++) {
+                     $result += (8+8)*count($this->SHPData["parts"][$i]["points"]);
+                  }
+                  break;
             case 8:
                 $result = 20 + 8*count($this->SHPData["points"]);
-                break;
+                  break;
             case 28:
                 $result = 20 + (2*4) + (8+4)*count($this->SHPData["points"]);
-                break;
+                  break;
             case 18:
                 $result = 20 + (4*4) + (8+8)*count($this->SHPData["points"]);
-                break;
+                  break;
             default:
                 $result = false;
-                $this->setError(sprintf("The Shape Type '%s' is not supported.", $this->shapeType));
-                break;
-        }
-        return $result;
-    }
-
-    private function _loadDBFData() {
-        $this->DBFData = @dbase_get_record_with_names($this->DBFFile, $this->recordNumber);
-        unset($this->DBFData["deleted"]);
-    }
-
-    private function _saveDBFData() {
-        unset($this->DBFData["deleted"]);
-        if ($this->recordNumber <= dbase_numrecords($this->DBFFile)) {
+                  $this->setError(sprintf("The Shape Type '%s' is not supported.", $this->shapeType));
+                  break;
+         }
+         return $result;
+      }
+
+      private function _loadDBFData() {
+         $this->DBFData = @dbase_get_record_with_names($this->DBFFile, $this->recordNumber);
+         unset($this->DBFData["deleted"]);
+      }
+
+      private 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.");
+                  $this->setError("I wasn't possible to update the information in the DBF file.");
             }
-        } else {
+         } 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.");
+                  $this->setError("I wasn't possible to add the information to the DBF file.");
             }
-        }
-    }
+         }
+      }
 
-    public function setError($error) {
-        $this->lastError = $error;
-        return false;
-    }
+      public function setError($error) {
+         $this->lastError = $error;
+         return false;
+      }
 }

Please login to merge, or discard this patch.

		@@ -275,7 +275,7 @@ discard block
		block discarded – undo
275	275	}
276	276	}
277	277
278		- private function _loadMultiPointMZRecord( $type ) {
	278	+ private function _loadMultiPointMZRecord($type) {
279	279
280	280	$this->SHPData[$type."min"] = Util::loadData("d", fread($this->SHPFile, 8));
281	281	$this->SHPData[$type."max"] = Util::loadData("d", fread($this->SHPFile, 8));
		@@ -308,7 +308,7 @@ discard block
		block discarded – undo
308	308	}
309	309	}
310	310
311		- private function _saveMultiPointMZRecord( $type ) {
	311	+ private function _saveMultiPointMZRecord($type) {
312	312
313	313	fwrite($this->SHPFile, pack("dd", $this->SHPData[$type."min"], $this->SHPData[$type."max"]));
314	314
		@@ -358,10 +358,10 @@ discard block
		block discarded – undo
358	358	}
359	359	}
360	360
361		- fseek($this->SHPFile, $firstIndex + ($readPoints*16));
	361	+ fseek($this->SHPFile, $firstIndex + ($readPoints * 16));
362	362	}
363	363
364		- private function _loadPolyLineMZRecord( $type ) {
	364	+ private function _loadPolyLineMZRecord($type) {
365	365
366	366	$this->SHPData[$type."min"] = Util::loadData("d", fread($this->SHPFile, 8));
367	367	$this->SHPData[$type."max"] = Util::loadData("d", fread($this->SHPFile, 8));
		@@ -376,7 +376,7 @@ discard block
		block discarded – undo
376	376	}
377	377	}
378	378
379		- fseek($this->SHPFile, $firstIndex + ($readPoints*24));
	379	+ fseek($this->SHPFile, $firstIndex + ($readPoints * 24));
380	380	}
381	381
382	382	private function _loadPolyLineMRecord() {
		@@ -398,10 +398,10 @@ discard block
		block discarded – undo
398	398	fwrite($this->SHPFile, pack("VV", $this->SHPData["numparts"], $this->SHPData["numpoints"]));
399	399
400	400	for ($i = 0; $i < $this->SHPData["numparts"]; $i++) {
401		- fwrite($this->SHPFile, pack("V", count($this->SHPData["parts"][$i])-1));
	401	+ fwrite($this->SHPFile, pack("V", count($this->SHPData["parts"][$i]) - 1));
402	402	}
403	403
404		- foreach ($this->SHPData["parts"] as $partData){
	404	+ foreach ($this->SHPData["parts"] as $partData) {
405	405	reset($partData["points"]);
406	406	while (list($pointIndex, $pointData) = each($partData["points"])) {
407	407	$this->_savePoint($pointData);
		@@ -409,10 +409,10 @@ discard block
		block discarded – undo
409	409	}
410	410	}
411	411
412		- private function _savePolyLineMZRecord( $type ) {
	412	+ private function _savePolyLineMZRecord($type) {
413	413	fwrite($this->SHPFile, pack("dd", $this->SHPData[$type."min"], $this->SHPData[$type."max"]));
414	414
415		- foreach ($this->SHPData["parts"] as $partData){
	415	+ foreach ($this->SHPData["parts"] as $partData) {
416	416	reset($partData["points"]);
417	417	while (list($pointIndex, $pointData) = each($partData["points"])) {
418	418	fwrite($this->SHPFile, Util::packDouble($pointData[$type]));
		@@ -465,8 +465,8 @@ discard block
		block discarded – undo
465	465	case 1:
466	466	case 11:
467	467	case 21:
468		- if (in_array($this->shapeType,array(11,21)) && !isset($point["m"])) $point["m"] = 0.0; // no_value
469		- if (in_array($this->shapeType,array(11)) && !isset($point["z"])) $point["z"] = 0.0; // no_value
	468	+ if (in_array($this->shapeType, array(11, 21)) && !isset($point["m"])) $point["m"] = 0.0; // no_value
	469	+ if (in_array($this->shapeType, array(11)) && !isset($point["z"])) $point["z"] = 0.0; // no_value
470	470	//Substitutes the value of the current point
471	471	$this->SHPData = $point;
472	472	break;
		@@ -476,8 +476,8 @@ discard block
		block discarded – undo
476	476	case 15:
477	477	case 23:
478	478	case 25:
479		- if (in_array($this->shapeType,array(13,15,23,25)) && !isset($point["m"])) $point["m"] = 0.0; // no_value
480		- if (in_array($this->shapeType,array(13,15)) && !isset($point["z"])) $point["z"] = 0.0; // no_value
	479	+ if (in_array($this->shapeType, array(13, 15, 23, 25)) && !isset($point["m"])) $point["m"] = 0.0; // no_value
	480	+ if (in_array($this->shapeType, array(13, 15)) && !isset($point["z"])) $point["z"] = 0.0; // no_value
481	481
482	482	//Adds a new point to the selected part
483	483	if (!isset($this->SHPData["xmin"]) \|\| ($this->SHPData["xmin"] > $point["x"])) $this->SHPData["xmin"] = $point["x"];
		@@ -492,13 +492,13 @@ discard block
		block discarded – undo
492	492	$this->SHPData["parts"][$partIndex]["points"][] = $point;
493	493
494	494	$this->SHPData["numparts"] = count($this->SHPData["parts"]);
495		- $this->SHPData["numpoints"] = 1 + (isset($this->SHPData["numpoints"])?$this->SHPData["numpoints"]:0);
	495	+ $this->SHPData["numpoints"] = 1 + (isset($this->SHPData["numpoints"]) ? $this->SHPData["numpoints"] : 0);
496	496	break;
497	497	case 8:
498	498	case 18:
499	499	case 28:
500		- if (in_array($this->shapeType,array(18,28)) && !isset($point["m"])) $point["m"] = 0.0; // no_value
501		- if (in_array($this->shapeType,array(18)) && !isset($point["z"])) $point["z"] = 0.0; // no_value
	500	+ if (in_array($this->shapeType, array(18, 28)) && !isset($point["m"])) $point["m"] = 0.0; // no_value
	501	+ if (in_array($this->shapeType, array(18)) && !isset($point["z"])) $point["z"] = 0.0; // no_value
502	502
503	503	//Adds a new point
504	504	if (!isset($this->SHPData["xmin"]) \|\| ($this->SHPData["xmin"] > $point["x"])) $this->SHPData["xmin"] = $point["x"];
		@@ -511,7 +511,7 @@ discard block
		block discarded – undo
511	511	if (isset($point["z"]) && (!isset($this->SHPData["zmax"]) \|\| ($this->SHPData["zmax"] < $point["z"]))) $this->SHPData["zmax"] = $point["z"];
512	512
513	513	$this->SHPData["points"][] = $point;
514		- $this->SHPData["numpoints"] = 1 + (isset($this->SHPData["numpoints"])?$this->SHPData["numpoints"]:0);
	514	+ $this->SHPData["numpoints"] = 1 + (isset($this->SHPData["numpoints"]) ? $this->SHPData["numpoints"] : 0);
515	515	break;
516	516	default:
517	517	$this->setError(sprintf("The Shape Type '%s' is not supported.", $this->shapeType));
		@@ -530,8 +530,8 @@ discard block
		block discarded – undo
530	530	//Sets the value of the point to zero
531	531	$this->SHPData["x"] = 0.0;
532	532	$this->SHPData["y"] = 0.0;
533		- if (in_array($this->shapeType,array(11,21))) $this->SHPData["m"] = 0.0;
534		- if (in_array($this->shapeType,array(11))) $this->SHPData["z"] = 0.0;
	533	+ if (in_array($this->shapeType, array(11, 21))) $this->SHPData["m"] = 0.0;
	534	+ if (in_array($this->shapeType, array(11))) $this->SHPData["z"] = 0.0;
535	535	break;
536	536	case 3:
537	537	case 5:
		@@ -587,33 +587,33 @@ discard block
		block discarded – undo
587	587	break;
588	588	case 3:
589	589	case 5:
590		- $result = 22 + 2*count($this->SHPData["parts"]);
	590	+ $result = 22 + 2 * count($this->SHPData["parts"]);
591	591	for ($i = 0; $i < count($this->SHPData["parts"]); $i++) {
592		- $result += 8*count($this->SHPData["parts"][$i]["points"]);
	592	+ $result += 8 * count($this->SHPData["parts"][$i]["points"]);
593	593	}
594	594	break;
595	595	case 23:
596	596	case 25:
597		- $result = 22 + (24) + 2count($this->SHPData["parts"]);
	597	+ $result = 22 + (2 * 4) + 2 * count($this->SHPData["parts"]);
598	598	for ($i = 0; $i < count($this->SHPData["parts"]); $i++) {
599		- $result += (8+4)*count($this->SHPData["parts"][$i]["points"]);
	599	+ $result += (8 + 4) * count($this->SHPData["parts"][$i]["points"]);
600	600	}
601	601	break;
602	602	case 13:
603	603	case 15:
604		- $result = 22 + (44) + 2count($this->SHPData["parts"]);
	604	+ $result = 22 + (4 * 4) + 2 * count($this->SHPData["parts"]);
605	605	for ($i = 0; $i < count($this->SHPData["parts"]); $i++) {
606		- $result += (8+8)*count($this->SHPData["parts"][$i]["points"]);
	606	+ $result += (8 + 8) * count($this->SHPData["parts"][$i]["points"]);
607	607	}
608	608	break;
609	609	case 8:
610		- $result = 20 + 8*count($this->SHPData["points"]);
	610	+ $result = 20 + 8 * count($this->SHPData["points"]);
611	611	break;
612	612	case 28:
613		- $result = 20 + (24) + (8+4)count($this->SHPData["points"]);
	613	+ $result = 20 + (2 * 4) + (8 + 4) * count($this->SHPData["points"]);
614	614	break;
615	615	case 18:
616		- $result = 20 + (44) + (8+8)count($this->SHPData["points"]);
	616	+ $result = 20 + (4 * 4) + (8 + 8) * count($this->SHPData["points"]);
617	617	break;
618	618	default:
619	619	$result = false;

		@@ -8,16 +8,16 @@
		block discarded – undo
8	8
9	9	$i = 1;
10	10	foreach($shp->records as $record){
11		- echo "<pre>";
12		- echo "Record No. $i:\n\n\n";
13		- echo "SHP Data = ";
14		- print_r($record->SHPData); //All the data related to the poligon
15		- print_r("\n\n\n");
16		- echo "DBF Data = ";
17		- print_r($record->DBFData); //All the information related to each poligon
18		- print_r("\n\n\n");
19		- echo "</pre>";
20		- $i++;
	11	+ echo "<pre>";
	12	+ echo "Record No. $i:\n\n\n";
	13	+ echo "SHP Data = ";
	14	+ print_r($record->SHPData); //All the data related to the poligon
	15	+ print_r("\n\n\n");
	16	+ echo "DBF Data = ";
	17	+ print_r($record->DBFData); //All the information related to each poligon
	18	+ print_r("\n\n\n");
	19	+ echo "</pre>";
	20	+ $i++;
21	21	}
22	22
23	23	echo "The ShapeFile was completely readed.<br />\n";

		@@ -7,14 +7,14 @@
		block discarded – undo
7	7	$shp->loadFromFile('../data/mexico.*');
8	8
9	9	$i = 1;
10		-foreach($shp->records as $record){
	10	+foreach ($shp->records as $record) {
11	11	echo "<pre>";
12	12	echo "Record No. $i:\n\n\n";
13	13	echo "SHP Data = ";
14		- print_r($record->SHPData); //All the data related to the poligon
	14	+ print_r($record->SHPData); //All the data related to the poligon
15	15	print_r("\n\n\n");
16	16	echo "DBF Data = ";
17		- print_r($record->DBFData); //All the information related to each poligon
	17	+ print_r($record->DBFData); //All the information related to each poligon
18	18	print_r("\n\n\n");
19	19	echo "</pre>";
20	20	$i++;

		@@ -7,14 +7,14 @@
		block discarded – undo
7	7	$shp->loadFromFile('../data/capitals.*');
8	8
9	9	$i = 1;
10		-foreach($shp->records as $record){
	10	+foreach ($shp->records as $record) {
11	11	echo "<pre>";
12	12	echo "Record No. $i:\n\n\n";
13	13	echo "SHP Data = ";
14		- print_r($record->SHPData); //All the data related to the point
	14	+ print_r($record->SHPData); //All the data related to the point
15	15	print_r("\n\n\n");
16	16	echo "DBF Data = ";
17		- print_r($record->DBFData); //All the information related to each point
	17	+ print_r($record->DBFData); //All the information related to each point
18	18	print_r("\n\n\n");
19	19	echo "</pre>";
20	20	$i++;

		@@ -95,20 +95,20 @@ discard block
		block discarded – undo
95	95	$this->records[] = $record;
96	96	$this->records[count($this->records) - 1]->recordNumber = count($this->records);
97	97
98		- if ($this->boundingBox["xmin"]==0.0 \|\| ($this->boundingBox["xmin"]>$record->SHPData["xmin"])) $this->boundingBox["xmin"] = $record->SHPData["xmin"];
99		- if ($this->boundingBox["xmax"]==0.0 \|\| ($this->boundingBox["xmax"]<$record->SHPData["xmax"])) $this->boundingBox["xmax"] = $record->SHPData["xmax"];
	98	+ if ($this->boundingBox["xmin"] == 0.0 \|\| ($this->boundingBox["xmin"] > $record->SHPData["xmin"])) $this->boundingBox["xmin"] = $record->SHPData["xmin"];
	99	+ if ($this->boundingBox["xmax"] == 0.0 \|\| ($this->boundingBox["xmax"] < $record->SHPData["xmax"])) $this->boundingBox["xmax"] = $record->SHPData["xmax"];
100	100
101		- if ($this->boundingBox["ymin"]==0.0 \|\| ($this->boundingBox["ymin"]>$record->SHPData["ymin"])) $this->boundingBox["ymin"] = $record->SHPData["ymin"];
102		- if ($this->boundingBox["ymax"]==0.0 \|\| ($this->boundingBox["ymax"]<$record->SHPData["ymax"])) $this->boundingBox["ymax"] = $record->SHPData["ymax"];
	101	+ if ($this->boundingBox["ymin"] == 0.0 \|\| ($this->boundingBox["ymin"] > $record->SHPData["ymin"])) $this->boundingBox["ymin"] = $record->SHPData["ymin"];
	102	+ if ($this->boundingBox["ymax"] == 0.0 \|\| ($this->boundingBox["ymax"] < $record->SHPData["ymax"])) $this->boundingBox["ymax"] = $record->SHPData["ymax"];
103	103
104		- if (in_array($this->shapeType,array(11,13,15,18,21,23,25,28))) {
105		- if (!isset($this->boundingBox["mmin"]) \|\| $this->boundingBox["mmin"]==0.0 \|\| ($this->boundingBox["mmin"]>$record->SHPData["mmin"])) $this->boundingBox["mmin"] = $record->SHPData["mmin"];
106		- if (!isset($this->boundingBox["mmax"]) \|\| $this->boundingBox["mmax"]==0.0 \|\| ($this->boundingBox["mmax"]<$record->SHPData["mmax"])) $this->boundingBox["mmax"] = $record->SHPData["mmax"];
	104	+ if (in_array($this->shapeType, array(11, 13, 15, 18, 21, 23, 25, 28))) {
	105	+ if (!isset($this->boundingBox["mmin"]) \|\| $this->boundingBox["mmin"] == 0.0 \|\| ($this->boundingBox["mmin"] > $record->SHPData["mmin"])) $this->boundingBox["mmin"] = $record->SHPData["mmin"];
	106	+ if (!isset($this->boundingBox["mmax"]) \|\| $this->boundingBox["mmax"] == 0.0 \|\| ($this->boundingBox["mmax"] < $record->SHPData["mmax"])) $this->boundingBox["mmax"] = $record->SHPData["mmax"];
107	107	}
108	108
109		- if (in_array($this->shapeType,array(11,13,15,18))) {
110		- if (!isset($this->boundingBox["zmin"]) \|\| $this->boundingBox["zmin"]==0.0 \|\| ($this->boundingBox["zmin"]>$record->SHPData["zmin"])) $this->boundingBox["zmin"] = $record->SHPData["zmin"];
111		- if (!isset($this->boundingBox["zmax"]) \|\| $this->boundingBox["zmax"]==0.0 \|\| ($this->boundingBox["zmax"]<$record->SHPData["zmax"])) $this->boundingBox["zmax"] = $record->SHPData["zmax"];
	109	+ if (in_array($this->shapeType, array(11, 13, 15, 18))) {
	110	+ if (!isset($this->boundingBox["zmin"]) \|\| $this->boundingBox["zmin"] == 0.0 \|\| ($this->boundingBox["zmin"] > $record->SHPData["zmin"])) $this->boundingBox["zmin"] = $record->SHPData["zmin"];
	111	+ if (!isset($this->boundingBox["zmax"]) \|\| $this->boundingBox["zmax"] == 0.0 \|\| ($this->boundingBox["zmax"] < $record->SHPData["zmax"])) $this->boundingBox["zmax"] = $record->SHPData["zmax"];
112	112	}
113	113
114	114	return (count($this->records) - 1);
		@@ -219,23 +219,23 @@ discard block
		block discarded – undo
219	219	fwrite($this->SHPFile, Util::packDouble($this->boundingBox['ymin']));
220	220	fwrite($this->SHPFile, Util::packDouble($this->boundingBox['xmax']));
221	221	fwrite($this->SHPFile, Util::packDouble($this->boundingBox['ymax']));
222		- fwrite($this->SHPFile, Util::packDouble(isset($this->boundingBox['zmin'])?$this->boundingBox['zmin']:0));
223		- fwrite($this->SHPFile, Util::packDouble(isset($this->boundingBox['zmax'])?$this->boundingBox['zmax']:0));
224		- fwrite($this->SHPFile, Util::packDouble(isset($this->boundingBox['mmin'])?$this->boundingBox['mmin']:0));
225		- fwrite($this->SHPFile, Util::packDouble(isset($this->boundingBox['mmax'])?$this->boundingBox['mmax']:0));
	222	+ fwrite($this->SHPFile, Util::packDouble(isset($this->boundingBox['zmin']) ? $this->boundingBox['zmin'] : 0));
	223	+ fwrite($this->SHPFile, Util::packDouble(isset($this->boundingBox['zmax']) ? $this->boundingBox['zmax'] : 0));
	224	+ fwrite($this->SHPFile, Util::packDouble(isset($this->boundingBox['mmin']) ? $this->boundingBox['mmin'] : 0));
	225	+ fwrite($this->SHPFile, Util::packDouble(isset($this->boundingBox['mmax']) ? $this->boundingBox['mmax'] : 0));
226	226
227	227	fwrite($this->SHXFile, pack("NNNNNN", 9994, 0, 0, 0, 0, 0));
228		- fwrite($this->SHXFile, pack("N", 50 + 4*count($this->records)));
	228	+ fwrite($this->SHXFile, pack("N", 50 + 4 * count($this->records)));
229	229	fwrite($this->SHXFile, pack("V", 1000));
230	230	fwrite($this->SHXFile, pack("V", $this->shapeType));
231	231	fwrite($this->SHXFile, Util::packDouble($this->boundingBox['xmin']));
232	232	fwrite($this->SHXFile, Util::packDouble($this->boundingBox['ymin']));
233	233	fwrite($this->SHXFile, Util::packDouble($this->boundingBox['xmax']));
234	234	fwrite($this->SHXFile, Util::packDouble($this->boundingBox['ymax']));
235		- fwrite($this->SHXFile, Util::packDouble(isset($this->boundingBox['zmin'])?$this->boundingBox['zmin']:0));
236		- fwrite($this->SHXFile, Util::packDouble(isset($this->boundingBox['zmax'])?$this->boundingBox['zmax']:0));
237		- fwrite($this->SHXFile, Util::packDouble(isset($this->boundingBox['mmin'])?$this->boundingBox['mmin']:0));
238		- fwrite($this->SHXFile, Util::packDouble(isset($this->boundingBox['mmax'])?$this->boundingBox['mmax']:0));
	235	+ fwrite($this->SHXFile, Util::packDouble(isset($this->boundingBox['zmin']) ? $this->boundingBox['zmin'] : 0));
	236	+ fwrite($this->SHXFile, Util::packDouble(isset($this->boundingBox['zmax']) ? $this->boundingBox['zmax'] : 0));
	237	+ fwrite($this->SHXFile, Util::packDouble(isset($this->boundingBox['mmin']) ? $this->boundingBox['mmin'] : 0));
	238	+ fwrite($this->SHXFile, Util::packDouble(isset($this->boundingBox['mmax']) ? $this->boundingBox['mmax'] : 0));
239	239	}
240	240
241	241	private function _loadRecords() {

		@@ -31,37 +31,37 @@
		block discarded – undo
31	31	namespace ShapeFile;
32	32
33	33	class Util {
34		- public static function loadData($type, $data) {
35		- if (!$data) return $data;
36		- $tmp = unpack($type, $data);
37		- return current($tmp);
38		- }
	34	+ public static function loadData($type, $data) {
	35	+ if (!$data) return $data;
	36	+ $tmp = unpack($type, $data);
	37	+ return current($tmp);
	38	+ }
39	39
40		- public static function swap($binValue) {
41		- $result = $binValue{strlen($binValue) - 1};
42		- for($i = strlen($binValue) - 2; $i >= 0 ; $i--) {
	40	+ public static function swap($binValue) {
	41	+ $result = $binValue{strlen($binValue) - 1};
	42	+ for($i = strlen($binValue) - 2; $i >= 0 ; $i--) {
43	43	$result .= $binValue{$i};
44		- }
	44	+ }
45	45
46		- return $result;
47		- }
	46	+ return $result;
	47	+ }
48	48
49		- public static function packDouble($value, $mode = 'LE') {
50		- $value = (double)$value;
51		- $bin = pack("d", $value);
	49	+ public static function packDouble($value, $mode = 'LE') {
	50	+ $value = (double)$value;
	51	+ $bin = pack("d", $value);
52	52
53		- //We test if the conversion of an integer (1) is done as LE or BE by default
54		- switch (pack ('L', 1)) {
	53	+ //We test if the conversion of an integer (1) is done as LE or BE by default
	54	+ switch (pack ('L', 1)) {
55	55	case pack ('V', 1): //Little Endian
56	56	$result = ($mode == 'LE') ? $bin : self::swap($bin);
57		- break;
	57	+ break;
58	58	case pack ('N', 1): //Big Endian
59	59	$result = ($mode == 'BE') ? $bin : self::swap($bin);
60		- break;
	60	+ break;
61	61	default: //Some other thing, we just return false
62	62	$result = FALSE;
63		- }
	63	+ }
64	64
65		- return $result;
66		- }
	65	+ return $result;
	66	+ }
67	67	}

		@@ -39,7 +39,7 @@ discard block
		block discarded – undo
39	39
40	40	public static function swap($binValue) {
41	41	$result = $binValue{strlen($binValue) - 1};
42		- for($i = strlen($binValue) - 2; $i >= 0 ; $i--) {
	42	+ for ($i = strlen($binValue) - 2; $i >= 0; $i--) {
43	43	$result .= $binValue{$i};
44	44	}
45	45
		@@ -47,15 +47,15 @@ discard block
		block discarded – undo
47	47	}
48	48
49	49	public static function packDouble($value, $mode = 'LE') {
50		- $value = (double)$value;
	50	+ $value = (double) $value;
51	51	$bin = pack("d", $value);
52	52
53	53	//We test if the conversion of an integer (1) is done as LE or BE by default
54		- switch (pack ('L', 1)) {
55		- case pack ('V', 1): //Little Endian
	54	+ switch (pack('L', 1)) {
	55	+ case pack('V', 1): //Little Endian
56	56	$result = ($mode == 'LE') ? $bin : self::swap($bin);
57	57	break;
58		- case pack ('N', 1): //Big Endian
	58	+ case pack('N', 1): //Big Endian
59	59	$result = ($mode == 'BE') ? $bin : self::swap($bin);
60	60	break;
61	61	default: //Some other thing, we just return false

phpmyadmin / shapefile

Push — master ( 965bc2...b47f29 )

Status

Category

Indentation +10 added lines, -10 removed lines patch added patch discarded remove patch

Spacing +3 added lines, -3 removed lines patch added patch discarded remove patch

Indentation +10 added lines, -10 removed lines patch added patch discarded remove patch

Spacing +3 added lines, -3 removed lines patch added patch discarded remove patch

Indentation +4 added lines, -4 removed lines patch added patch discarded remove patch

Spacing +19 added lines, -19 removed lines patch added patch discarded remove patch

Indentation +197 added lines, -197 removed lines patch added patch discarded remove patch

Indentation +21 added lines, -21 removed lines patch added patch discarded remove patch

Spacing +5 added lines, -5 removed lines patch added patch discarded remove patch

Spacing +28 added lines, -28 removed lines patch added patch discarded remove patch

Indentation +405 added lines, -405 removed lines patch added patch discarded remove patch