Ysurac / FlightAirMap

waypoints-geojson.php

Indentation +16 added lines, -16 removed lines

@@ -26,7 +26,7 @@ 
 		date_default_timezone_set('UTC');
 		//waypoint plotting
 		$output .= '{"type": "Feature",';
-		    $output .= '"properties": {';
+			$output .= '"properties": {';
 			$output .= '"segment_name": "'.$spotter_item['segment_name'].'",';
 			$output .= '"base": "'.$spotter_item['base'].'",';
 			$output .= '"top": "'.$spotter_item['top'].'",';
@@ -49,15 +49,15 @@ 
 				$output .= '"stroke": "#f0f0f0",';
 				$output .= '"stroke-width": 2';
 //			}
-		    $output .= '},';
-		    $output .= '"geometry": {';
+			$output .= '},';
+			$output .= '"geometry": {';
 			$output .= '"type": "LineString",';
 			$output .= '"coordinates": [';
-			    //$output .= '['.$spotter_item['longitude_begin'].', '.$spotter_item['latitude_begin'].'], ['.$spotter_item['longitude_end'].', '.$spotter_item['latitude_end'].'], ['.$spotter_item['longitude_end_seg2'].', '.$spotter_item['latitude_end_seg2'].']';
-			    $output .= '['.$spotter_item['longitude_begin'].', '.$spotter_item['latitude_begin'].','.round($spotter_item['base']*100*0.3048).'], ['.$spotter_item['longitude_end'].', '.$spotter_item['latitude_end'].','.round($spotter_item['base']*100*0.3048).']';
+				//$output .= '['.$spotter_item['longitude_begin'].', '.$spotter_item['latitude_begin'].'], ['.$spotter_item['longitude_end'].', '.$spotter_item['latitude_end'].'], ['.$spotter_item['longitude_end_seg2'].', '.$spotter_item['latitude_end_seg2'].']';
+				$output .= '['.$spotter_item['longitude_begin'].', '.$spotter_item['latitude_begin'].','.round($spotter_item['base']*100*0.3048).'], ['.$spotter_item['longitude_end'].', '.$spotter_item['latitude_end'].','.round($spotter_item['base']*100*0.3048).']';
 			//    $output .= '['.$spotter_item['latitude_begin'].', '.$spotter_item['longitude_begin'].'], ['.$spotter_item['latitude_end'].', '.$spotter_item['longitude_end'].']';
 			$output .= ']';
-		    $output .= '}';
+			$output .= '}';
 /*		    $output .= '"geometry": {';
 			$output .= '"type": "Point",';
 			$output .= '"coordinates": [';
@@ -68,7 +68,7 @@ 
 		$output .= '},';
 		//waypoint plotting
 		$output .= '{"type": "Feature",';
-		    $output .= '"properties": {';
+			$output .= '"properties": {';
 			$output .= '"ident": "'.$spotter_item['name_begin'].'",';
 			$output .= '"high": "'.$spotter_item['high'].'",';
 			$output .= '"alt": "'.$spotter_item['base'].'",';
@@ -98,17 +98,17 @@ 
 				$output .= '"marker-size": "small",';
 				$output .= '"marker-color": "#0000ff"';
 			}
-		    $output .= '},';
-		    $output .= '"geometry": {';
+			$output .= '},';
+			$output .= '"geometry": {';
 			$output .= '"type": "Point",';
 			$output .= '"coordinates": [';
-			    $output .= $spotter_item['longitude_begin'].', '.$spotter_item['latitude_begin'].', '.round($spotter_item['base']*100*0.3048);;
+				$output .= $spotter_item['longitude_begin'].', '.$spotter_item['latitude_begin'].', '.round($spotter_item['base']*100*0.3048);;
 			$output .= ']';
-		    $output .= '}';
+			$output .= '}';
 
 		$output .= '},';
 		$output .= '{"type": "Feature",';
-		    $output .= '"properties": {';
+			$output .= '"properties": {';
 			$output .= '"ident": "'.$spotter_item['name_end'].'",';
 			$output .= '"high": "'.$spotter_item['high'].'",';
 			$output .= '"alt": "'.$spotter_item['top'].'",';
@@ -145,13 +145,13 @@ 
 				$output .= '"marker-size": "small",';
 				$output .= '"marker-color": "#0000ff"';
 			}
-		    $output .= '},';
-		    $output .= '"geometry": {';
+			$output .= '},';
+			$output .= '"geometry": {';
 			$output .= '"type": "Point",';
 			$output .= '"coordinates": [';
-			    $output .= $spotter_item['longitude_end'].', '.$spotter_item['latitude_end'].', '.round($spotter_item['base']*100*0.3048);
+				$output .= $spotter_item['longitude_end'].', '.$spotter_item['latitude_end'].', '.round($spotter_item['base']*100*0.3048);
 			$output .= ']';
-		    $output .= '}';
+			$output .= '}';
 
 		$output .= '},';
 	}

Spacing +3 added lines, -3 removed lines

@@ -10,7 +10,7 @@ 
 
 if (isset($_GET['coord'])) 
 {
-	$coords = explode(',',$_GET['coord']);
+	$coords = explode(',', $_GET['coord']);
 	$spotter_array = $Spotter->getAllWaypointsInfobyCoord($coords);
 } else {
 	die;
@@ -21,7 +21,7 @@ 
 if (!empty($spotter_array))
 {	  
 //	print_r($spotter_array);
-	foreach($spotter_array as $spotter_item)
+	foreach ($spotter_array as $spotter_item)
 	{
 		date_default_timezone_set('UTC');
 		//waypoint plotting
@@ -102,7 +102,7 @@ 
 		    $output .= '"geometry": {';
 			$output .= '"type": "Point",';
 			$output .= '"coordinates": [';
-			    $output .= $spotter_item['longitude_begin'].', '.$spotter_item['latitude_begin'].', '.round($spotter_item['base']*100*0.3048);;
+			    $output .= $spotter_item['longitude_begin'].', '.$spotter_item['latitude_begin'].', '.round($spotter_item['base']*100*0.3048); ;
 			$output .= ']';
 		    $output .= '}';
 

airspace-data.php

Spacing +3 added lines, -3 removed lines

@@ -7,7 +7,7 @@ 
 <button type="button" class="close">&times;</button>
 <?php
 
-$airspaceid = filter_input(INPUT_GET,'airspace',FILTER_SANITIZE_NUMBER_INT);
+$airspaceid = filter_input(INPUT_GET, 'airspace', FILTER_SANITIZE_NUMBER_INT);
 //$notamref = urldecode($notamref);
 if ($globalDBdriver == 'mysql') {
 	$query = "SELECT * FROM airspace WHERE ogr_fid = :id";
@@ -18,10 +18,10 @@ 
 try {
 	$sth = $Connection->db->prepare($query);
 	$sth->execute(array(':id' => $airspaceid));
-} catch(PDOException $e) {
+} catch (PDOException $e) {
 	echo "error";
 }
-$result=$sth->fetchAll(PDO::FETCH_ASSOC);
+$result = $sth->fetchAll(PDO::FETCH_ASSOC);
 $airspace = $result[0];
 date_default_timezone_set('UTC');
 print '<div class="top">';

Braces +9 added lines, -3 removed lines

@@ -25,7 +25,9 @@ 
 $airspace = $result[0];
 date_default_timezone_set('UTC');
 print '<div class="top">';
-if (isset($airspace['name'])) $airspace['title'] = $airspace['name']; 
+if (isset($airspace['name'])) {
+	$airspace['title'] = $airspace['name'];
+}
 print '<div class="right"><div class="callsign-details"><div class="callsign">'.$airspace['title'].'</a></div>';
 print '</div>';
 print '<div class="details">';
@@ -44,13 +46,17 @@ 
 	print '</div>';
 }
 
-if (isset($airspace['ceiling'])) $airspace['tops'] = $airspace['ceiling'];
+if (isset($airspace['ceiling'])) {
+	$airspace['tops'] = $airspace['ceiling'];
+}
 print '<div>';
 print '<span>'._("Tops").'</span>';
 print $airspace['tops'];
 print '</div>';
 
-if (isset($airspace['floor'])) $airspace['base'] = $airspace['floor'];
+if (isset($airspace['floor'])) {
+	$airspace['base'] = $airspace['floor'];
+}
 print '<div>';
 print '<span>'._("Base").'</span>';
 print $airspace['base'];

airspace-geojson.php

Spacing +11 added lines, -11 removed lines

@@ -16,14 +16,14 @@ 
 
 if (isset($_GET['coord'])) 
 {
-	$coords = explode(',',$_GET['coord']);
+	$coords = explode(',', $_GET['coord']);
         if ($globalDBdriver == 'mysql') {
 		$query = "SELECT *, ST_AsWKB(SHAPE) AS wkb FROM airspace WHERE ST_Intersects(SHAPE, ST_Envelope(linestring(point(:minlon,:minlat), point(:maxlon,:maxlat))))";
 		try {
 			$sth = $Connection->db->prepare($query);
-			$sth->execute(array(':minlon' => $coords[0],':minlat' => $coords[1],':maxlon' => $coords[2],':maxlat' => $coords[3]));
+			$sth->execute(array(':minlon' => $coords[0], ':minlat' => $coords[1], ':maxlon' => $coords[2], ':maxlat' => $coords[3]));
 			//$sth->execute();
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			echo "error";
 		}
 	} else {
@@ -32,7 +32,7 @@ 
 			$sth = $Connection->db->prepare($query);
 			//$sth->execute(array(':minlon' => $coords[0],':minlat' => $coords[1],':maxlon' => $coords[2],':maxlat' => $coords[3]));
 			$sth->execute();
-		} catch(PDOException $e) {
+		} catch (PDOException $e) {
 			echo "error";
 		}
 	}
@@ -45,7 +45,7 @@ 
 	try {
 		$sth = $Connection->db->prepare($query);
 		$sth->execute();
-	} catch(PDOException $e) {
+	} catch (PDOException $e) {
 		echo "error";
 	}
 }
@@ -73,20 +73,20 @@ 
 		elseif (isset($properties['ogc_fid'])) $properties['id'] = $properties['ogc_fid'];
 		if (isset($properties['ceiling'])) $properties['tops'] = $properties['ceiling'];
 		if (isset($properties['floor'])) $properties['base'] = $properties['floor'];
-		if (preg_match('/^FL(\s)*(?<alt>\d+)/',strtoupper($properties['tops']),$matches)) {
+		if (preg_match('/^FL(\s)*(?<alt>\d+)/', strtoupper($properties['tops']), $matches)) {
 			$properties['upper_limit'] = round($matches['alt']*100*0.38048);
-		} elseif (preg_match('/^(?<alt>\d+)(\s)*(FT|AGL|ALT|MSL)/',strtoupper($properties['tops']),$matches)) {
+		} elseif (preg_match('/^(?<alt>\d+)(\s)*(FT|AGL|ALT|MSL)/', strtoupper($properties['tops']), $matches)) {
 			$properties['upper_limit'] = round($matches['alt']*0.38048);
-		} elseif (preg_match('/^(?<alt>\d+)(\s)*M/',strtoupper($properties['tops']),$matches)) {
+		} elseif (preg_match('/^(?<alt>\d+)(\s)*M/', strtoupper($properties['tops']), $matches)) {
 			$properties['upper_limit'] = $matches['alt'];
 		}
 		if ($properties['base'] == 'SFC' || $properties['base'] == 'MSL' || $properties['base'] == 'GROUND' || $properties['base'] == 'GND') {
 			$properties['lower_limit'] = 0;
-		} elseif (preg_match('/^FL(\s)*(?<alt>\d+)/',strtoupper($properties['base']),$matches)) {
+		} elseif (preg_match('/^FL(\s)*(?<alt>\d+)/', strtoupper($properties['base']), $matches)) {
 			$properties['lower_limit'] = round($matches['alt']*100*0.38048);
-		} elseif (preg_match('/^(?<alt>\d+)(\s)*(FT|AGL|ALT|MSL)/',strtoupper($properties['base']),$matches)) {
+		} elseif (preg_match('/^(?<alt>\d+)(\s)*(FT|AGL|ALT|MSL)/', strtoupper($properties['base']), $matches)) {
 			$properties['lower_limit'] = round($matches['alt']*0.38048);
-		} elseif (preg_match('/^(?<alt>\d+)(\s)*M/',strtoupper($properties['base']),$matches)) {
+		} elseif (preg_match('/^(?<alt>\d+)(\s)*M/', strtoupper($properties['base']), $matches)) {
 			$properties['lower_limit'] = $matches['alt'];
 		}
 		if ($properties['type'] == 'RESTRICTED' || $properties['type'] == 'R') {

Braces +16 added lines, -6 removed lines

@@ -67,12 +67,22 @@
 		} else {
 			$geom = geoPHP::load(stream_get_contents($row['wkb']));
 		}
-		if (isset($properties['type'])) $properties['type'] = trim($properties['type']);
-		elseif (isset($properties['class'])) $properties['type'] = trim($properties['class']);
-		if (isset($properties['ogr_fid'])) $properties['id'] = $properties['ogr_fid'];
-		elseif (isset($properties['ogc_fid'])) $properties['id'] = $properties['ogc_fid'];
-		if (isset($properties['ceiling'])) $properties['tops'] = $properties['ceiling'];
-		if (isset($properties['floor'])) $properties['base'] = $properties['floor'];
+		if (isset($properties['type'])) {
+			$properties['type'] = trim($properties['type']);
+		} elseif (isset($properties['class'])) {
+			$properties['type'] = trim($properties['class']);
+		}
+		if (isset($properties['ogr_fid'])) {
+			$properties['id'] = $properties['ogr_fid'];
+		} elseif (isset($properties['ogc_fid'])) {
+			$properties['id'] = $properties['ogc_fid'];
+		}
+		if (isset($properties['ceiling'])) {
+			$properties['tops'] = $properties['ceiling'];
+		}
+		if (isset($properties['floor'])) {
+			$properties['base'] = $properties['floor'];
+		}
 		if (preg_match('/^FL(\s)*(?<alt>\d+)/',strtoupper($properties['tops']),$matches)) {
 			$properties['upper_limit'] = round($matches['alt']*100*0.38048);
 		} elseif (preg_match('/^(?<alt>\d+)(\s)*(FT|AGL|ALT|MSL)/',strtoupper($properties['tops']),$matches)) {