Ysurac / FlightAirMap

require/class.Weather.php

Spacing +15 added lines, -15 removed lines

@@ -11,12 +11,12 @@ 
 	public function buildcloudlayer($metar) {
 		//print_r($metar);
 		$result = array();
-		foreach($metar['cloud'] as $key => $data) {
+		foreach ($metar['cloud'] as $key => $data) {
 			$alt_m = $metar['cloud'][$key]['level'];
 			$alt_ft = $alt_m*3.28084;
 			$pressure = $metar['QNH'];
-			$cumulus_base = 122.0 * ($metar['temperature'] - $metar['dew']);
-			$stratus_base = 100.0 * (100.0 * $metar['rh'])*0.3048;
+			$cumulus_base = 122.0*($metar['temperature'] - $metar['dew']);
+			$stratus_base = 100.0*(100.0*$metar['rh'])*0.3048;
 			$coverage_norm = 0.0;
 			if ($metar['cloud'][$key]['type'] == 'Few') {
 				$coverage_norm = 2.0/8.0;
@@ -38,9 +38,9 @@ 
 					$layer_type = 'ns';
 				}
 			} else {
-				if ($cumulus_base * 0.80 < $alt_m && $cumulus_base * 1.20 > $alt_m) {
+				if ($cumulus_base*0.80 < $alt_m && $cumulus_base*1.20 > $alt_m) {
 					$layer_type = 'cu';
-				} elseif ($stratus_base * 0.80 < $alt_m && $stratus_base * 1.40 > $alt_m) {
+				} elseif ($stratus_base*0.80 < $alt_m && $stratus_base*1.40 > $alt_m) {
 					$layer_type = 'st';
 				} else {
 					if ($alt_ft < 2000) {
@@ -53,10 +53,10 @@ 
 				}
 			}
 			//echo 'coverage norm : '.$coverage_norm.' - layer_type: '.$layer_type."\n";
-			$result[] = array('cov' => $coverage_norm, 'type' => $layer_type,'alt' => $alt_m,'rh' => $metar['rh']);
+			$result[] = array('cov' => $coverage_norm, 'type' => $layer_type, 'alt' => $alt_m, 'rh' => $metar['rh']);
 		}
 		if (count($result) < 2 && $metar['rh'] > 60) {
-			$result[] = array('cov' => 0.75, 'type' => 'ci','alt' => 4000,'rh' => $metar['rh']);
+			$result[] = array('cov' => 0.75, 'type' => 'ci', 'alt' => 4000, 'rh' => $metar['rh']);
 		}
 		return $result;
 	}
@@ -76,8 +76,8 @@ 
 		
 		// http://nomads.ncep.noaa.gov/cgi-bin/filter_gfs_0p50.pl?file=gfs.t05z.pgrb2full.0p50.f000&lev_10_m_above_ground=on&lev_surface=on&var_TMP=on&var_UGRD=on&var_VGRD=on&leftlon=0&rightlon=360&toplat=90&bottomlat=-90&dir=/gfs.2017111717
 		$resolution = '0.5';
-		$baseurl = 'http://nomads.ncep.noaa.gov/cgi-bin/filter_gfs_'.($resolution === '1' ? '1p00':'0p50').'.pl';
-		$get = array('file' => 'gfs.t'.sprintf('%02d',(6*floor($hour/6))).($resolution === '1' ? 'z.pgrb2.1p00.f000' : 'z.pgrb2full.0p50.f000'),
+		$baseurl = 'http://nomads.ncep.noaa.gov/cgi-bin/filter_gfs_'.($resolution === '1' ? '1p00' : '0p50').'.pl';
+		$get = array('file' => 'gfs.t'.sprintf('%02d', (6*floor($hour/6))).($resolution === '1' ? 'z.pgrb2.1p00.f000' : 'z.pgrb2full.0p50.f000'),
 			'lev_10_m_above_ground' => 'on',
 			'lev_surface' => 'on',
 			'var_TMP' => 'on',
@@ -87,21 +87,21 @@ 
 			'rightlon' => 360,
 			'toplat' => 90,
 			'bottomlat' => -90,
-			'dir' => '/gfs.'.date('Ymd').sprintf('%02d',(6*floor($hour/6)))
+			'dir' => '/gfs.'.date('Ymd').sprintf('%02d', (6*floor($hour/6)))
 		);
 		$url = $baseurl.'?'.http_build_query($get);
 		echo $url;
 		$Common = new Common();
-		$Common->download($url,$windpathsrc);
+		$Common->download($url, $windpathsrc);
 		// Check if the downloaded file is in GRIB format
-		$file = fopen($windpathsrc,"r");
+		$file = fopen($windpathsrc, "r");
 		$firc = fgetc($file);
 		fclose($file);
 		if ($firc == 'G') {
 			system($grib2json.' --data --output '.$windpathdest.' --names --compact '.$windpathsrc);
 		} else {
 			// if not try previous run
-			$this->nomad_wind(date('G')-6);
+			$this->nomad_wind(date('G') - 6);
 		}
 	}
 
@@ -120,10 +120,10 @@ 
 		$url = 'https://podaac.jpl.nasa.gov/ws/search/granule/?datasetId=PODAAC-OSCAR-03D01&itemsPerPage=1&sortBy=timeDesc&format=atom&pretty=false';
 		$Common = new Common();
 		$oscarlst = $Common->getData($url);
-		$oscarlst_xml = json_decode(json_encode(simplexml_load_string($oscarlst)),true);
+		$oscarlst_xml = json_decode(json_encode(simplexml_load_string($oscarlst)), true);
 		foreach ($oscarlst_xml['entry']['link'] as $oscarlnk) {
 			if ($oscarlnk['@attributes']['type'] == 'application/x-netcdf') {
-				$Common->download($oscarlnk['@attributes']['href'],$wavepathsrc.'.gz');
+				$Common->download($oscarlnk['@attributes']['href'], $wavepathsrc.'.gz');
 				break;
 			}
 		}

Braces +3 added lines, -1 removed lines

@@ -63,7 +63,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'];