--- vfrnav-20141211/flightdeck/sensgpsd.cc.orig	2015-01-29 16:14:59.000000000 +0100
+++ vfrnav-20141211/flightdeck/sensgpsd.cc	2015-07-07 12:28:28.368437598 +0200
@@ -134,9 +134,6 @@
 
 			case MODE_3D:
 				m_fixtype = fixtype_3d;
-				if (m_gpsdata.m_gpsdata.status == STATUS_DGPS_FIX &&
-				    (m_gpsdata.m_gpsdata.set & STATUS_SET))
-					m_fixtype = fixtype_3d_diff;
 				break;
 			}
 		}
@@ -177,16 +174,16 @@
 	if (m_gpsdata.m_gpsdata.set & SATELLITE_SET) {
 		std::set<int> satused;
 		for (int i = 0; i < m_gpsdata.m_gpsdata.satellites_used; ++i) {
-			satused.insert(m_gpsdata.m_gpsdata.used[i]);
+			satused.insert(m_gpsdata.m_gpsdata.skyview[i].used);
 			if (true)
-				std::cerr << "SV PRN used: " << m_gpsdata.m_gpsdata.used[i] << std::endl;
+				std::cerr << "SV PRN used: " << m_gpsdata.m_gpsdata.skyview[i].used << std::endl;
 		}
 		satellites_t sat;
 		for (int i = 0; i < m_gpsdata.m_gpsdata.satellites_visible; ++i) {
-			sat.push_back(Satellite(m_gpsdata.m_gpsdata.PRN[i], m_gpsdata.m_gpsdata.azimuth[i], m_gpsdata.m_gpsdata.elevation[i],
-						m_gpsdata.m_gpsdata.ss[i], satused.find(m_gpsdata.m_gpsdata.PRN[i]) != satused.end()));
+			sat.push_back(Satellite(m_gpsdata.m_gpsdata.skyview[i].PRN, m_gpsdata.m_gpsdata.skyview[i].azimuth, m_gpsdata.m_gpsdata.skyview[i].elevation,
+						m_gpsdata.m_gpsdata.skyview[i].ss, satused.find(m_gpsdata.m_gpsdata.skyview[i].PRN) != satused.end()));
 			if (true)
-				std::cerr << "SV: " << m_gpsdata.m_gpsdata.PRN[i] << std::endl;
+				std::cerr << "SV: " << m_gpsdata.m_gpsdata.skyview[i].PRN << std::endl;
 		}
 		m_sat.swap(sat);
 		pc.set_changed(parnrsatellites);