phpmyadmin / shapefile

src/ShapeFile.php

Doc Comments +3 added lines

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

Spacing +19 added lines, -19 removed lines

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

Braces +27 added lines, -9 removed lines

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

src/ShapeRecord.php

Doc Comments +18 added lines

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

Spacing +28 added lines, -28 removed lines

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

Braces +78 added lines, -24 removed lines

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

src/Util.php

Spacing +5 added lines, -5 removed lines

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

Braces +3 added lines, -1 removed lines

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

examples/read_polygon.php

Spacing +3 added lines, -3 removed lines

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

examples/read_point.php

Spacing +3 added lines, -3 removed lines

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