@@ -70,7 +70,7 @@ discard block |
||
70 | 70 | foreach ($this->getPoints() as $delta => $point) { |
71 | 71 | $previous_point = $this->geometryN($delta); |
72 | 72 | if ($previous_point) { |
73 | - $length += sqrt(pow(($previous_point->getX() - $point->getX()), 2) + pow(($previous_point->getY()- $point->getY()), 2)); |
|
73 | + $length += sqrt(pow(($previous_point->getX() - $point->getX()), 2) + pow(($previous_point->getY() - $point->getY()), 2)); |
|
74 | 74 | } |
75 | 75 | } |
76 | 76 | return $length; |
@@ -79,10 +79,10 @@ discard block |
||
79 | 79 | public function greatCircleLength($radius = 6378137) { |
80 | 80 | $length = 0; |
81 | 81 | $points = $this->getPoints(); |
82 | - for($i=0; $i<$this->numPoints()-1; $i++) { |
|
82 | + for ($i = 0; $i < $this->numPoints() - 1; $i++) { |
|
83 | 83 | $point = $points[$i]; |
84 | - $next_point = $points[$i+1]; |
|
85 | - if (!is_object($next_point)) {continue;} |
|
84 | + $next_point = $points[$i + 1]; |
|
85 | + if (!is_object($next_point)) {continue; } |
|
86 | 86 | // Great circle method |
87 | 87 | $lat1 = deg2rad($point->getY()); |
88 | 88 | $lat2 = deg2rad($next_point->getY()); |
@@ -90,15 +90,15 @@ discard block |
||
90 | 90 | $lon2 = deg2rad($next_point->getX()); |
91 | 91 | $dlon = $lon2 - $lon1; |
92 | 92 | $length += |
93 | - $radius * |
|
93 | + $radius* |
|
94 | 94 | atan2( |
95 | 95 | sqrt( |
96 | - pow(cos($lat2) * sin($dlon), 2) + |
|
97 | - pow(cos($lat1) * sin($lat2) - sin($lat1) * cos($lat2) * cos($dlon), 2) |
|
96 | + pow(cos($lat2)*sin($dlon), 2) + |
|
97 | + pow(cos($lat1)*sin($lat2) - sin($lat1)*cos($lat2)*cos($dlon), 2) |
|
98 | 98 | ) |
99 | 99 | , |
100 | - sin($lat1) * sin($lat2) + |
|
101 | - cos($lat1) * cos($lat2) * cos($dlon) |
|
100 | + sin($lat1)*sin($lat2) + |
|
101 | + cos($lat1)*cos($lat2)*cos($dlon) |
|
102 | 102 | ); |
103 | 103 | } |
104 | 104 | // Returns length in meters. |
@@ -108,14 +108,14 @@ discard block |
||
108 | 108 | public function haversineLength() { |
109 | 109 | $degrees = 0; |
110 | 110 | $points = $this->getPoints(); |
111 | - for($i=0; $i<$this->numPoints()-1; $i++) { |
|
111 | + for ($i = 0; $i < $this->numPoints() - 1; $i++) { |
|
112 | 112 | $point = $points[$i]; |
113 | - $next_point = $points[$i+1]; |
|
114 | - if (!is_object($next_point)) {continue;} |
|
113 | + $next_point = $points[$i + 1]; |
|
114 | + if (!is_object($next_point)) {continue; } |
|
115 | 115 | $degree = rad2deg( |
116 | 116 | acos( |
117 | - sin(deg2rad($point->getY())) * sin(deg2rad($next_point->getY())) + |
|
118 | - cos(deg2rad($point->getY())) * cos(deg2rad($next_point->getY())) * |
|
117 | + sin(deg2rad($point->getY()))*sin(deg2rad($next_point->getY())) + |
|
118 | + cos(deg2rad($point->getY()))*cos(deg2rad($next_point->getY()))* |
|
119 | 119 | cos(deg2rad(abs($point->getX() - $next_point->getX()))) |
120 | 120 | ) |
121 | 121 | ); |
@@ -130,8 +130,8 @@ discard block |
||
130 | 130 | $points = $this->getPoints(); |
131 | 131 | |
132 | 132 | foreach ($points as $i => $point) { |
133 | - if (isset($points[$i+1])) { |
|
134 | - $parts[] = new LineString(array($point, $points[$i+1])); |
|
133 | + if (isset($points[$i + 1])) { |
|
134 | + $parts[] = new LineString(array($point, $points[$i + 1])); |
|
135 | 135 | } |
136 | 136 | } |
137 | 137 | return $parts; |
@@ -168,18 +168,18 @@ discard block |
||
168 | 168 | $p3_x = $segment->endPoint()->x(); |
169 | 169 | $p3_y = $segment->endPoint()->y(); |
170 | 170 | |
171 | - $s1_x = $p1_x - $p0_x; $s1_y = $p1_y - $p0_y; |
|
172 | - $s2_x = $p3_x - $p2_x; $s2_y = $p3_y - $p2_y; |
|
171 | + $s1_x = $p1_x - $p0_x; $s1_y = $p1_y - $p0_y; |
|
172 | + $s2_x = $p3_x - $p2_x; $s2_y = $p3_y - $p2_y; |
|
173 | 173 | |
174 | - $fps = (-$s2_x * $s1_y) + ($s1_x * $s2_y); |
|
175 | - $fpt = (-$s2_x * $s1_y) + ($s1_x * $s2_y); |
|
174 | + $fps = (-$s2_x*$s1_y) + ($s1_x*$s2_y); |
|
175 | + $fpt = (-$s2_x*$s1_y) + ($s1_x*$s2_y); |
|
176 | 176 | |
177 | 177 | if ($fps == 0 || $fpt == 0) { |
178 | 178 | return FALSE; |
179 | 179 | } |
180 | 180 | |
181 | - $s = (-$s1_y * ($p0_x - $p2_x) + $s1_x * ($p0_y - $p2_y)) / $fps; |
|
182 | - $t = ( $s2_x * ($p0_y - $p2_y) - $s2_y * ($p0_x - $p2_x)) / $fpt; |
|
181 | + $s = (-$s1_y*($p0_x - $p2_x) + $s1_x*($p0_y - $p2_y))/$fps; |
|
182 | + $t = ($s2_x*($p0_y - $p2_y) - $s2_y*($p0_x - $p2_x))/$fpt; |
|
183 | 183 | |
184 | 184 | if ($s > 0 && $s < 1 && $t > 0 && $t < 1) { |
185 | 185 | // Collision detected |
@@ -21,8 +21,8 @@ discard block |
||
21 | 21 | abstract public function geometryN($n); |
22 | 22 | abstract public function startPoint(); |
23 | 23 | abstract public function endPoint(); |
24 | - abstract public function isRing(); // Mssing dependancy |
|
25 | - abstract public function isClosed(); // Missing dependancy |
|
24 | + abstract public function isRing(); // Mssing dependancy |
|
25 | + abstract public function isClosed(); // Missing dependancy |
|
26 | 26 | abstract public function numPoints(); |
27 | 27 | abstract public function pointN($n); |
28 | 28 | abstract public function exteriorRing(); |
@@ -64,12 +64,12 @@ discard block |
||
64 | 64 | } |
65 | 65 | |
66 | 66 | $bbox = $this->getBBox(); |
67 | - $points = array ( |
|
68 | - new Point($bbox['maxx'],$bbox['miny']), |
|
69 | - new Point($bbox['maxx'],$bbox['maxy']), |
|
70 | - new Point($bbox['minx'],$bbox['maxy']), |
|
71 | - new Point($bbox['minx'],$bbox['miny']), |
|
72 | - new Point($bbox['maxx'],$bbox['miny']), |
|
67 | + $points = array( |
|
68 | + new Point($bbox['maxx'], $bbox['miny']), |
|
69 | + new Point($bbox['maxx'], $bbox['maxy']), |
|
70 | + new Point($bbox['minx'], $bbox['maxy']), |
|
71 | + new Point($bbox['minx'], $bbox['miny']), |
|
72 | + new Point($bbox['maxx'], $bbox['miny']), |
|
73 | 73 | ); |
74 | 74 | |
75 | 75 | $outer_boundary = new LineString($points); |
@@ -147,7 +147,7 @@ discard block |
||
147 | 147 | // It hasn't been set yet, generate it |
148 | 148 | if (geoPHP::geosInstalled()) { |
149 | 149 | $reader = new GEOSWKBReader(); |
150 | - $this->geos = $reader->readHEX($this->out('wkb',TRUE)); |
|
150 | + $this->geos = $reader->readHEX($this->out('wkb', TRUE)); |
|
151 | 151 | } |
152 | 152 | else { |
153 | 153 | $this->geos = FALSE; |
@@ -91,7 +91,7 @@ discard block |
||
91 | 91 | } |
92 | 92 | |
93 | 93 | static function getAdapterMap() { |
94 | - return array ( |
|
94 | + return array( |
|
95 | 95 | 'wkt' => 'WKT', |
96 | 96 | 'ewkt' => 'EWKT', |
97 | 97 | 'wkb' => 'WKB', |
@@ -154,8 +154,8 @@ discard block |
||
154 | 154 | |
155 | 155 | // If the geometry cannot even theoretically be reduced more, then pass it back |
156 | 156 | if (gettype($geometry) == 'object') { |
157 | - $passbacks = array('Point','LineString','Polygon'); |
|
158 | - if (in_array($geometry->geometryType(),$passbacks)) { |
|
157 | + $passbacks = array('Point', 'LineString', 'Polygon'); |
|
158 | + if (in_array($geometry->geometryType(), $passbacks)) { |
|
159 | 159 | return $geometry; |
160 | 160 | } |
161 | 161 | } |
@@ -163,8 +163,8 @@ discard block |
||
163 | 163 | // If it is a mutlti-geometry, check to see if it just has one member |
164 | 164 | // If it does, then pass the member, if not, then just pass back the geometry |
165 | 165 | if (gettype($geometry) == 'object') { |
166 | - $simple_collections = array('MultiPoint','MultiLineString','MultiPolygon'); |
|
167 | - if (in_array(get_class($geometry),$passbacks)) { |
|
166 | + $simple_collections = array('MultiPoint', 'MultiLineString', 'MultiPolygon'); |
|
167 | + if (in_array(get_class($geometry), $passbacks)) { |
|
168 | 168 | $components = $geometry->getComponents(); |
169 | 169 | if (count($components) == 1) { |
170 | 170 | return $components[0]; |
@@ -183,7 +183,7 @@ discard block |
||
183 | 183 | $geometries = array(); |
184 | 184 | $geom_types = array(); |
185 | 185 | |
186 | - $collections = array('MultiPoint','MultiLineString','MultiPolygon','GeometryCollection'); |
|
186 | + $collections = array('MultiPoint', 'MultiLineString', 'MultiPolygon', 'GeometryCollection'); |
|
187 | 187 | |
188 | 188 | foreach ($geometry as $item) { |
189 | 189 | if ($item) { |
@@ -3,15 +3,15 @@ discard block |
||
3 | 3 | require_once('require/class.Spotter.php'); |
4 | 4 | require_once('require/class.Language.php'); |
5 | 5 | $Spotter = new Spotter(); |
6 | -$sort = filter_input(INPUT_GET,'sort',FILTER_SANITIZE_STRING); |
|
7 | -$registration = filter_input(INPUT_GET,'registration',FILTER_SANITIZE_STRING); |
|
6 | +$sort = filter_input(INPUT_GET, 'sort', FILTER_SANITIZE_STRING); |
|
7 | +$registration = filter_input(INPUT_GET, 'registration', FILTER_SANITIZE_STRING); |
|
8 | 8 | $spotter_array = $Spotter->getSpotterDataByRegistration($registration, "0,1", $sort); |
9 | 9 | $aircraft_array = $Spotter->getAircraftInfoByRegistration($registration); |
10 | 10 | |
11 | 11 | |
12 | 12 | if (!empty($spotter_array)) |
13 | 13 | { |
14 | - $title = sprintf(_("Most Common Routes from aircraft with registration %s"),$registration); |
|
14 | + $title = sprintf(_("Most Common Routes from aircraft with registration %s"), $registration); |
|
15 | 15 | |
16 | 16 | require_once('header.php'); |
17 | 17 | print '<div class="info column">'; |
@@ -24,7 +24,7 @@ discard block |
||
24 | 24 | include('registration-sub-menu.php'); |
25 | 25 | print '<div class="column">'; |
26 | 26 | print '<h2>'._("Most Common Routes").'</h2>'; |
27 | - print '<p>'.sprintf(_("The statistic below shows the most common routes of aircraft with registration <strong>%s</strong>."),$registration).'</p>'; |
|
27 | + print '<p>'.sprintf(_("The statistic below shows the most common routes of aircraft with registration <strong>%s</strong>."), $registration).'</p>'; |
|
28 | 28 | |
29 | 29 | $route_array = $Spotter->countAllRoutesByRegistration($registration); |
30 | 30 | if (!empty($route_array)) |
@@ -40,7 +40,7 @@ discard block |
||
40 | 40 | print '</thead>'; |
41 | 41 | print '<tbody>'; |
42 | 42 | $i = 1; |
43 | - foreach($route_array as $route_item) |
|
43 | + foreach ($route_array as $route_item) |
|
44 | 44 | { |
45 | 45 | print '<tr>'; |
46 | 46 | print '<td><strong>'.$i.'</strong></td>'; |
@@ -8,7 +8,7 @@ |
||
8 | 8 | |
9 | 9 | $page_url = $globalURL.'/acars-archive'; |
10 | 10 | |
11 | -if(!isset($_GET['limit'])) |
|
11 | +if (!isset($_GET['limit'])) |
|
12 | 12 | { |
13 | 13 | $limit_start = 0; |
14 | 14 | $limit_end = 25; |
@@ -3,17 +3,17 @@ discard block |
||
3 | 3 | require_once('require/class.Spotter.php'); |
4 | 4 | require_once('require/class.Language.php'); |
5 | 5 | |
6 | -$sort = filter_input(INPUT_GET,'sort',FILTER_SANITIZE_STRING); |
|
7 | -$country = filter_input(INPUT_GET,'country',FILTER_SANITIZE_STRING); |
|
8 | -$date = filter_input(INPUT_GET,'date',FILTER_SANITIZE_STRING); |
|
6 | +$sort = filter_input(INPUT_GET, 'sort', FILTER_SANITIZE_STRING); |
|
7 | +$country = filter_input(INPUT_GET, 'country', FILTER_SANITIZE_STRING); |
|
8 | +$date = filter_input(INPUT_GET, 'date', FILTER_SANITIZE_STRING); |
|
9 | 9 | |
10 | 10 | $Spotter = new Spotter(); |
11 | -if (isset($_GET['date'])) $spotter_array = $Spotter->getSpotterDataByDate($date,"0,1", $sort); |
|
11 | +if (isset($_GET['date'])) $spotter_array = $Spotter->getSpotterDataByDate($date, "0,1", $sort); |
|
12 | 12 | else $spotter_array = array(); |
13 | 13 | |
14 | 14 | if (!empty($spotter_array)) |
15 | 15 | { |
16 | - $title = sprintf(_("Most Common Airlines by Country on %s"),date("l F j, Y", strtotime($spotter_array[0]['date_iso_8601']))); |
|
16 | + $title = sprintf(_("Most Common Airlines by Country on %s"), date("l F j, Y", strtotime($spotter_array[0]['date_iso_8601']))); |
|
17 | 17 | require_once('header.php'); |
18 | 18 | print '<div class="select-item">'; |
19 | 19 | print '<form action="'.$globalURL.'/date" method="post">'; |
@@ -24,13 +24,13 @@ discard block |
||
24 | 24 | print '</div>'; |
25 | 25 | |
26 | 26 | print '<div class="info column">'; |
27 | - print '<h1>'.sprintf(_("Flights from %s"),date("l F j, Y", strtotime($spotter_array[0]['date_iso_8601']))).'</h1>'; |
|
27 | + print '<h1>'.sprintf(_("Flights from %s"), date("l F j, Y", strtotime($spotter_array[0]['date_iso_8601']))).'</h1>'; |
|
28 | 28 | print '</div>'; |
29 | 29 | |
30 | 30 | include('date-sub-menu.php'); |
31 | 31 | print '<div class="column">'; |
32 | 32 | print '<h2>'._("Most Common Airlines by Country").'</h2>'; |
33 | - print '<p>'.sprintf(_("The statistic below shows the most common airlines by Country of origin of flights on <strong>%s</strong>."),date("l F j, Y", strtotime($spotter_array[0]['date_iso_8601']))).'</p>'; |
|
33 | + print '<p>'.sprintf(_("The statistic below shows the most common airlines by Country of origin of flights on <strong>%s</strong>."), date("l F j, Y", strtotime($spotter_array[0]['date_iso_8601']))).'</p>'; |
|
34 | 34 | |
35 | 35 | $airline_array = $Spotter->countAllAirlineCountriesByDate($date); |
36 | 36 | print '<script type="text/javascript" src="https://www.google.com/jsapi"></script>'; |
@@ -42,7 +42,7 @@ discard block |
||
42 | 42 | var data = google.visualization.arrayToDataTable([ |
43 | 43 | ["'._("Country").'", "'._("# of times").'"], '; |
44 | 44 | $country_data = ''; |
45 | - foreach($airline_array as $airline_item) |
|
45 | + foreach ($airline_array as $airline_item) |
|
46 | 46 | { |
47 | 47 | $country_data .= '[ "'.$airline_item['airline_country'].'",'.$airline_item['airline_country_count'].'],'; |
48 | 48 | } |
@@ -76,7 +76,7 @@ discard block |
||
76 | 76 | print '</thead>'; |
77 | 77 | print '<tbody>'; |
78 | 78 | $i = 1; |
79 | - foreach($airline_array as $airline_item) |
|
79 | + foreach ($airline_array as $airline_item) |
|
80 | 80 | { |
81 | 81 | print '<tr>'; |
82 | 82 | print '<td><strong>'.$i.'</strong></td>'; |
@@ -27,7 +27,7 @@ |
||
27 | 27 | print '</thead>'; |
28 | 28 | print '<tbody>'; |
29 | 29 | $i = 1; |
30 | - foreach($route_array as $route_item) |
|
30 | + foreach ($route_array as $route_item) |
|
31 | 31 | { |
32 | 32 | print '<tr>'; |
33 | 33 | print '<td><strong>'.$i.'</strong></td>'; |
@@ -10,7 +10,7 @@ discard block |
||
10 | 10 | |
11 | 11 | $page_url = $globalURL.'/tools-metar'; |
12 | 12 | |
13 | -$message = filter_input(INPUT_POST,'metar_message',FILTER_SANITIZE_STRING); |
|
13 | +$message = filter_input(INPUT_POST, 'metar_message', FILTER_SANITIZE_STRING); |
|
14 | 14 | |
15 | 15 | print '<div class="info column">'; |
16 | 16 | print '<h1>'._("Parse METAR messages").'</h1>'; |
@@ -71,7 +71,7 @@ discard block |
||
71 | 71 | print '<b>'._("Dew point:").'</b> '.$metar_parse['dew'].' °C'." "; |
72 | 72 | } |
73 | 73 | if (isset($metar_parse['temperature']) && isset($metar_parse['dew'])) { |
74 | - $humidity = round(100 * pow((112 - (0.1 * $metar_parse['temperature']) + $metar_parse['dew']) / (112 + (0.9 * $metar_parse['temperature'])), 8),1); |
|
74 | + $humidity = round(100*pow((112 - (0.1*$metar_parse['temperature']) + $metar_parse['dew'])/(112 + (0.9*$metar_parse['temperature'])), 8), 1); |
|
75 | 75 | print '<b>'._("Humidity:").'</b> '.$humidity.'%'." "; |
76 | 76 | } |
77 | 77 | if (isset($metar_parse['QNH'])) { |
@@ -3,9 +3,9 @@ discard block |
||
3 | 3 | </span> |
4 | 4 | <div class="sub-menu sub-menu-container"> |
5 | 5 | <ul class="nav nav-pills"> |
6 | - <li><a href="<?php print $globalURL; ?>/country/<?php print $country; ?>" <?php if (strtolower($current_page) == "country-detailed"){ print 'class="active"'; } ?>><?php echo _("Detailed"); ?></a></li> |
|
6 | + <li><a href="<?php print $globalURL; ?>/country/<?php print $country; ?>" <?php if (strtolower($current_page) == "country-detailed") { print 'class="active"'; } ?>><?php echo _("Detailed"); ?></a></li> |
|
7 | 7 | <li class="dropdown"> |
8 | - <a class="dropdown-toggle <?php if(strtolower($current_page) == "country-statistics-aircraft" || strtolower($current_page) == "country-statistics-registration" || strtolower($current_page) == "country-statistics-manufacturer"){ print 'active'; } ?>" data-toggle="dropdown" href="#"> |
|
8 | + <a class="dropdown-toggle <?php if (strtolower($current_page) == "country-statistics-aircraft" || strtolower($current_page) == "country-statistics-registration" || strtolower($current_page) == "country-statistics-manufacturer") { print 'active'; } ?>" data-toggle="dropdown" href="#"> |
|
9 | 9 | <?php echo _("Aircraft"); ?> <span class="caret"></span> |
10 | 10 | </a> |
11 | 11 | <ul class="dropdown-menu" role="menu"> |
@@ -15,7 +15,7 @@ discard block |
||
15 | 15 | </ul> |
16 | 16 | </li> |
17 | 17 | <li class="dropdown"> |
18 | - <a class="dropdown-toggle <?php if(strtolower($current_page) == "country-statistics-airline" || strtolower($current_page) == "country-statistics-airline-country"){ print 'active'; } ?>" data-toggle="dropdown" href="#"> |
|
18 | + <a class="dropdown-toggle <?php if (strtolower($current_page) == "country-statistics-airline" || strtolower($current_page) == "country-statistics-airline-country") { print 'active'; } ?>" data-toggle="dropdown" href="#"> |
|
19 | 19 | <?php echo _("Airline"); ?> <span class="caret"></span> |
20 | 20 | </a> |
21 | 21 | <ul class="dropdown-menu" role="menu"> |
@@ -24,7 +24,7 @@ discard block |
||
24 | 24 | </ul> |
25 | 25 | </li> |
26 | 26 | <li class="dropdown"> |
27 | - <a class="dropdown-toggle <?php if(strtolower($current_page) == "country-statistics-departure-airport" || strtolower($current_page) == "country-statistics-departure-airport-country" || strtolower($current_page) == "country-statistics-arrival-airport" || strtolower($current_page) == "country-statistics-arrival-airport-country"){ print 'active'; } ?>" data-toggle="dropdown" href="#"> |
|
27 | + <a class="dropdown-toggle <?php if (strtolower($current_page) == "country-statistics-departure-airport" || strtolower($current_page) == "country-statistics-departure-airport-country" || strtolower($current_page) == "country-statistics-arrival-airport" || strtolower($current_page) == "country-statistics-arrival-airport-country") { print 'active'; } ?>" data-toggle="dropdown" href="#"> |
|
28 | 28 | <?php echo _("Airport"); ?> <span class="caret"></span> |
29 | 29 | </a> |
30 | 30 | <ul class="dropdown-menu" role="menu"> |
@@ -34,7 +34,7 @@ discard block |
||
34 | 34 | <li><a href="<?php print $globalURL; ?>/country/statistics/arrival-airport-country/<?php print $country; ?>"><?php echo _("Arrival Airport by Country"); ?></a></li> |
35 | 35 | </ul> |
36 | 36 | </li> |
37 | - <li><a href="<?php print $globalURL; ?>/country/statistics/route/<?php print $country; ?>" <?php if (strtolower($current_page) == "country-statistics-route"){ print 'class="active"'; } ?>><?php echo _("Route"); ?></a></li> |
|
38 | - <li><a href="<?php print $globalURL; ?>/country/statistics/time/<?php print $country; ?>" <?php if (strtolower($current_page) == "country-statistics-time"){ print 'class="active"'; } ?>><?php echo _("Time"); ?></a></li> |
|
37 | + <li><a href="<?php print $globalURL; ?>/country/statistics/route/<?php print $country; ?>" <?php if (strtolower($current_page) == "country-statistics-route") { print 'class="active"'; } ?>><?php echo _("Route"); ?></a></li> |
|
38 | + <li><a href="<?php print $globalURL; ?>/country/statistics/time/<?php print $country; ?>" <?php if (strtolower($current_page) == "country-statistics-time") { print 'class="active"'; } ?>><?php echo _("Time"); ?></a></li> |
|
39 | 39 | </ul> |
40 | 40 | </div> |
41 | 41 | \ No newline at end of file |