Ysurac / FlightAirMap

require/libs/geoPHP/tests/test.php

Spacing +7 added lines, -7 removed lines

@@ -18,7 +18,7 @@ 
   }
 
   foreach (scandir('./input') as $file) {
-    $parts = explode('.',$file);
+    $parts = explode('.', $file);
     if ($parts[0]) {
       $format = $parts[1];
       $value = file_get_contents('./input/'.$file);
@@ -88,7 +88,7 @@ 
   $geometry->difference($geometry);
   $geometry->symDifference($geometry);
   $geometry->union($geometry);
-  $geometry->simplify(0);// @@TODO: Adjust this once we can deal with empty geometries
+  $geometry->simplify(0); // @@TODO: Adjust this once we can deal with empty geometries
   $geometry->disjoint($geometry);
   $geometry->touches($geometry);
   $geometry->intersects($geometry);
@@ -127,7 +127,7 @@ 
         }
       }
       else {
-        print "Empty output on "  . $adapter_key . "\n";
+        print "Empty output on ".$adapter_key."\n";
       }
     }
   }
@@ -171,7 +171,7 @@ 
 
   $methods = array(
     //'boundary', //@@TODO: Uncomment this and fix errors
-    'envelope',   //@@TODO: Testing reveales errors in this method -- POINT vs. POLYGON
+    'envelope', //@@TODO: Testing reveales errors in this method -- POINT vs. POLYGON
     'getBBox',
     'x',
     'y',
@@ -204,7 +204,7 @@ 
 
     // Now check base on type
     if ($geos_type == 'object') {
-      $haus_dist = $geos_result->hausdorffDistance(geoPHP::load($norm_result->out('wkt'),'wkt'));
+      $haus_dist = $geos_result->hausdorffDistance(geoPHP::load($norm_result->out('wkt'), 'wkt'));
 
       // Get the length of the diagonal of the bbox - this is used to scale the haustorff distance
       // Using Pythagorean theorem
@@ -212,7 +212,7 @@ 
       $scale = sqrt((($bb['maxy'] - $bb['miny'])^2) + (($bb['maxx'] - $bb['minx'])^2));
 
       // The difference in the output of GEOS and native-PHP methods should be less than 0.5 scaled haustorff units
-      if ($haus_dist / $scale > 0.5) {
+      if ($haus_dist/$scale > 0.5) {
         print 'Output mismatch on '.$method.":\n";
         print 'GEOS : '.$geos_result->out('wkt')."\n";
         print 'NORM : '.$norm_result->out('wkt')."\n";
@@ -237,7 +237,7 @@ 
 function test_detection($value, $format, $file) {
   $detected = geoPHP::detectFormat($value);
   if ($detected != $format) {
-    if ($detected) print 'detected as ' . $detected . "\n";
+    if ($detected) print 'detected as '.$detected."\n";
     else print "not detected\n";
   }
   // Make sure it loads using auto-detect

require/libs/geoPHP/tests/postgis.php

Spacing +7 added lines, -7 removed lines

@@ -9,12 +9,12 @@ 
   include_once('../geoPHP.inc');
   
   // Your database test table should contain 3 columns: name (text), type (text), geom (geometry)
-  $host =     'localhost';
+  $host = 'localhost';
   $database = 'phayes';
-  $table =    'test';
-  $column =   'geom';
-  $user =     'phayes';
-  $pass =     'supersecret';
+  $table = 'test';
+  $column = 'geom';
+  $user = 'phayes';
+  $pass = 'supersecret';
   
   $connection = pg_connect("host=$host dbname=$database user=$user password=$pass");
   
@@ -25,7 +25,7 @@ 
   // ----------------------------
   
   foreach (scandir('./input') as $file) {
-    $parts = explode('.',$file);
+    $parts = explode('.', $file);
     if ($parts[0]) {
       $name = $parts[0];
       $format = $parts[1];
@@ -58,7 +58,7 @@ 
   // SELECT and INSERT directly, with no wrapping functions
   $result = pg_fetch_all(pg_query($connection, "SELECT geom as geom FROM $table WHERE name='$name'"));
   foreach ($result as $item) {
-    $wkb = pack('H*',$item['geom']);   // Unpacking the hex blob
+    $wkb = pack('H*', $item['geom']); // Unpacking the hex blob
     $geom = geoPHP::load($wkb, $format); // We now have a geoPHP Geometry
   
     // Let's re-insert directly into postGIS

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

Spacing +1 added lines, -1 removed lines

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

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

Spacing +11 added lines, -11 removed lines

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

     // Change to lower-case, strip all CDATA, and de-namespace

     $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 GeoRSS: ". $text);

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

     }

     

     $this->xmlobj = $xmlobj;

     try {

       $geom = $this->geomFromXML();

-    } catch(InvalidText $e) {

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

-    } catch(Exception $e) {

+    } catch (InvalidText $e) {

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

+    } catch (Exception $e) {

         throw $e;

     }

 

@@ -82,9 +82,9 @@ 
   

   protected function getPointsFromCoords($string) {

     $coords = array();

-    $latlon = explode(' ',$string);

+    $latlon = explode(' ', $string);

     foreach ($latlon as $key => $item) {

-      if (!($key % 2)) {

+      if (!($key%2)) {

         // It's a latitude

         $lat = $item;

       }

@@ -139,7 +139,7 @@ 
     $polygons = array();

     $box_elements = $this->xmlobj->getElementsByTagName('box');

     foreach ($box_elements as $box) {

-      $parts = explode(' ',trim($box->firstChild->nodeValue));

+      $parts = explode(' ', trim($box->firstChild->nodeValue));

       $components = array(

         new Point($parts[3], $parts[2]),

         new Point($parts[3], $parts[0]),

@@ -159,7 +159,7 @@ 
     $points = array();

     $circle_elements = $this->xmlobj->getElementsByTagName('circle');

     foreach ($circle_elements as $circle) {

-      $parts = explode(' ',trim($circle->firstChild->nodeValue));

+      $parts = explode(' ', trim($circle->firstChild->nodeValue));

       $points[] = new Point($parts[1], $parts[0]);

     }

     return $points;

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

Spacing +17 added lines, -17 removed lines

@@ -16,10 +16,10 @@ 
     $wkt = trim($wkt);
     
     // If it contains a ';', then it contains additional SRID data
-    if (strpos($wkt,';')) {
+    if (strpos($wkt, ';')) {
       $parts = explode(';', $wkt);
       $wkt = $parts[1];
-      $eparts = explode('=',$parts[0]);
+      $eparts = explode('=', $parts[0]);
       $srid = $eparts[1];
     }
     else {
@@ -63,7 +63,7 @@ 
   
   private function parsePoint($data_string) {
     $data_string = $this->trimParens($data_string);
-    $parts = explode(' ',$data_string);
+    $parts = explode(' ', $data_string);
     return new Point($parts[0], $parts[1]);
   }
 
@@ -73,7 +73,7 @@ 
     // If it's marked as empty, then return an empty line
     if ($data_string == 'EMPTY') return new LineString();
     
-    $parts = explode(',',$data_string);
+    $parts = explode(',', $data_string);
     $points = array();
     foreach ($parts as $part) {
       $points[] = $this->parsePoint($part);
@@ -87,11 +87,11 @@ 
     // If it's marked as empty, then return an empty polygon
     if ($data_string == 'EMPTY') return new Polygon();
     
-    $parts = explode('),(',$data_string);
+    $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);
@@ -103,7 +103,7 @@ 
     // If it's marked as empty, then return an empty MutiPoint
     if ($data_string == 'EMPTY') return new MultiPoint();
     
-    $parts = explode(',',$data_string);
+    $parts = explode(',', $data_string);
     $points = array();
     foreach ($parts as $part) {
       $points[] = $this->parsePoint($part);
@@ -117,12 +117,12 @@ 
     // If it's marked as empty, then return an empty multi-linestring
     if ($data_string == 'EMPTY') return new MultiLineString();
     
-    $parts = explode('),(',$data_string);
+    $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);
@@ -134,12 +134,12 @@ 
     // If it's marked as empty, then return an empty multi-polygon
     if ($data_string == 'EMPTY') return new MultiPolygon();
     
-    $parts = explode(')),((',$data_string);
+    $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);
@@ -179,18 +179,18 @@ 
     
     // We want to only strip off one set of parenthesis
     if ($this->beginsWith($str, '(')) {
-      return substr($str,1,-1);
+      return substr($str, 1, -1);
     }
     else return $str;
   }
   
   protected function beginsWith($str, $char) {
-    if (substr($str,0,strlen($char)) == $char) return TRUE;
+    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;
+    if (substr($str, (0 - strlen($char))) == $char) return TRUE;
     else return FALSE;
   }
     

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

Spacing +2 added lines, -2 removed lines

@@ -43,7 +43,7 @@ 
     }
     
     $url = "http://maps.googleapis.com/maps/api/geocode/json";
-    $url .= '?address='. urlencode($address);
+    $url .= '?address='.urlencode($address);
     $url .= $bounds_string;
     $url .= '&sensor=false';
     $this->result = json_decode(@file_get_contents($url));
@@ -121,7 +121,7 @@ 
   }
 
   private function getPolygon($delta = 0) {
-    $points = array (
+    $points = array(
       $this->getTopLeft($delta),
       $this->getTopRight($delta),
       $this->getBottomRight($delta),

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;

   }