Network position provider

app/CMakeLists.txt

@@ -32,8 +32,10 @@ set(MM_SRCS
     ios/iosutils.cpp
     position/providers/abstractpositionprovider.cpp
     position/providers/internalpositionprovider.cpp
+    position/providers/networkpositionprovider.cpp
     position/providers/positionprovidersmodel.cpp
     position/providers/simulatedpositionprovider.cpp
+    position/providers/nmeaparser.cpp
     position/tracking/abstracttrackingbackend.cpp
     position/tracking/internaltrackingbackend.cpp
     position/tracking/positiontrackinghighlight.cpp
@@ -126,8 +128,10 @@ set(MM_HDRS
     ios/iosutils.h
     position/providers/abstractpositionprovider.h
     position/providers/internalpositionprovider.h
+    position/providers/networkpositionprovider.h
     position/providers/positionprovidersmodel.h
     position/providers/simulatedpositionprovider.h
+    position/providers/nmeaparser.h
     position/tracking/abstracttrackingbackend.h
     position/tracking/internaltrackingbackend.h
     position/tracking/positiontrackinghighlight.h
@@ -332,6 +336,7 @@ target_include_directories(
          ${CMAKE_CURRENT_SOURCE_DIR}/layer
          ${CMAKE_CURRENT_SOURCE_DIR}/maptools
          ${CMAKE_CURRENT_SOURCE_DIR}/position
+         ${CMAKE_CURRENT_SOURCE_DIR}/position/providers
 )
 
 qt_policy(SET QTP0002 NEW)

app/appsettings.cpp

@@ -215,6 +215,7 @@ QVariantList AppSettings::savedPositionProviders() const
     QStringList provider;
     provider << settings.value( "providerName" ).toString();
     provider << settings.value( "providerAddress" ).toString();
+    provider << settings.value( "providerType" ).toString();
     providers.push_back( provider );
   }
 
@@ -238,15 +239,16 @@ void AppSettings::savePositionProviders( const QVariantList &providers )
   {
     QVariantList provider = providers[i].toList();
 
-    if ( provider.length() < 2 )
+    if ( provider.length() < 3 )
     {
       CoreUtils::log( QStringLiteral( "AppSettings" ), QStringLiteral( "Tried to save provider without sufficient data" ) );
       continue;
     }
     settings.setArrayIndex( i );
 
-    settings.setValue( "providerName", providers[i].toList()[0] );
-    settings.setValue( "providerAddress", providers[i].toList()[1] );
+    settings.setValue( "providerName", provider[0] );
+    settings.setValue( "providerAddress", provider[1] );
+    settings.setValue( "providerType", provider[2] );
   }
   settings.endArray();
 }

app/bluetoothdiscoverymodel.cpp

@@ -40,9 +40,9 @@ QHash<int, QByteArray> BluetoothDiscoveryModel::roleNames() const
   QHash<int, QByteArray> roles;
 
 #ifdef HAVE_BLUETOOTH
-  roles.insert( DataRoles::DeviceAddress, "DeviceAddress" );
-  roles.insert( DataRoles::DeviceName, "DeviceName" );
-  roles.insert( DataRoles::SignalStrength, "SignalStrength" );
+  roles.insert( DataRoles::DeviceAddress, "deviceAddress" );
+  roles.insert( DataRoles::DeviceName, "deviceName" );
+  roles.insert( DataRoles::SignalStrength, "signalStrength" );
 #endif
 
   return roles;

app/icons/icons.qrc

@@ -7,6 +7,7 @@
         <file>ArrowLinkRight.svg</file>
         <file>ArrowUp.svg</file>
         <file>Back.svg</file>
+        <file>Bluetooth.svg</file>
         <file>Briefcase.svg</file>
         <file>Calendar.svg</file>
         <file>Checkmark.svg</file>
@@ -58,6 +59,7 @@
         <file>Mouth.svg</file>
         <file>NaturalResources.svg</file>
         <file>Next.svg</file>
+        <file>Network.svg</file>
         <file>Other.svg</file>
         <file>Others.svg</file>
         <file>Personal.svg</file>