MS0NTR-Radio-Club
/
dump1090-fa
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixed up the merge problems

This commit is contained in:
byronbest 2019-09-04 09:43:13 -07:00 committed by GitHub
parent a1a7d42e90
commit 0ba4ba3fd7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
public_html/script.js
View File

@ -1106,18 +1106,16 @@ function refreshHighlighted() {
highlighted = Planes[HighlightedPlane];
}
var infoBox = $('#highlighted_infoblock');
// no highlighted plane or in process of removing plane
if (!highlighted || !highlighted.marker) {
$('#highlighted_infoblock').fadeOut();
infoBox.fadeOut();
return;
}
var marker = highlighted.marker;
var infoBox = $('#highlighted_infoblock');
var mapCanvas = $('#map_canvas');
infoBox.fadeIn(100);
var mapCanvas = $('#map_canvas');
var markerCoordinates = highlighted.marker.getGeometry().getCoordinates();
var markerPosition = OLMap.getPixelFromCoordinate(markerCoordinates);
var x = markerPosition[0] + 20;