Ysurac / FlightAirMap

require/class.Weather.php

Braces +12 added lines, -4 removed lines

@@ -63,12 +63,16 @@ 
 	
 	public function openweathermap($latitude,$longitude) {
 		global $globalOpenWeatherMapKey;
-		if ($globalOpenWeatherMapKey == '') return array();
+		if ($globalOpenWeatherMapKey == '') {
+			return array();
+		}
 		$Common = new Common();
 		$url = 'http://api.openweathermap.org/data/2.5/weather?lat='.$latitude.'&lon='.$longitude.'&units=metric&appid='.$globalOpenWeatherMapKey;
 		//echo $url."\n";
 		$weatherdata = json_decode($Common->getData($url),true);
-		if (!isset($weatherdata['main']['temp']) || !isset($weatherdata['weather'][0]['id'])) return array();
+		if (!isset($weatherdata['main']['temp']) || !isset($weatherdata['weather'][0]['id'])) {
+			return array();
+		}
 		$dew = $weatherdata['main']['temp'] - ((100-$weatherdata['main']['humidity'])/5);
 		$cumulus_base = 122.0 * ($weatherdata['main']['temp'] - $dew);
 		$stratus_base = 100.0 * (100.0 * $weatherdata['main']['humidity'])*0.3048;
@@ -104,7 +108,9 @@ 
 	
 	public function nomad_wind($hour = '') {
 		global $globalWindsPath;
-		if ($hour == '') $hour = date('G');
+		if ($hour == '') {
+			$hour = date('G');
+		}
 		if (isset($globalWindsPath) && $globalWindsPath != '') {
 			$grib2json = $globalWindsPath['grib2json'];
 			$windpathsrc = $globalWindsPath['source'];
@@ -142,7 +148,9 @@ 
 			system($grib2json.' --data --output '.$windpathdest.' --names --compact '.$windpathsrc);
 		} else {
 			// if not try previous run
-			if ($hour == date('G')) $this->nomad_wind(date('G')-6);
+			if ($hour == date('G')) {
+				$this->nomad_wind(date('G')-6);
+			}
 		}
 	}
 

weather-json.php

Braces +12 added lines, -4 removed lines

@@ -11,7 +11,9 @@ 
 header('Content-Type: text/javascript');
 $latitude = filter_input(INPUT_GET,'latitude',FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION);
 $longitude = filter_input(INPUT_GET,'longitude',FILTER_SANITIZE_NUMBER_FLOAT,FILTER_FLAG_ALLOW_FRACTION);
-if ($latitude == '' || $longitude == '') return '';
+if ($latitude == '' || $longitude == '') {
+	return '';
+}
 //echo 'latitude : '.$latitude.' - longitude : '.$longitude."\n";
 $airports = $Spotter->closestAirports($latitude,$longitude,300);
 //print_r($airports);
@@ -20,7 +22,9 @@ 
 $i = 0;
 $ew = true;
 $dtf = false;
-if (empty($airports)) $ew = false;
+if (empty($airports)) {
+	$ew = false;
+}
 while($ew) {
 	$met = $METAR->getMETAR($airports[$i]['icao']);
 	//print_r($met);
@@ -43,8 +47,12 @@ 
 		}
 	}
 	$i++;
-	if ($i >= count($airports)) $ew = false;
+	if ($i >= count($airports)) {
+		$ew = false;
+	}
+	}
+if ($dtf === false) {
+	echo json_encode($Weather->openweathermap($latitude,$longitude));
 }
-if ($dtf === false) echo json_encode($Weather->openweathermap($latitude,$longitude));
 
 ?>
\ No newline at end of file