Ysurac / FlightAirMap

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

Braces +6 added lines, -7 removed lines

@@ -57,7 +57,9 @@ 
   }
 
   public function envelope() {
-    if ($this->isEmpty()) return new Polygon();
+    if ($this->isEmpty()) {
+    	return new Polygon();
+    }
 
     if ($this->geos()) {
       return geoPHP::geosToGeometry($this->geos()->envelope());
@@ -148,8 +150,7 @@ 
     if (geoPHP::geosInstalled()) {
       $reader = new GEOSWKBReader();
       $this->geos = $reader->readHEX($this->out('wkb',TRUE));
-    }
-    else {
+    } else {
       $this->geos = FALSE;
     }
     return $this->geos;
@@ -175,8 +176,7 @@ 
     if ($this->geos()) {
       if ($pattern) {
         return $this->geos()->relate($geometry->geos(), $pattern);
-      }
-      else {
+      } else {
         return $this->geos()->relate($geometry->geos());
       }
     }
@@ -227,8 +227,7 @@ 
           $geom = $geom->union($item->geos());
         }
         return geoPHP::geosToGeometry($geom);
-      }
-      else {
+      } else {
         return geoPHP::geosToGeometry($this->geos()->union($geometry->geos()));
       }
     }

require/libs/geoPHP/geoPHP.inc

Braces +42 added lines, -21 removed lines

@@ -52,7 +52,9 @@ 
     if (!$type) {

       // If the user is trying to load a Geometry from a Geometry... Just pass it back

       if (is_object($data)) {

-        if ($data instanceOf Geometry) return $data;

+        if ($data instanceOf Geometry) {
+        	return $data;
+        }
       }

       

       $detected = geoPHP::detectFormat($data);

@@ -120,7 +122,9 @@ 
 

   static function geosInstalled($force = NULL) {

     static $geos_installed = NULL;

-    if ($force !== NULL) $geos_installed = $force;

+    if ($force !== NULL) {
+    	$geos_installed = $force;
+    }
     if ($geos_installed !== NULL) {

       return $geos_installed;

     }

@@ -148,8 +152,12 @@ 
   static function geometryReduce($geometry) {

     // If it's an array of one, then just parse the one

     if (is_array($geometry)) {

-      if (empty($geometry)) return FALSE;

-      if (count($geometry) == 1) return geoPHP::geometryReduce(array_shift($geometry));

+      if (empty($geometry)) {
+      	return FALSE;
+      }
+      if (count($geometry) == 1) {
+      	return geoPHP::geometryReduce(array_shift($geometry));
+      }
     }

 

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

@@ -168,8 +176,7 @@ 
         $components = $geometry->getComponents();

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

           return $components[0];

-        }

-        else {

+        } else {

           return $geometry;

         }

       }

@@ -192,8 +199,7 @@ 
             $geometries[] = $component;

             $geom_types[] = $component->geometryType();

           }

-        }

-        else {

+        } else {

           $geometries[] = $item;

           $geom_types[] = $item->geometryType();

         }

@@ -209,13 +215,11 @@ 
     if (count($geom_types) == 1) {

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

         return $geometries[0];

-      }

-      else {

+      } else {

         $class = 'Multi'.$geom_types[0];

         return new $class($geometries);

       }

-    }

-    else {

+    } else {

       return new GeometryCollection($geometries);

     }

   }

@@ -230,7 +234,9 @@ 
     $bytes = unpack("c*", fread($mem, 11));

 

     // If bytes is empty, then we were passed empty input

-    if (empty($bytes)) return FALSE;

+    if (empty($bytes)) {
+    	return FALSE;
+    }
 

     // First char is a tab, space or carriage-return. trim it and try again

     if ($bytes[1] == 9 || $bytes[1] == 10 || $bytes[1] == 32) {

@@ -240,8 +246,11 @@ 
     // Detect WKB or EWKB -- first byte is 1 (little endian indicator)

     if ($bytes[1] == 1) {

       // If SRID byte is TRUE (1), it's EWKB

-      if ($bytes[5]) return 'ewkb';

-      else return 'wkb';

+      if ($bytes[5]) {
+      	return 'ewkb';
+      } else {
+      	return 'wkb';
+      }
     }

 

     // Detect HEX encoded WKB or EWKB (PostGIS format) -- first byte is 48, second byte is 49 (hex '01' => first-byte = 1)

@@ -274,12 +283,24 @@ 
     if ($bytes[1] == 60) {

       // grab the first 256 characters

       $string = substr($input, 0, 256);

-      if (strpos($string, '<kml') !== FALSE)        return 'kml';

-      if (strpos($string, '<coordinate') !== FALSE) return 'kml';

-      if (strpos($string, '<gpx') !== FALSE)        return 'gpx';

-      if (strpos($string, '<georss') !== FALSE)     return 'georss';

-      if (strpos($string, '<rss') !== FALSE)        return 'georss';

-      if (strpos($string, '<feed') !== FALSE)       return 'georss';

+      if (strpos($string, '<kml') !== FALSE) {
+      	return 'kml';
+      }
+      if (strpos($string, '<coordinate') !== FALSE) {
+      	return 'kml';
+      }
+      if (strpos($string, '<gpx') !== FALSE) {
+      	return 'gpx';
+      }
+      if (strpos($string, '<georss') !== FALSE) {
+      	return 'georss';
+      }
+      if (strpos($string, '<rss') !== FALSE) {
+      	return 'georss';
+      }
+      if (strpos($string, '<feed') !== FALSE) {
+      	return 'georss';
+      }
     }

 

     // We need an 8 byte string for geohash and unpacked WKB / WKT

require/class.SpotterServer.php

Braces +72 added lines, -25 removed lines

@@ -36,81 +36,128 @@
 		    $data['hex'] = trim($line['hex']);
 		    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');
+		    } else {
+		    	$data['datetime'] = date('Y-m-d H:i:s');
+		    }
 		    if (!isset($line['aircraft_icao'])) {
 		        $Spotter = new Spotter();
 		        $aircraft_icao = $Spotter->getAllAircraftType($data['hex']);
 		        $Spotter->db = null;
 			if ($aircraft_icao == '' && isset($line['aircraft_type'])) {
-			    if ($line['aircraft_type'] == 'PARA_GLIDER') $aircraft_icao = 'GLID';
-			    elseif ($line['aircraft_type'] == 'HELICOPTER_ROTORCRAFT') $aircraft_icao = 'UHEL';
-			    elseif ($line['aircraft_type'] == 'TOW_PLANE') $aircraft_icao = 'TOWPLANE';
-			    elseif ($line['aircraft_type'] == 'POWERED_AIRCRAFT') $aircraft_icao = 'POWAIRC';
+			    if ($line['aircraft_type'] == 'PARA_GLIDER') {
+			    	$aircraft_icao = 'GLID';
+			    } elseif ($line['aircraft_type'] == 'HELICOPTER_ROTORCRAFT') {
+			    	$aircraft_icao = 'UHEL';
+			    } elseif ($line['aircraft_type'] == 'TOW_PLANE') {
+			    	$aircraft_icao = 'TOWPLANE';
+			    } elseif ($line['aircraft_type'] == 'POWERED_AIRCRAFT') {
+			    	$aircraft_icao = 'POWAIRC';
+			    }
 			}
 			$data['aircraft_icao'] = $aircraft_icao;
-		    } else $data['aircraft_icao'] = $line['aircraft_icao'];
+		    } else {
+		    	$data['aircraft_icao'] = $line['aircraft_icao'];
+		    }
 		    //if ($globalDebug) echo "*********** New aircraft hex : ".$data['hex']." ***********\n";
 		}
 		if (isset($line['registration']) && $line['registration'] != '') {
 		    $data['registration'] = $line['registration'];
-		} else $data['registration'] = null;
+		} else {
+			$data['registration'] = null;
+		}
 		if (isset($line['waypoints']) && $line['waypoints'] != '') {
 		    $data['waypoints'] = $line['waypoints'];
-		} else $data['waypoints'] = null;
+		} else {
+			$data['waypoints'] = null;
+		}
 		if (isset($line['ident']) && $line['ident'] != '' && $line['ident'] != '????????' && $line['ident'] != '00000000' && preg_match('/^[a-zA-Z0-9]+$/', $line['ident'])) {
 		    $data['ident'] = trim($line['ident']);
-		} else $data['ident'] = null;
+		} else {
+			$data['ident'] = null;
+		}
 
 	        if (isset($line['latitude']) && isset($line['longitude']) && $line['latitude'] != '' && $line['longitude'] != '') {
 		    if (isset($line['latitude']) && $line['latitude'] != '' && $line['latitude'] != 0 && $line['latitude'] < 91 && $line['latitude'] > -90) {
 			$data['latitude'] = $line['latitude'];
-		    } else $data['latitude'] = null;
+		    } else {
+		    	$data['latitude'] = null;
+		    }
 		    if (isset($line['longitude']) && $line['longitude'] != '' && $line['longitude'] != 0 && $line['longitude'] < 360 && $line['longitude'] > -180) {
-		        if ($line['longitude'] > 180) $line['longitude'] = $line['longitude'] - 360;
+		        if ($line['longitude'] > 180) {
+		        	$line['longitude'] = $line['longitude'] - 360;
+		        }
 			$data['longitude'] = $line['longitude'];
-		    } else $data['longitude'] = null;
+		    } else {
+		    	$data['longitude'] = null;
+		    }
 		} else {
 		    $data['latitude'] = null;
 		    $data['longitude'] = null;
 		}
 		if (isset($line['verticalrate']) && $line['verticalrate'] != '') {
 		    $data['verticalrate'] = $line['verticalrate'];
-		} else $data['verticalrate'] = null;
+		} else {
+			$data['verticalrate'] = null;
+		}
 		if (isset($line['emergency']) && $line['emergency'] != '') {
 		    $data['emergency'] = $line['emergency'];
-		} else $data['emergency'] = null;
+		} else {
+			$data['emergency'] = null;
+		}
 		if (isset($line['ground']) && $line['ground'] != '') {
 		    $data['ground'] = $line['ground'];
-		} else $data['ground'] = null;
+		} else {
+			$data['ground'] = null;
+		}
 		if (isset($line['speed']) && $line['speed'] != '') {
 		    $data['speed'] = round($line['speed']);
-		} else $data['speed'] = null;
+		} else {
+			$data['speed'] = null;
+		}
 		if (isset($line['squawk']) && $line['squawk'] != '') {
 		    $data['squawk'] = $line['squawk'];
-		} else $data['squawk'] = null;
+		} else {
+			$data['squawk'] = null;
+		}
 
 		if (isset($line['altitude']) && $line['altitude'] != '') {
 			$data['altitude'] = round($line['altitude']);
-  		} else $data['altitude'] = null;
+  		} else {
+  			$data['altitude'] = null;
+  		}
 		if (isset($line['heading']) && $line['heading'] != '') {
 		    $data['heading'] = round($line['heading']);
-  		} else $data['heading'] = null;
+  		} else {
+  			$data['heading'] = null;
+  		}
 		if (isset($line['source_name']) && $line['source_name'] != '') {
 		    $data['source_name'] = $line['source_name'];
-  		} else $data['source_name'] = null;
+  		} else {
+  			$data['source_name'] = null;
+  		}
 		if (isset($line['over_country']) && $line['over_country'] != '') {
 		    $data['over_country'] = $line['over_country'];
-  		} else $data['over_country'] = null;
+  		} else {
+  			$data['over_country'] = null;
+  		}
   		if (isset($line['noarchive']) && $line['noarchive']) {
   		    $data['noarchive'] = true;
-  		} else $data['noarchive'] = false;
+  		} else {
+  			$data['noarchive'] = false;
+  		}
   		$data['format_source'] = $line['format_source'];
-  		if (isset($line['id_source'])) $id_source = $line['id_source'];
+  		if (isset($line['id_source'])) {
+  			$id_source = $line['id_source'];
+  		}
   		if (isset($data['hex'])) {
   		    echo '.';
   		    $id_user = $globalServerUserID;
-  		    if ($id_user == NULL) $id_user = 1;
-  		    if (!isset($id_source)) $id_source = 1;
+  		    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']);
 		    try {

notam-geojson.php

Braces +3 added lines, -1 removed lines

@@ -54,7 +54,9 @@
 			$radius = $spotter_item['radius']*1852;
 			$output .= '"radiusm": "'.$radius.'",';
 			$output .= '"radiusnm": "'.$spotter_item['radius'].'",';
-			if ($radius > 25000) $radius = 25000;
+			if ($radius > 25000) {
+				$radius = 25000;
+			}
 			$output .= '"radius": "'.$radius.'"';
 		    $output .= '},';
 		    $output .= '"geometry": {';

country-detailed.php

Braces +1 added lines, -1 removed lines

@@ -13,7 +13,7 @@
 	  $limit_start = 0;
 	  $limit_end = 25;
 	  $absolute_difference = 25;
-	}  else {
+	} else {
 		$limit_explode = explode(",", $_GET['limit']);
 		$limit_start = $limit_explode[0];
 		$limit_end = $limit_explode[1];

airport-data.php

Braces +3 added lines, -1 removed lines

@@ -12,7 +12,9 @@
 		$METAR = new METAR();
 		$metar_info = $METAR->getMETAR($icao);
 		//print_r($metar_info);
-		if (isset($metar_info[0]['metar'])) $metar_parse = $METAR->parse($metar_info[0]['metar']);
+		if (isset($metar_info[0]['metar'])) {
+			$metar_parse = $METAR->parse($metar_info[0]['metar']);
+		}
 		//print_r($metar_parse);
 	}
 }

archive-country.php

Braces +5 added lines, -2 removed lines

@@ -8,8 +8,11 @@
 $date = filter_input(INPUT_GET,'date',FILTER_SANITIZE_STRING);
 
 $Spotter = new Spotter();
-if (isset($_GET['date'])) $spotter_array = $Spotter->getSpotterDataByDate($date,"0,1", $sort);
-else $spotter_array = array();
+if (isset($_GET['date'])) {
+	$spotter_array = $Spotter->getSpotterDataByDate($date,"0,1", $sort);
+} else {
+	$spotter_array = array();
+}
 
 if (!empty($spotter_array))
 {

registration-statistics-departure-airport.php

Braces +5 added lines, -2 removed lines

@@ -5,8 +5,11 @@
 $Spotter = new Spotter();
 $registration = filter_input(INPUT_GET,'registration',FILTER_SANITIZE_STRING);
 $sort = filter_input(INPUT_GET,'sort',FILTER_SANITIZE_STRING);
-if (isset($_GET['sort'])) $spotter_array = $Spotter->getSpotterDataByRegistration($registration, "0,1", $sort);
-else $spotter_array = $Spotter->getSpotterDataByRegistration($registration, "0,1");
+if (isset($_GET['sort'])) {
+	$spotter_array = $Spotter->getSpotterDataByRegistration($registration, "0,1", $sort);
+} else {
+	$spotter_array = $Spotter->getSpotterDataByRegistration($registration, "0,1");
+}
 $aircraft_array = $Spotter->getAircraftInfoByRegistration($registration);
 
 

tools-metar.php

Braces +6 added lines, -2 removed lines

@@ -23,7 +23,9 @@ 
 print '<fieldset class="form-group">';
 print '<label for="metar_message">'._("METAR Message").'</label>';
 print '<textarea class="form-control" name="metar_message" id="metar_message" rows="5">';
-if ($message != '') print $message;
+if ($message != '') {
+	print $message;
+}
 print '</textarea>';
 print '</fieldset>';
 print '<button type="submit" class="btn btn-primary">Submit</button>';
@@ -59,7 +61,9 @@ 
 		if (isset($metar_parse['cloud'])) {
 			print '<b>'._("Cloud:").'</b> ';
 			foreach ($metar_parse['cloud'] as $key => $cloud) {
-				if ($key > 0) print ' / ';
+				if ($key > 0) {
+					print ' / ';
+				}
 				print $cloud['type'].' at '.$cloud['level'].' m';
 			}
 			print " ";