Add:port_android:On download completion, move screen position to the center of downloaded area.

git-svn-id: http://svn.code.sf.net/p/navit/code/trunk/navit@6045 ffa7fe5e-494d-0410-b361-a75ebd5db220

2 files changed, 16 insertions, 4 deletions

diff --git a/navit/android/src/org/navitproject/navit/NavitDialogs.java b/navit/android/src/org/navitproject/navit/NavitDialogs.java
index a997eb5b5..1da2ed4f8 100644
--- a/navit/android/src/org/navitproject/navit/NavitDialogs.java
+++ b/navit/android/src/org/navitproject/navit/NavitDialogs.java
@@ -68,11 +68,21 @@ public class NavitDialogs extends Handler{
 			mActivity.dismissDialog(DIALOG_MAPDOWNLOAD);
 			mActivity.removeDialog(DIALOG_MAPDOWNLOAD);
 			if (msg.getData().getInt("value1") == 1) {
-				Message activate_map_msg =
+				Message msg_out =
 				        Message.obtain(Navit.N_NavitGraphics.callback_handler,
 				                NavitGraphics.msg_type.CLB_LOAD_MAP.ordinal());
-				activate_map_msg.setData(msg.getData());
-				activate_map_msg.sendToTarget();
+				msg_out.setData(msg.getData());
+				msg_out.sendToTarget();
+
+				msg_out =  Message.obtain(Navit.N_NavitGraphics.callback_handler,
+				                NavitGraphics.msg_type.CLB_CALL_CMD.ordinal());
+				Bundle b = new Bundle();
+				int mi=msg.getData().getInt("value2");
+				double lon=(Double.parseDouble(NavitMapDownloader.osm_maps[mi].lon1)+Double.parseDouble(NavitMapDownloader.osm_maps[mi].lon2))/2.0;
+				double lat=(Double.parseDouble(NavitMapDownloader.osm_maps[mi].lat1)+Double.parseDouble(NavitMapDownloader.osm_maps[mi].lat2))/2.0;
+				b.putString("cmd", "set_center(\""+ lon +" "+ lat + "\",1); zoom=256");
+				msg_out.setData(b);
+				msg_out.sendToTarget();
 			}
 			break;
 		}
diff --git a/navit/android/src/org/navitproject/navit/NavitMapDownloader.java b/navit/android/src/org/navitproject/navit/NavitMapDownloader.java
index 421758fd6..ae8087819 100644
--- a/navit/android/src/org/navitproject/navit/NavitMapDownloader.java
+++ b/navit/android/src/org/navitproject/navit/NavitMapDownloader.java
@@ -321,6 +321,7 @@ public class NavitMapDownloader extends Thread
 	}

 	private Boolean                     stop_me                                 = false;

 	private osm_map_values              map_values;

+	private int                         map_id;

 	private long                        uiLastUpdated                           = -1;

 

 	private Boolean                     retryDownload                           = false; //Download failed, but

@@ -338,6 +339,7 @@ public class NavitMapDownloader extends Thread
 

 	public NavitMapDownloader(int map_id) {

 		this.map_values = osm_maps[map_id];

+		this.map_id=map_id;

 	}

 

 	public void run() {

@@ -366,7 +368,7 @@ public class NavitMapDownloader extends Thread
 

 		if (success || stop_me ) {

 			NavitDialogs.sendDialogMessage( NavitDialogs.MSG_MAP_DOWNLOAD_FINISHED

-					, MAP_FILENAME_PATH + map_values.map_name + ".bin", null, -1, success ? 1 : 0 , 0 );

+					, MAP_FILENAME_PATH + map_values.map_name + ".bin", null, -1, success ? 1 : 0 , map_id );

 		}

 	}