Ysurac / FlightAirMap

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

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

Spacing +22 added lines, -22 removed lines

@@ -70,7 +70,7 @@ 
     foreach ($this->getPoints() as $delta => $point) {
       $previous_point = $this->geometryN($delta);
       if ($previous_point) {
-        $length += sqrt(pow(($previous_point->getX() - $point->getX()), 2) + pow(($previous_point->getY()- $point->getY()), 2));
+        $length += sqrt(pow(($previous_point->getX() - $point->getX()), 2) + pow(($previous_point->getY() - $point->getY()), 2));
       }
     }
     return $length;
@@ -79,10 +79,10 @@ 
   public function greatCircleLength($radius = 6378137) {
     $length = 0;
     $points = $this->getPoints();
-    for($i=0; $i<$this->numPoints()-1; $i++) {
+    for ($i = 0; $i < $this->numPoints() - 1; $i++) {
       $point = $points[$i];
-      $next_point = $points[$i+1];
-      if (!is_object($next_point)) {continue;}
+      $next_point = $points[$i + 1];
+      if (!is_object($next_point)) {continue; }
       // Great circle method
       $lat1 = deg2rad($point->getY());
       $lat2 = deg2rad($next_point->getY());
@@ -90,15 +90,15 @@ 
       $lon2 = deg2rad($next_point->getX());
       $dlon = $lon2 - $lon1;
       $length +=
-        $radius *
+        $radius*
           atan2(
             sqrt(
-              pow(cos($lat2) * sin($dlon), 2) +
-                pow(cos($lat1) * sin($lat2) - sin($lat1) * cos($lat2) * cos($dlon), 2)
+              pow(cos($lat2)*sin($dlon), 2) +
+                pow(cos($lat1)*sin($lat2) - sin($lat1)*cos($lat2)*cos($dlon), 2)
             )
             ,
-            sin($lat1) * sin($lat2) +
-              cos($lat1) * cos($lat2) * cos($dlon)
+            sin($lat1)*sin($lat2) +
+              cos($lat1)*cos($lat2)*cos($dlon)
           );
     }
     // Returns length in meters.
@@ -108,14 +108,14 @@ 
   public function haversineLength() {
     $degrees = 0;
     $points = $this->getPoints();
-    for($i=0; $i<$this->numPoints()-1; $i++) {
+    for ($i = 0; $i < $this->numPoints() - 1; $i++) {
       $point = $points[$i];
-      $next_point = $points[$i+1];
-      if (!is_object($next_point)) {continue;}
+      $next_point = $points[$i + 1];
+      if (!is_object($next_point)) {continue; }
       $degree = rad2deg(
         acos(
-          sin(deg2rad($point->getY())) * sin(deg2rad($next_point->getY())) +
-            cos(deg2rad($point->getY())) * cos(deg2rad($next_point->getY())) *
+          sin(deg2rad($point->getY()))*sin(deg2rad($next_point->getY())) +
+            cos(deg2rad($point->getY()))*cos(deg2rad($next_point->getY()))*
               cos(deg2rad(abs($point->getX() - $next_point->getX())))
         )
       );
@@ -130,8 +130,8 @@ 
     $points = $this->getPoints();
 
     foreach ($points as $i => $point) {
-      if (isset($points[$i+1])) {
-        $parts[] = new LineString(array($point, $points[$i+1]));
+      if (isset($points[$i + 1])) {
+        $parts[] = new LineString(array($point, $points[$i + 1]));
       }
     }
     return $parts;
@@ -168,18 +168,18 @@ 
     $p3_x = $segment->endPoint()->x();
     $p3_y = $segment->endPoint()->y();
 
-    $s1_x = $p1_x - $p0_x;     $s1_y = $p1_y - $p0_y;
-    $s2_x = $p3_x - $p2_x;     $s2_y = $p3_y - $p2_y;
+    $s1_x = $p1_x - $p0_x; $s1_y = $p1_y - $p0_y;
+    $s2_x = $p3_x - $p2_x; $s2_y = $p3_y - $p2_y;
 
-    $fps = (-$s2_x * $s1_y) + ($s1_x * $s2_y);
-    $fpt = (-$s2_x * $s1_y) + ($s1_x * $s2_y);
+    $fps = (-$s2_x*$s1_y) + ($s1_x*$s2_y);
+    $fpt = (-$s2_x*$s1_y) + ($s1_x*$s2_y);
 
     if ($fps == 0 || $fpt == 0) {
       return FALSE;
     }
 
-    $s = (-$s1_y * ($p0_x - $p2_x) + $s1_x * ($p0_y - $p2_y)) / $fps;
-    $t = ( $s2_x * ($p0_y - $p2_y) - $s2_y * ($p0_x - $p2_x)) / $fpt;
+    $s = (-$s1_y*($p0_x - $p2_x) + $s1_x*($p0_y - $p2_y))/$fps;
+    $t = ($s2_x*($p0_y - $p2_y) - $s2_y*($p0_x - $p2_x))/$fpt;
 
     if ($s > 0 && $s < 1 && $t > 0 && $t < 1) {
       // Collision detected

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

Spacing +9 added lines, -9 removed lines

@@ -21,8 +21,8 @@ 
   abstract public function geometryN($n);
   abstract public function startPoint();
   abstract public function endPoint();
-  abstract public function isRing();            // Mssing dependancy
-  abstract public function isClosed();          // Missing dependancy
+  abstract public function isRing(); // Mssing dependancy
+  abstract public function isClosed(); // Missing dependancy
   abstract public function numPoints();
   abstract public function pointN($n);
   abstract public function exteriorRing();
@@ -64,12 +64,12 @@ 
     }
 
     $bbox = $this->getBBox();
-    $points = array (
-      new Point($bbox['maxx'],$bbox['miny']),
-      new Point($bbox['maxx'],$bbox['maxy']),
-      new Point($bbox['minx'],$bbox['maxy']),
-      new Point($bbox['minx'],$bbox['miny']),
-      new Point($bbox['maxx'],$bbox['miny']),
+    $points = array(
+      new Point($bbox['maxx'], $bbox['miny']),
+      new Point($bbox['maxx'], $bbox['maxy']),
+      new Point($bbox['minx'], $bbox['maxy']),
+      new Point($bbox['minx'], $bbox['miny']),
+      new Point($bbox['maxx'], $bbox['miny']),
     );
 
     $outer_boundary = new LineString($points);
@@ -147,7 +147,7 @@ 
     // It hasn't been set yet, generate it
     if (geoPHP::geosInstalled()) {
       $reader = new GEOSWKBReader();
-      $this->geos = $reader->readHEX($this->out('wkb',TRUE));
+      $this->geos = $reader->readHEX($this->out('wkb', TRUE));
     }
     else {
       $this->geos = FALSE;

require/libs/geoPHP/geoPHP.inc

Spacing +6 added lines, -6 removed lines

@@ -91,7 +91,7 @@ 
   }

 

   static function getAdapterMap() {

-    return array (

+    return array(

       'wkt' =>  'WKT',

       'ewkt' => 'EWKT',

       'wkb' =>  'WKB',

@@ -154,8 +154,8 @@ 
 

     // If the geometry cannot even theoretically be reduced more, then pass it back

     if (gettype($geometry) == 'object') {

-      $passbacks = array('Point','LineString','Polygon');

-      if (in_array($geometry->geometryType(),$passbacks)) {

+      $passbacks = array('Point', 'LineString', 'Polygon');

+      if (in_array($geometry->geometryType(), $passbacks)) {

         return $geometry;

       }

     }

@@ -163,8 +163,8 @@ 
     // If it is a mutlti-geometry, check to see if it just has one member

     // If it does, then pass the member, if not, then just pass back the geometry

     if (gettype($geometry) == 'object') {

-      $simple_collections = array('MultiPoint','MultiLineString','MultiPolygon');

-      if (in_array(get_class($geometry),$passbacks)) {

+      $simple_collections = array('MultiPoint', 'MultiLineString', 'MultiPolygon');

+      if (in_array(get_class($geometry), $passbacks)) {

         $components = $geometry->getComponents();

         if (count($components) == 1) {

           return $components[0];

@@ -183,7 +183,7 @@ 
     $geometries = array();

     $geom_types = array();

 

-    $collections = array('MultiPoint','MultiLineString','MultiPolygon','GeometryCollection');

+    $collections = array('MultiPoint', 'MultiLineString', 'MultiPolygon', 'GeometryCollection');

 

     foreach ($geometry as $item) {

       if ($item) {

require/class.ATC.php

Spacing +11 added lines, -11 removed lines

@@ -15,25 +15,25 @@ 
                  try {
                         $sth = $this->db->prepare($query);
                         $sth->execute($query_values);
-                } catch(PDOException $e) {
+                } catch (PDOException $e) {
                         return "error : ".$e->getMessage();
                 }
                 $all = $sth->fetchAll(PDO::FETCH_ASSOC);
                 return $all;
         }
 
-       public function add($ident,$frequency,$latitude,$longitude,$range,$info,$date,$type = '',$ivao_id = '',$ivao_name = '') {
-    		$info = preg_replace('/[^(\x20-\x7F)]*/','',$info);
-    		$info = str_replace('^','<br />',$info);
-    		$info = str_replace('&amp;sect;','',$info);
-    		$info = str_replace('"','',$info);
+       public function add($ident, $frequency, $latitude, $longitude, $range, $info, $date, $type = '', $ivao_id = '', $ivao_name = '') {
+    		$info = preg_replace('/[^(\x20-\x7F)]*/', '', $info);
+    		$info = str_replace('^', '<br />', $info);
+    		$info = str_replace('&amp;sect;', '', $info);
+    		$info = str_replace('"', '', $info);
     		if ($type == '') $type = NULL;
                 $query = "INSERT INTO atc (ident,frequency,latitude,longitude,atc_range,info,atc_lastseen,type,ivao_id,ivao_name) VALUES (:ident,:frequency,:latitude,:longitude,:range,:info,:date,:type,:ivao_id,:ivao_name)";
-                $query_values = array(':ident' => $ident,':frequency' => $frequency,':latitude' => $latitude,':longitude' => $longitude,':range' => $range,':info' => $info,':date' => $date,':ivao_id' => $ivao_id,':ivao_name' => $ivao_name, ':type' => $type);
+                $query_values = array(':ident' => $ident, ':frequency' => $frequency, ':latitude' => $latitude, ':longitude' => $longitude, ':range' => $range, ':info' => $info, ':date' => $date, ':ivao_id' => $ivao_id, ':ivao_name' => $ivao_name, ':type' => $type);
                  try {
                         $sth = $this->db->prepare($query);
                         $sth->execute($query_values);
-                } catch(PDOException $e) {
+                } catch (PDOException $e) {
                         return "error : ".$e->getMessage();
                 }
         }
@@ -44,7 +44,7 @@ 
                  try {
                         $sth = $this->db->prepare($query);
                         $sth->execute($query_values);
-                } catch(PDOException $e) {
+                } catch (PDOException $e) {
                         return "error : ".$e->getMessage();
                 }
         }
@@ -55,7 +55,7 @@ 
                  try {
                         $sth = $this->db->prepare($query);
                         $sth->execute($query_values);
-                } catch(PDOException $e) {
+                } catch (PDOException $e) {
                         return "error : ".$e->getMessage();
                 }
         }
@@ -70,7 +70,7 @@ 
                 try {
                         $sth = $this->db->prepare($query);
                         $sth->execute();
-                } catch(PDOException $e) {
+                } catch (PDOException $e) {
                         return "error";
                 }
                 return "success";

require/class.SpotterServer.php

Spacing +6 added lines, -6 removed lines

@@ -11,12 +11,12 @@ 
     
     function __construct($dbs = null) {
 	if ($dbs === null) {
-	    $Connection = new Connection(null,'server');
+	    $Connection = new Connection(null, 'server');
 	    $this->dbs = $Connection->dbs;
 	    $query = "CREATE TABLE IF NOT EXISTS `spotter_temp` ( `id_data` INT NOT NULL AUTO_INCREMENT , `id_user` INT NOT NULL , `datetime` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP , `hex` VARCHAR(20) NOT NULL , `ident` VARCHAR(20) NULL , `latitude` FLOAT NULL , `longitude` FLOAT NULL , `verticalrate` INT NULL , `speed` INT NULL , `squawk` INT NULL , `altitude` INT NULL , `heading` INT NULL , `registration` VARCHAR(10) NULL , `aircraft_icao` VARCHAR(10) NULL , `waypoints` VARCHAR(255) NULL , `noarchive` BOOLEAN NOT NULL DEFAULT FALSE, `id_source` INT NOT NULL DEFAULT '1', `format_source` VARCHAR(25) NULL, `source_name` VARCHAR(25) NULL, `over_country` VARCHAR(255) NULL, PRIMARY KEY (`id_data`) ) ENGINE = MEMORY;";
 	    try {
 		$sth = $this->dbs['server']->exec($query);
-	    } catch(PDOException $e) {
+	    } catch (PDOException $e) {
 		return "error : ".$e->getMessage();
 	    }
 	}
@@ -31,10 +31,10 @@ 
 	date_default_timezone_set('UTC');
 	//if (isset($line['format_source']) && ($line['format_source'] === 'sbs' || $line['format_source'] === 'tsv' || $line['format_source'] === 'raw' || $line['format_source'] === 'deltadbtxt' || $line['format_source'] === 'aprs')) {
 	if (isset($line['format_source'])) {
-	    if(is_array($line) && isset($line['hex'])) {
+	    if (is_array($line) && isset($line['hex'])) {
 		if ($line['hex'] != '' && $line['hex'] != '00000' && $line['hex'] != '000000' && $line['hex'] != '111111' && ctype_xdigit($line['hex']) && strlen($line['hex']) === 6) {
 		    $data['hex'] = trim($line['hex']);
-		    if (preg_match('/^(\d{4}(?:\-\d{2}){2} \d{2}(?:\:\d{2}){2})$/',$line['datetime'])) {
+		    if (preg_match('/^(\d{4}(?:\-\d{2}){2} \d{2}(?:\:\d{2}){2})$/', $line['datetime'])) {
 		        $data['datetime'] = $line['datetime'];
 		    } else $data['datetime'] = date('Y-m-d H:i:s');
 		    if (!isset($line['aircraft_icao'])) {
@@ -112,11 +112,11 @@ 
   		    if ($id_user == NULL) $id_user = 1;
   		    if (!isset($id_source)) $id_source = 1;
   		    $query = 'INSERT INTO spotter_temp (id_user,datetime,hex,ident,latitude,longitude,verticalrate,speed,squawk,altitude,heading,registration,aircraft_icao,waypoints,id_source,noarchive,format_source,source_name,over_country) VALUES (:id_user,:datetime,:hex,:ident,:latitude,:longitude,:verticalrate,:speed,:squawk,:altitude,:heading,:registration,:aircraft_icao,:waypoints,:id_source,:noarchive, :format_source, :source_name, :over_country)';
-		    $query_values = array(':id_user' => $id_user,':datetime' => $data['datetime'],':hex' => $data['hex'],':ident' => $data['ident'],':latitude' => $data['latitude'],':longitude' => $data['longitude'],':verticalrate' => $data['verticalrate'],':speed' => $data['speed'],':squawk' => $data['squawk'],':altitude' => $data['altitude'],':heading' => $data['heading'],':registration' => $data['registration'],':aircraft_icao' => $data['aircraft_icao'],':waypoints' => $data['waypoints'],':id_source' => $id_source,':noarchive' => $data['noarchive'], ':format_source' => $data['format_source'], ':source_name' => $data['source_name'],':over_country' => $data['over_country']);
+		    $query_values = array(':id_user' => $id_user, ':datetime' => $data['datetime'], ':hex' => $data['hex'], ':ident' => $data['ident'], ':latitude' => $data['latitude'], ':longitude' => $data['longitude'], ':verticalrate' => $data['verticalrate'], ':speed' => $data['speed'], ':squawk' => $data['squawk'], ':altitude' => $data['altitude'], ':heading' => $data['heading'], ':registration' => $data['registration'], ':aircraft_icao' => $data['aircraft_icao'], ':waypoints' => $data['waypoints'], ':id_source' => $id_source, ':noarchive' => $data['noarchive'], ':format_source' => $data['format_source'], ':source_name' => $data['source_name'], ':over_country' => $data['over_country']);
 		    try {
                         $sth = $this->dbs['server']->prepare($query);
                         $sth->execute($query_values);
-                    } catch(PDOException $e) {
+                    } catch (PDOException $e) {
                         return "error : ".$e->getMessage();
             	    }
         	}

date-statistics-route.php

Spacing +6 added lines, -6 removed lines

@@ -3,12 +3,12 @@ 
 require_once('require/class.Spotter.php');
 require_once('require/class.Language.php');
 $Spotter = new Spotter();
-$sort = filter_input(INPUT_GET,'sort',FILTER_SANITIZE_STRING);
-$spotter_array = $Spotter->getSpotterDataByDate($_GET['date'],"0,1", $sort);
+$sort = filter_input(INPUT_GET, 'sort', FILTER_SANITIZE_STRING);
+$spotter_array = $Spotter->getSpotterDataByDate($_GET['date'], "0,1", $sort);
 
 if (!empty($spotter_array))
 {
-	$title = sprintf(_("Most Common Routes on %s"),date("l F j, Y", strtotime($spotter_array[0]['date_iso_8601'])));
+	$title = sprintf(_("Most Common Routes on %s"), date("l F j, Y", strtotime($spotter_array[0]['date_iso_8601'])));
 
 	require_once('header.php');
 	print '<div class="select-item">';
@@ -20,13 +20,13 @@ 
 	print '</div>';
 
 	print '<div class="info column">';
-	print '<h1>'.sprintf(_("Flights from %s"),date("l F j, Y", strtotime($spotter_array[0]['date_iso_8601']))).'</h1>';
+	print '<h1>'.sprintf(_("Flights from %s"), date("l F j, Y", strtotime($spotter_array[0]['date_iso_8601']))).'</h1>';
 	print '</div>';
 
 	include('date-sub-menu.php');
 	print '<div class="column">';
 	print '<h2>'._("Most Common Routes").'</h2>';
-	print '<p>'.sprintf(_("The statistic below shows the most common routes on <strong>%s</strong>."),date("l F j, Y", strtotime($spotter_array[0]['date_iso_8601']))).'</p>';
+	print '<p>'.sprintf(_("The statistic below shows the most common routes on <strong>%s</strong>."), date("l F j, Y", strtotime($spotter_array[0]['date_iso_8601']))).'</p>';
 
 	$route_array = $Spotter->countAllRoutesByDate($_GET['date']);
 	if (!empty($route_array))
@@ -43,7 +43,7 @@ 
 		print '</thead>';
 		print '<tbody>';
 		$i = 1;
-		foreach($route_array as $route_item)
+		foreach ($route_array as $route_item)
 		{
 			print '<tr>';
 			print '<td><strong>'.$i.'</strong></td>';

manufacturer-statistics-time.php

Spacing +8 added lines, -8 removed lines

@@ -7,23 +7,23 @@ 
         die();
 }
 $Spotter = new Spotter();
-$manufacturer = ucwords(str_replace("-", " ", filter_input(INPUT_GET,'aircraft_manufacturer',FILTER_SANITIZE_STRING)));
+$manufacturer = ucwords(str_replace("-", " ", filter_input(INPUT_GET, 'aircraft_manufacturer', FILTER_SANITIZE_STRING)));
 
-$sort = filter_input(INPUT_GET,'sort',FILTER_SANITIZE_STRING);
-$spotter_array = $Spotter->getSpotterDataByManufacturer($manufacturer,"0,1", $sort);
+$sort = filter_input(INPUT_GET, 'sort', FILTER_SANITIZE_STRING);
+$spotter_array = $Spotter->getSpotterDataByManufacturer($manufacturer, "0,1", $sort);
 
 if (!empty($spotter_array))
 {
-	$title = sprintf(_("Most Common Time of Day from %s"),$manufacturer);
+	$title = sprintf(_("Most Common Time of Day from %s"), $manufacturer);
 	require_once('header.php');
 	print '<div class="select-item">';
 	print '<form action="'.$globalURL.'/manufacturer" method="post">';
 	print '<select name="aircraft_manufacturer" class="selectpicker" data-live-search="true">';
 	print '<option></option>';
 	$all_manufacturers = $Spotter->getAllManufacturers();
-	foreach($all_manufacturers as $all_manufacturer)
+	foreach ($all_manufacturers as $all_manufacturer)
 	{
-		if($_GET['aircraft_manufacturer'] == strtolower(str_replace(" ", "-", $all_manufacturer['aircraft_manufacturer'])))
+		if ($_GET['aircraft_manufacturer'] == strtolower(str_replace(" ", "-", $all_manufacturer['aircraft_manufacturer'])))
 		{
 			print '<option value="'.strtolower(str_replace(" ", "-", $all_manufacturer['aircraft_manufacturer'])).'" selected="selected">'.$all_manufacturer['aircraft_manufacturer'].'</option>';
 		} else {
@@ -42,7 +42,7 @@ 
 	include('manufacturer-sub-menu.php');
 	print '<div class="column">';
 	print '<h2>'._("Most Common Time of Day").'</h2>';
-	print '<p>'.sprintf(_("The statistic below shows the most common time of day from <strong>%s</strong>."),$manufacturer).'</p>';
+	print '<p>'.sprintf(_("The statistic below shows the most common time of day from <strong>%s</strong>."), $manufacturer).'</p>';
 
 	$hour_array = $Spotter->countAllHoursByManufacturer($manufacturer);
 	print '<script type="text/javascript" src="https://www.google.com/jsapi"></script>';
@@ -54,7 +54,7 @@ 
             var data = google.visualization.arrayToDataTable([
             	["'._("Hour").'", "'._("# of Flights").'"], ';
             	$hour_data = '';
-	foreach($hour_array as $hour_item)
+	foreach ($hour_array as $hour_item)
 	{
 		$hour_data .= '[ "'.date("ga", strtotime($hour_item['hour_name'].":00")).'",'.$hour_item['hour_count'].'],';
 	}