Fix:Android:OSM license, where its not so ugly to view

git-svn-id: https://navit.svn.sourceforge.net/svnroot/navit/trunk@4277 ffa7fe5e-494d-0410-b361-a75ebd5db220

diff --git a/navit/navit/android/src/org/navitproject/navit/Navit.java b/navit/navit/android/src/org/navitproject/navit/Navit.java
index 1829dc7..40a5dbc 100644 (file)
--- a/navit/navit/android/src/org/navitproject/navit/Navit.java
+++ b/navit/navit/android/src/org/navitproject/navit/Navit.java
@@ -1329,6 +1329,8 @@ public class Navit extends Activity implements Handler.Callback
                                progressThread_pri = mapdownloader_pri.new ProgressThread(progress_handler,\r
                                                NavitMapDownloader.OSM_MAPS[Navit.download_map_id], MAP_NUM_PRIMARY);\r
                                progressThread_pri.start();\r
+                               // show license for OSM maps\r
+                               Toast.makeText(getApplicationContext(), "Map data (c) OpenStreetMap contributors, CC-BY-SA", Toast.LENGTH_LONG).show(); //TRANS\r
                                return mapdownloader_dialog_pri;\r
                        case Navit.MAPDOWNLOAD_SEC_DIALOG :\r
                                mapdownloader_dialog_sec = new ProgressDialog(this);\r
@@ -1353,6 +1355,8 @@ public class Navit extends Activity implements Handler.Callback
                                progressThread_sec = mapdownloader_sec.new ProgressThread(progress_handler,\r
                                                NavitMapDownloader.OSM_MAPS[Navit.download_map_id], MAP_NUM_SECONDARY);\r
                                progressThread_sec.start();\r
+                               // show license for OSM maps\r
+                               Toast.makeText(getApplicationContext(), "Map data (c) OpenStreetMap contributors, CC-BY-SA", Toast.LENGTH_LONG).show(); //TRANS\r
                                return mapdownloader_dialog_sec;\r
                }\r
                // should never get here!!\r

diff --git a/navit/navit/android/src/org/navitproject/navit/NavitMapDownloader.java b/navit/navit/android/src/org/navitproject/navit/NavitMapDownloader.java
index 0643011..1cb46f1 100644 (file)
--- a/navit/navit/android/src/org/navitproject/navit/NavitMapDownloader.java
+++ b/navit/navit/android/src/org/navitproject/navit/NavitMapDownloader.java
@@ -508,7 +508,8 @@ public class NavitMapDownloader
                        Peru, Uruguay, Venezuela                                                                                                                };\r
        public static String[]                          OSM_MAP_NAME_LIST                                                               = new String[]{\r
 \r
-                       Whole_Planet.map_name, Africa.map_name, Angola.map_name, Burundi.map_name,\r
+                                                                                                                                                                                                       Whole_Planet.map_name,\r
+                       Africa.map_name, Angola.map_name, Burundi.map_name,\r
                        Democratic_Republic_of_the_Congo.map_name, Kenya.map_name, Lesotho.map_name,\r
                        Madagascar.map_name, Nambia_Botswana.map_name, Reunion.map_name, Rwanda.map_name,\r
                        South_Africa.map_name, Uganda.map_name, Asia.map_name, China.map_name, Cyprus.map_name,\r
@@ -779,8 +780,7 @@ public class NavitMapDownloader
                                        b.putString("text", "downloading: " + map_values.map_name + "\n" + " "\r
                                                        + (int) (already_read / 1024f / 1024f) + "Mb / "\r
                                                        + (int) (map_values.est_size_bytes / 1024f / 1024f) + "Mb" + "\n" + " "\r
-                                                       + kbytes_per_second + "kb/s" + " ETA: " + eta_string + "\n" +\r
-                                                       "Map data CC-BY-SA by OpenStreetMap"); //TRANS\r
+                                                       + kbytes_per_second + "kb/s" + " ETA: " + eta_string); //TRANS\r
                                        msg.setData(b);\r
                                        handler.sendMessage(msg);\r
                                        //                                      try\r