Dolibarr / dolibarr

htdocs/includes/geoPHP/lib/adapters/WKT.class.php

Braces +55 added lines, -19 removed lines

@@ -63,7 +63,9 @@ 
 		$data_string = $this->trimParens($data_string);
 
 		// If it's marked as empty, then return an empty point
-		if ($data_string == 'EMPTY') return new Point();
+		if ($data_string == 'EMPTY') {
+			return new Point();
+		}
 
 		$parts = explode(' ', $data_string);
 		return new Point($parts[0], $parts[1]);
@@ -74,7 +76,9 @@ 
 		$data_string = $this->trimParens($data_string);
 
 		// If it's marked as empty, then return an empty line
-		if ($data_string == 'EMPTY') return new LineString();
+		if ($data_string == 'EMPTY') {
+			return new LineString();
+		}
 
 		$parts = explode(',', $data_string);
 		$points = array();
@@ -89,13 +93,19 @@ 
 		$data_string = $this->trimParens($data_string);
 
 		// If it's marked as empty, then return an empty polygon
-		if ($data_string == 'EMPTY') return new Polygon();
+		if ($data_string == 'EMPTY') {
+			return new Polygon();
+		}
 
 		$parts = explode('),(', $data_string);
 		$lines = array();
 		foreach ($parts as $part) {
-			if (!$this->beginsWith($part, '(')) $part = '(' . $part;
-			if (!$this->endsWith($part, ')'))   $part = $part . ')';
+			if (!$this->beginsWith($part, '(')) {
+				$part = '(' . $part;
+			}
+			if (!$this->endsWith($part, ')')) {
+				$part = $part . ')';
+			}
 			$lines[] = $this->parseLineString($part);
 		}
 		return new Polygon($lines);
@@ -106,7 +116,9 @@ 
 		$data_string = $this->trimParens($data_string);
 
 		// If it's marked as empty, then return an empty MutiPoint
-		if ($data_string == 'EMPTY') return new MultiPoint();
+		if ($data_string == 'EMPTY') {
+			return new MultiPoint();
+		}
 
 		$parts = explode(',', $data_string);
 		$points = array();
@@ -121,14 +133,20 @@ 
 		$data_string = $this->trimParens($data_string);
 
 		// If it's marked as empty, then return an empty multi-linestring
-		if ($data_string == 'EMPTY') return new MultiLineString();
+		if ($data_string == 'EMPTY') {
+			return new MultiLineString();
+		}
 
 		$parts = explode('),(', $data_string);
 		$lines = array();
 		foreach ($parts as $part) {
 			// Repair the string if the explode broke it
-			if (!$this->beginsWith($part, '(')) $part = '(' . $part;
-			if (!$this->endsWith($part, ')'))   $part = $part . ')';
+			if (!$this->beginsWith($part, '(')) {
+				$part = '(' . $part;
+			}
+			if (!$this->endsWith($part, ')')) {
+				$part = $part . ')';
+			}
 			$lines[] = $this->parseLineString($part);
 		}
 		return new MultiLineString($lines);
@@ -139,14 +157,20 @@ 
 		$data_string = $this->trimParens($data_string);
 
 		// If it's marked as empty, then return an empty multi-polygon
-		if ($data_string == 'EMPTY') return new MultiPolygon();
+		if ($data_string == 'EMPTY') {
+			return new MultiPolygon();
+		}
 
 		$parts = explode(')),((', $data_string);
 		$polys = array();
 		foreach ($parts as $part) {
 			// Repair the string if the explode broke it
-			if (!$this->beginsWith($part, '((')) $part = '((' . $part;
-			if (!$this->endsWith($part, '))'))   $part = $part . '))';
+			if (!$this->beginsWith($part, '((')) {
+				$part = '((' . $part;
+			}
+			if (!$this->endsWith($part, '))')) {
+				$part = $part . '))';
+			}
 			$polys[] = $this->parsePolygon($part);
 		}
 		return new MultiPolygon($polys);
@@ -157,7 +181,9 @@ 
 		$data_string = $this->trimParens($data_string);
 
 		// If it's marked as empty, then return an empty geom-collection
-		if ($data_string == 'EMPTY') return new GeometryCollection();
+		if ($data_string == 'EMPTY') {
+			return new GeometryCollection();
+		}
 
 		$geometries = array();
 		$matches = array();
@@ -178,7 +204,9 @@ 
 			return substr($wkt, $first_paren);
 		} elseif (strstr($wkt, 'EMPTY')) {
 			return 'EMPTY';
-		} else return false;
+		} else {
+			return false;
+		}
 	}
 
 	/**
@@ -191,19 +219,27 @@ 
 		// We want to only strip off one set of parenthesis
 		if ($this->beginsWith($str, '(')) {
 			return substr($str, 1, -1);
-		} else return $str;
+		} else {
+			return $str;
+		}
 	}
 
 	protected function beginsWith($str, $char)
 	{
-		if (substr($str, 0, strlen($char)) == $char) return true;
-		else return false;
+		if (substr($str, 0, strlen($char)) == $char) {
+			return true;
+		} else {
+			return false;
+		}
 	}
 
 	protected function endsWith($str, $char)
 	{
-		if (substr($str, (0 - strlen($char))) == $char) return true;
-		else return false;
+		if (substr($str, (0 - strlen($char))) == $char) {
+			return true;
+		} else {
+			return false;
+		}
 	}
 
 	/**

htdocs/includes/geoPHP/lib/adapters/GPX.class.php

Braces +3 added lines, -1 removed lines

@@ -36,7 +36,9 @@
 	 */
 	public function write(Geometry $geometry, $namespace = false)
 	{
-		if ($geometry->isEmpty()) return null;
+		if ($geometry->isEmpty()) {
+			return null;
+		}
 		if ($namespace) {
 			$this->namespace = $namespace;
 			$this->nss = $namespace.':';

htdocs/includes/geoPHP/lib/adapters/WKB.class.php

Braces +3 added lines, -1 removed lines

@@ -102,7 +102,9 @@
 		$line_length = unpack('L', fread($mem, 4));
 
 		// Return an empty linestring if there is no line-length
-		if (!$line_length[1]) return new LineString();
+		if (!$line_length[1]) {
+			return new LineString();
+		}
 
 		// Read the nubmer of points x2 (each point is two coords) into decimal-floats
 		$line_coords = unpack('d*', fread($mem, $line_length[1]*$this->dimension*8));

htdocs/includes/geoPHP/lib/adapters/GoogleGeocode.class.php

Braces +13 added lines, -5 removed lines

@@ -31,7 +31,9 @@ 
 	 */
 	public function read($address, $return_type = 'point', $bounds = false, $return_multiple = false)
 	{
-		if (is_array($address)) $address = join(',', $address);
+		if (is_array($address)) {
+			$address = join(',', $address);
+		}
 
 		if (gettype($bounds) == 'object') {
 			$bounds = $bounds->getBBox();
@@ -74,8 +76,11 @@ 
 				}
 			}
 		} else {
-			if ($this->result->status) throw new Exception('Error in Google Geocoder: '.$this->result->status);
-			else throw new Exception('Unknown error in Google Geocoder');
+			if ($this->result->status) {
+				throw new Exception('Error in Google Geocoder: '.$this->result->status);
+			} else {
+				throw new Exception('Unknown error in Google Geocoder');
+			}
 			return false;
 		}
 	}
@@ -114,8 +119,11 @@ 
 				return $this->result->results;
 			}
 		} else {
-			if ($this->result->status) throw new Exception('Error in Google Reverse Geocoder: '.$this->result->status);
-			else throw new Exception('Unknown error in Google Reverse Geocoder');
+			if ($this->result->status) {
+				throw new Exception('Error in Google Reverse Geocoder: '.$this->result->status);
+			} else {
+				throw new Exception('Unknown error in Google Reverse Geocoder');
+			}
 			return false;
 		}
 	}

htdocs/includes/geoPHP/lib/adapters/KML.class.php

Braces +3 added lines, -1 removed lines

@@ -243,7 +243,9 @@
 			$str .= '<'.$this->nss.'coordinates>';
 			$i=0;
 			foreach ($geom->getComponents() as $comp) {
-				if ($i != 0) $str .= ' ';
+				if ($i != 0) {
+					$str .= ' ';
+				}
 				$str .= $comp->getX() .','. $comp->getY();
 				$i++;
 			}

htdocs/includes/geoPHP/lib/adapters/GeoRSS.class.php

Braces +6 added lines, -2 removed lines

@@ -222,7 +222,9 @@ 
 		$output = '<'.$this->nss.'line>';
 		foreach ($geom->getComponents() as $k => $point) {
 			$output .= $point->getY().' '.$point->getX();
-			if ($k < ($geom->numGeometries() -1)) $output .= ' ';
+			if ($k < ($geom->numGeometries() -1)) {
+				$output .= ' ';
+			}
 		}
 		$output .= '</'.$this->nss.'line>';
 		return $output;
@@ -234,7 +236,9 @@ 
 		$exterior_ring = $geom->exteriorRing();
 		foreach ($exterior_ring->getComponents() as $k => $point) {
 			$output .= $point->getY().' '.$point->getX();
-			if ($k < ($exterior_ring->numGeometries() -1)) $output .= ' ';
+			if ($k < ($exterior_ring->numGeometries() -1)) {
+				$output .= ' ';
+			}
 		}
 		$output .= '</'.$this->nss.'polygon>';
 		return $output;

htdocs/includes/geoPHP/lib/adapters/GeoJSON.class.php

Braces +3 added lines, -1 removed lines

@@ -153,9 +153,11 @@
 			'type'=> 'GeometryCollection',
 			'geometries'=> $component_array,
 			);
-		} else return array(
+		} else {
+			return array(
 		'type'=> $geometry->getGeomType(),
 		'coordinates'=> $geometry->asArray(),
 		);
+		}
 	}
 }

htdocs/includes/geoPHP/lib/adapters/GeoHash.class.php

Braces +53 added lines, -11 removed lines

@@ -98,7 +98,9 @@ 
 	 */
 	public function write(Geometry $geometry, $precision = null)
 	{
-		if ($geometry->isEmpty()) return '';
+		if ($geometry->isEmpty()) {
+			return '';
+		}
 
 		if ($geometry->geometryType() === 'Point') {
 			return $this->encodePoint($geometry, $precision);
@@ -197,19 +199,59 @@ 
 		for ($i=0,$c=strlen($hash);$i<$c;$i++) {
 			$v = strpos($this->table, $hash[$i]);
 			if (1&$i) {
-				if (16&$v)$minlat = ($minlat+$maxlat)/2; else $maxlat = ($minlat+$maxlat)/2;
-				if (8&$v) $minlon = ($minlon+$maxlon)/2; else $maxlon = ($minlon+$maxlon)/2;
-				if (4&$v) $minlat = ($minlat+$maxlat)/2; else $maxlat = ($minlat+$maxlat)/2;
-				if (2&$v) $minlon = ($minlon+$maxlon)/2; else $maxlon = ($minlon+$maxlon)/2;
-				if (1&$v) $minlat = ($minlat+$maxlat)/2; else $maxlat = ($minlat+$maxlat)/2;
+				if (16&$v) {
+					$minlat = ($minlat+$maxlat)/2;
+				} else {
+					$maxlat = ($minlat+$maxlat)/2;
+				}
+				if (8&$v) {
+					$minlon = ($minlon+$maxlon)/2;
+				} else {
+					$maxlon = ($minlon+$maxlon)/2;
+				}
+				if (4&$v) {
+					$minlat = ($minlat+$maxlat)/2;
+				} else {
+					$maxlat = ($minlat+$maxlat)/2;
+				}
+				if (2&$v) {
+					$minlon = ($minlon+$maxlon)/2;
+				} else {
+					$maxlon = ($minlon+$maxlon)/2;
+				}
+				if (1&$v) {
+					$minlat = ($minlat+$maxlat)/2;
+				} else {
+					$maxlat = ($minlat+$maxlat)/2;
+				}
 				$latE /= 8;
 				$lonE /= 4;
 			} else {
-				if (16&$v)$minlon = ($minlon+$maxlon)/2; else $maxlon = ($minlon+$maxlon)/2;
-				if (8&$v) $minlat = ($minlat+$maxlat)/2; else $maxlat = ($minlat+$maxlat)/2;
-				if (4&$v) $minlon = ($minlon+$maxlon)/2; else $maxlon = ($minlon+$maxlon)/2;
-				if (2&$v) $minlat = ($minlat+$maxlat)/2; else $maxlat = ($minlat+$maxlat)/2;
-				if (1&$v) $minlon = ($minlon+$maxlon)/2; else $maxlon = ($minlon+$maxlon)/2;
+				if (16&$v) {
+					$minlon = ($minlon+$maxlon)/2;
+				} else {
+					$maxlon = ($minlon+$maxlon)/2;
+				}
+				if (8&$v) {
+					$minlat = ($minlat+$maxlat)/2;
+				} else {
+					$maxlat = ($minlat+$maxlat)/2;
+				}
+				if (4&$v) {
+					$minlon = ($minlon+$maxlon)/2;
+				} else {
+					$maxlon = ($minlon+$maxlon)/2;
+				}
+				if (2&$v) {
+					$minlat = ($minlat+$maxlat)/2;
+				} else {
+					$maxlat = ($minlat+$maxlat)/2;
+				}
+				if (1&$v) {
+					$minlon = ($minlon+$maxlon)/2;
+				} else {
+					$maxlon = ($minlon+$maxlon)/2;
+				}
 				$latE /= 4;
 				$lonE /= 8;
 			}

htdocs/includes/geoPHP/geoPHP.inc.php

Braces +38 added lines, -13 removed lines

@@ -54,7 +54,9 @@ 
 		if (!$type) {
 			// If the user is trying to load a Geometry from a Geometry... Just pass it back
 			if (is_object($data)) {
-				if ($data instanceOf Geometry) return $data;
+				if ($data instanceOf Geometry) {
+					return $data;
+				}
 			}
 
 			$detected = geoPHP::detectFormat($data);
@@ -124,7 +126,9 @@ 
 	static function geosInstalled($force = null)
 	{
 		static $geos_installed = null;
-		if ($force !== null) $geos_installed = $force;
+		if ($force !== null) {
+			$geos_installed = $force;
+		}
 		if ($geos_installed !== null) {
 			return $geos_installed;
 		}
@@ -154,8 +158,12 @@ 
 	{
 		// If it's an array of one, then just parse the one
 		if (is_array($geometry)) {
-			if (empty($geometry)) return false;
-			if (count($geometry) == 1) return geoPHP::geometryReduce(array_shift($geometry));
+			if (empty($geometry)) {
+				return false;
+			}
+			if (count($geometry) == 1) {
+				return geoPHP::geometryReduce(array_shift($geometry));
+			}
 		}
 
 		// If the geometry cannot even theoretically be reduced more, then pass it back
@@ -233,7 +241,9 @@ 
 		$bytes = unpack("c*", fread($mem, 11));
 
 		// If bytes is empty, then we were passed empty input
-		if (empty($bytes)) return false;
+		if (empty($bytes)) {
+			return false;
+		}
 
 		// First char is a tab, space or carriage-return. trim it and try again
 		if ($bytes[1] == 9 || $bytes[1] == 10 || $bytes[1] == 32) {
@@ -244,8 +254,11 @@ 
 		// Detect WKB or EWKB -- first byte is 1 (little endian indicator)
 		if ($bytes[1] == 1) {
 			// If SRID byte is TRUE (1), it's EWKB
-			if ($bytes[5]) return 'ewkb';
-			else return 'wkb';
+			if ($bytes[5]) {
+				return 'ewkb';
+			} else {
+				return 'wkb';
+			}
 		}
 
 		// Detect HEX encoded WKB or EWKB (PostGIS format) -- first byte is 48, second byte is 49 (hex '01' => first-byte = 1)
@@ -278,12 +291,24 @@ 
 		if ($bytes[1] == 60) {
 			// grab the first 256 characters
 			$string = substr($input, 0, 256);
-			if (strpos($string, '<kml') !== false)        return 'kml';
-			if (strpos($string, '<coordinate') !== false) return 'kml';
-			if (strpos($string, '<gpx') !== false)        return 'gpx';
-			if (strpos($string, '<georss') !== false)     return 'georss';
-			if (strpos($string, '<rss') !== false)        return 'georss';
-			if (strpos($string, '<feed') !== false)       return 'georss';
+			if (strpos($string, '<kml') !== false) {
+				return 'kml';
+			}
+			if (strpos($string, '<coordinate') !== false) {
+				return 'kml';
+			}
+			if (strpos($string, '<gpx') !== false) {
+				return 'gpx';
+			}
+			if (strpos($string, '<georss') !== false) {
+				return 'georss';
+			}
+			if (strpos($string, '<rss') !== false) {
+				return 'georss';
+			}
+			if (strpos($string, '<feed') !== false) {
+				return 'georss';
+			}
 		}
 
 		// We need an 8 byte string for geohash and unpacked WKB / WKT