Ysurac / FlightAirMap

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

Spacing +10 added lines, -10 removed lines

@@ -14,7 +14,7 @@ 
    */
   public function read($wkb, $is_hex_string = FALSE) {
     if ($is_hex_string) {
-      $wkb = pack('H*',$wkb);
+      $wkb = pack('H*', $wkb);
     }
     
     // Open the wkb up in memory so we can examine the SRID
@@ -51,41 +51,41 @@ 
    */
   public function write(Geometry $geometry, $write_as_hex = FALSE) {
     // We always write into NDR (little endian)
-    $wkb = pack('c',1);
+    $wkb = pack('c', 1);
     
     switch ($geometry->getGeomType()) {
       case 'Point';
-        $wkb .= pack('L',1);
+        $wkb .= pack('L', 1);
         $wkb .= $this->writePoint($geometry);
         break;
       case 'LineString';
-        $wkb .= pack('L',2);
+        $wkb .= pack('L', 2);
         $wkb .= $this->writeLineString($geometry);
         break;
       case 'Polygon';
-        $wkb .= pack('L',3);
+        $wkb .= pack('L', 3);
         $wkb .= $this->writePolygon($geometry);
         break;
       case 'MultiPoint';
-        $wkb .= pack('L',4);
+        $wkb .= pack('L', 4);
         $wkb .= $this->writeMulti($geometry);
         break;
       case 'MultiLineString';
-        $wkb .= pack('L',5);
+        $wkb .= pack('L', 5);
         $wkb .= $this->writeMulti($geometry);
         break;
       case 'MultiPolygon';
-        $wkb .= pack('L',6);
+        $wkb .= pack('L', 6);
         $wkb .= $this->writeMulti($geometry);
         break;
       case 'GeometryCollection';
-        $wkb .= pack('L',7);
+        $wkb .= pack('L', 7);
         $wkb .= $this->writeMulti($geometry);
         break;
     }
     
     if ($write_as_hex) {
-      $unpacked = unpack('H*',$wkb);
+      $unpacked = unpack('H*', $wkb);
       return $unpacked[1];
     }
     else {

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

Spacing +44 added lines, -44 removed lines

@@ -6,7 +6,7 @@ 
  * @see http://en.wikipedia.org/wiki/Geohash
  *
  */
-class GeoHash extends GeoAdapter{
+class GeoHash extends GeoAdapter {
   private $table = "0123456789bcdefghjkmnpqrstuvwxyz";
 
   /**
@@ -39,10 +39,10 @@ 
    * @param Point $geometry
    * @see GeoAdapter::write()
    */
-  public function write(Geometry $geometry, $precision = NULL){
+  public function write(Geometry $geometry, $precision = NULL) {
     if ($geometry->isEmpty()) return '';
 
-    if($geometry->geometryType() === 'Point'){
+    if ($geometry->geometryType() === 'Point') {
       return $this->encodePoint($geometry, $precision);
     }
     else {
@@ -74,30 +74,30 @@ 
    * @author algorithm based on code by Alexander Songe <a@songe.me>
    * @see https://github.com/asonge/php-geohash/issues/1
    */
-  private function encodePoint($point, $precision = NULL){
+  private function encodePoint($point, $precision = NULL) {
     if ($precision === NULL) {
-      $lap = strlen($point->y())-strpos($point->y(),".");
-      $lop = strlen($point->x())-strpos($point->x(),".");
-      $precision = pow(10,-max($lap-1,$lop-1,0))/2;
+      $lap = strlen($point->y()) - strpos($point->y(), ".");
+      $lop = strlen($point->x()) - strpos($point->x(), ".");
+      $precision = pow(10, -max($lap - 1, $lop - 1, 0))/2;
     }
 
-    $minlat =  -90;
-    $maxlat =   90;
+    $minlat = -90;
+    $maxlat = 90;
     $minlon = -180;
-    $maxlon =  180;
-    $latE   =   90;
-    $lonE   =  180;
+    $maxlon = 180;
+    $latE   = 90;
+    $lonE   = 180;
     $i = 0;
     $error = 180;
-    $hash='';
-    while($error>=$precision) {
+    $hash = '';
+    while ($error >= $precision) {
       $chr = 0;
-      for($b=4;$b>=0;--$b) {
-        if((1&$b) == (1&$i)) {
+      for ($b = 4; $b >= 0; --$b) {
+        if ((1&$b) == (1&$i)) {
           // even char, even bit OR odd char, odd bit...a lon
-          $next = ($minlon+$maxlon)/2;
-          if($point->x()>$next) {
-            $chr |= pow(2,$b);
+          $next = ($minlon + $maxlon)/2;
+          if ($point->x() > $next) {
+            $chr |= pow(2, $b);
             $minlon = $next;
           } else {
             $maxlon = $next;
@@ -105,9 +105,9 @@ 
           $lonE /= 2;
         } else {
           // odd char, even bit OR even char, odd bit...a lat
-          $next = ($minlat+$maxlat)/2;
-          if($point->y()>$next) {
-            $chr |= pow(2,$b);
+          $next = ($minlat + $maxlat)/2;
+          if ($point->y() > $next) {
+            $chr |= pow(2, $b);
             $minlat = $next;
           } else {
             $maxlat = $next;
@@ -117,7 +117,7 @@ 
       }
       $hash .= $this->table[$chr];
       $i++;
-      $error = min($latE,$lonE);
+      $error = min($latE, $lonE);
     }
     return $hash;
   }
@@ -127,30 +127,30 @@ 
    * @author algorithm based on code by Alexander Songe <a@songe.me>
    * @see https://github.com/asonge/php-geohash/issues/1
    */
-  private function decode($hash){
+  private function decode($hash) {
     $ll = array();
-    $minlat =  -90;
-    $maxlat =   90;
+    $minlat = -90;
+    $maxlat = 90;
     $minlon = -180;
-    $maxlon =  180;
-    $latE   =   90;
-    $lonE   =  180;
-    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;
+    $maxlon = 180;
+    $latE   = 90;
+    $lonE   = 180;
+    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;
         $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;
       }
@@ -159,8 +159,8 @@ 
     $ll['minlon'] = $minlon;
     $ll['maxlat'] = $maxlat;
     $ll['maxlon'] = $maxlon;
-    $ll['medlat'] = round(($minlat+$maxlat)/2, max(1, -round(log10($latE)))-1);
-    $ll['medlon'] = round(($minlon+$maxlon)/2, max(1, -round(log10($lonE)))-1);
+    $ll['medlat'] = round(($minlat + $maxlat)/2, max(1, -round(log10($latE))) - 1);
+    $ll['medlon'] = round(($minlon + $maxlon)/2, max(1, -round(log10($lonE))) - 1);
     return $ll;
   }
 }

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

Spacing +6 added lines, -6 removed lines

@@ -45,21 +45,21 @@ 
   public function geomFromText($text) {

     // Change to lower-case and strip all CDATA

     $text = strtolower($text);

-    $text = preg_replace('/<!\[cdata\[(.*?)\]\]>/s','',$text);

+    $text = preg_replace('/<!\[cdata\[(.*?)\]\]>/s', '', $text);

     

     // Load into DOMDocument

     $xmlobj = new DOMDocument();

     @$xmlobj->loadXML($text);

     if ($xmlobj === false) {

-      throw new Exception("Invalid GPX: ". $text);

+      throw new Exception("Invalid GPX: ".$text);

     }

     

     $this->xmlobj = $xmlobj;

     try {

       $geom = $this->geomFromXML();

-    } catch(InvalidText $e) {

-        throw new Exception("Cannot Read Geometry From GPX: ". $text);

-    } catch(Exception $e) {

+    } catch (InvalidText $e) {

+        throw new Exception("Cannot Read Geometry From GPX: ".$text);

+    } catch (Exception $e) {

         throw $e;

     }

 

@@ -112,7 +112,7 @@ 
           $components[] = new Point($lon, $lat);

         }

       }

-      if ($components) {$lines[] = new LineString($components);}

+      if ($components) {$lines[] = new LineString($components); }

     }

     return $lines;

   }

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

Spacing +1 added lines, -1 removed lines

@@ -50,7 +50,7 @@
     if ($type == 'GeometryCollection') {
       return $this->objToGeometryCollection($obj);
     }
-    $method = 'arrayTo' . $type;
+    $method = 'arrayTo'.$type;
     return $this->$method($obj->coordinates);
   }
 

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

Spacing +27 added lines, -27 removed lines

@@ -30,11 +30,11 @@ 
    */

   public function read($wkb, $is_hex_string = FALSE) {

     if ($is_hex_string) {

-      $wkb = pack('H*',$wkb);

+      $wkb = pack('H*', $wkb);

     }

 

     if (empty($wkb)) {

-      throw new Exception('Cannot read empty WKB geometry. Found ' . gettype($wkb));

+      throw new Exception('Cannot read empty WKB geometry. Found '.gettype($wkb));

     }

 

     $mem = fopen('php://memory', 'r+');

@@ -74,37 +74,37 @@ 
       case 3:

         return $this->getPolygon($mem);

       case 4:

-        return $this->getMulti($mem,'point');

+        return $this->getMulti($mem, 'point');

       case 5:

-        return $this->getMulti($mem,'line');

+        return $this->getMulti($mem, 'line');

       case 6:

-        return $this->getMulti($mem,'polygon');

+        return $this->getMulti($mem, 'polygon');

       case 7:

-        return $this->getMulti($mem,'geometry');

+        return $this->getMulti($mem, 'geometry');

     }

   }

 

   function getPoint(&$mem) {

-    $point_coords = unpack("d*", fread($mem,$this->dimension*8));

-    return new Point($point_coords[1],$point_coords[2]);

+    $point_coords = unpack("d*", fread($mem, $this->dimension*8));

+    return new Point($point_coords[1], $point_coords[2]);

   }

 

   function getLinstring(&$mem) {

     // Get the number of points expected in this string out of the first 4 bytes

-    $line_length = unpack('L',fread($mem,4));

+    $line_length = unpack('L', fread($mem, 4));

 

     // Return an empty linestring if there is no line-length

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

+    $line_coords = unpack('d*', fread($mem, $line_length[1]*$this->dimension*8));

 

     // We have our coords, build up the linestring

     $components = array();

     $i = 1;

     $num_coords = count($line_coords);

     while ($i <= $num_coords) {

-      $components[] = new Point($line_coords[$i],$line_coords[$i+1]);

+      $components[] = new Point($line_coords[$i], $line_coords[$i + 1]);

       $i += 2;

     }

     return new LineString($components);

@@ -112,7 +112,7 @@ 
 

   function getPolygon(&$mem) {

     // Get the number of linestring expected in this poly out of the first 4 bytes

-    $poly_length = unpack('L',fread($mem,4));

+    $poly_length = unpack('L', fread($mem, 4));

 

     $components = array();

     $i = 1;

@@ -125,7 +125,7 @@ 
 

   function getMulti(&$mem, $type) {

     // Get the number of items expected in this multi out of the first 4 bytes

-    $multi_length = unpack('L',fread($mem,4));

+    $multi_length = unpack('L', fread($mem, 4));

 

     $components = array();

     $i = 1;

@@ -154,41 +154,41 @@ 
    */

   public function write(Geometry $geometry, $write_as_hex = FALSE) {

     // We always write into NDR (little endian)

-    $wkb = pack('c',1);

+    $wkb = pack('c', 1);

 

     switch ($geometry->getGeomType()) {

       case 'Point';

-        $wkb .= pack('L',1);

+        $wkb .= pack('L', 1);

         $wkb .= $this->writePoint($geometry);

         break;

       case 'LineString';

-        $wkb .= pack('L',2);

+        $wkb .= pack('L', 2);

         $wkb .= $this->writeLineString($geometry);

         break;

       case 'Polygon';

-        $wkb .= pack('L',3);

+        $wkb .= pack('L', 3);

         $wkb .= $this->writePolygon($geometry);

         break;

       case 'MultiPoint';

-        $wkb .= pack('L',4);

+        $wkb .= pack('L', 4);

         $wkb .= $this->writeMulti($geometry);

         break;

       case 'MultiLineString';

-        $wkb .= pack('L',5);

+        $wkb .= pack('L', 5);

         $wkb .= $this->writeMulti($geometry);

         break;

       case 'MultiPolygon';

-        $wkb .= pack('L',6);

+        $wkb .= pack('L', 6);

         $wkb .= $this->writeMulti($geometry);

         break;

       case 'GeometryCollection';

-        $wkb .= pack('L',7);

+        $wkb .= pack('L', 7);

         $wkb .= $this->writeMulti($geometry);

         break;

     }

 

     if ($write_as_hex) {

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

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

       return $unpacked[1];

     }

     else {

@@ -198,18 +198,18 @@ 
 

   function writePoint($point) {

     // Set the coords

-    $wkb = pack('dd',$point->x(), $point->y());

+    $wkb = pack('dd', $point->x(), $point->y());

 

     return $wkb;

   }

 

   function writeLineString($line) {

     // Set the number of points in this line

-    $wkb = pack('L',$line->numPoints());

+    $wkb = pack('L', $line->numPoints());

 

     // Set the coords

     foreach ($line->getComponents() as $point) {

-      $wkb .= pack('dd',$point->x(), $point->y());

+      $wkb .= pack('dd', $point->x(), $point->y());

     }

 

     return $wkb;

@@ -217,7 +217,7 @@ 
 

   function writePolygon($poly) {

     // Set the number of lines in this poly

-    $wkb = pack('L',$poly->numGeometries());

+    $wkb = pack('L', $poly->numGeometries());

 

     // Write the lines

     foreach ($poly->getComponents() as $line) {

@@ -229,7 +229,7 @@ 
 

   function writeMulti($geometry) {

     // Set the number of components

-    $wkb = pack('L',$geometry->numGeometries());

+    $wkb = pack('L', $geometry->numGeometries());

 

     // Write the components

     foreach ($geometry->getComponents() as $component) {

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

Spacing +16 added lines, -16 removed lines

@@ -53,21 +53,21 @@ 
 

     // Change to lower-case and strip all CDATA

     $text = mb_strtolower($text, mb_detect_encoding($text));

-    $text = preg_replace('/<!\[cdata\[(.*?)\]\]>/s','',$text);

+    $text = preg_replace('/<!\[cdata\[(.*?)\]\]>/s', '', $text);

 

     // Load into DOMDOcument

     $xmlobj = new DOMDocument();

     @$xmlobj->loadXML($text);

     if ($xmlobj === false) {

-      throw new Exception("Invalid KML: ". $text);

+      throw new Exception("Invalid KML: ".$text);

     }

 

     $this->xmlobj = $xmlobj;

     try {

       $geom = $this->geomFromXML();

-    } catch(InvalidText $e) {

-        throw new Exception("Cannot Read Geometry From KML: ". $text);

-    } catch(Exception $e) {

+    } catch (InvalidText $e) {

+        throw new Exception("Cannot Read Geometry From KML: ".$text);

+    } catch (Exception $e) {

         throw $e;

     }

 

@@ -115,14 +115,14 @@ 
 

   protected function parsePoint($xml) {

     $coordinates = $this->_extractCoordinates($xml);

-    return new Point($coordinates[0][0],$coordinates[0][1]);

+    return new Point($coordinates[0][0], $coordinates[0][1]);

   }

 

   protected function parseLineString($xml) {

     $coordinates = $this->_extractCoordinates($xml);

     $point_array = array();

     foreach ($coordinates as $set) {

-      $point_array[] = new Point($set[0],$set[1]);

+      $point_array[] = new Point($set[0], $set[1]);

     }

     return new LineString($point_array);

   }

@@ -173,7 +173,7 @@ 
       foreach ($coord_sets as $set_string) {

         $set_string = trim($set_string);

         if ($set_string) {

-          $set_array = explode(',',$set_string);

+          $set_array = explode(',', $set_string);

           if (count($set_array) >= 2) {

             $coordinates[] = $set_array;

           }

@@ -214,21 +214,21 @@ 
       $type = $geom->getGeomType();

     }

 

-    $str = '<'.$this->nss . $type .'>';

+    $str = '<'.$this->nss.$type.'>';

 

     if (!$geom->isEmpty()) {

       $str .= '<'.$this->nss.'coordinates>';

-      $i=0;

+      $i = 0;

       foreach ($geom->getComponents() as $comp) {

         if ($i != 0) $str .= ' ';

-        $str .= $comp->getX() .','. $comp->getY();

+        $str .= $comp->getX().','.$comp->getY();

         $i++;

       }

 

       $str .= '</'.$this->nss.'coordinates>';

     }

 

-    $str .= '</'. $this->nss . $type .'>';

+    $str .= '</'.$this->nss.$type.'>';

 

     return $str;

   }

@@ -236,13 +236,13 @@ 
   public function polygonToKML($geom) {

     $components = $geom->getComponents();

     if (!empty($components)) {

-      $str = '<'.$this->nss.'outerBoundaryIs>' . $this->linestringToKML($components[0], 'LinearRing') . '</'.$this->nss.'outerBoundaryIs>';

+      $str = '<'.$this->nss.'outerBoundaryIs>'.$this->linestringToKML($components[0], 'LinearRing').'</'.$this->nss.'outerBoundaryIs>';

       foreach (array_slice($components, 1) as $comp) {

-        $str .= '<'.$this->nss.'innerBoundaryIs>' . $this->linestringToKML($comp) . '</'.$this->nss.'innerBoundaryIs>';

+        $str .= '<'.$this->nss.'innerBoundaryIs>'.$this->linestringToKML($comp).'</'.$this->nss.'innerBoundaryIs>';

       }

     }

 

-    return '<'.$this->nss.'Polygon>'. $str .'</'.$this->nss.'Polygon>';

+    return '<'.$this->nss.'Polygon>'.$str.'</'.$this->nss.'Polygon>';

   }

 

   public function collectionToKML($geom) {

@@ -253,7 +253,7 @@ 
       $str .= $sub_adapter->write($comp);

     }

 

-    return $str .'</'.$this->nss.'MultiGeometry>';

+    return $str.'</'.$this->nss.'MultiGeometry>';

   }

 

 }

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

Spacing +23 added lines, -23 removed lines

@@ -19,15 +19,15 @@ 
     $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());
+    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;
@@ -52,7 +52,7 @@ 
     $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);
     
@@ -61,15 +61,15 @@ 
       return $this->exteriorRing()->pointN(1);
     }
     
-    foreach($pts as $k => $p){
-      $j = ($k + 1) % $c;
-      $P = ($p->getX() * $pts[$j]->getY()) - ($p->getY() * $pts[$j]->getX());
-      $cn['x'] = $cn['x'] + ($p->getX() + $pts[$j]->getX()) * $P;
-      $cn['y'] = $cn['y'] + ($p->getY() + $pts[$j]->getY()) * $P;
+    foreach ($pts as $k => $p) {
+      $j = ($k + 1)%$c;
+      $P = ($p->getX()*$pts[$j]->getY()) - ($p->getY()*$pts[$j]->getX());
+      $cn['x'] = $cn['x'] + ($p->getX() + $pts[$j]->getX())*$P;
+      $cn['y'] = $cn['y'] + ($p->getY() + $pts[$j]->getY())*$P;
     }
     
-    $cn['x'] = $cn['x'] / ( 6 * $a);
-    $cn['y'] = $cn['y'] / ( 6 * $a);
+    $cn['x'] = $cn['x']/(6*$a);
+    $cn['y'] = $cn['y']/(6*$a);
     
     $centroid = new Point($cn['x'], $cn['y']);
     return $centroid;
@@ -85,10 +85,10 @@ 
 
 		$max = array('length' => 0, 'point' => null);
 
-		foreach($this->getPoints() as $point) {
+		foreach ($this->getPoints() as $point) {
 			$lineString = new LineString(array($centroid, $point));
 
-			if($lineString->length() > $max['length']) {
+			if ($lineString->length() > $max['length']) {
 				$max['length'] = $lineString->length();
 				$max['point'] = $point;
 			}
@@ -104,11 +104,11 @@ 
   
   public function numInteriorRings() {
     if ($this->isEmpty()) return 0;
-    return $this->numGeometries()-1;
+    return $this->numGeometries() - 1;
   }
   
   public function interiorRingN($n) {
-    return $this->geometryN($n+1);
+    return $this->geometryN($n + 1);
   }
   
   public function dimension() {
@@ -157,8 +157,8 @@ 
     $intersections = 0; 
     $vertices_count = count($vertices);
 
-    for ($i=1; $i < $vertices_count; $i++) {
-      $vertex1 = $vertices[$i-1]; 
+    for ($i = 1; $i < $vertices_count; $i++) {
+      $vertex1 = $vertices[$i - 1]; 
       $vertex2 = $vertices[$i];
       if ($vertex1->y() == $vertex2->y() 
       && $vertex1->y() == $point->y() 
@@ -172,7 +172,7 @@ 
       && $point->x() <= max($vertex1->x(), $vertex2->x())
       && $vertex1->y() != $vertex2->y()) {
         $xinters = 
-          ($point->y() - $vertex1->y()) * ($vertex2->x() - $vertex1->x())
+          ($point->y() - $vertex1->y())*($vertex2->x() - $vertex1->x())
           / ($vertex2->y() - $vertex1->y()) 
           + $vertex1->x();
         if ($xinters == $point->x()) {
@@ -185,7 +185,7 @@ 
       } 
     } 
     // If the number of edges we passed through is even, then it's in the polygon.
-    if ($intersections % 2 != 0) {
+    if ($intersections%2 != 0) {
       return TRUE;
     }
     else {
@@ -194,7 +194,7 @@ 
   }
   
   public function pointOnVertex($point) {
-    foreach($this->getPoints() as $vertex) {
+    foreach ($this->getPoints() as $vertex) {
       if ($point->equals($vertex)) {
         return true;
       }

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

Spacing +11 added lines, -11 removed lines

@@ -139,17 +139,17 @@
   }
 
   // Not valid for this geometry type
-  public function numGeometries()    { return NULL; }
-  public function geometryN($n)      { return NULL; }
-  public function startPoint()       { return NULL; }
-  public function endPoint()         { return NULL; }
-  public function isRing()           { return NULL; }
-  public function isClosed()         { return NULL; }
-  public function pointN($n)         { return NULL; }
-  public function exteriorRing()     { return NULL; }
+  public function numGeometries() { return NULL; }
+  public function geometryN($n) { return NULL; }
+  public function startPoint() { return NULL; }
+  public function endPoint() { return NULL; }
+  public function isRing() { return NULL; }
+  public function isClosed() { return NULL; }
+  public function pointN($n) { return NULL; }
+  public function exteriorRing() { return NULL; }
   public function numInteriorRings() { return NULL; }
-  public function interiorRingN($n)  { return NULL; }
-  public function pointOnSurface()   { return NULL; }
-  public function explode()          { return NULL; }
+  public function interiorRingN($n) { return NULL; }
+  public function pointOnSurface() { return NULL; }
+  public function explode() { return NULL; }
 }
 

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

Spacing +12 added lines, -12 removed lines

@@ -147,8 +147,8 @@ 
   // Note that the standard is 1 based indexing
   public function geometryN($n) {
     $n = intval($n);
-    if (array_key_exists($n-1, $this->components)) {
-      return $this->components[$n-1];
+    if (array_key_exists($n - 1, $this->components)) {
+      return $this->components[$n - 1];
     }
     else {
       return NULL;
@@ -279,16 +279,16 @@ 
 
   // Not valid for this geometry type
   // --------------------------------
-  public function x()                { return NULL; }
-  public function y()                { return NULL; }
-  public function startPoint()       { return NULL; }
-  public function endPoint()         { return NULL; }
-  public function isRing()           { return NULL; }
-  public function isClosed()         { return NULL; }
-  public function pointN($n)         { return NULL; }
-  public function exteriorRing()     { return NULL; }
+  public function x() { return NULL; }
+  public function y() { return NULL; }
+  public function startPoint() { return NULL; }
+  public function endPoint() { return NULL; }
+  public function isRing() { return NULL; }
+  public function isClosed() { return NULL; }
+  public function pointN($n) { return NULL; }
+  public function exteriorRing() { return NULL; }
   public function numInteriorRings() { return NULL; }
-  public function interiorRingN($n)  { return NULL; }
-  public function pointOnSurface()   { return NULL; }
+  public function interiorRingN($n) { return NULL; }
+  public function pointOnSurface() { return NULL; }
 }