Mirror/betaflight-configurator
1
0
Fork 0
mirror of https://github.com/betaflight/betaflight-configurator.git synced 2025-07-25 17:25:16 +03:00
Code Issues Wiki Activity

Merge pull request #1341 from McGiverGim/fix_flickering_gps

Browse source 
Remove flickering when fix is unstable
This commit is contained in:
Michael Keller 2019-04-07 11:06:24 +12:00 • committed by GitHub
commit daac0a6c58
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 44 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

13
src/js/tabs/gps.js
View file

@ -42,6 +42,9 @@ TABS.gps.initialize = function (callback) {
MSP.send_message(MSPCodes.MSP_GPS_SV_INFO, false, false, update_ui);
}
// To not flicker the divs while the fix is unstable
var gpsWasFixed = false;
function update_ui() {
var lat = GPS_DATA.lat / 10000000;
var lon = GPS_DATA.lon / 10000000;
@ -81,16 +84,20 @@ TABS.gps.initialize = function (callback) {
if (navigator.onLine) {
$('#connect').hide();
//if(lat != 0 && lon != 0){
if(GPS_DATA.fix){
if (GPS_DATA.fix) {
gpsWasFixed = true;
frame.contentWindow.postMessage(message, '*');
$('#loadmap').show();
$('#waiting').hide();
}else{
} else if (!gpsWasFixed) {
$('#loadmap').hide();
$('#waiting').show();
} else {
message.action = 'nofix';
frame.contentWindow.postMessage(message, '*');
}
}else{
gpsWasFixed = false;
$('#connect').show();
$('#waiting').hide();
$('#loadmap').hide();

40
src/js/tabs/map.js
View file

@ -1,12 +1,15 @@
const DEFAULT_ZOOM = 16,
DEFAULT_LON = 0,
DEFAULT_LAT = 0,
ICON_IMAGE = '/images/icons/cf_icon_position.png';
ICON_IMAGE = '/images/icons/cf_icon_position.png',
ICON_IMAGE_NOFIX = '/images/icons/cf_icon_position_nofix.png';
var iconGeometry,
map,
mapView,
marker;
iconStyle,
iconStyleNoFix,
iconFeature;
window.onload = initializeMap;
@ -30,17 +33,30 @@ function initializeMap() {
controls: []
});
var iconStyle = new ol.style.Style({
image: new ol.style.Icon(({
anchor: [0.5, 1],
opacity: 1,
scale: 0.5,
src: ICON_IMAGE
}))
var icon = new ol.style.Icon(({
anchor: [0.5, 1],
opacity: 1,
scale: 0.5,
src: ICON_IMAGE
}));
var iconNoFix = new ol.style.Icon(({
anchor: [0.5, 1],
opacity: 1,
scale: 0.5,
src: ICON_IMAGE_NOFIX
}));
iconStyle = new ol.style.Style({
image: icon
});
iconStyleNoFix = new ol.style.Style({
image: iconNoFix
});
iconGeometry = new ol.geom.Point(lonLat);
var iconFeature = new ol.Feature({
iconFeature = new ol.Feature({
geometry: iconGeometry
});
@ -73,11 +89,15 @@ function processMapEvents(e) {
break;
case 'center':
iconFeature.setStyle(iconStyle);
var center = ol.proj.fromLonLat([e.data.lon, e.data.lat]);
mapView.setCenter(center);
iconGeometry.setCoordinates(center);
break;
case 'nofix':
iconFeature.setStyle(iconStyleNoFix);
break;
}
} catch (e) {