From 970f16549251dd96d114b1401ba2a949cecc7d43 Mon Sep 17 00:00:00 2001 From: zoff99 Date: Wed, 2 Mar 2011 11:14:11 +0000 Subject: [PATCH] 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 --- navit/navit/android/src/org/navitproject/navit/Navit.java | 4 ++++ .../android/src/org/navitproject/navit/NavitMapDownloader.java | 6 +++--- 2 files changed, 7 insertions(+), 3 deletions(-) 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 --- 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, NavitMapDownloader.OSM_MAPS[Navit.download_map_id], MAP_NUM_PRIMARY); progressThread_pri.start(); + // show license for OSM maps + Toast.makeText(getApplicationContext(), "Map data (c) OpenStreetMap contributors, CC-BY-SA", Toast.LENGTH_LONG).show(); //TRANS return mapdownloader_dialog_pri; case Navit.MAPDOWNLOAD_SEC_DIALOG : mapdownloader_dialog_sec = new ProgressDialog(this); @@ -1353,6 +1355,8 @@ public class Navit extends Activity implements Handler.Callback progressThread_sec = mapdownloader_sec.new ProgressThread(progress_handler, NavitMapDownloader.OSM_MAPS[Navit.download_map_id], MAP_NUM_SECONDARY); progressThread_sec.start(); + // show license for OSM maps + Toast.makeText(getApplicationContext(), "Map data (c) OpenStreetMap contributors, CC-BY-SA", Toast.LENGTH_LONG).show(); //TRANS return mapdownloader_dialog_sec; } // should never get here!! 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 --- 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 }; public static String[] OSM_MAP_NAME_LIST = new String[]{ - Whole_Planet.map_name, Africa.map_name, Angola.map_name, Burundi.map_name, + Whole_Planet.map_name, + Africa.map_name, Angola.map_name, Burundi.map_name, Democratic_Republic_of_the_Congo.map_name, Kenya.map_name, Lesotho.map_name, Madagascar.map_name, Nambia_Botswana.map_name, Reunion.map_name, Rwanda.map_name, South_Africa.map_name, Uganda.map_name, Asia.map_name, China.map_name, Cyprus.map_name, @@ -779,8 +780,7 @@ public class NavitMapDownloader b.putString("text", "downloading: " + map_values.map_name + "\n" + " " + (int) (already_read / 1024f / 1024f) + "Mb / " + (int) (map_values.est_size_bytes / 1024f / 1024f) + "Mb" + "\n" + " " - + kbytes_per_second + "kb/s" + " ETA: " + eta_string + "\n" + - "Map data CC-BY-SA by OpenStreetMap"); //TRANS + + kbytes_per_second + "kb/s" + " ETA: " + eta_string); //TRANS msg.setData(b); handler.sendMessage(msg); // try -- 2.7.4