phpmyadmin / shapefile

read_point.php

Spacing +3 added lines, -3 removed lines

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

src/ShapeFile.lib.php

Spacing +11 added lines, -11 removed lines

@@ -36,7 +36,7 @@ 
 
   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};
     }
 
@@ -44,15 +44,15 @@ 
   }
 
   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 : swap($bin);
       break;
-      case pack ('N', 1): //Big Endian
+      case pack('N', 1): //Big Endian
         $result = ($mode == 'BE') ? $bin : swap($bin);
       break;
       default: //Some other thing, we just return false
@@ -233,7 +233,7 @@ 
       fwrite($this->SHPFile, pack("dddd", 0, 0, 0, 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, packDouble($this->boundingBox['xmin']));
@@ -522,7 +522,7 @@ 
         }
       }
 
-      fseek($this->SHPFile, $firstIndex + ($readPoints*16));
+      fseek($this->SHPFile, $firstIndex + ($readPoints * 16));
     }
 
     function _savePolyLineRecord() {
@@ -534,7 +534,7 @@ 
         fwrite($this->SHPFile, pack("V", count($this->SHPData["parts"][$i])));
       }
 
-      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);
@@ -638,13 +638,13 @@ 
         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 8:
-          $result = 20 + 8*count($this->SHPData["points"]);
+          $result = 20 + 8 * count($this->SHPData["points"]);
         break;
         default:
           $result = false;

Braces +30 added lines, -10 removed lines

@@ -29,7 +29,9 @@ 
  *
  */
   function loadData($type, $data) {
-    if (!$data) return $data;
+    if (!$data) {
+       return $data;
+    }
     $tmp = unpack($type, $data);
     return current($tmp);
   }
@@ -104,7 +106,9 @@ 
     }
 
     function saveToFile($FileName = NULL) {
-      if ($FileName != NULL) $this->FileName = $FileName;
+      if ($FileName != NULL) {
+         $this->FileName = $FileName;
+      }
 
       if (($this->_openSHPFile(TRUE)) && ($this->_openSHXFile(TRUE)) && ($this->_openDBFFile(TRUE))) {
         $this->_saveHeaders();
@@ -562,10 +566,18 @@ 
         case 3:
         case 5:
           //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($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($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($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"];
+          }
 
           $this->SHPData["parts"][$partIndex]["points"][] = $point;
 
@@ -574,10 +586,18 @@ 
         break;
         case 8:
           //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($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($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($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"];
+          }
 
           $this->SHPData["points"][] = $point;
           $this->SHPData["numpoints"]++;

read_polygon.php

Spacing +3 added lines, -3 removed lines

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