From d873df57b37fcf43e46b3c79b666c914a5ba7b05 Mon Sep 17 00:00:00 2001
From: Carles Fernandez <carlesfernandez@gmail.com>
Date: Mon, 8 May 2017 19:56:10 +0200
Subject: [PATCH] Replace old implementation names by new ones so existing
 configurations do not break

---
 src/core/receiver/gnss_block_factory.cc | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/core/receiver/gnss_block_factory.cc b/src/core/receiver/gnss_block_factory.cc
index 34c6007ab..e01ec42df 100644
--- a/src/core/receiver/gnss_block_factory.cc
+++ b/src/core/receiver/gnss_block_factory.cc
@@ -1060,7 +1060,8 @@ std::unique_ptr<GNSSBlockInterface> GNSSBlockFactory::GetBlock(
         }
 
     // OBSERVABLES -----------------------------------------------------------------
-    else if (implementation.compare("Hybrid_Observables") == 0)
+    else if ((implementation.compare("Hybrid_Observables") == 0) || (implementation.compare("GPS_L1_CA_Observables") == 0) || (implementation.compare("GPS_L2C_Observables") == 0) ||
+    (implementation.compare("Galileo_E5A_Observables") == 0))
         {
             std::unique_ptr<GNSSBlockInterface> block_(new HybridObservables(configuration.get(), role, in_streams,
                     out_streams));
@@ -1073,7 +1074,7 @@ std::unique_ptr<GNSSBlockInterface> GNSSBlockFactory::GetBlock(
                     out_streams));
             block = std::move(block_);
         }
-    else if (implementation.compare("RTKLIB_PVT") == 0)
+    else if ((implementation.compare("RTKLIB_PVT") == 0) || (implementation.compare("GPS_L1_CA_PVT") == 0) || (implementation.compare("Galileo_E1_PVT") == 0) )
         {
             std::unique_ptr<GNSSBlockInterface> block_(new RtklibPvt(configuration.get(), role, in_streams,
                     out_streams));