|
@@ -2,7 +2,7 @@ discard block |
|
|
block discarded – undo |
|
2
|
2
|
require_once('../require/settings.php'); |
|
3
|
3
|
require_once('../require/class.Language.php'); |
|
4
|
4
|
|
|
5
|
|
-setcookie("MapFormat",'2d'); |
|
|
5
|
+setcookie("MapFormat", '2d'); |
|
6
|
6
|
|
|
7
|
7
|
if (!isset($globalOpenWeatherMapKey)) $globalOpenWeatherMapKey = ''; |
|
8
|
8
|
// Compressed GeoJson is used if true |
|
@@ -56,16 +56,16 @@ discard block |
|
|
block discarded – undo |
|
56
|
56
|
<?php |
|
57
|
57
|
} |
|
58
|
58
|
if (isset($_GET['ident'])) { |
|
59
|
|
- $ident = filter_input(INPUT_GET,'ident',FILTER_SANITIZE_STRING); |
|
|
59
|
+ $ident = filter_input(INPUT_GET, 'ident', FILTER_SANITIZE_STRING); |
|
60
|
60
|
} |
|
61
|
61
|
if (isset($_GET['flightaware_id'])) { |
|
62
|
|
- $flightaware_id = filter_input(INPUT_GET,'flightaware_id',FILTER_SANITIZE_STRING); |
|
|
62
|
+ $flightaware_id = filter_input(INPUT_GET, 'flightaware_id', FILTER_SANITIZE_STRING); |
|
63
|
63
|
} |
|
64
|
64
|
if (isset($_GET['latitude'])) { |
|
65
|
|
- $latitude = filter_input(INPUT_GET,'latitude',FILTER_SANITIZE_STRING); |
|
|
65
|
+ $latitude = filter_input(INPUT_GET, 'latitude', FILTER_SANITIZE_STRING); |
|
66
|
66
|
} |
|
67
|
67
|
if (isset($_GET['longitude'])) { |
|
68
|
|
- $longitude = filter_input(INPUT_GET,'longitude',FILTER_SANITIZE_STRING); |
|
|
68
|
+ $longitude = filter_input(INPUT_GET, 'longitude', FILTER_SANITIZE_STRING); |
|
69
|
69
|
} |
|
70
|
70
|
?> |
|
71
|
71
|
|
|
@@ -93,7 +93,7 @@ discard block |
|
|
block discarded – undo |
|
93
|
93
|
} else { |
|
94
|
94
|
if ((isset($globalCenterLatitude) && $globalCenterLatitude != '' && isset($globalCenterLongitude) && $globalCenterLongitude != '') || isset($_COOKIE['lastcentercoord'])) { |
|
95
|
95
|
if (isset($_COOKIE['lastcentercoord'])) { |
|
96
|
|
- $lastcentercoord = explode(',',$_COOKIE['lastcentercoord']); |
|
|
96
|
+ $lastcentercoord = explode(',', $_COOKIE['lastcentercoord']); |
|
97
|
97
|
$viewcenterlatitude = $lastcentercoord[0]; |
|
98
|
98
|
$viewcenterlongitude = $lastcentercoord[1]; |
|
99
|
99
|
$viewzoom = $lastcentercoord[2]; |
|
@@ -114,7 +114,7 @@ discard block |
|
|
block discarded – undo |
|
114
|
114
|
|| navigator.userAgent.match(/BlackBerry/i) |
|
115
|
115
|
|| navigator.userAgent.match(/Windows Phone/i)) |
|
116
|
116
|
{ |
|
117
|
|
- var zoom = <?php if (isset($viewzoom) && $viewzoom == $globalLiveZoom) print $viewzoom-1; elseif (isset($viewzoom)) print $viewzoom; else print '8'; ?>; |
|
|
117
|
+ var zoom = <?php if (isset($viewzoom) && $viewzoom == $globalLiveZoom) print $viewzoom - 1; elseif (isset($viewzoom)) print $viewzoom; else print '8'; ?>; |
|
118
|
118
|
} else { |
|
119
|
119
|
var zoom = <?php if (isset($viewzoom)) print $viewzoom; else print '9'; ?>; |
|
120
|
120
|
} |
|
@@ -240,19 +240,19 @@ discard block |
|
|
block discarded – undo |
|
240
|
240
|
map.addLayer(yandexLayer); |
|
241
|
241
|
<?php |
|
242
|
242
|
} elseif ($MapType == 'Bing-Aerial') { |
|
243
|
|
- if (!isset($globalBingMapKey) || $globalBingMapKey == '') setcookie('MapType','OpenStreetMap'); |
|
|
243
|
+ if (!isset($globalBingMapKey) || $globalBingMapKey == '') setcookie('MapType', 'OpenStreetMap'); |
|
244
|
244
|
?> |
|
245
|
245
|
var bingLayer = new L.tileLayer.bing({bingMapsKey: '<?php print $globalBingMapKey; ?>',imagerySet: 'Aerial'}); |
|
246
|
246
|
map.addLayer(bingLayer); |
|
247
|
247
|
<?php |
|
248
|
248
|
} elseif ($MapType == 'Bing-Hybrid') { |
|
249
|
|
- if (!isset($globalBingMapKey) || $globalBingMapKey == '') setcookie('MapType','OpenStreetMap'); |
|
|
249
|
+ if (!isset($globalBingMapKey) || $globalBingMapKey == '') setcookie('MapType', 'OpenStreetMap'); |
|
250
|
250
|
?> |
|
251
|
251
|
var bingLayer = new L.tileLayer.bing({bingMapsKey: '<?php print $globalBingMapKey; ?>',imagerySet: 'AerialWithLabels'}); |
|
252
|
252
|
map.addLayer(bingLayer); |
|
253
|
253
|
<?php |
|
254
|
254
|
} elseif ($MapType == 'Bing-Road') { |
|
255
|
|
- if (!isset($globalBingMapKey) || $globalBingMapKey == '') setcookie('MapType','OpenStreetMap'); |
|
|
255
|
+ if (!isset($globalBingMapKey) || $globalBingMapKey == '') setcookie('MapType', 'OpenStreetMap'); |
|
256
|
256
|
?> |
|
257
|
257
|
var bingLayer = new L.tileLayer.bing({bingMapsKey: '<?php print $globalBingMapKey; ?>',imagerySet: 'Road'}); |
|
258
|
258
|
map.addLayer(bingLayer); |
|
@@ -390,7 +390,7 @@ discard block |
|
|
block discarded – undo |
|
390
|
390
|
|
|
391
|
391
|
function update_tsk() { |
|
392
|
392
|
var bbox = map.getBounds().toBBoxString(); |
|
393
|
|
- var tskLayerQuery = $.getJSON("<?php print $globalURL; ?>/tsk-geojson.php?tsk=<?php echo filter_input(INPUT_GET,'tsk',FILTER_SANITIZE_URL); ?>",function (data) { |
|
|
393
|
+ var tskLayerQuery = $.getJSON("<?php print $globalURL; ?>/tsk-geojson.php?tsk=<?php echo filter_input(INPUT_GET, 'tsk', FILTER_SANITIZE_URL); ?>",function (data) { |
|
394
|
394
|
tskLayer = L.geoJson(data,{ |
|
395
|
395
|
onEachFeature: function (feature, layer) { |
|
396
|
396
|
tskPopup(feature, layer); |
Ysurac /
FlightAirMap
