Inspection of "added support for M and Z coordinates, removed acc..." - phpmyadmin/shapefile - Measure and Improve Code Quality continuously with Scrutinizer

Completed

Push — master ( a99ae2...001830 )

by Michal

created 2016-06-14 08:51 UTC

Status

Doc Comments +29 added lines patch added patch discarded remove patch

@@ -27,6 +27,8 @@  discard block
 block discarded – undo
  * along with this program; if not, you can download one from
  * http://www.gnu.org/copyleft/gpl.html.
  *
+ * @param string $type
+ * @param string $data
  */
   function loadData($type, $data) {
     if (!$data) return $data;
@@ -34,6 +36,9 @@  discard block
 block discarded – undo
     return current($tmp);
   }
 
+  /**
+   * @param string $binValue
+   */
   function swap($binValue) {
     $result = $binValue{strlen($binValue) - 1};
     for($i = strlen($binValue) - 2; $i >= 0 ; $i--) {
@@ -43,6 +48,9 @@  discard block
 block discarded – undo
     return $result;
   }
 
+  /**
+   * @return string
+   */
   function packDouble($value, $mode = 'LE') {
     $value = (double)$value;
     $bin = pack("d", $value);
@@ -366,6 +374,9 @@  discard block
 block discarded – undo
       }
     }
 
+    /**
+     * @param string $error
+     */
     function setError($error) {
       $this->lastError = $error;
       return false;
@@ -384,6 +395,9 @@  discard block
 block discarded – undo
     var $SHPData = array();
     var $DBFData = array();
 
+    /**
+     * @param integer $shapeType
+     */
     public function __construct($shapeType) {
       $this->shapeType = $shapeType;
     }
@@ -617,6 +631,9 @@  discard block
 block discarded – undo
       }
     }
 
+    /**
+     * @param string $type
+     */
     function _loadMultiPointMZRecord( $type ) {
 
       $this->SHPData[$type."min"] = loadData("d", fread($this->SHPFile, 8));
@@ -650,6 +667,9 @@  discard block
 block discarded – undo
       }
     }
 
+    /**
+     * @param string $type
+     */
     function _saveMultiPointMZRecord( $type ) {
 
       fwrite($this->SHPFile, pack("dd", $this->SHPData[$type."min"], $this->SHPData[$type."max"]));
@@ -703,6 +723,9 @@  discard block
 block discarded – undo
       fseek($this->SHPFile, $firstIndex + ($readPoints*16));
     }
 
+    /**
+     * @param string $type
+     */
     function _loadPolyLineMZRecord( $type ) {
 
       $this->SHPData[$type."min"] = loadData("d", fread($this->SHPFile, 8));
@@ -751,6 +774,9 @@  discard block
 block discarded – undo
       }
     }
 
+    /**
+     * @param string $type
+     */
     function _savePolyLineMZRecord( $type ) {
       fwrite($this->SHPFile, pack("dd", $this->SHPData[$type."min"], $this->SHPData[$type."max"]));
 
@@ -983,6 +1009,9 @@  discard block
 block discarded – undo
       }
     }
 
+    /**
+     * @param string $error
+     */
     function setError($error) {
       $this->lastError = $error;
       return false;

Please login to merge, or discard this patch.

Braces +108 added lines, -34 removed lines patch added patch discarded remove patch

@@ -29,7 +29,9 @@  discard block
 block discarded – undo
  *
  */
   function loadData($type, $data) {
-    if (!$data) return $data;
+    if (!$data) {
+       return $data;
+    }
     $tmp = unpack($type, $data);
     return current($tmp);
   }
@@ -105,7 +107,9 @@  discard block
 block discarded – undo
     }
 
     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();
@@ -127,20 +131,36 @@  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 (!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);
@@ -807,8 +827,14 @@  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;
@@ -818,18 +844,40 @@  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"];
-          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;
 
@@ -839,18 +887,40 @@  discard block
 block discarded – undo
         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);
@@ -872,8 +942,12 @@  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:

Please login to merge, or discard this patch.

		@@ -27,6 +27,8 @@ discard block
		block discarded – undo
27	27	* along with this program; if not, you can download one from
28	28	* http://www.gnu.org/copyleft/gpl.html.
29	29	*
	30	+ * @param string $type
	31	+ * @param string $data
30	32	*/
31	33	function loadData($type, $data) {
32	34	if (!$data) return $data;
		@@ -34,6 +36,9 @@ discard block
		block discarded – undo
34	36	return current($tmp);
35	37	}
36	38
	39	+ /**
	40	+ * @param string $binValue
	41	+ */
37	42	function swap($binValue) {
38	43	$result = $binValue{strlen($binValue) - 1};
39	44	for($i = strlen($binValue) - 2; $i >= 0 ; $i--) {
		@@ -43,6 +48,9 @@ discard block
		block discarded – undo
43	48	return $result;
44	49	}
45	50
	51	+ /**
	52	+ * @return string
	53	+ */
46	54	function packDouble($value, $mode = 'LE') {
47	55	$value = (double)$value;
48	56	$bin = pack("d", $value);
		@@ -366,6 +374,9 @@ discard block
		block discarded – undo
366	374	}
367	375	}
368	376
	377	+ /**
	378	+ * @param string $error
	379	+ */
369	380	function setError($error) {
370	381	$this->lastError = $error;
371	382	return false;
		@@ -384,6 +395,9 @@ discard block
		block discarded – undo
384	395	var $SHPData = array();
385	396	var $DBFData = array();
386	397
	398	+ /**
	399	+ * @param integer $shapeType
	400	+ */
387	401	public function __construct($shapeType) {
388	402	$this->shapeType = $shapeType;
389	403	}
		@@ -617,6 +631,9 @@ discard block
		block discarded – undo
617	631	}
618	632	}
619	633
	634	+ /**
	635	+ * @param string $type
	636	+ */
620	637	function _loadMultiPointMZRecord( $type ) {
621	638
622	639	$this->SHPData[$type."min"] = loadData("d", fread($this->SHPFile, 8));
		@@ -650,6 +667,9 @@ discard block
		block discarded – undo
650	667	}
651	668	}
652	669
	670	+ /**
	671	+ * @param string $type
	672	+ */
653	673	function _saveMultiPointMZRecord( $type ) {
654	674
655	675	fwrite($this->SHPFile, pack("dd", $this->SHPData[$type."min"], $this->SHPData[$type."max"]));
		@@ -703,6 +723,9 @@ discard block
		block discarded – undo
703	723	fseek($this->SHPFile, $firstIndex + ($readPoints*16));
704	724	}
705	725
	726	+ /**
	727	+ * @param string $type
	728	+ */
706	729	function _loadPolyLineMZRecord( $type ) {
707	730
708	731	$this->SHPData[$type."min"] = loadData("d", fread($this->SHPFile, 8));
		@@ -751,6 +774,9 @@ discard block
		block discarded – undo
751	774	}
752	775	}
753	776
	777	+ /**
	778	+ * @param string $type
	779	+ */
754	780	function _savePolyLineMZRecord( $type ) {
755	781	fwrite($this->SHPFile, pack("dd", $this->SHPData[$type."min"], $this->SHPData[$type."max"]));
756	782
		@@ -983,6 +1009,9 @@ discard block
		block discarded – undo
983	1009	}
984	1010	}
985	1011
	1012	+ /**
	1013	+ * @param string $error
	1014	+ */
986	1015	function setError($error) {
987	1016	$this->lastError = $error;
988	1017	return false;

		@@ -29,7 +29,9 @@ discard block
		block discarded – undo
29	29	*
30	30	*/
31	31	function loadData($type, $data) {
32		- if (!$data) return $data;
	32	+ if (!$data) {
	33	+ return $data;
	34	+ }
33	35	$tmp = unpack($type, $data);
34	36	return current($tmp);
35	37	}
		@@ -105,7 +107,9 @@ discard block
		block discarded – undo
105	107	}
106	108
107	109	function saveToFile($FileName = NULL) {
108		- if ($FileName != NULL) $this->FileName = $FileName;
	110	+ if ($FileName != NULL) {
	111	+ $this->FileName = $FileName;
	112	+ }
109	113
110	114	if (($this->_openSHPFile(TRUE)) && ($this->_openSHXFile(TRUE)) && ($this->_openDBFFile(TRUE))) {
111	115	$this->_saveHeaders();
		@@ -127,20 +131,36 @@ discard block
		block discarded – undo
127	131	$this->records[] = $record;
128	132	$this->records[count($this->records) - 1]->recordNumber = count($this->records);
129	133
130		- if ($this->boundingBox["xmin"]==0.0 \|\| ($this->boundingBox["xmin"]>$record->SHPData["xmin"])) $this->boundingBox["xmin"] = $record->SHPData["xmin"];
131		- if ($this->boundingBox["xmax"]==0.0 \|\| ($this->boundingBox["xmax"]<$record->SHPData["xmax"])) $this->boundingBox["xmax"] = $record->SHPData["xmax"];
	134	+ if ($this->boundingBox["xmin"]==0.0 \|\| ($this->boundingBox["xmin"]>$record->SHPData["xmin"])) {
	135	+ $this->boundingBox["xmin"] = $record->SHPData["xmin"];
	136	+ }
	137	+ if ($this->boundingBox["xmax"]==0.0 \|\| ($this->boundingBox["xmax"]<$record->SHPData["xmax"])) {
	138	+ $this->boundingBox["xmax"] = $record->SHPData["xmax"];
	139	+ }
132	140
133		- if ($this->boundingBox["ymin"]==0.0 \|\| ($this->boundingBox["ymin"]>$record->SHPData["ymin"])) $this->boundingBox["ymin"] = $record->SHPData["ymin"];
134		- if ($this->boundingBox["ymax"]==0.0 \|\| ($this->boundingBox["ymax"]<$record->SHPData["ymax"])) $this->boundingBox["ymax"] = $record->SHPData["ymax"];
	141	+ if ($this->boundingBox["ymin"]==0.0 \|\| ($this->boundingBox["ymin"]>$record->SHPData["ymin"])) {
	142	+ $this->boundingBox["ymin"] = $record->SHPData["ymin"];
	143	+ }
	144	+ if ($this->boundingBox["ymax"]==0.0 \|\| ($this->boundingBox["ymax"]<$record->SHPData["ymax"])) {
	145	+ $this->boundingBox["ymax"] = $record->SHPData["ymax"];
	146	+ }
135	147
136	148	if (in_array($this->shapeType,array(11,13,15,18,21,23,25,28))) {
137		- if (!isset($this->boundingBox["mmin"]) \|\| $this->boundingBox["mmin"]==0.0 \|\| ($this->boundingBox["mmin"]>$record->SHPData["mmin"])) $this->boundingBox["mmin"] = $record->SHPData["mmin"];
138		- if (!isset($this->boundingBox["mmax"]) \|\| $this->boundingBox["mmax"]==0.0 \|\| ($this->boundingBox["mmax"]<$record->SHPData["mmax"])) $this->boundingBox["mmax"] = $record->SHPData["mmax"];
	149	+ if (!isset($this->boundingBox["mmin"]) \|\| $this->boundingBox["mmin"]==0.0 \|\| ($this->boundingBox["mmin"]>$record->SHPData["mmin"])) {
	150	+ $this->boundingBox["mmin"] = $record->SHPData["mmin"];
	151	+ }
	152	+ if (!isset($this->boundingBox["mmax"]) \|\| $this->boundingBox["mmax"]==0.0 \|\| ($this->boundingBox["mmax"]<$record->SHPData["mmax"])) {
	153	+ $this->boundingBox["mmax"] = $record->SHPData["mmax"];
	154	+ }
139	155	}
140	156
141	157	if (in_array($this->shapeType,array(11,13,15,18))) {
142		- if (!isset($this->boundingBox["zmin"]) \|\| $this->boundingBox["zmin"]==0.0 \|\| ($this->boundingBox["zmin"]>$record->SHPData["zmin"])) $this->boundingBox["zmin"] = $record->SHPData["zmin"];
143		- if (!isset($this->boundingBox["zmax"]) \|\| $this->boundingBox["zmax"]==0.0 \|\| ($this->boundingBox["zmax"]<$record->SHPData["zmax"])) $this->boundingBox["zmax"] = $record->SHPData["zmax"];
	158	+ if (!isset($this->boundingBox["zmin"]) \|\| $this->boundingBox["zmin"]==0.0 \|\| ($this->boundingBox["zmin"]>$record->SHPData["zmin"])) {
	159	+ $this->boundingBox["zmin"] = $record->SHPData["zmin"];
	160	+ }
	161	+ if (!isset($this->boundingBox["zmax"]) \|\| $this->boundingBox["zmax"]==0.0 \|\| ($this->boundingBox["zmax"]<$record->SHPData["zmax"])) {
	162	+ $this->boundingBox["zmax"] = $record->SHPData["zmax"];
	163	+ }
144	164	}
145	165
146	166	return (count($this->records) - 1);
		@@ -807,8 +827,14 @@ discard block
		block discarded – undo
807	827	case 1:
808	828	case 11:
809	829	case 21:
810		- if (in_array($this->shapeType,array(11,21)) && !isset($point["m"])) $point["m"] = 0.0; // no_value
811		- if (in_array($this->shapeType,array(11)) && !isset($point["z"])) $point["z"] = 0.0; // no_value
	830	+ if (in_array($this->shapeType,array(11,21)) && !isset($point["m"])) {
	831	+ $point["m"] = 0.0;
	832	+ }
	833	+ // no_value
	834	+ if (in_array($this->shapeType,array(11)) && !isset($point["z"])) {
	835	+ $point["z"] = 0.0;
	836	+ }
	837	+ // no_value
812	838	//Substitutes the value of the current point
813	839	$this->SHPData = $point;
814	840	break;
		@@ -818,18 +844,40 @@ discard block
		block discarded – undo
818	844	case 15:
819	845	case 23:
820	846	case 25:
821		- if (in_array($this->shapeType,array(13,15,23,25)) && !isset($point["m"])) $point["m"] = 0.0; // no_value
822		- if (in_array($this->shapeType,array(13,15)) && !isset($point["z"])) $point["z"] = 0.0; // no_value
	847	+ if (in_array($this->shapeType,array(13,15,23,25)) && !isset($point["m"])) {
	848	+ $point["m"] = 0.0;
	849	+ }
	850	+ // no_value
	851	+ if (in_array($this->shapeType,array(13,15)) && !isset($point["z"])) {
	852	+ $point["z"] = 0.0;
	853	+ }
	854	+ // no_value
823	855
824	856	//Adds a new point to the selected part
825		- if (!isset($this->SHPData["xmin"]) \|\| ($this->SHPData["xmin"] > $point["x"])) $this->SHPData["xmin"] = $point["x"];
826		- if (!isset($this->SHPData["ymin"]) \|\| ($this->SHPData["ymin"] > $point["y"])) $this->SHPData["ymin"] = $point["y"];
827		- if (isset($point["m"]) && (!isset($this->SHPData["mmin"]) \|\| ($this->SHPData["mmin"] > $point["m"]))) $this->SHPData["mmin"] = $point["m"];
828		- if (isset($point["z"]) && (!isset($this->SHPData["zmin"]) \|\| ($this->SHPData["zmin"] > $point["z"]))) $this->SHPData["zmin"] = $point["z"];
829		- if (!isset($this->SHPData["xmax"]) \|\| ($this->SHPData["xmax"] < $point["x"])) $this->SHPData["xmax"] = $point["x"];
830		- if (!isset($this->SHPData["ymax"]) \|\| ($this->SHPData["ymax"] < $point["y"])) $this->SHPData["ymax"] = $point["y"];
831		- if (isset($point["m"]) && (!isset($this->SHPData["mmax"]) \|\| ($this->SHPData["mmax"] < $point["m"]))) $this->SHPData["mmax"] = $point["m"];
832		- if (isset($point["z"]) && (!isset($this->SHPData["zmax"]) \|\| ($this->SHPData["zmax"] < $point["z"]))) $this->SHPData["zmax"] = $point["z"];
	857	+ if (!isset($this->SHPData["xmin"]) \|\| ($this->SHPData["xmin"] > $point["x"])) {
	858	+ $this->SHPData["xmin"] = $point["x"];
	859	+ }
	860	+ if (!isset($this->SHPData["ymin"]) \|\| ($this->SHPData["ymin"] > $point["y"])) {
	861	+ $this->SHPData["ymin"] = $point["y"];
	862	+ }
	863	+ if (isset($point["m"]) && (!isset($this->SHPData["mmin"]) \|\| ($this->SHPData["mmin"] > $point["m"]))) {
	864	+ $this->SHPData["mmin"] = $point["m"];
	865	+ }
	866	+ if (isset($point["z"]) && (!isset($this->SHPData["zmin"]) \|\| ($this->SHPData["zmin"] > $point["z"]))) {
	867	+ $this->SHPData["zmin"] = $point["z"];
	868	+ }
	869	+ if (!isset($this->SHPData["xmax"]) \|\| ($this->SHPData["xmax"] < $point["x"])) {
	870	+ $this->SHPData["xmax"] = $point["x"];
	871	+ }
	872	+ if (!isset($this->SHPData["ymax"]) \|\| ($this->SHPData["ymax"] < $point["y"])) {
	873	+ $this->SHPData["ymax"] = $point["y"];
	874	+ }
	875	+ if (isset($point["m"]) && (!isset($this->SHPData["mmax"]) \|\| ($this->SHPData["mmax"] < $point["m"]))) {
	876	+ $this->SHPData["mmax"] = $point["m"];
	877	+ }
	878	+ if (isset($point["z"]) && (!isset($this->SHPData["zmax"]) \|\| ($this->SHPData["zmax"] < $point["z"]))) {
	879	+ $this->SHPData["zmax"] = $point["z"];
	880	+ }
833	881
834	882	$this->SHPData["parts"][$partIndex]["points"][] = $point;
835	883
		@@ -839,18 +887,40 @@ discard block
		block discarded – undo
839	887	case 8:
840	888	case 18:
841	889	case 28:
842		- if (in_array($this->shapeType,array(18,28)) && !isset($point["m"])) $point["m"] = 0.0; // no_value
843		- if (in_array($this->shapeType,array(18)) && !isset($point["z"])) $point["z"] = 0.0; // no_value
	890	+ if (in_array($this->shapeType,array(18,28)) && !isset($point["m"])) {
	891	+ $point["m"] = 0.0;
	892	+ }
	893	+ // no_value
	894	+ if (in_array($this->shapeType,array(18)) && !isset($point["z"])) {
	895	+ $point["z"] = 0.0;
	896	+ }
	897	+ // no_value
844	898
845	899	//Adds a new point
846		- if (!isset($this->SHPData["xmin"]) \|\| ($this->SHPData["xmin"] > $point["x"])) $this->SHPData["xmin"] = $point["x"];
847		- if (!isset($this->SHPData["ymin"]) \|\| ($this->SHPData["ymin"] > $point["y"])) $this->SHPData["ymin"] = $point["y"];
848		- if (isset($point["m"]) && (!isset($this->SHPData["mmin"]) \|\| ($this->SHPData["mmin"] > $point["m"]))) $this->SHPData["mmin"] = $point["m"];
849		- if (isset($point["z"]) && (!isset($this->SHPData["zmin"]) \|\| ($this->SHPData["zmin"] > $point["z"]))) $this->SHPData["zmin"] = $point["z"];
850		- if (!isset($this->SHPData["xmax"]) \|\| ($this->SHPData["xmax"] < $point["x"])) $this->SHPData["xmax"] = $point["x"];
851		- if (!isset($this->SHPData["ymax"]) \|\| ($this->SHPData["ymax"] < $point["y"])) $this->SHPData["ymax"] = $point["y"];
852		- if (isset($point["m"]) && (!isset($this->SHPData["mmax"]) \|\| ($this->SHPData["mmax"] < $point["m"]))) $this->SHPData["mmax"] = $point["m"];
853		- if (isset($point["z"]) && (!isset($this->SHPData["zmax"]) \|\| ($this->SHPData["zmax"] < $point["z"]))) $this->SHPData["zmax"] = $point["z"];
	900	+ if (!isset($this->SHPData["xmin"]) \|\| ($this->SHPData["xmin"] > $point["x"])) {
	901	+ $this->SHPData["xmin"] = $point["x"];
	902	+ }
	903	+ if (!isset($this->SHPData["ymin"]) \|\| ($this->SHPData["ymin"] > $point["y"])) {
	904	+ $this->SHPData["ymin"] = $point["y"];
	905	+ }
	906	+ if (isset($point["m"]) && (!isset($this->SHPData["mmin"]) \|\| ($this->SHPData["mmin"] > $point["m"]))) {
	907	+ $this->SHPData["mmin"] = $point["m"];
	908	+ }
	909	+ if (isset($point["z"]) && (!isset($this->SHPData["zmin"]) \|\| ($this->SHPData["zmin"] > $point["z"]))) {
	910	+ $this->SHPData["zmin"] = $point["z"];
	911	+ }
	912	+ if (!isset($this->SHPData["xmax"]) \|\| ($this->SHPData["xmax"] < $point["x"])) {
	913	+ $this->SHPData["xmax"] = $point["x"];
	914	+ }
	915	+ if (!isset($this->SHPData["ymax"]) \|\| ($this->SHPData["ymax"] < $point["y"])) {
	916	+ $this->SHPData["ymax"] = $point["y"];
	917	+ }
	918	+ if (isset($point["m"]) && (!isset($this->SHPData["mmax"]) \|\| ($this->SHPData["mmax"] < $point["m"]))) {
	919	+ $this->SHPData["mmax"] = $point["m"];
	920	+ }
	921	+ if (isset($point["z"]) && (!isset($this->SHPData["zmax"]) \|\| ($this->SHPData["zmax"] < $point["z"]))) {
	922	+ $this->SHPData["zmax"] = $point["z"];
	923	+ }
854	924
855	925	$this->SHPData["points"][] = $point;
856	926	$this->SHPData["numpoints"] = 1 + (isset($this->SHPData["numpoints"])?$this->SHPData["numpoints"]:0);
		@@ -872,8 +942,12 @@ discard block
		block discarded – undo
872	942	//Sets the value of the point to zero
873	943	$this->SHPData["x"] = 0.0;
874	944	$this->SHPData["y"] = 0.0;
875		- if (in_array($this->shapeType,array(11,21))) $this->SHPData["m"] = 0.0;
876		- if (in_array($this->shapeType,array(11))) $this->SHPData["z"] = 0.0;
	945	+ if (in_array($this->shapeType,array(11,21))) {
	946	+ $this->SHPData["m"] = 0.0;
	947	+ }
	948	+ if (in_array($this->shapeType,array(11))) {
	949	+ $this->SHPData["z"] = 0.0;
	950	+ }
877	951	break;
878	952	case 3:
879	953	case 5:

phpmyadmin / shapefile

Push — master ( a99ae2...001830 )

Status

Category

Doc Comments +29 added lines patch added patch discarded remove patch

Braces +108 added lines, -34 removed lines patch added patch discarded remove patch