[android] Added location and compass support

android/jni/android_framework.cpp

@@ -123,3 +123,40 @@ void AndroidFramework::Zoom(int mode, double x1, double y1, double x2, double y2
   case 2: m_work.StopScale(e); break;
   }
 }
+
+void f()
+{
+  // empty location stub
+}
+
+void AndroidFramework::EnableLocation(bool enable)
+{
+  if (enable)
+    m_work.StartLocationService(bind(&f));
+  else
+    m_work.StopLocationService();
+}
+
+void AndroidFramework::UpdateLocation(uint64_t timestamp, double lat, double lon, float accuracy)
+{
+  location::GpsInfo info;
+  info.m_timestamp = static_cast<double>(timestamp);
+  info.m_latitude = lat;
+  info.m_longitude = lon;
+  info.m_horizontalAccuracy = accuracy;
+  info.m_status = location::EAccurateMode;
+  info.m_altitude = 0;
+  info.m_course = 0;
+  info.m_verticalAccuracy = 0;
+  m_work.OnGpsUpdate(info);
+}
+
+void AndroidFramework::UpdateCompass(uint64_t timestamp, double magneticNorth, double trueNorth, float accuracy)
+{
+  location::CompassInfo info;
+  info.m_timestamp = static_cast<double>(timestamp);
+  info.m_magneticHeading = magneticNorth;
+  info.m_trueHeading = trueNorth;
+  info.m_accuracy = accuracy;
+  m_work.OnCompassUpdate(info);
+}

android/jni/android_framework.hpp

@@ -45,4 +45,8 @@ public:
 
   void Move(int mode, double x, double y);
   void Zoom(int mode, double x1, double y1, double x2, double y2);
+
+  void EnableLocation(bool enable);
+  void UpdateLocation(uint64_t timestamp, double lat, double lon, float accuracy);
+  void UpdateCompass(uint64_t timestamp, double magneticNorth, double trueNorth, float accuracy);
 };

android/jni/main_native.cpp

@@ -134,4 +134,29 @@ Java_com_mapswithme_maps_DownloadUI_countryStatus(JNIEnv * env, jobject thiz,
   return static_cast<jint>(g_work->Storage().CountryStatus(storage::TIndex(group, country, region)));
 }
 
+///////////////////////////////////////////////////////////////////////////////////
+// LocationService
+///////////////////////////////////////////////////////////////////////////////////
+
+JNIEXPORT void JNICALL
+Java_com_mapswithme_maps_location_LocationService_nativeEnableLocationService(JNIEnv * env, jobject thiz,
+    jboolean enable)
+{
+  g_work->EnableLocation(enable);
+}
+
+JNIEXPORT void JNICALL
+Java_com_mapswithme_maps_location_LocationService_nativeLocationChanged(JNIEnv * env, jobject thiz,
+    jlong time, jdouble lat, jdouble lon, jfloat accuracy)
+{
+  g_work->UpdateLocation(time, lat, lon, accuracy);
+}
+
+JNIEXPORT void JNICALL
+Java_com_mapswithme_maps_location_LocationService_nativeCompassChanged(JNIEnv * env, jobject thiz,
+    jlong time, jdouble magneticNorth, jdouble trueNorth, jfloat accuracy)
+{
+  g_work->UpdateCompass(time, magneticNorth, trueNorth, accuracy);
+}
+
 } // extern "C"

android/src/com/mapswithme/maps/MWMActivity.java

@@ -4,8 +4,10 @@ import java.io.File;
 
 import com.mapswithme.maps.MainGLView;
 import com.mapswithme.maps.R;
+import com.mapswithme.maps.location.LocationService;
 
 import android.app.Activity;
+import android.content.Intent;
 import android.content.pm.ApplicationInfo;
 import android.content.pm.PackageManager;
 import android.content.pm.PackageManager.NameNotFoundException;
@@ -23,6 +25,8 @@ public class MWMActivity extends Activity
   
   private MainGLView m_view;
 
+  private boolean m_locationEnabled = false;
+
   private String getAppBundlePath() throws NameNotFoundException
   {
     PackageManager packMgmr = getApplication().getPackageManager();
@@ -65,6 +69,8 @@ public class MWMActivity extends Activity
   {
     super.onPause();
     m_view.onPause();
+    if (m_locationEnabled)
+      LocationService.stop();
   }
 
   @Override
@@ -72,6 +78,8 @@ public class MWMActivity extends Activity
   {
     super.onResume();
     m_view.onResume();
+    if (m_locationEnabled)
+      LocationService.start(this);
   }
 
   @Override
@@ -89,10 +97,15 @@ public class MWMActivity extends Activity
     switch (item.getItemId())
     {
     case R.id.my_position:
-      Log.i(TAG, "onMyPosition");
+      if (m_locationEnabled)
+        LocationService.stop();
+      else
+        LocationService.start(this);
+      m_locationEnabled = !m_locationEnabled;
       return true;
     case R.id.download_maps:
-      Log.i(TAG, "onDownloadMaps");
+      Intent intent = new Intent(this, DownloadUI.class);
+      startActivity(intent);
       return true;
     default:
       return super.onOptionsItemSelected(item);

map/framework.cpp

@@ -72,11 +72,8 @@ void Framework<TModel>::OnGpsUpdate(location::GpsInfo const & info)
 template <typename TModel>
 void Framework<TModel>::OnCompassUpdate(location::CompassInfo const & info)
 {
-  if (info.m_timestamp < location::POSITION_TIMEOUT_SECONDS)
-  {
-    m_locationState.UpdateCompass(info);
-    Invalidate();
-  }
+  m_locationState.UpdateCompass(info);
+  Invalidate();
 }
 
 template <typename TModel>

map/framework.hpp

@@ -133,12 +133,11 @@ protected:
   void AddMap(string const & file);
   void RemoveMap(string const & datFile);
 
+public:
   void OnGpsUpdate(location::GpsInfo const & info);
 
   void OnCompassUpdate(location::CompassInfo const & info);
 
-public:
-
   Framework(shared_ptr<WindowHandle> windowHandle,
             size_t bottomShift);