Ysurac / FlightAirMap

require/libs/geoPHP/lib/adapters/WKT.class.php

Braces +52 added lines, -25 removed lines

@@ -21,8 +21,7 @@ 
       $wkt = $parts[1];
       $eparts = explode('=',$parts[0]);
       $srid = $eparts[1];
-    }
-    else {
+    } else {
       $srid = NULL;
     }
     
@@ -33,8 +32,7 @@ 
         $geom = geoPHP::geosToGeometry($reader->read($wkt));
         $geom->setSRID($srid);
         return $geom;
-      }
-      else { 
+      } else { 
         return geoPHP::geosToGeometry($reader->read($wkt));
       }
     }
@@ -52,8 +50,7 @@ 
           $geom = $this->$method($data_string);
           $geom->setSRID($srid);
           return $geom;
-        }
-        else { 
+        } else { 
           return $this->$method($data_string);
         }
         
@@ -71,7 +68,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();
@@ -85,13 +84,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);
@@ -101,7 +106,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();
@@ -115,14 +122,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);
@@ -132,14 +145,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);
@@ -149,7 +168,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();
@@ -180,18 +201,25 @@ 
     // 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;
+    }
   }
     
   /**
@@ -211,8 +239,7 @@ 
     
     if ($geometry->isEmpty()) {
       return strtoupper($geometry->geometryType()).' EMPTY';
-    }
-    else if ($data = $this->extractData($geometry)) {
+    } else if ($data = $this->extractData($geometry)) {
       return strtoupper($geometry->geometryType()).' ('.$data.')';
     }
   }

require/libs/geoPHP/lib/adapters/GoogleGeocode.class.php

Braces +16 added lines, -11 removed lines

@@ -30,15 +30,16 @@ 
    * @return Geometry|GeometryCollection
    */
   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();
     }
     if (gettype($bounds) == 'array') {
       $bounds_string = '&bounds='.$bounds['miny'].','.$bounds['minx'].'|'.$bounds['maxy'].','.$bounds['maxx'];
-    }
-    else {
+    } else {
       $bounds_string = '';
     }
     
@@ -73,10 +74,12 @@ 
           return new MultiPolygon($polygons);
         }
       }
-    }
-    else {
-      if ($this->result->status) throw new Exception('Error in Google Geocoder: '.$this->result->status);
-      else throw new Exception('Unknown error in Google Geocoder');
+    } else {
+      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;
     }
   }
@@ -106,10 +109,12 @@ 
       if ($return_type == 'array') {
         return $this->result->results[0]->address_components;
       }
-    }
-    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');
+    } 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');
+      }
       return FALSE;
     }
   }

require/libs/geoPHP/lib/adapters/EWKB.class.php

Braces +2 added lines, -4 removed lines

@@ -24,8 +24,7 @@ 
     $base_info = unpack("corder/ctype/cz/cm/cs", fread($mem, 5));
     if ($base_info['s']) {
       $srid = current(unpack("Lsrid", fread($mem, 4)));
-    }
-    else {
+    } else {
       $srid = NULL;
     }
     fclose($mem);
@@ -87,8 +86,7 @@ 
     if ($write_as_hex) {
       $unpacked = unpack('H*',$wkb);
       return $unpacked[1];
-    }
-    else {
+    } else {
       return $wkb;
     }
   }

require/libs/geoPHP/lib/adapters/GeoHash.class.php

Braces +55 added lines, -15 removed lines

@@ -19,8 +19,7 @@ 
     $ll = $this->decode($hash);
     if (!$as_grid) {
       return new Point($ll['medlon'], $ll['medlat']);
-    }
-    else {
+    } else {
       return new Polygon(array(
         new LineString(array(
           new Point($ll['minlon'], $ll['maxlat']),
@@ -40,12 +39,13 @@ 
    * @see GeoAdapter::write()
    */
   public function write(Geometry $geometry, $precision = NULL){
-    if ($geometry->isEmpty()) return '';
+    if ($geometry->isEmpty()) {
+    	return '';
+    }
 
     if($geometry->geometryType() === 'Point'){
       return $this->encodePoint($geometry, $precision);
-    }
-    else {
+    } else {
       // The geohash is the hash grid ID that fits the envelope
       $envelope = $geometry->envelope();
       $geohashes = array();
@@ -138,19 +138,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;
       }

require/libs/geoPHP/lib/adapters/GPX.class.php

Braces +3 added lines, -1 removed lines

@@ -34,7 +34,9 @@
    * @return string The GPX string representation of the input geometries

    */

   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.':';    

require/libs/geoPHP/lib/adapters/GeoJSON.class.php

Braces +4 added lines, -4 removed lines

@@ -120,8 +120,7 @@ 
   public function write(Geometry $geometry, $return_array = FALSE) {
     if ($return_array) {
       return $this->getArray($geometry);
-    }
-    else {
+    } else {
       return json_encode($this->getArray($geometry));
     }
   }
@@ -139,11 +138,12 @@ 
         'type'=> 'GeometryCollection',
         'geometries'=> $component_array,
       );
-    }
-    else return array(
+    } else {
+    	return array(
       'type'=> $geometry->getGeomType(),
       'coordinates'=> $geometry->asArray(),
     );
+    }
   }
 }
 

require/libs/geoPHP/lib/adapters/WKB.class.php

Braces +4 added lines, -3 removed lines

@@ -94,7 +94,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));

@@ -190,8 +192,7 @@ 
     if ($write_as_hex) {

       $unpacked = unpack('H*',$wkb);

       return $unpacked[1];

-    }

-    else {

+    } else {

       return $wkb;

     }

   }

require/libs/geoPHP/lib/adapters/KML.class.php

Braces +4 added lines, -3 removed lines

@@ -89,8 +89,7 @@ 
           }

         }

       }

-    }

-    else {

+    } else {

       // The document does not have a placemark, try to create a valid geometry from the root element

       $node_name = $this->xmlobj->documentElement->nodeName == 'multigeometry' ? 'geometrycollection' : $this->xmlobj->documentElement->nodeName;

       if (array_key_exists($node_name, $geom_types)) {

@@ -220,7 +219,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++;

       }

require/libs/geoPHP/lib/geometry/Polygon.class.php

Braces +27 added lines, -11 removed lines

@@ -9,7 +9,9 @@ 
   protected $geom_type = 'Polygon';
 
   public function area($exterior_only = FALSE, $signed = FALSE) {
-    if ($this->isEmpty()) return 0;
+    if ($this->isEmpty()) {
+    	return 0;
+    }
     
     if ($this->geos() && $exterior_only == FALSE) {
       return $this->geos()->area();
@@ -19,15 +21,20 @@ 
     $pts = $exterior_ring->getComponents();
     
     $c = count($pts);
-    if((int)$c == '0') return NULL;
+    if((int)$c == '0') {
+    	return NULL;
+    }
     $a = '0';
     foreach($pts as $k => $p){
       $j = ($k + 1) % $c;
       $a = $a + ($p->getX() * $pts[$j]->getY()) - ($p->getY() * $pts[$j]->getX());
     }
     
-    if ($signed) $area = ($a / 2);
-    else $area = abs(($a / 2));
+    if ($signed) {
+    	$area = ($a / 2);
+    } else {
+    	$area = abs(($a / 2));
+    }
     
     if ($exterior_only == TRUE) {
       return $area;
@@ -42,7 +49,9 @@ 
   }
   
   public function centroid() {
-    if ($this->isEmpty()) return NULL;
+    if ($this->isEmpty()) {
+    	return NULL;
+    }
     
     if ($this->geos()) {
       return geoPHP::geosToGeometry($this->geos()->centroid());
@@ -52,7 +61,9 @@ 
     $pts = $exterior_ring->getComponents();
     
     $c = count($pts);
-    if((int)$c == '0') return NULL;
+    if((int)$c == '0') {
+    	return NULL;
+    }
     $cn = array('x' => '0', 'y' => '0');
     $a = $this->area(TRUE, TRUE);
     
@@ -98,12 +109,16 @@ 
   }
 
   public function exteriorRing() {
-    if ($this->isEmpty()) return new LineString();
+    if ($this->isEmpty()) {
+    	return new LineString();
+    }
     return $this->components[0];
   }
   
   public function numInteriorRings() {
-    if ($this->isEmpty()) return 0;
+    if ($this->isEmpty()) {
+    	return 0;
+    }
     return $this->numGeometries()-1;
   }
   
@@ -112,7 +127,9 @@ 
   }
   
   public function dimension() {
-    if ($this->isEmpty()) return 0;
+    if ($this->isEmpty()) {
+    	return 0;
+    }
     return 2;
   }
 
@@ -187,8 +204,7 @@ 
     // If the number of edges we passed through is even, then it's in the polygon.
     if ($intersections % 2 != 0) {
       return TRUE;
-    }
-    else {
+    } else {
       return FALSE;
     }
   }