phpmyadmin / shapefile

src/ShapeFile.php

Spacing +19 added lines, -19 removed lines

@@ -97,34 +97,34 @@ 
         $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"])) {
+        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"])) {
+        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"])) {
+        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"])) {
+        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"])) {
+        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"])) {
+            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"])) {
+        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"])) {
+            if (!isset($this->boundingBox["zmax"]) || $this->boundingBox["zmax"] == 0.0 || ($this->boundingBox["zmax"] < $record->SHPData["zmax"])) {
                 $this->boundingBox["zmax"] = $record->SHPData["zmax"];
             }
         }
@@ -237,23 +237,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() {

src/ShapeRecord.php

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,10 +465,10 @@ 
             case 1:
             case 11:
             case 21:
-                if (in_array($this->shapeType,array(11,21)) && !isset($point["m"])) {
+                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"])) {
+                if (in_array($this->shapeType, array(11)) && !isset($point["z"])) {
                     $point["z"] = 0.0; // no_value
                 }
                 //Substitutes the value of the current point
@@ -480,10 +480,10 @@ 
             case 15:
             case 23:
             case 25:
-                if (in_array($this->shapeType,array(13,15,23,25)) && !isset($point["m"])) {
+                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"])) {
+                if (in_array($this->shapeType, array(13, 15)) && !isset($point["z"])) {
                     $point["z"] = 0.0; // no_value
                 }
 
@@ -516,15 +516,15 @@ 
                 $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"])) {
+                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"])) {
+                if (in_array($this->shapeType, array(18)) && !isset($point["z"])) {
                     $point["z"] = 0.0; // no_value
                 }
 
@@ -555,7 +555,7 @@ 
                 }
 
                 $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));
@@ -574,10 +574,10 @@ 
                 //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))) {
+                if (in_array($this->shapeType, array(11, 21))) {
                     $this->SHPData["m"] = 0.0;
                 }
-                if (in_array($this->shapeType,array(11))) {
+                if (in_array($this->shapeType, array(11))) {
                     $this->SHPData["z"] = 0.0;
                 }
                 break;
@@ -635,33 +635,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;