[android] Added saddr/daddr input parameters to build route intentbeta-949

2 files changed, 27 insertions, 14 deletions

diff --git a/android/src/com/mapswithme/maps/DownloadResourcesLegacyActivity.java b/android/src/com/mapswithme/maps/DownloadResourcesLegacyActivity.java
index 42f0e9d59b..778176be81 100644
--- a/android/src/com/mapswithme/maps/DownloadResourcesLegacyActivity.java
+++ b/android/src/com/mapswithme/maps/DownloadResourcesLegacyActivity.java
@@ -864,6 +864,8 @@ public class DownloadResourcesLegacyActivity extends BaseMwmFragmentActivity
     private static final String EXTRA_LON_TO = "lon_to";
     private static final String EXTRA_LAT_FROM = "lat_from";
     private static final String EXTRA_LON_FROM = "lon_from";
+    private static final String EXTRA_SADDR = "saddr";
+    private static final String EXTRA_DADDR = "daddr";
     private static final String EXTRA_ROUTER = "router";
 
     @Override
@@ -878,6 +880,8 @@ public class DownloadResourcesLegacyActivity extends BaseMwmFragmentActivity
       if (!intent.hasExtra(EXTRA_LAT_TO) || !intent.hasExtra(EXTRA_LON_TO))
         return false;
 
+      String saddr = intent.getStringExtra(EXTRA_SADDR);
+      String daddr = intent.getStringExtra(EXTRA_DADDR);
       double latTo = getCoordinateFromIntent(intent, EXTRA_LAT_TO);
       double lonTo = getCoordinateFromIntent(intent, EXTRA_LON_TO);
       boolean hasFrom = intent.hasExtra(EXTRA_LAT_FROM) && intent.hasExtra(EXTRA_LON_FROM);
@@ -887,14 +891,15 @@ public class DownloadResourcesLegacyActivity extends BaseMwmFragmentActivity
       {
         double latFrom = getCoordinateFromIntent(intent, EXTRA_LAT_FROM);
         double lonFrom = getCoordinateFromIntent(intent, EXTRA_LON_FROM);
-        mMapTaskToForward = new MwmActivity.BuildRouteTask(latTo, lonTo, latFrom,lonFrom,
-                                                           intent.getStringExtra(EXTRA_ROUTER));
+        mMapTaskToForward = new MwmActivity.BuildRouteTask(latTo, lonTo, saddr, latFrom,lonFrom,
+                                                           daddr, intent.getStringExtra(EXTRA_ROUTER));
       }
       else if (hasFrom)
       {
         double latFrom = getCoordinateFromIntent(intent, EXTRA_LAT_FROM);
         double lonFrom = getCoordinateFromIntent(intent, EXTRA_LON_FROM);
-        mMapTaskToForward = new MwmActivity.BuildRouteTask(latTo, lonTo, latFrom,lonFrom);
+        mMapTaskToForward = new MwmActivity.BuildRouteTask(latTo, lonTo, saddr,
+                                                           latFrom,lonFrom, daddr);
       }
       else
       {
diff --git a/android/src/com/mapswithme/maps/MwmActivity.java b/android/src/com/mapswithme/maps/MwmActivity.java
index 25cc849237..ed90c6a318 100644
--- a/android/src/com/mapswithme/maps/MwmActivity.java
+++ b/android/src/com/mapswithme/maps/MwmActivity.java
@@ -2265,31 +2265,39 @@ public class MwmActivity extends BaseMwmFragmentActivity
     @Nullable
     private final Double mLonFrom;
     @Nullable
+    private final String mSaddr;
+    @Nullable
+    private final String mDaddr;
     private final String mRouter;
 
     @NonNull
-    private static MapObject fromLatLon(double lat, double lon)
+    private static MapObject fromLatLon(double lat, double lon, @Nullable String addr)
     {
-      return MapObject.createMapObject(FeatureId.EMPTY, MapObject.API_POINT, "", "", lat, lon);
+      return MapObject.createMapObject(FeatureId.EMPTY, MapObject.API_POINT,
+                                       TextUtils.isEmpty(addr) ? "" : addr, "", lat, lon);
     }
 
     BuildRouteTask(double latTo, double lonTo)
     {
-      this(latTo, lonTo, null, null, null);
+      this(latTo, lonTo, null, null, null, null, null);
     }
 
-    BuildRouteTask(double latTo, double lonTo, @Nullable Double latFrom, @Nullable Double lonFrom)
+    BuildRouteTask(double latTo, double lonTo, @Nullable String saddr,
+                   @Nullable Double latFrom, @Nullable Double lonFrom, @Nullable String daddr)
     {
-      this(latTo, lonTo, latFrom, lonFrom, null);
+      this(latTo, lonTo, saddr, latFrom, lonFrom, daddr, null);
     }
 
-    BuildRouteTask(double latTo, double lonTo, @Nullable Double latFrom, @Nullable Double lonFrom,
+    BuildRouteTask(double latTo, double lonTo, @Nullable String saddr,
+                   @Nullable Double latFrom, @Nullable Double lonFrom, @Nullable String daddr,
                    @Nullable String router)
     {
       mLatTo = latTo;
       mLonTo = lonTo;
       mLatFrom = latFrom;
       mLonFrom = lonFrom;
+      mSaddr = saddr;
+      mDaddr = daddr;
       mRouter = router;
     }
 
@@ -2318,17 +2326,17 @@ public class MwmActivity extends BaseMwmFragmentActivity
 
       if (mLatFrom != null && mLonFrom != null && routerType >= 0)
       {
-        RoutingController.get().prepare(fromLatLon(mLatFrom, mLonFrom),
-                                        fromLatLon(mLatTo, mLonTo), routerType, true);
+        RoutingController.get().prepare(fromLatLon(mLatFrom, mLonFrom, mSaddr),
+                                        fromLatLon(mLatTo, mLonTo, mDaddr), routerType, true);
       }
       else if (mLatFrom != null && mLonFrom != null)
       {
-        RoutingController.get().prepare(fromLatLon(mLatFrom, mLonFrom),
-                                        fromLatLon(mLatTo, mLonTo), true);
+        RoutingController.get().prepare(fromLatLon(mLatFrom, mLonFrom, mSaddr),
+                                        fromLatLon(mLatTo, mLonTo, mDaddr), true);
       }
       else
       {
-        RoutingController.get().prepare(fromLatLon(mLatTo, mLonTo), true);
+        RoutingController.get().prepare(fromLatLon(mLatTo, mLonTo, mDaddr), true);
       }
       return true;
     }