|
@@ -6,8 +6,8 @@ discard block |
|
|
block discarded – undo |
|
6
|
6
|
if (!isset($globalJsonCompress)) $compress = true; |
|
7
|
7
|
else $compress = $globalJsonCompress; |
|
8
|
8
|
|
|
9
|
|
-if (isset($_GET['ident'])) $ident = filter_input(INPUT_GET,'ident',FILTER_SANITIZE_STRING); |
|
10
|
|
-if (isset($_GET['flightaware_id'])) $flightaware_id = filter_input(INPUT_GET,'flightaware_id',FILTER_SANITIZE_STRING); |
|
|
9
|
+if (isset($_GET['ident'])) $ident = filter_input(INPUT_GET, 'ident', FILTER_SANITIZE_STRING); |
|
|
10
|
+if (isset($_GET['flightaware_id'])) $flightaware_id = filter_input(INPUT_GET, 'flightaware_id', FILTER_SANITIZE_STRING); |
|
11
|
11
|
$archive = false; |
|
12
|
12
|
if (isset($_COOKIE['archive_begin']) && $_COOKIE['archive_begin'] != '') $archive = true; |
|
13
|
13
|
?> |
|
@@ -210,7 +210,7 @@ discard block |
|
|
block discarded – undo |
|
210
|
210
|
if (typeof props != 'undefined') { |
|
211
|
211
|
var thedate = new Date(props); |
|
212
|
212
|
$("#thedate").html(thedate.toUTCString()); |
|
213
|
|
- // $("#archivebox").html('<h4><?php echo str_replace("'","\'",_("Archive Date & Time")); ?></h4>' + '<b><i class="fa fa-spinner fa-pulse fa-2x fa-fw margin-bottom"></i></b>'); |
|
|
213
|
+ // $("#archivebox").html('<h4><?php echo str_replace("'", "\'", _("Archive Date & Time")); ?></h4>' + '<b><i class="fa fa-spinner fa-pulse fa-2x fa-fw margin-bottom"></i></b>'); |
|
214
|
214
|
} |
|
215
|
215
|
} |
|
216
|
216
|
<?php |
|
@@ -364,7 +364,7 @@ discard block |
|
|
block discarded – undo |
|
364
|
364
|
<?php |
|
365
|
365
|
} else { |
|
366
|
366
|
?> |
|
367
|
|
- var movingtime = Math.round(<?php if (isset($archiveupdatetime)) print $archiveupdatetime*1000; else print $globalMapRefresh*1000+20000; ?>+feature.properties.sqt*1000); |
|
|
367
|
+ var movingtime = Math.round(<?php if (isset($archiveupdatetime)) print $archiveupdatetime*1000; else print $globalMapRefresh*1000 + 20000; ?>+feature.properties.sqt*1000); |
|
368
|
368
|
return new L.Marker.movingMarker([latLng, feature.properties.nextlatlon],[movingtime],{ |
|
369
|
369
|
<?php |
|
370
|
370
|
} |
|
@@ -381,7 +381,7 @@ discard block |
|
|
block discarded – undo |
|
381
|
381
|
/* |
|
382
|
382
|
shadowUrl: iconURLShadowpath, |
|
383
|
383
|
shadowSize: [<?php print $globalAircraftSize; ?>, <?php print $globalAircraftSize; ?>], |
|
384
|
|
- shadowAnchor: [<?php print ($globalAircraftSize/2)+1; ?>, <?php print $globalAircraftSize; ?>] |
|
|
384
|
+ shadowAnchor: [<?php print ($globalAircraftSize/2) + 1; ?>, <?php print $globalAircraftSize; ?>] |
|
385
|
385
|
*/ |
|
386
|
386
|
}) |
|
387
|
387
|
}) |
|
@@ -414,7 +414,7 @@ discard block |
|
|
block discarded – undo |
|
414
|
414
|
<?php |
|
415
|
415
|
} else { |
|
416
|
416
|
?> |
|
417
|
|
- var movingtime = Math.round(<?php if (isset($archiveupdatetime)) print $archiveupdatetime*1000; else print $globalMapRefresh*1000+20000; ?>+feature.properties.sqt*1000); |
|
|
417
|
+ var movingtime = Math.round(<?php if (isset($archiveupdatetime)) print $archiveupdatetime*1000; else print $globalMapRefresh*1000 + 20000; ?>+feature.properties.sqt*1000); |
|
418
|
418
|
return new L.Marker.movingMarker([latLng, feature.properties.nextlatlon],[movingtime],{ |
|
419
|
419
|
<?php |
|
420
|
420
|
} |
|
@@ -461,7 +461,7 @@ discard block |
|
|
block discarded – undo |
|
461
|
461
|
<?php |
|
462
|
462
|
} else { |
|
463
|
463
|
?> |
|
464
|
|
- var movingtime = Math.round(<?php if (isset($archiveupdatetime)) print $archiveupdatetime*1000; else print $globalMapRefresh*1000+20000; ?>+feature.properties.sqt*1000); |
|
|
464
|
+ var movingtime = Math.round(<?php if (isset($archiveupdatetime)) print $archiveupdatetime*1000; else print $globalMapRefresh*1000 + 20000; ?>+feature.properties.sqt*1000); |
|
465
|
465
|
return new L.Marker.movingMarker([latLng, feature.properties.nextlatlon],[movingtime],{ |
|
466
|
466
|
<?php |
|
467
|
467
|
} |
|
@@ -875,7 +875,7 @@ discard block |
|
|
block discarded – undo |
|
875
|
875
|
var archivegeoJSONQuery = $.getJSON(url, function(data) { |
|
876
|
876
|
$("#infobox").remove(); |
|
877
|
877
|
document.getElementById('archivebox').style.display = "block"; |
|
878
|
|
- $("#archivebox").html('<h4><?php echo str_replace("'","\'",_("Archive Date & Time")); ?></h4>' + '<b><span id="thedate"></span></b>' + '<br/><a href="#" onClick="archivePause();"><i class="fa fa-pause" aria-hidden="true"></i></a> <a href="#" onClick="archivePlay();"><i class="fa fa-play" aria-hidden="true"></i></a><br/><input type="range" min="1" id="archiveboxspeed" max="50" size="10" step="1" onInput="archiveboxspeedrange.value=value;" onChange="archiveboxspeedrange.value=value;archiveplayback.setSpeed(value);" value="'+getCookie('archive_speed')+'"/><output id="archiveboxspeedrange">'+getCookie('archive_speed')+'</output>'); |
|
|
878
|
+ $("#archivebox").html('<h4><?php echo str_replace("'", "\'", _("Archive Date & Time")); ?></h4>' + '<b><span id="thedate"></span></b>' + '<br/><a href="#" onClick="archivePause();"><i class="fa fa-pause" aria-hidden="true"></i></a> <a href="#" onClick="archivePlay();"><i class="fa fa-play" aria-hidden="true"></i></a><br/><input type="range" min="1" id="archiveboxspeed" max="50" size="10" step="1" onInput="archiveboxspeedrange.value=value;" onChange="archiveboxspeedrange.value=value;archiveplayback.setSpeed(value);" value="'+getCookie('archive_speed')+'"/><output id="archiveboxspeedrange">'+getCookie('archive_speed')+'</output>'); |
|
879
|
879
|
|
|
880
|
880
|
var archiveLayerGroup = L.layerGroup(); |
|
881
|
881
|
var archivegeoJSON = L.geoJson(data, { |
Ysurac /
FlightAirMap
