View GitHub Repository FlightAirMap

Schedule Inspection
Subscribe
Completed
Push — master ( 37a602...7790d6 )
by Yannick
10:55
created
Status
Category
Toggle Patches
js/map-marine.2d.js.php 1 patch
Spacing   +7 added lines, -7 removed lines patch added patch discarded remove patch 
@@ -1,7 +1,7 @@  discard block
 
 block discarded – undo
1 1 
 <?php
2 2 
 require_once('../require/settings.php');
3 3 
 require_once('../require/class.Language.php');
4 
-setcookie("MapFormat",'2d');
4 
+setcookie("MapFormat", '2d');
5 5 
 header('Content-Type: text/javascript');
6 6 
 ?>
7 7 
 /**
 
@@ -39,10 +39,10 @@  discard block
 
 block discarded – undo
39 39
40 40 
 <?php
41 41 
 	if (isset($_GET['fammarine_id'])) {
42 
-		$fammarine_id = filter_input(INPUT_GET,'fammarine_id',FILTER_SANITIZE_STRING);
42 
+		$fammarine_id = filter_input(INPUT_GET, 'fammarine_id', FILTER_SANITIZE_STRING);
43 43 
 	}
44 44 
 	if (isset($_GET['ident'])) {
45 
-		$ident = filter_input(INPUT_GET,'ident',FILTER_SANITIZE_STRING);
45 
+		$ident = filter_input(INPUT_GET, 'ident', FILTER_SANITIZE_STRING);
46 46 
 	}
47 47 
 	if (!isset($ident) && !isset($fammarine_id)) {
48 48 
 ?>
 
@@ -202,7 +202,7 @@  discard block
 
 block discarded – undo
202 202 
 <?php
203 203 
 		} else {
204 204 
 ?>
205 
-		    var movingtime = Math.round(<?php if (isset($archiveupdatetime)) print $archiveupdatetime*1000; else print $globalMapRefresh*1000+20000; ?>+feature.properties.sqt*1000);
205 
+		    var movingtime = Math.round(<?php if (isset($archiveupdatetime)) print $archiveupdatetime*1000; else print $globalMapRefresh*1000 + 20000; ?>+feature.properties.sqt*1000);
206 206 
 		    return new L.Marker.movingMarker([latLng, feature.properties.nextlatlon],[movingtime],{
207 207 
 <?php
208 208 
 		}
 
@@ -218,7 +218,7 @@  discard block
 
 block discarded – undo
218 218 
 			    /*
219 219 
 			    shadowUrl: iconURLShadowpath,
220 220 
 			    shadowSize: [<?php print $globalAircraftSize; ?>, <?php print $globalAircraftSize; ?>],
221 
-			    shadowAnchor: [<?php print ($globalAircraftSize/2)+1; ?>, <?php print $globalAircraftSize; ?>]
221 
+			    shadowAnchor: [<?php print ($globalAircraftSize/2) + 1; ?>, <?php print $globalAircraftSize; ?>]
222 222 
 			    */
223 223 
 			})
224 224 
 		    })
 
@@ -259,7 +259,7 @@  discard block
 
 block discarded – undo
259 259 
 <?php
260 260 
 		} else {
261 261 
 ?>
262 
-			    var movingtime = Math.round(<?php if (isset($archiveupdatetime)) print $archiveupdatetime*1000; else print $globalMapRefresh*1000+20000; ?>+feature.properties.sqt*1000);
262 
+			    var movingtime = Math.round(<?php if (isset($archiveupdatetime)) print $archiveupdatetime*1000; else print $globalMapRefresh*1000 + 20000; ?>+feature.properties.sqt*1000);
263 263 
 			    return new L.Marker.movingMarker([latLng, feature.properties.nextlatlon],[movingtime],{
264 264 
 <?php
265 265 
 		}
 
@@ -315,7 +315,7 @@  discard block
 
 block discarded – undo
315 315 
 <?php
316 316 
 		} else {
317 317 
 ?>
318 
-			    var movingtime = Math.round(<?php if (isset($archiveupdatetime)) print $archiveupdatetime*1000; else print $globalMapRefresh*1000+20000; ?>+feature.properties.sqt*1000);
318 
+			    var movingtime = Math.round(<?php if (isset($archiveupdatetime)) print $archiveupdatetime*1000; else print $globalMapRefresh*1000 + 20000; ?>+feature.properties.sqt*1000);
319 319 
 			    return new L.Marker.movingMarker([latLng, feature.properties.nextlatlon],[movingtime],{
320 320 
 <?php
321 321 
 		}
Please login to merge, or discard this patch.
js/map-tracker.2d.js.php 1 patch
Spacing   +7 added lines, -7 removed lines patch added patch discarded remove patch 
@@ -1,7 +1,7 @@  discard block
 
 block discarded – undo
1 1 
 <?php
2 2 
 require_once('../require/settings.php');
3 3 
 require_once('../require/class.Language.php');
4 
-setcookie("MapFormat",'2d');
4 
+setcookie("MapFormat", '2d');
5 5 
 header('Content-Type: text/javascript');
6 6 
 ?>
7 7 
 /**
 
@@ -28,10 +28,10 @@  discard block
 
 block discarded – undo
28 28
29 29 
 <?php
30 30 
 	if (isset($_GET['famtrackid'])) {
31 
-		$famtrackid = filter_input(INPUT_GET,'famtrackid',FILTER_SANITIZE_STRING);
31 
+		$famtrackid = filter_input(INPUT_GET, 'famtrackid', FILTER_SANITIZE_STRING);
32 32 
 	}
33 33 
 	if (isset($_GET['ident'])) {
34 
-		$ident = filter_input(INPUT_GET,'ident',FILTER_SANITIZE_STRING);
34 
+		$ident = filter_input(INPUT_GET, 'ident', FILTER_SANITIZE_STRING);
35 35 
 	}
36 36 
 	if (!isset($ident) && !isset($famtrackid)) {
37 37 
 ?>
 
@@ -211,7 +211,7 @@  discard block
 
 block discarded – undo
211 211 
 <?php
212 212 
 		} else {
213 213 
 ?>
214 
-		    var movingtime = Math.round(<?php if (isset($archiveupdatetime)) print $archiveupdatetime*1000; else print $globalMapRefresh*1000+20000; ?>+feature.properties.sqt*1000);
214 
+		    var movingtime = Math.round(<?php if (isset($archiveupdatetime)) print $archiveupdatetime*1000; else print $globalMapRefresh*1000 + 20000; ?>+feature.properties.sqt*1000);
215 215 
 		    return new L.Marker.movingMarker([latLng, feature.properties.nextlatlon],[movingtime],{
216 216 
 <?php
217 217 
 		}
 
@@ -227,7 +227,7 @@  discard block
 
 block discarded – undo
227 227 
 			    /*
228 228 
 			    shadowUrl: iconURLShadowpath,
229 229 
 			    shadowSize: [<?php print $globalAircraftSize; ?>, <?php print $globalAircraftSize; ?>],
230 
-			    shadowAnchor: [<?php print ($globalAircraftSize/2)+1; ?>, <?php print $globalAircraftSize; ?>]
230 
+			    shadowAnchor: [<?php print ($globalAircraftSize/2) + 1; ?>, <?php print $globalAircraftSize; ?>]
231 231 
 			    */
232 232 
 			})
233 233 
 		    })
 
@@ -268,7 +268,7 @@  discard block
 
 block discarded – undo
268 268 
 <?php
269 269 
 		} else {
270 270 
 ?>
271 
-			    var movingtime = Math.round(<?php if (isset($archiveupdatetime)) print $archiveupdatetime*1000; else print $globalMapRefresh*1000+20000; ?>+feature.properties.sqt*1000);
271 
+			    var movingtime = Math.round(<?php if (isset($archiveupdatetime)) print $archiveupdatetime*1000; else print $globalMapRefresh*1000 + 20000; ?>+feature.properties.sqt*1000);
272 272 
 			    return new L.Marker.movingMarker([latLng, feature.properties.nextlatlon],[movingtime],{
273 273 
 <?php
274 274 
 		}
 
@@ -324,7 +324,7 @@  discard block
 
 block discarded – undo
324 324 
 <?php
325 325 
 		} else {
326 326 
 ?>
327 
-			    var movingtime = Math.round(<?php if (isset($archiveupdatetime)) print $archiveupdatetime*1000; else print $globalMapRefresh*1000+20000; ?>+feature.properties.sqt*1000);
327 
+			    var movingtime = Math.round(<?php if (isset($archiveupdatetime)) print $archiveupdatetime*1000; else print $globalMapRefresh*1000 + 20000; ?>+feature.properties.sqt*1000);
328 328 
 			    return new L.Marker.movingMarker([latLng, feature.properties.nextlatlon],[movingtime],{
329 329 
 <?php
330 330 
 		}
Please login to merge, or discard this patch.
js/map-satellite.2d.js.php 1 patch
Spacing   +7 added lines, -7 removed lines patch added patch discarded remove patch 
@@ -1,7 +1,7 @@  discard block
 
 block discarded – undo
1 1 
 <?php
2 2 
 require_once('../require/settings.php');
3 3 
 require_once('../require/class.Language.php');
4 
-setcookie("MapFormat",'2d');
4 
+setcookie("MapFormat", '2d');
5 5 
 header('Content-Type: text/javascript');
6 6 
 ?>
7 7 
 /**
 
@@ -27,10 +27,10 @@  discard block
 
 block discarded – undo
27 27
28 28 
 <?php
29 29 
 	if (isset($_GET['famsatid'])) {
30 
-		$famsatid = filter_input(INPUT_GET,'famsatid',FILTER_SANITIZE_STRING);
30 
+		$famsatid = filter_input(INPUT_GET, 'famsatid', FILTER_SANITIZE_STRING);
31 31 
 	}
32 32 
 	if (isset($_GET['ident'])) {
33 
-		$ident = filter_input(INPUT_GET,'ident',FILTER_SANITIZE_STRING);
33 
+		$ident = filter_input(INPUT_GET, 'ident', FILTER_SANITIZE_STRING);
34 34 
 	}
35 35 
 	if (!isset($ident) && !isset($famsatid)) {
36 36 
 ?>
 
@@ -175,7 +175,7 @@  discard block
 
 block discarded – undo
175 175 
 <?php
176 176 
 		} else {
177 177 
 ?>
178 
-		    var movingtime = Math.round(<?php if (isset($archiveupdatetime)) print $archiveupdatetime*1000; else print $globalMapRefresh*1000+20000; ?>+feature.properties.sqt*1000);
178 
+		    var movingtime = Math.round(<?php if (isset($archiveupdatetime)) print $archiveupdatetime*1000; else print $globalMapRefresh*1000 + 20000; ?>+feature.properties.sqt*1000);
179 179 
 		    return new L.Marker.movingMarker([latLng, feature.properties.nextlatlon],[movingtime],{
180 180 
 <?php
181 181 
 		}
 
@@ -191,7 +191,7 @@  discard block
 
 block discarded – undo
191 191 
 			    /*
192 192 
 			    shadowUrl: iconURLShadowpath,
193 193 
 			    shadowSize: [<?php print $globalAircraftSize; ?>, <?php print $globalAircraftSize; ?>],
194 
-			    shadowAnchor: [<?php print ($globalAircraftSize/2)+1; ?>, <?php print $globalAircraftSize; ?>]
194 
+			    shadowAnchor: [<?php print ($globalAircraftSize/2) + 1; ?>, <?php print $globalAircraftSize; ?>]
195 195 
 			    */
196 196 
 			})
197 197 
 		    })
 
@@ -232,7 +232,7 @@  discard block
 
 block discarded – undo
232 232 
 <?php
233 233 
 		} else {
234 234 
 ?>
235 
-			    var movingtime = Math.round(<?php if (isset($archiveupdatetime)) print $archiveupdatetime*1000; else print $globalMapRefresh*1000+20000; ?>+feature.properties.sqt*1000);
235 
+			    var movingtime = Math.round(<?php if (isset($archiveupdatetime)) print $archiveupdatetime*1000; else print $globalMapRefresh*1000 + 20000; ?>+feature.properties.sqt*1000);
236 236 
 			    return new L.Marker.movingMarker([latLng, feature.properties.nextlatlon],[movingtime],{
237 237 
 <?php
238 238 
 		}
 
@@ -288,7 +288,7 @@  discard block
 
 block discarded – undo
288 288 
 <?php
289 289 
 		} else {
290 290 
 ?>
291 
-			    var movingtime = Math.round(<?php if (isset($archiveupdatetime)) print $archiveupdatetime*1000; else print $globalMapRefresh*1000+20000; ?>+feature.properties.sqt*1000);
291 
+			    var movingtime = Math.round(<?php if (isset($archiveupdatetime)) print $archiveupdatetime*1000; else print $globalMapRefresh*1000 + 20000; ?>+feature.properties.sqt*1000);
292 292 
 			    return new L.Marker.movingMarker([latLng, feature.properties.nextlatlon],[movingtime],{
293 293 
 <?php
294 294 
 		}
Please login to merge, or discard this patch.
js/map.2d.js.php 1 patch
Spacing   +11 added lines, -11 removed lines patch added patch discarded remove patch 
@@ -1,7 +1,7 @@  discard block
 
 block discarded – undo
1 1 
 <?php
2 2 
 require_once('../require/settings.php');
3 3 
 require_once('../require/class.Language.php');
4 
-setcookie("MapFormat",'2d');
4 
+setcookie("MapFormat", '2d');
5 5 
 header('Content-Type: text/javascript');
6 6 
 ?>
7 7 
 /**
 
@@ -112,16 +112,16 @@  discard block
 
 block discarded – undo
112 112 
 <?php
113 113 
 	}
114 114 
 	if (isset($_GET['ident'])) {
115 
-		$ident = filter_input(INPUT_GET,'ident',FILTER_SANITIZE_STRING);
115 
+		$ident = filter_input(INPUT_GET, 'ident', FILTER_SANITIZE_STRING);
116 116 
 	}
117 117 
 	if (isset($_GET['flightaware_id'])) {
118 
-		$flightaware_id = filter_input(INPUT_GET,'flightaware_id',FILTER_SANITIZE_STRING);
118 
+		$flightaware_id = filter_input(INPUT_GET, 'flightaware_id', FILTER_SANITIZE_STRING);
119 119 
 	}
120 120 
 	if (isset($_GET['latitude'])) {
121 
-		$latitude = filter_input(INPUT_GET,'latitude',FILTER_SANITIZE_STRING);
121 
+		$latitude = filter_input(INPUT_GET, 'latitude', FILTER_SANITIZE_STRING);
122 122 
 	}
123 123 
 	if (isset($_GET['longitude'])) {
124 
-		$longitude = filter_input(INPUT_GET,'longitude',FILTER_SANITIZE_STRING);
124 
+		$longitude = filter_input(INPUT_GET, 'longitude', FILTER_SANITIZE_STRING);
125 125 
 	}
126 126 
 ?>
127 127 
 
@@ -149,7 +149,7 @@  discard block
 
 block discarded – undo
149 149 
 	} else {
150 150 
 		if ((isset($globalCenterLatitude) && $globalCenterLatitude != '' && isset($globalCenterLongitude) && $globalCenterLongitude != '') || isset($_COOKIE['lastcentercoord'])) {
151 151 
 			if (isset($_COOKIE['lastcentercoord'])) {
152 
-				$lastcentercoord = explode(',',$_COOKIE['lastcentercoord']);
152 
+				$lastcentercoord = explode(',', $_COOKIE['lastcentercoord']);
153 153 
 				$viewcenterlatitude = $lastcentercoord[0];
154 154 
 				$viewcenterlongitude = $lastcentercoord[1];
155 155 
 				$viewzoom = $lastcentercoord[2];
 
@@ -170,7 +170,7 @@  discard block
 
 block discarded – undo
170 170 
 	     || navigator.userAgent.match(/BlackBerry/i)
171 171 
 	     || navigator.userAgent.match(/Windows Phone/i))
172 172 
 	{
173 
-		var zoom = <?php if (isset($viewzoom) && $viewzoom == $globalLiveZoom) print $viewzoom-1; elseif (isset($viewzoom)) print $viewzoom; else print '8'; ?>;
173 
+		var zoom = <?php if (isset($viewzoom) && $viewzoom == $globalLiveZoom) print $viewzoom - 1; elseif (isset($viewzoom)) print $viewzoom; else print '8'; ?>;
174 174 
 	} else {
175 175 
 		var zoom = <?php if (isset($viewzoom)) print $viewzoom; else print '9'; ?>;
176 176 
 	}
 
@@ -314,19 +314,19 @@  discard block
 
 block discarded – undo
314 314 
 	map.addLayer(yandexLayer);
315 315 
 <?php
316 316 
 	} elseif ($MapType == 'Bing-Aerial') {
317 
-		if (!isset($globalBingMapKey) || $globalBingMapKey == '') setcookie('MapType','OpenStreetMap');
317 
+		if (!isset($globalBingMapKey) || $globalBingMapKey == '') setcookie('MapType', 'OpenStreetMap');
318 318 
 ?>
319 319 
 	var bingLayer = new L.tileLayer.bing({bingMapsKey: '<?php print $globalBingMapKey; ?>',imagerySet: 'Aerial'});
320 320 
 	map.addLayer(bingLayer);
321 321 
 <?php
322 322 
 	} elseif ($MapType == 'Bing-Hybrid') {
323 
-		if (!isset($globalBingMapKey) || $globalBingMapKey == '') setcookie('MapType','OpenStreetMap');
323 
+		if (!isset($globalBingMapKey) || $globalBingMapKey == '') setcookie('MapType', 'OpenStreetMap');
324 324 
 ?>
325 325 
 	var bingLayer = new L.tileLayer.bing({bingMapsKey: '<?php print $globalBingMapKey; ?>',imagerySet: 'AerialWithLabels'});
326 326 
 	map.addLayer(bingLayer);
327 327 
 <?php
328 328 
 	} elseif ($MapType == 'Bing-Road') {
329 
-		if (!isset($globalBingMapKey) || $globalBingMapKey == '') setcookie('MapType','OpenStreetMap');
329 
+		if (!isset($globalBingMapKey) || $globalBingMapKey == '') setcookie('MapType', 'OpenStreetMap');
330 330 
 ?>
331 331 
 	var bingLayer = new L.tileLayer.bing({bingMapsKey: '<?php print $globalBingMapKey; ?>',imagerySet: 'Road'});
332 332 
 	map.addLayer(bingLayer);
 
@@ -464,7 +464,7 @@  discard block
 
 block discarded – undo
464 464
465 465 
 	function update_tsk() {
466 466 
 		var bbox = map.getBounds().toBBoxString();
467 
-		var tskLayerQuery = $.getJSON("<?php print $globalURL; ?>/tsk-geojson.php?tsk=<?php echo filter_input(INPUT_GET,'tsk',FILTER_SANITIZE_URL); ?>",function (data) {
467 
+		var tskLayerQuery = $.getJSON("<?php print $globalURL; ?>/tsk-geojson.php?tsk=<?php echo filter_input(INPUT_GET, 'tsk', FILTER_SANITIZE_URL); ?>",function (data) {
468 468 
 		    tskLayer = L.geoJson(data,{
469 469 
 			onEachFeature: function (feature, layer) {
470 470 
 			    tskPopup(feature, layer);
Please login to merge, or discard this patch.