|
@@ -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
|
?> |
|
6
|
6
|
/** |
|
7
|
7
|
* This javascript is part of FlightAirmap. |
|
@@ -108,16 +108,16 @@ discard block |
|
|
block discarded – undo |
|
108
|
108
|
<?php |
|
109
|
109
|
} |
|
110
|
110
|
if (isset($_GET['ident'])) { |
|
111
|
|
- $ident = filter_input(INPUT_GET,'ident',FILTER_SANITIZE_STRING); |
|
|
111
|
+ $ident = filter_input(INPUT_GET, 'ident', FILTER_SANITIZE_STRING); |
|
112
|
112
|
} |
|
113
|
113
|
if (isset($_GET['flightaware_id'])) { |
|
114
|
|
- $flightaware_id = filter_input(INPUT_GET,'flightaware_id',FILTER_SANITIZE_STRING); |
|
|
114
|
+ $flightaware_id = filter_input(INPUT_GET, 'flightaware_id', FILTER_SANITIZE_STRING); |
|
115
|
115
|
} |
|
116
|
116
|
if (isset($_GET['latitude'])) { |
|
117
|
|
- $latitude = filter_input(INPUT_GET,'latitude',FILTER_SANITIZE_STRING); |
|
|
117
|
+ $latitude = filter_input(INPUT_GET, 'latitude', FILTER_SANITIZE_STRING); |
|
118
|
118
|
} |
|
119
|
119
|
if (isset($_GET['longitude'])) { |
|
120
|
|
- $longitude = filter_input(INPUT_GET,'longitude',FILTER_SANITIZE_STRING); |
|
|
120
|
+ $longitude = filter_input(INPUT_GET, 'longitude', FILTER_SANITIZE_STRING); |
|
121
|
121
|
} |
|
122
|
122
|
?> |
|
123
|
123
|
|
|
@@ -145,7 +145,7 @@ discard block |
|
|
block discarded – undo |
|
145
|
145
|
} else { |
|
146
|
146
|
if ((isset($globalCenterLatitude) && $globalCenterLatitude != '' && isset($globalCenterLongitude) && $globalCenterLongitude != '') || isset($_COOKIE['lastcentercoord'])) { |
|
147
|
147
|
if (isset($_COOKIE['lastcentercoord'])) { |
|
148
|
|
- $lastcentercoord = explode(',',$_COOKIE['lastcentercoord']); |
|
|
148
|
+ $lastcentercoord = explode(',', $_COOKIE['lastcentercoord']); |
|
149
|
149
|
$viewcenterlatitude = $lastcentercoord[0]; |
|
150
|
150
|
$viewcenterlongitude = $lastcentercoord[1]; |
|
151
|
151
|
$viewzoom = $lastcentercoord[2]; |
|
@@ -166,7 +166,7 @@ discard block |
|
|
block discarded – undo |
|
166
|
166
|
|| navigator.userAgent.match(/BlackBerry/i) |
|
167
|
167
|
|| navigator.userAgent.match(/Windows Phone/i)) |
|
168
|
168
|
{ |
|
169
|
|
- var zoom = <?php if (isset($viewzoom) && $viewzoom == $globalLiveZoom) print $viewzoom-1; elseif (isset($viewzoom)) print $viewzoom; else print '8'; ?>; |
|
|
169
|
+ var zoom = <?php if (isset($viewzoom) && $viewzoom == $globalLiveZoom) print $viewzoom - 1; elseif (isset($viewzoom)) print $viewzoom; else print '8'; ?>; |
|
170
|
170
|
} else { |
|
171
|
171
|
var zoom = <?php if (isset($viewzoom)) print $viewzoom; else print '9'; ?>; |
|
172
|
172
|
} |
|
@@ -310,19 +310,19 @@ discard block |
|
|
block discarded – undo |
|
310
|
310
|
map.addLayer(yandexLayer); |
|
311
|
311
|
<?php |
|
312
|
312
|
} elseif ($MapType == 'Bing-Aerial') { |
|
313
|
|
- if (!isset($globalBingMapKey) || $globalBingMapKey == '') setcookie('MapType','OpenStreetMap'); |
|
|
313
|
+ if (!isset($globalBingMapKey) || $globalBingMapKey == '') setcookie('MapType', 'OpenStreetMap'); |
|
314
|
314
|
?> |
|
315
|
315
|
var bingLayer = new L.tileLayer.bing({bingMapsKey: '<?php print $globalBingMapKey; ?>',imagerySet: 'Aerial'}); |
|
316
|
316
|
map.addLayer(bingLayer); |
|
317
|
317
|
<?php |
|
318
|
318
|
} elseif ($MapType == 'Bing-Hybrid') { |
|
319
|
|
- if (!isset($globalBingMapKey) || $globalBingMapKey == '') setcookie('MapType','OpenStreetMap'); |
|
|
319
|
+ if (!isset($globalBingMapKey) || $globalBingMapKey == '') setcookie('MapType', 'OpenStreetMap'); |
|
320
|
320
|
?> |
|
321
|
321
|
var bingLayer = new L.tileLayer.bing({bingMapsKey: '<?php print $globalBingMapKey; ?>',imagerySet: 'AerialWithLabels'}); |
|
322
|
322
|
map.addLayer(bingLayer); |
|
323
|
323
|
<?php |
|
324
|
324
|
} elseif ($MapType == 'Bing-Road') { |
|
325
|
|
- if (!isset($globalBingMapKey) || $globalBingMapKey == '') setcookie('MapType','OpenStreetMap'); |
|
|
325
|
+ if (!isset($globalBingMapKey) || $globalBingMapKey == '') setcookie('MapType', 'OpenStreetMap'); |
|
326
|
326
|
?> |
|
327
|
327
|
var bingLayer = new L.tileLayer.bing({bingMapsKey: '<?php print $globalBingMapKey; ?>',imagerySet: 'Road'}); |
|
328
|
328
|
map.addLayer(bingLayer); |
|
@@ -460,7 +460,7 @@ discard block |
|
|
block discarded – undo |
|
460
|
460
|
|
|
461
|
461
|
function update_tsk() { |
|
462
|
462
|
var bbox = map.getBounds().toBBoxString(); |
|
463
|
|
- var tskLayerQuery = $.getJSON("<?php print $globalURL; ?>/tsk-geojson.php?tsk=<?php echo filter_input(INPUT_GET,'tsk',FILTER_SANITIZE_URL); ?>",function (data) { |
|
|
463
|
+ var tskLayerQuery = $.getJSON("<?php print $globalURL; ?>/tsk-geojson.php?tsk=<?php echo filter_input(INPUT_GET, 'tsk', FILTER_SANITIZE_URL); ?>",function (data) { |
|
464
|
464
|
tskLayer = L.geoJson(data,{ |
|
465
|
465
|
onEachFeature: function (feature, layer) { |
|
466
|
466
|
tskPopup(feature, layer); |