summaryrefslogtreecommitdiff
path: root/navit
diff options
context:
space:
mode:
authorzoff99 <zoff99@ffa7fe5e-494d-0410-b361-a75ebd5db220>2011-02-19 09:31:47 +0000
committerzoff99 <zoff99@ffa7fe5e-494d-0410-b361-a75ebd5db220>2011-02-19 09:31:47 +0000
commit953deb9c705d8ad32d5d14345b912078c6c04206 (patch)
tree1054635724f3e3125617f29181564298eedcbe17 /navit
parent9c70ec8f1cc3d41f90fb1c8d5c25520256c6239e (diff)
downloadnavit-953deb9c705d8ad32d5d14345b912078c6c04206.tar.gz
Fix:Android:map download -> longer list and a few tweaks for speed
git-svn-id: http://svn.code.sf.net/p/navit/code/trunk/navit@4209 ffa7fe5e-494d-0410-b361-a75ebd5db220
Diffstat (limited to 'navit')
-rw-r--r--navit/android/src/org/navitproject/navit/NavitMapDownloader.java452
1 files changed, 398 insertions, 54 deletions
diff --git a/navit/android/src/org/navitproject/navit/NavitMapDownloader.java b/navit/android/src/org/navitproject/navit/NavitMapDownloader.java
index c5788a989..b80ad3044 100644
--- a/navit/android/src/org/navitproject/navit/NavitMapDownloader.java
+++ b/navit/android/src/org/navitproject/navit/NavitMapDownloader.java
@@ -44,10 +44,10 @@ public class NavitMapDownloader
String lon2;
String lat2;
String map_name = "";
- int est_size_bytes = 0;
+ long est_size_bytes = 0;
public osm_map_values(String mapname, String lon_1, String lat_1, String lon_2, String lat_2,
- int bytes_est)
+ long bytes_est)
{
this.map_name = mapname;
this.lon1 = lon_1;
@@ -68,28 +68,390 @@ public class NavitMapDownloader
//
// define the maps here
// name , lon1 , lat1 , lon2 , lat2, est. size in bytes
- public static osm_map_values austria = new osm_map_values("Austria",
- "9.4", "46.32", "17.21",
- "49.1", 222000000);
- public static osm_map_values benelux = new osm_map_values("BeNeLux",
- "2.08", "48.87", "7.78",
- "54.52", 530000000);
- public static osm_map_values germany = new osm_map_values("Germany",
- "5.18", "46.84", "15.47",
- "55.64", 943000000);
- public static osm_map_values[] OSM_MAPS = new osm_map_values[]{
- NavitMapDownloader.austria, NavitMapDownloader.germany, NavitMapDownloader.benelux};
- public static String[] OSM_MAP_NAME_LIST = new String[]{
- NavitMapDownloader.OSM_MAPS[0].map_name, NavitMapDownloader.OSM_MAPS[1].map_name,
- NavitMapDownloader.OSM_MAPS[2].map_name };
-
- public Boolean stop_me = false;
- static final int SOCKET_CONNECT_TIMEOUT = 6000;
- static final int SOCKET_READ_TIMEOUT = 6000;
- static final int MAP_WRITE_FILE_BUFFER = 1024 * 64;
- static final int MAP_WRITE_MEM_BUFFER = 1024 * 64;
- static final int MAP_READ_FILE_BUFFER = 1024 * 64;
- static final int UPDATE_PROGRESS_EVERY_CYCLE = 2;
+ /*
+ * public static osm_map_values austria = new osm_map_values("Austria",
+ * "9.4", "46.32", "17.21",
+ * "49.1", 222000000);
+ * public static osm_map_values benelux = new osm_map_values("BeNeLux",
+ * "2.08", "48.87", "7.78",
+ * "54.52", 530000000);
+ * public static osm_map_values germany = new osm_map_values("Germany",
+ * "5.18", "46.84", "15.47",
+ * "55.64", 943000000);
+ */
+
+
+ public static osm_map_values Whole_Planet = new osm_map_values(
+ "Whole Planet",
+ "-180",
+ "-90",
+ "180",
+ "90",
+ (long) (5.6 * 1024 * 1024 * 1024));
+ public static osm_map_values Africa = new osm_map_values("Africa",
+ "-20.8", "-35.2",
+ "52.5", "37.4", 20);
+ public static osm_map_values Angola = new osm_map_values("Angola",
+ "11.4", "-18.1", "24.2",
+ "-5.3", 20);
+ public static osm_map_values Burundi = new osm_map_values(
+ "Burundi", "28.9",
+ "-4.5", "30.9", "-2.2",
+ 20);
+ public static osm_map_values Democratic_Republic_of_the_Congo = new osm_map_values(
+ "Democratic Republic of the Congo",
+ "11.7", "-13.6", "31.5",
+ "5.7", 20);
+ public static osm_map_values Kenya = new osm_map_values("Kenya",
+ "33.8", "-5.2", "42.4",
+ "4.9", 20);
+ public static osm_map_values Lesotho = new osm_map_values(
+ "Lesotho", "26.9",
+ "-30.7", "29.6",
+ "-28.4", 20);
+ public static osm_map_values Madagascar = new osm_map_values(
+ "Madagascar", "43.0",
+ "-25.8", "50.8",
+ "-11.8", 20);
+ public static osm_map_values Nambia_Botswana = new osm_map_values(
+ "Nambia+Botswana",
+ "11.4", "-29.1", "29.5",
+ "-16.9", 20);
+ public static osm_map_values Reunion = new osm_map_values(
+ "Reunion", "55.2",
+ "-21.4", "55.9",
+ "-20.9", 20);
+ public static osm_map_values Rwanda = new osm_map_values("Rwanda",
+ "28.8", "-2.9", "30.9",
+ "-1.0", 20);
+ public static osm_map_values South_Africa = new osm_map_values(
+ "South Africa", "15.6",
+ "-35.2", "33.3",
+ "-21.9", 20);
+ public static osm_map_values Uganda = new osm_map_values("Uganda",
+ "29.3", "-1.6", "35.1",
+ "4.3", 20);
+ public static osm_map_values Asia = new osm_map_values("Asia",
+ "23.8", "0.1", "195.0",
+ "82.4", 20);
+ public static osm_map_values China = new osm_map_values("China",
+ "67.3", "5.3", "135.0",
+ "54.5", 20);
+ public static osm_map_values Cyprus = new osm_map_values("Cyprus",
+ "32.0", "34.5", "34.9",
+ "35.8", 20);
+ public static osm_map_values India_Nepal = new osm_map_values(
+ "India+Nepal", "67.9",
+ "5.5", "89.6", "36.0",
+ 20);
+ public static osm_map_values Indonesia = new osm_map_values(
+ "Indonesia", "93.7",
+ "-17.3", "155.5", "7.6",
+ 20);
+ public static osm_map_values Iran = new osm_map_values("Iran",
+ "43.5", "24.4", "63.6",
+ "40.4", 20);
+ public static osm_map_values Iraq = new osm_map_values("Iraq",
+ "38.7", "28.5", "49.2",
+ "37.4", 20);
+ public static osm_map_values Israel = new osm_map_values("Israel",
+ "33.99", "29.8",
+ "35.95", "33.4", 20);
+ public static osm_map_values Japan_Korea_Taiwan = new osm_map_values(
+ "Japan+Korea+Taiwan",
+ "117.6", "20.5",
+ "151.3", "47.1", 20);
+ public static osm_map_values Malasia_Singapore = new osm_map_values(
+ "Malasia+Singapore",
+ "94.3", "-5.9", "108.6",
+ "6.8", 20);
+ public static osm_map_values Mongolia = new osm_map_values(
+ "Mongolia", "87.5",
+ "41.4", "120.3", "52.7",
+ 20);
+ public static osm_map_values Thailand = new osm_map_values(
+ "Thailand", "97.5",
+ "5.7", "105.2", "19.7",
+ 20);
+ public static osm_map_values Turkey = new osm_map_values("Turkey",
+ "25.1", "35.8", "46.4",
+ "42.8", 20);
+ public static osm_map_values UAE_Other = new osm_map_values(
+ "UAE+Other", "51.5",
+ "22.6", "56.7", "26.5",
+ 20);
+ public static osm_map_values Australia = new osm_map_values(
+ "Australia", "110.5",
+ "-44.2", "154.9",
+ "-9.2", 20);
+ public static osm_map_values Tasmania = new osm_map_values(
+ "Tasmania", "144.0",
+ "-45.1", "155.3",
+ "-24.8", 20);
+ public static osm_map_values Victoria_New_South_Wales = new osm_map_values(
+ "Victoria+New South Wales",
+ "140.7", "-39.4",
+ "153.7", "-26.9", 20);
+ public static osm_map_values New_Zealand = new osm_map_values(
+ "New Zealand", "165.2",
+ "-47.6", "179.1",
+ "-33.7", 20);
+ public static osm_map_values Europe = new osm_map_values("Europe",
+ "-12.97", "33.59",
+ "34.15", "72.10", 20);
+ public static osm_map_values Western_Europe = new osm_map_values(
+ "Western Europe",
+ "-17.6", "34.5", "42.9",
+ "70.9", 20);
+ public static osm_map_values Austria = new osm_map_values(
+ "Austria", "9.4",
+ "46.32", "17.21",
+ "49.1", 20);
+ public static osm_map_values BeNeLux = new osm_map_values(
+ "BeNeLux", "2.08",
+ "48.87", "7.78",
+ "54.52", 20);
+ public static osm_map_values Faroe_Islands = new osm_map_values(
+ "Faroe Islands", "-7.8",
+ "61.3", "-6.1", "62.5",
+ 20);
+ public static osm_map_values France = new osm_map_values("France",
+ "-5.45", "42.00",
+ "8.44", "51.68", 20);
+ public static osm_map_values Germany = new osm_map_values(
+ "Germany", "5.18",
+ "46.84", "15.47",
+ "55.64", 20);
+ public static osm_map_values Bavaria = new osm_map_values(
+ "Bavaria", "10.3",
+ "47.8", "13.6", "49.7",
+ 20);
+ public static osm_map_values Saxonia = new osm_map_values(
+ "Saxonia", "11.8",
+ "50.1", "15.0", "51.7",
+ 20);
+ public static osm_map_values Germany_Austria_Switzerland = new osm_map_values(
+ "Germany+Austria+Switzerland",
+ "3.4", "44.5", "18.6",
+ "55.1", 20);
+ public static osm_map_values Iceland = new osm_map_values(
+ "Iceland", "-25.3",
+ "62.8", "-11.4", "67.5",
+ 20);
+ public static osm_map_values Ireland = new osm_map_values(
+ "Ireland", "-11.17",
+ "51.25", "-5.23",
+ "55.9", 20);
+ public static osm_map_values Italy = new osm_map_values("Italy",
+ "6.52", "36.38",
+ "18.96", "47.19", 20);
+ public static osm_map_values Spain_Portugal = new osm_map_values(
+ "Spain+Portugal",
+ "-11.04", "34.87",
+ "4.62", "44.41", 20);
+ public static osm_map_values Mallorca = new osm_map_values(
+ "Mallorca", "2.2",
+ "38.8", "4.7", "40.2",
+ 20);
+ public static osm_map_values Galicia = new osm_map_values(
+ "Galicia", "-10.0",
+ "41.7", "-6.3", "44.1",
+ 20);
+ public static osm_map_values Scandinavia = new osm_map_values(
+ "Scandinavia", "4.0",
+ "54.4", "32.1", "71.5",
+ 20);
+ public static osm_map_values Finland = new osm_map_values(
+ "Finland", "18.6",
+ "59.2", "32.3", "70.3",
+ 20);
+ public static osm_map_values Denmark = new osm_map_values(
+ "Denmark", "7.49",
+ "54.33", "13.05",
+ "57.88", 20);
+ public static osm_map_values Switzerland = new osm_map_values(
+ "Switzerland", "5.79",
+ "45.74", "10.59",
+ "47.84", 20);
+ public static osm_map_values UK = new osm_map_values("UK",
+ "-9.7", "49.6", "2.2",
+ "61.2", 20);
+ public static osm_map_values Bulgaria = new osm_map_values(
+ "Bulgaria", "24.7",
+ "42.1", "24.8", "42.1",
+ 20);
+ public static osm_map_values Czech_Republic = new osm_map_values(
+ "Czech Republic",
+ "11.91", "48.48",
+ "19.02", "51.17", 20);
+ public static osm_map_values Croatia = new osm_map_values(
+ "Croatia", "13.4",
+ "42.1", "19.4", "46.9",
+ 20);
+ public static osm_map_values Estonia = new osm_map_values(
+ "Estonia", "21.5",
+ "57.5", "28.2", "59.6",
+ 20);
+ public static osm_map_values Greece = new osm_map_values("Greece",
+ "28.9", "37.8", "29.0",
+ "37.8", 20);
+ public static osm_map_values Crete = new osm_map_values("Crete",
+ "23.3", "34.5", "26.8",
+ "36.0", 20);
+ public static osm_map_values Hungary = new osm_map_values(
+ "Hungary", "16.08",
+ "45.57", "23.03",
+ "48.39", 20);
+ public static osm_map_values Latvia = new osm_map_values("Latvia",
+ "20.7", "55.6", "28.3",
+ "58.1", 20);
+ public static osm_map_values Lithuania = new osm_map_values(
+ "Lithuania", "20.9",
+ "53.8", "26.9", "56.5",
+ 20);
+ public static osm_map_values Poland = new osm_map_values("Poland",
+ "13.6", "48.8", "24.5",
+ "55.0", 20);
+ public static osm_map_values Romania = new osm_map_values(
+ "Romania", "20.3",
+ "43.5", "29.9", "48.4",
+ 20);
+ public static osm_map_values North_America = new osm_map_values(
+ "North America",
+ "-178.1", "6.5",
+ "-10.4", "84.0", 20);
+ public static osm_map_values Alaska = new osm_map_values("Alaska",
+ "-179.5", "49.5",
+ "-129", "71.6", 20);
+ public static osm_map_values Canada = new osm_map_values("Canada",
+ "-141.3", "41.5",
+ "-52.2", "70.2", 20);
+ public static osm_map_values Hawaii = new osm_map_values("Hawaii",
+ "-161.07", "18.49",
+ "-154.45", "22.85", 20);
+ public static osm_map_values USA__except_Alaska_and_Hawaii_ = new osm_map_values(
+ "USA (except Alaska and Hawaii)",
+ "-125.4", "24.3",
+ "-66.5", "49.3", 20);
+ public static osm_map_values Nevada = new osm_map_values("Nevada",
+ "-120.2", "35.0",
+ "-113.8", "42.1", 20);
+ public static osm_map_values Oregon = new osm_map_values("Oregon",
+ "-124.8", "41.8",
+ "-116.3", "46.3", 20);
+ public static osm_map_values Washington_State = new osm_map_values(
+ "Washington State",
+ "-125.0", "45.5",
+ "-116.9", "49.0", 20);
+ public static osm_map_values South_Middle_America = new osm_map_values(
+ "South+Middle America",
+ "-83.5", "-56.3",
+ "-30.8", "13.7", 20);
+ public static osm_map_values Argentina = new osm_map_values(
+ "Argentina", "-73.9",
+ "-57.3", "-51.6",
+ "-21.0", 20);
+ public static osm_map_values Argentina_Chile = new osm_map_values(
+ "Argentina+Chile",
+ "-77.2", "-56.3",
+ "-52.7", "-16.1", 20);
+ public static osm_map_values Bolivia = new osm_map_values(
+ "Bolivia", "-70.5",
+ "-23.1", "-57.3",
+ "-9.3", 20);
+ public static osm_map_values Brazil = new osm_map_values("Brazil",
+ "-71.4", "-34.7",
+ "-32.8", "5.4", 20);
+ public static osm_map_values Cuba = new osm_map_values("Cuba",
+ "-85.3", "19.6",
+ "-74.0", "23.6", 20);
+ public static osm_map_values Colombia = new osm_map_values(
+ "Colombia", "-79.1",
+ "-4.0", "-66.7", "12.6",
+ 20);
+ public static osm_map_values Ecuador = new osm_map_values(
+ "Ecuador", "-82.6",
+ "-5.4", "-74.4", "2.3",
+ 20);
+ public static osm_map_values Guyana_Suriname_Guyane_Francaise = new osm_map_values(
+ "Guyana+Suriname+Guyane Francaise",
+ "-62.0", "1.0", "-51.2",
+ "8.9", 20);
+ public static osm_map_values Haiti_Republica_Dominicana = new osm_map_values(
+ "Haiti+Republica Dominicana",
+ "-74.8", "17.3",
+ "-68.2", "20.1", 20);
+ public static osm_map_values Jamaica = new osm_map_values(
+ "Jamaica", "-78.6",
+ "17.4", "-75.9", "18.9",
+ 20);
+ public static osm_map_values Mexico = new osm_map_values("Mexico",
+ "-117.6", "14.1",
+ "-86.4", "32.8", 20);
+ public static osm_map_values Paraguay = new osm_map_values(
+ "Paraguay", "-63.8",
+ "-28.1", "-53.6",
+ "-18.8", 20);
+ public static osm_map_values Peru = new osm_map_values("Peru",
+ "-82.4", "-18.1",
+ "-67.5", "0.4", 20);
+ public static osm_map_values Uruguay = new osm_map_values(
+ "Uruguay", "-59.2",
+ "-36.5", "-51.7",
+ "-29.7", 20);
+ public static osm_map_values Venezuela = new osm_map_values(
+ "Venezuela", "-73.6",
+ "0.4", "-59.7", "12.8",
+ 20);
+
+
+ public static osm_map_values[] OSM_MAPS = new osm_map_values[]{
+ Whole_Planet, Africa, Angola, Burundi, Democratic_Republic_of_the_Congo, Kenya, Lesotho,
+ Madagascar, Nambia_Botswana, Reunion, Rwanda, South_Africa, Uganda, Asia, China, Cyprus,
+ India_Nepal, Indonesia, Iran, Iraq, Israel, Japan_Korea_Taiwan, Malasia_Singapore,
+ Mongolia, Nambia_Botswana, Thailand, Turkey, UAE_Other, Australia, Tasmania,
+ Victoria_New_South_Wales, New_Zealand, Europe, Western_Europe, Austria, BeNeLux,
+ Faroe_Islands, France, Germany, Bavaria, Saxonia, Germany_Austria_Switzerland, Iceland,
+ Ireland, Italy, Spain_Portugal, Mallorca, Galicia, Scandinavia, Finland, Denmark,
+ Switzerland, UK, Bulgaria, Czech_Republic, Croatia, Estonia, Greece, Crete, Hungary,
+ Latvia, Lithuania, Poland, Romania, North_America, Alaska, Canada, Hawaii,
+ USA__except_Alaska_and_Hawaii_, Nevada, Oregon, Washington_State, South_Middle_America,
+ Argentina, Argentina_Chile, Bolivia, Brazil, Cuba, Colombia, Ecuador,
+ Guyana_Suriname_Guyane_Francaise, Haiti_Republica_Dominicana, Jamaica, Mexico, Paraguay,
+ 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,
+ 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,
+ India_Nepal.map_name, Indonesia.map_name, Iran.map_name, Iraq.map_name, Israel.map_name,
+ Japan_Korea_Taiwan.map_name, Malasia_Singapore.map_name, Mongolia.map_name,
+ Nambia_Botswana.map_name, Thailand.map_name, Turkey.map_name, UAE_Other.map_name,
+ Australia.map_name, Tasmania.map_name, Victoria_New_South_Wales.map_name,
+ New_Zealand.map_name, Europe.map_name, Western_Europe.map_name, Austria.map_name,
+ BeNeLux.map_name, Faroe_Islands.map_name, France.map_name, Germany.map_name,
+ Bavaria.map_name, Saxonia.map_name, Germany_Austria_Switzerland.map_name,
+ Iceland.map_name, Ireland.map_name, Italy.map_name, Spain_Portugal.map_name,
+ Mallorca.map_name, Galicia.map_name, Scandinavia.map_name, Finland.map_name,
+ Denmark.map_name, Switzerland.map_name, UK.map_name, Bulgaria.map_name,
+ Czech_Republic.map_name, Croatia.map_name, Estonia.map_name, Greece.map_name,
+ Crete.map_name, Hungary.map_name, Latvia.map_name, Lithuania.map_name, Poland.map_name,
+ Romania.map_name, North_America.map_name, Alaska.map_name, Canada.map_name,
+ Hawaii.map_name, USA__except_Alaska_and_Hawaii_.map_name, Nevada.map_name,
+ Oregon.map_name, Washington_State.map_name, South_Middle_America.map_name,
+ Argentina.map_name, Argentina_Chile.map_name, Bolivia.map_name, Brazil.map_name,
+ Cuba.map_name, Colombia.map_name, Ecuador.map_name,
+ Guyana_Suriname_Guyane_Francaise.map_name, Haiti_Republica_Dominicana.map_name,
+ Jamaica.map_name, Mexico.map_name, Paraguay.map_name, Peru.map_name, Uruguay.map_name,
+ Venezuela.map_name };
+
+ public Boolean stop_me = false;
+ static final int SOCKET_CONNECT_TIMEOUT = 6000;
+ static final int SOCKET_READ_TIMEOUT = 6000;
+ static final int MAP_WRITE_FILE_BUFFER = 1024 * 64;
+ static final int MAP_WRITE_MEM_BUFFER = 1024 * 64;
+ static final int MAP_READ_FILE_BUFFER = 1024 * 64;
+ static final int UPDATE_PROGRESS_EVERY_CYCLE = 8;
public class ProgressThread extends Thread
@@ -139,7 +501,7 @@ public class NavitMapDownloader
Message msg = handler.obtainMessage();
Bundle b = new Bundle();
msg.what = 1;
- b.putInt("max", map_values.est_size_bytes);
+ b.putInt("max", 20); // use a dummy number here
b.putInt("cur", 0);
b.putString("title", "Mapdownload");
b.putString("text", "downloading: " + map_values.map_name);
@@ -171,19 +533,21 @@ public class NavitMapDownloader
c.setDoOutput(true);
c.setReadTimeout(SOCKET_READ_TIMEOUT);
c.setConnectTimeout(SOCKET_CONNECT_TIMEOUT);
- int real_size_bytes = c.getContentLength();
+ long real_size_bytes = c.getContentLength();
c.connect();
- if (real_size_bytes > 0)
+ Log.d("NavitMapDownloader", "real size in bytes: " + real_size_bytes);
+ if (real_size_bytes > 20)
{
// change the estimated filesize to reported filesize
map_values.est_size_bytes = real_size_bytes;
}
+ Log.d("NavitMapDownloader", "size in bytes: " + map_values.est_size_bytes);
File file = new File(PATH);
File outputFile = new File(file, fileName);
File final_outputFile = new File(file, final_fileName);
- // tests have shown that deleting the file first is sometimes faster -> so we delete it (who cares)
+ // tests have shown that deleting the file first is sometimes faster -> so we delete it (who knows)
outputFile.delete();
// seems this command overwrites the output file anyway
FileOutputStream fos = new FileOutputStream(outputFile);
@@ -198,29 +562,23 @@ public class NavitMapDownloader
int alt = UPDATE_PROGRESS_EVERY_CYCLE; // show progress about every xx cylces
int alt_cur = 0;
String kbytes_per_second = "";
- //long last_timestamp = 0;
long start_timestamp = System.currentTimeMillis();
- //int last_bytes = 0;
NumberFormat formatter = new DecimalFormat("00000.0");
String eta_string = "";
float per_second_overall = 0f;
- int bytes_remaining = 0;
+ long bytes_remaining = 0;
int eta_seconds = 0;
- //while ((len1 = is.read(buffer)) != -1)
while ((len1 = bif.read(buffer)) != -1)
{
if (stop_me)
{
// ok we need to be stopped! close all files and end
- Log.d("NavitMapDownloader", "stop_me 1");
buf.flush();
buf.close();
fos.close();
bif.close();
is.close();
- Log.d("NavitMapDownloader", "stop_me 2");
c.disconnect();
- Log.d("NavitMapDownloader", "stop_me 3");
return 2;
}
already_read = already_read + len1;
@@ -232,25 +590,12 @@ public class NavitMapDownloader
msg = handler.obtainMessage();
b = new Bundle();
msg.what = 1;
- b.putInt("max", map_values.est_size_bytes);
- b.putInt("cur", already_read);
+ b.putInt("max", (int) (map_values.est_size_bytes / 1024));
+ b.putInt("cur", (int) (already_read / 1024));
b.putString("title", "Map download");
- // if (last_timestamp == 0)
- // {
- // kbytes_per_second = "--";
- // }
- // else
- // {
- // //float temp = (((already_read - last_bytes) / 1024f) / ((System
- // // .currentTimeMillis() - last_timestamp) / 1000f));
- // //kbytes_per_second = formatter.format(temp);
- // }
- //last_timestamp = System.currentTimeMillis();
- //last_bytes = already_read;
per_second_overall = (float) already_read
/ (float) ((System.currentTimeMillis() - start_timestamp) / 1000);
kbytes_per_second = formatter.format((per_second_overall / 1024f));
- // Log.d("NavitMapDownloader", "k " + kbytes_per_second);
bytes_remaining = map_values.est_size_bytes - already_read;
eta_seconds = (int) ((float) bytes_remaining / (float) per_second_overall);
if (eta_seconds > 60)
@@ -270,13 +615,12 @@ public class NavitMapDownloader
// try
// {
// // little pause here
- // Thread.sleep(50);
+ // Thread.sleep(20);
// }
// catch (InterruptedException e1)
// {
// }
}
- //fos.write(buffer, 0, len1);
buf.write(buffer, 0, len1);
}
buf.flush();
@@ -322,8 +666,8 @@ public class NavitMapDownloader
msg = handler.obtainMessage();
b = new Bundle();
msg.what = 1;
- b.putInt("max", map_values.est_size_bytes);
- b.putInt("cur", map_values.est_size_bytes);
+ b.putInt("max", (int) (map_values.est_size_bytes / 1024));
+ b.putInt("cur", (int) (map_values.est_size_bytes / 1024));
b.putString("title", "Mapdownload");
b.putString("text", map_values.map_name + " ready");
msg.setData(b);
View Lorry Controller Status