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;

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;

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

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);
     }