Ysurac / FlightAirMap

require/libs/geoPHP/tests/tests/methodsTest.php

Braces +3 added lines, -1 removed lines

@@ -290,7 +290,9 @@
 
   function _methods_tester_with_geos($geometry) {
     // Cannot test methods if GEOS is not intstalled
-    if (!geoPHP::geosInstalled()) return;
+    if (!geoPHP::geosInstalled()) {
+    	return;
+    }
 
     $methods = array(
       //'boundary', //@@TODO: Uncomment this and fix errors

require/libs/geoPHP/tests/tests/adaptersTest.php

Braces +3 added lines, -1 removed lines

@@ -32,7 +32,9 @@
 
         // Test to make sure adapter work the same wether GEOS is ON or OFF
         // Cannot test methods if GEOS is not intstalled
-        if (!geoPHP::geosInstalled()) return;
+        if (!geoPHP::geosInstalled()) {
+        	return;
+        }
 
         foreach (geoPHP::getAdapterMap() as $adapter_key => $adapter_class) {
           if ($adapter_key != 'google_geocode') { //Don't test google geocoder regularily. Uncomment to test

require/libs/geoPHP/tests/test.php

Braces +13 added lines, -8 removed lines

@@ -12,8 +12,7 @@ 
 
   if (geoPHP::geosInstalled()) {
     print "GEOS is installed.\n";
-  }
-  else {
+  } else {
     print "GEOS is not installed.\n";
   }
 
@@ -125,8 +124,7 @@ 
         if ($test_geom_1->out('wkt') != $test_geom_2->out('wkt')) {
           print "Mismatched adapter output in ".$adapter_class."\n";
         }
-      }
-      else {
+      } else {
         print "Empty output on "  . $adapter_key . "\n";
       }
     }
@@ -134,7 +132,9 @@ 
 
   // Test to make sure adapter work the same wether GEOS is ON or OFF
   // Cannot test methods if GEOS is not intstalled
-  if (!geoPHP::geosInstalled()) return;
+  if (!geoPHP::geosInstalled()) {
+  	return;
+  }
 
   foreach (geoPHP::getAdapterMap() as $adapter_key => $adapter_class) {
     if ($adapter_key != 'google_geocode') { //Don't test google geocoder regularily. Uncomment to test
@@ -167,7 +167,9 @@ 
 
 function test_methods($geometry) {
   // Cannot test methods if GEOS is not intstalled
-  if (!geoPHP::geosInstalled()) return;
+  if (!geoPHP::geosInstalled()) {
+  	return;
+  }
 
   $methods = array(
     //'boundary', //@@TODO: Uncomment this and fix errors
@@ -237,8 +239,11 @@ 
 function test_detection($value, $format, $file) {
   $detected = geoPHP::detectFormat($value);
   if ($detected != $format) {
-    if ($detected) print 'detected as ' . $detected . "\n";
-    else print "not detected\n";
+    if ($detected) {
+    	print 'detected as ' . $detected . "\n";
+    } else {
+    	print "not detected\n";
+    }
   }
   // Make sure it loads using auto-detect
   geoPHP::load($value);

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

Braces +1 added lines, -2 removed lines

@@ -19,8 +19,7 @@
       $wkt = 'SRID=' . $srid . ';';
       $wkt .= $geometry->out('wkt');
       return $wkt;
-    }
-    else {
+    } else {
       return $geometry->out('wkt');
     }
   }

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

Braces +8 added lines, -6 removed lines

@@ -87,8 +87,7 @@ 
       if (!($key % 2)) {

         // It's a latitude

         $lat = $item;

-      }

-      else {

+      } else {

         // It's a longitude

         $lon = $item;

         $coords[] = new Point($lon, $lat);

@@ -125,8 +124,7 @@ 
         $points = $this->getPointsFromCoords(trim($poly->firstChild->nodeValue));

         $exterior_ring = new LineString($points);

         $polygons[] = new Polygon(array($exterior_ring));

-      }

-      else {

+      } else {

         // It's an EMPTY polygon

         $polygons[] = new Polygon(); 

       }

@@ -196,7 +194,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;

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

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;
       }