Streamline measurements processing

Consolidate the translation from QMI LOC into one
place in order to minimize traffic

Change-Id: I73c2f25e94544a2b69d4227c63548ef11b6a4d91
CRs-fixed: 2430668

4 files changed, 5 insertions, 20 deletions

diff --git a/core/LocAdapterBase.cpp b/core/LocAdapterBase.cpp
index 5f6a0c8..6fad918 100644
--- a/core/LocAdapterBase.cpp
+++ b/core/LocAdapterBase.cpp
@@ -101,10 +101,6 @@ void LocAdapterBase::
 DEFAULT_IMPL()
 
 void LocAdapterBase::
-    reportSvMeasurementEvent(GnssSvMeasurementSet &/*svMeasurementSet*/)
-DEFAULT_IMPL()
-
-void LocAdapterBase::
     reportSvPolynomialEvent(GnssSvPolynomial &/*svPolynomial*/)
 DEFAULT_IMPL()
 
@@ -162,7 +158,7 @@ bool LocAdapterBase::
 DEFAULT_IMPL(false)
 
 void LocAdapterBase::
-    reportGnssMeasurementDataEvent(const GnssMeasurementsNotification& /*measurements*/,
+reportGnssMeasurementsEvent(const GnssMeasurements& /*gnssMeasurements*/,
                                    int /*msInWeek*/)
 DEFAULT_IMPL()
 
diff --git a/core/LocAdapterBase.h b/core/LocAdapterBase.h
index 05b72db..13c8493 100644
--- a/core/LocAdapterBase.h
+++ b/core/LocAdapterBase.h
@@ -158,7 +158,6 @@ public:
                                bool fromEngineHub=false);
     virtual void reportDataEvent(const GnssDataNotification& dataNotify, int msInWeek);
     virtual void reportNmeaEvent(const char* nmea, size_t length);
-    virtual void reportSvMeasurementEvent(GnssSvMeasurementSet &svMeasurementSet);
     virtual void reportSvPolynomialEvent(GnssSvPolynomial &svPolynomial);
     virtual void reportSvEphemerisEvent(GnssSvEphemerisReport &svEphemeris);
     virtual void reportStatus(LocGpsStatusValue status);
@@ -175,7 +174,7 @@ public:
     virtual bool requestNiNotifyEvent(const GnssNiNotification &notify, const void* data);
     inline virtual bool isInSession() { return false; }
     ContextBase* getContext() const { return mContext; }
-    virtual void reportGnssMeasurementDataEvent(const GnssMeasurementsNotification& measurements,
+    virtual void reportGnssMeasurementsEvent(const GnssMeasurements& gnssMeasurements,
                                                 int msInWeek);
     virtual bool reportWwanZppFix(LocGpsLocation &zppLoc);
     virtual bool reportZppBestAvailableFix(LocGpsLocation &zppLoc,
diff --git a/core/LocApiBase.cpp b/core/LocApiBase.cpp
index 3c67af2..c172376 100644
--- a/core/LocApiBase.cpp
+++ b/core/LocApiBase.cpp
@@ -434,14 +434,6 @@ void LocApiBase::reportSv(GnssSvNotification& svNotify)
         );
 }
 
-void LocApiBase::reportSvMeasurement(GnssSvMeasurementSet &svMeasurementSet)
-{
-    // loop through adapters, and deliver to all adapters.
-    TO_ALL_LOCADAPTERS(
-        mLocAdapters[i]->reportSvMeasurementEvent(svMeasurementSet)
-    );
-}
-
 void LocApiBase::reportSvPolynomial(GnssSvPolynomial &svPolynomial)
 {
     // loop through adapters, and deliver to all adapters.
@@ -534,11 +526,10 @@ void* LocApiBase :: getSibling()
 LocApiProxyBase* LocApiBase :: getLocApiProxy()
     DEFAULT_IMPL(NULL)
 
-void LocApiBase::reportGnssMeasurementData(GnssMeasurementsNotification& measurements,
-                                           int msInWeek)
+void LocApiBase::reportGnssMeasurements(GnssMeasurements& gnssMeasurements, int msInWeek)
 {
     // loop through adapters, and deliver to all adapters.
-    TO_ALL_LOCADAPTERS(mLocAdapters[i]->reportGnssMeasurementDataEvent(measurements, msInWeek));
+    TO_ALL_LOCADAPTERS(mLocAdapters[i]->reportGnssMeasurementsEvent(gnssMeasurements, msInWeek));
 }
 
 void LocApiBase::reportGnssSvIdConfig(const GnssSvIdConfig& config)
diff --git a/core/LocApiBase.h b/core/LocApiBase.h
index afdb83c..1c2afaf 100644
--- a/core/LocApiBase.h
+++ b/core/LocApiBase.h
@@ -164,7 +164,6 @@ public:
                         GnssDataNotification* pDataNotify = nullptr,
                         int msInWeek = -1);
     void reportSv(GnssSvNotification& svNotify);
-    void reportSvMeasurement(GnssSvMeasurementSet &svMeasurementSet);
     void reportSvPolynomial(GnssSvPolynomial &svPolynomial);
     void reportSvEphemeris(GnssSvEphemerisReport &svEphemeris);
     void reportStatus(LocGpsStatusValue status);
@@ -179,7 +178,7 @@ public:
     void requestATL(int connHandle, LocAGpsType agps_type, LocApnTypeMask apn_type_mask);
     void releaseATL(int connHandle);
     void requestNiNotify(GnssNiNotification &notify, const void* data);
-    void reportGnssMeasurementData(GnssMeasurementsNotification& measurements, int msInWeek);
+    void reportGnssMeasurements(GnssMeasurements& gnssMeasurements, int msInWeek);
     void reportWwanZppFix(LocGpsLocation &zppLoc);
     void reportZppBestAvailableFix(LocGpsLocation &zppLoc, GpsLocationExtended &location_extended,
             LocPosTechMask tech_mask);