diff options
Diffstat (limited to 'navit/android/src/org/navitproject/navit/NavitMapDownloader.java')
| -rw-r--r-- | navit/android/src/org/navitproject/navit/NavitMapDownloader.java | 745 |
1 files changed, 361 insertions, 384 deletions
diff --git a/navit/android/src/org/navitproject/navit/NavitMapDownloader.java b/navit/android/src/org/navitproject/navit/NavitMapDownloader.java index c2c40fe2e..51c362407 100644 --- a/navit/android/src/org/navitproject/navit/NavitMapDownloader.java +++ b/navit/android/src/org/navitproject/navit/NavitMapDownloader.java @@ -1,4 +1,4 @@ -/** +/* * Navit, a modular navigation system. Copyright (C) 2005-2008 Navit Team * * This program is free software; you can redistribute it and/or modify it under the terms of the @@ -15,11 +15,14 @@ package org.navitproject.navit; +import static org.navitproject.navit.NavitAppConfig.getTstring; + import android.location.Location; import android.os.Bundle; import android.os.Message; import android.os.StatFs; import android.util.Log; + import java.io.BufferedInputStream; import java.io.BufferedOutputStream; import java.io.File; @@ -37,7 +40,8 @@ import java.net.MalformedURLException; import java.net.URL; import java.net.URLConnection; -/** + +/* * @author rikky * */ @@ -47,438 +51,418 @@ public class NavitMapDownloader extends Thread { // define the maps here // size estimations updated 2017-06-22 // - public static final osm_map_values[] osm_maps = { - new osm_map_values(Navit.getInstance().getTstring(R.string.whole_planet), "-180", "-90", "180", "90", + static final OsmMapValues[] osm_maps = { + new OsmMapValues(getTstring(R.string.whole_planet), "-180", "-90", "180", "90", 23992258630L, 0), - new osm_map_values(Navit.getInstance().getTstring(R.string.africa), "-30.89", "-36.17", "61.68", + new OsmMapValues(getTstring(R.string.africa), "-30.89", "-36.17", "61.68", "38.40", 2070076339L, 0), - new osm_map_values(Navit.getInstance().getTstring(R.string.angola), "11.4", "-18.1", "24.2", "-5.3", + new OsmMapValues(getTstring(R.string.angola), "11.4", "-18.1", "24.2", "-5.3", 127557789L, 1), - new osm_map_values(Navit.getInstance().getTstring(R.string.burundi), "28.9", "-4.5", "30.9", "-2.2", + new OsmMapValues(getTstring(R.string.burundi), "28.9", "-4.5", "30.9", "-2.2", 124049667L, 1), - new osm_map_values(Navit.getInstance().getTstring(R.string.canary_islands), "-18.69", "26.52", "-12.79", + new OsmMapValues(getTstring(R.string.canary_islands), "-18.69", "26.52", "-12.79", "29.99", 133565815L, 1), - new osm_map_values(Navit.getInstance().getTstring(R.string.congo), "11.7", + new OsmMapValues(getTstring(R.string.congo), "11.7", "-13.6", "31.5", "5.7", 244228485L, 1), - new osm_map_values(Navit.getInstance().getTstring(R.string.ethiopia), "32.89", "3.33", "48.07", "14.97", + new OsmMapValues(getTstring(R.string.ethiopia), "32.89", "3.33", "48.07", "14.97", 153067406L, 1), - new osm_map_values(Navit.getInstance().getTstring(R.string.guinea), "-15.47", "7.12", "-7.58", "12.74", + new OsmMapValues(getTstring(R.string.guinea), "-15.47", "7.12", "-7.58", "12.74", 188047126L, 1), - new osm_map_values(Navit.getInstance().getTstring(R.string.cotedivoire), "-8.72", "4.09", "-2.43", + new OsmMapValues(getTstring(R.string.cotedivoire), "-8.72", "4.09", "-2.43", "10.80", 132187496L, 1), - new osm_map_values(Navit.getInstance().getTstring(R.string.kenya), "33.8", "-5.2", "42.4", "4.9", + new OsmMapValues(getTstring(R.string.kenya), "33.8", "-5.2", "42.4", "4.9", 190073089L, 1), - new osm_map_values(Navit.getInstance().getTstring(R.string.lesotho), "26.9", "-30.7", "29.6", "-28.4", + new OsmMapValues(getTstring(R.string.lesotho), "26.9", "-30.7", "29.6", "-28.4", 196189429L, 1), - new osm_map_values(Navit.getInstance().getTstring(R.string.liberia), "-15.00", "-0.73", "-7.20", "8.65", + new OsmMapValues(getTstring(R.string.liberia), "-15.00", "-0.73", "-7.20", "8.65", 156257253L, 1), - new osm_map_values(Navit.getInstance().getTstring(R.string.libya), "9.32", "19.40", "25.54", "33.63", + new OsmMapValues(getTstring(R.string.libya), "9.32", "19.40", "25.54", "33.63", 126046917L, 1), - new osm_map_values(Navit.getInstance().getTstring(R.string.madagascar), "42.25", "-26.63", "51.20", + new OsmMapValues(getTstring(R.string.madagascar), "42.25", "-26.63", "51.20", "-11.31", 145210721L, 1), - new osm_map_values( - Navit.getInstance().getTstring(R.string.namibia) + "+" - + Navit.getInstance().getTstring(R.string.botswana), + new OsmMapValues(getTstring(R.string.namibia) + "+" + getTstring(R.string.botswana), "11.4", "-29.1", "29.5", "-16.9", 248970987L, 1), - new osm_map_values(Navit.getInstance().getTstring(R.string.reunion), "55.2", "-21.4", "55.9", "-20.9", + new OsmMapValues(getTstring(R.string.reunion), "55.2", "-21.4", "55.9", "-20.9", 126008774L, 1), - new osm_map_values(Navit.getInstance().getTstring(R.string.rwanda), "28.8", "-2.9", "30.9", "-1.0", + new OsmMapValues(getTstring(R.string.rwanda), "28.8", "-2.9", "30.9", "-1.0", 128267595L, 1), - new osm_map_values( - Navit.getInstance().getTstring(R.string.south_africa) + "+" - + Navit.getInstance().getTstring(R.string.lesotho), + new OsmMapValues(getTstring(R.string.south_africa) + "+" + getTstring(R.string.lesotho), "15.93", "-36.36", "33.65", "-22.08", 307280006L, 1), - new osm_map_values(Navit.getInstance().getTstring(R.string.tanzania), "29.19", + new OsmMapValues(getTstring(R.string.tanzania), "29.19", "-11.87", "40.74", "-0.88", 253621029L, 1), - new osm_map_values(Navit.getInstance().getTstring(R.string.uganda), "29.3", "-1.6", "35.1", "4.3", + new OsmMapValues(getTstring(R.string.uganda), "29.3", "-1.6", "35.1", "4.3", 179134521L, 1), - new osm_map_values(Navit.getInstance().getTstring(R.string.asia), "23.8", "0.1", "195.0", "82.4", + new OsmMapValues(getTstring(R.string.asia), "23.8", "0.1", "195.0", "82.4", 5113673780L, 0), - new osm_map_values(Navit.getInstance().getTstring(R.string.azerbaijan), "44.74", "38.34", "51.69", + new OsmMapValues(getTstring(R.string.azerbaijan), "44.74", "38.34", "51.69", "42.37", 138346406L, 1), - new osm_map_values(Navit.getInstance().getTstring(R.string.china), "67.3", "5.3", "135.0", "54.5", + new OsmMapValues(getTstring(R.string.china), "67.3", "5.3", "135.0", "54.5", 1718108758L, 1), - new osm_map_values(Navit.getInstance().getTstring(R.string.cyprus), "32.0", "34.5", "34.9", "35.8", + new OsmMapValues(getTstring(R.string.cyprus), "32.0", "34.5", "34.9", "35.8", 118472448L, 1), - new osm_map_values( - Navit.getInstance().getTstring(R.string.india) + "+" - + Navit.getInstance().getTstring(R.string.nepal), "67.9", + new OsmMapValues(getTstring(R.string.india) + "+" + getTstring(R.string.nepal), "67.9", "5.5", "89.6", "36.0", 601877877L, 1), - new osm_map_values(Navit.getInstance().getTstring(R.string.indonesia), "93.7", "-17.3", "155.5", "7.6", + new OsmMapValues(getTstring(R.string.indonesia), "93.7", "-17.3", "155.5", "7.6", 420741405L, 1), - new osm_map_values(Navit.getInstance().getTstring(R.string.iran), "43.5", "24.4", + new OsmMapValues(getTstring(R.string.iran), "43.5", "24.4", "63.6", "40.4", 242016066L, 1), - new osm_map_values(Navit.getInstance().getTstring(R.string.iraq), "38.7", "28.5", "49.2", "37.4", + new OsmMapValues(getTstring(R.string.iraq), "38.7", "28.5", "49.2", "37.4", 160751805L, 1), - new osm_map_values(Navit.getInstance().getTstring(R.string.israel), "33.99", "29.8", "35.95", "33.4", + new OsmMapValues(getTstring(R.string.israel), "33.99", "29.8", "35.95", "33.4", 155685778L, 1), - new osm_map_values( - Navit.getInstance().getTstring(R.string.japan) + "+" - + Navit.getInstance().getTstring(R.string.korea), "123.6", + new OsmMapValues(getTstring(R.string.japan) + "+" + getTstring(R.string.korea), "123.6", "25.2", "151.3", "47.1", 1029080156L, 1), - new osm_map_values(Navit.getInstance().getTstring(R.string.kazakhstan), "46.44", "40.89", "87.36", + new OsmMapValues(getTstring(R.string.kazakhstan), "46.44", "40.89", "87.36", "55.45", 407633007L, 1), - new osm_map_values(Navit.getInstance().getTstring(R.string.kyrgyzsyan), "69.23", "39.13", "80.33", + new OsmMapValues(getTstring(R.string.kyrgyzsyan), "69.23", "39.13", "80.33", "43.29", 147997835L, 1), - new osm_map_values( - Navit.getInstance().getTstring(R.string.malaysia) + "+" - + Navit.getInstance().getTstring(R.string.singapore), + new OsmMapValues(getTstring(R.string.malaysia) + "+" + getTstring(R.string.singapore), "94.3", "-5.9", "108.6", "6.8", 168816435L, 1), - new osm_map_values(Navit.getInstance().getTstring(R.string.mongolia), "87.5", "41.4", "120.3", "52.7", + new OsmMapValues(getTstring(R.string.mongolia), "87.5", "41.4", "120.3", "52.7", 153534851L, 1), - new osm_map_values(Navit.getInstance().getTstring(R.string.pakistan), "60.83", "23.28", "77.89", + new OsmMapValues(getTstring(R.string.pakistan), "60.83", "23.28", "77.89", "37.15", 217644321L, 1), - new osm_map_values(Navit.getInstance().getTstring(R.string.philippines), "115.58", "4.47", "127.85", + new OsmMapValues(getTstring(R.string.philippines), "115.58", "4.47", "127.85", "21.60", 281428307L, 1), - new osm_map_values(Navit.getInstance().getTstring(R.string.saudi_arabia), "33.2", "16.1", "55.9", + new OsmMapValues(getTstring(R.string.saudi_arabia), "33.2", "16.1", "55.9", "33.5", 242648303L, 1), - new osm_map_values(Navit.getInstance().getTstring(R.string.taiwan), "119.1", "21.5", "122.5", "25.2", + new OsmMapValues(getTstring(R.string.taiwan), "119.1", "21.5", "122.5", "25.2", 1029080156L, 1), - new osm_map_values(Navit.getInstance().getTstring(R.string.thailand), "97.5", "5.7", "105.2", "19.7", + new OsmMapValues(getTstring(R.string.thailand), "97.5", "5.7", "105.2", "19.7", 185135492L, 1), - new osm_map_values(Navit.getInstance().getTstring(R.string.turkey), "25.1", "35.8", "46.4", "42.8", + new OsmMapValues(getTstring(R.string.turkey), "25.1", "35.8", "46.4", "42.8", 331087441L, 1), - new osm_map_values(Navit.getInstance().getTstring(R.string.turkmenistan), "51.78", "35.07", "66.76", + new OsmMapValues(getTstring(R.string.turkmenistan), "51.78", "35.07", "66.76", "42.91", 131045087L, 1), - new osm_map_values(Navit.getInstance().getTstring(R.string.uae_other), "51.5", "22.6", "56.7", "26.5", + new OsmMapValues(getTstring(R.string.uae_other), "51.5", "22.6", "56.7", "26.5", 128934674L, 1), - new osm_map_values( - Navit.getInstance().getTstring(R.string.australia) + "+" - + Navit.getInstance().getTstring(R.string.oceania), + new OsmMapValues(getTstring(R.string.australia) + "+" + getTstring(R.string.oceania), "89.84", "-57.39", "179.79", "7.26", 782722650L, 0), - new osm_map_values(Navit.getInstance().getTstring(R.string.australia), "110.5", "-44.2", "154.9", + new OsmMapValues(getTstring(R.string.australia), "110.5", "-44.2", "154.9", "-9.2", 348652900L, 0), - new osm_map_values(Navit.getInstance().getTstring(R.string.tasmania), "144.0", "-45.1", "155.3", + new OsmMapValues(getTstring(R.string.tasmania), "144.0", "-45.1", "155.3", "-24.8", 253231890L, 1), - new osm_map_values(Navit.getInstance().getTstring(R.string.victoria) + " + " + Navit.getInstance() - .getTstring(R.string.new_south_wales), "140.7", "-39.4", "153.7", "-26.9", 241500829L, 1), - new osm_map_values(Navit.getInstance().getTstring(R.string.new_caledonia), "157.85", "-25.05", "174.15", + new OsmMapValues(getTstring(R.string.victoria) + " + " + getTstring(R.string.new_south_wales), + "140.7", "-39.4", "153.7", "-26.9", 241500829L, 1), + new OsmMapValues(getTstring(R.string.new_caledonia), "157.85", "-25.05", "174.15", "-16.85", 115512336L, 1), - new osm_map_values(Navit.getInstance().getTstring(R.string.newzealand), "165.2", "-47.6", "179.1", + new OsmMapValues(getTstring(R.string.newzealand), "165.2", "-47.6", "179.1", "-33.7", 239264192L, 1), - new osm_map_values(Navit.getInstance().getTstring(R.string.europe), "-12.97", "33.59", "34.15", "72.10", + new OsmMapValues(getTstring(R.string.europe), "-12.97", "33.59", "34.15", "72.10", 11984126789L, 0), - new osm_map_values(Navit.getInstance().getTstring(R.string.western_europe), "-17.6", "34.5", "42.9", + new OsmMapValues(getTstring(R.string.western_europe), "-17.6", "34.5", "42.9", "70.9", 12648810717L, 1), - new osm_map_values(Navit.getInstance().getTstring(R.string.austria), "9.4", "46.32", "17.21", "49.1", + new OsmMapValues(getTstring(R.string.austria), "9.4", "46.32", "17.21", "49.1", 898273634L, 1), - new osm_map_values(Navit.getInstance().getTstring(R.string.azores), "-31.62", "36.63", "-24.67", + new OsmMapValues(getTstring(R.string.azores), "-31.62", "36.63", "-24.67", "40.13", 112687225L, 1), - new osm_map_values(Navit.getInstance().getTstring(R.string.belgium), "2.3", "49.5", "6.5", "51.6", + new OsmMapValues(getTstring(R.string.belgium), "2.3", "49.5", "6.5", "51.6", 733035524L, 1), - new osm_map_values(Navit.getInstance().getTstring(R.string.benelux), "2.08", "48.87", "7.78", "54.52", + new OsmMapValues(getTstring(R.string.benelux), "2.08", "48.87", "7.78", "54.52", 1771971595L, 1), - new osm_map_values(Navit.getInstance().getTstring(R.string.netherlands), "3.07", "50.75", "7.23", + new OsmMapValues(getTstring(R.string.netherlands), "3.07", "50.75", "7.23", "53.73", 1191828033L, 1), - new osm_map_values(Navit.getInstance().getTstring(R.string.denmark), "7.65", "54.32", "15.58", "58.07", + new OsmMapValues(getTstring(R.string.denmark), "7.65", "54.32", "15.58", "58.07", 365606979L, 1), - new osm_map_values(Navit.getInstance().getTstring(R.string.faroe_islands), "-7.8", "61.3", "-6.1", + new OsmMapValues(getTstring(R.string.faroe_islands), "-7.8", "61.3", "-6.1", "62.5", 109377568L, 1), - new osm_map_values(Navit.getInstance().getTstring(R.string.france), "-5.45", "42.00", "8.44", "51.68", + new OsmMapValues(getTstring(R.string.france), "-5.45", "42.00", "8.44", "51.68", 3907969744L, 1), - new osm_map_values(Navit.getInstance().getTstring(R.string.alsace), "6.79", "47.27", "8.48", "49.17", + new OsmMapValues(getTstring(R.string.alsace), "6.79", "47.27", "8.48", "49.17", 354249349L, 2), - new osm_map_values(Navit.getInstance().getTstring(R.string.aquitaine), "-2.27", "42.44", "1.50", + new OsmMapValues(getTstring(R.string.aquitaine), "-2.27", "42.44", "1.50", "45.76", 443715019L, 2), - new osm_map_values(Navit.getInstance().getTstring(R.string.auvergne), "2.01", "44.57", "4.54", "46.85", + new OsmMapValues(getTstring(R.string.auvergne), "2.01", "44.57", "4.54", "46.85", 287663213L, 2), - new osm_map_values(Navit.getInstance().getTstring(R.string.basse_normandie), "-2.09", "48.13", "1.03", + new OsmMapValues(getTstring(R.string.basse_normandie), "-2.09", "48.13", "1.03", "49.98", 262352354L, 2), - new osm_map_values(Navit.getInstance().getTstring(R.string.bourgogne), "2.80", "46.11", "5.58", "48.45", + new OsmMapValues(getTstring(R.string.bourgogne), "2.80", "46.11", "5.58", "48.45", 298868796L, 2), - new osm_map_values(Navit.getInstance().getTstring(R.string.bretagne), "-5.58", "46.95", "-0.96", + new OsmMapValues(getTstring(R.string.bretagne), "-5.58", "46.95", "-0.96", "48.99", 382770794L, 2), - new osm_map_values(Navit.getInstance().getTstring(R.string.centre), "0.01", "46.29", "3.18", "48.99", + new OsmMapValues(getTstring(R.string.centre), "0.01", "46.29", "3.18", "48.99", 474224721L, 2), - new osm_map_values(Navit.getInstance().getTstring(R.string.champagne_ardenne), "3.34", "47.53", "5.94", + new OsmMapValues(getTstring(R.string.champagne_ardenne), "3.34", "47.53", "5.94", "50.28", 269947824L, 2), - new osm_map_values(Navit.getInstance().getTstring(R.string.corse), "8.12", "41.32", "9.95", "43.28", + new OsmMapValues(getTstring(R.string.corse), "8.12", "41.32", "9.95", "43.28", 129902146L, 2), - new osm_map_values(Navit.getInstance().getTstring(R.string.franche_comte), "5.20", "46.21", "7.83", + new OsmMapValues(getTstring(R.string.franche_comte), "5.20", "46.21", "7.83", "48.07", 324476070L, 2), - new osm_map_values(Navit.getInstance().getTstring(R.string.haute_normandie), "-0.15", "48.62", "1.85", + new OsmMapValues(getTstring(R.string.haute_normandie), "-0.15", "48.62", "1.85", "50.18", 202782876L, 2), - new osm_map_values(Navit.getInstance().getTstring(R.string.ile_de_france), "1.40", "48.07", "3.61", + new OsmMapValues(getTstring(R.string.ile_de_france), "1.40", "48.07", "3.61", "49.29", 311052699L, 2), - new osm_map_values(Navit.getInstance().getTstring(R.string.languedoc_roussillon), "1.53", "42.25", + new OsmMapValues(getTstring(R.string.languedoc_roussillon), "1.53", "42.25", "4.89", "45.02", 380145667L, 2), - new osm_map_values(Navit.getInstance().getTstring(R.string.limousin), "0.58", "44.87", "2.66", "46.50", + new OsmMapValues(getTstring(R.string.limousin), "0.58", "44.87", "2.66", "46.50", 206696539L, 2), - new osm_map_values(Navit.getInstance().getTstring(R.string.lorraine), "4.84", "47.77", "7.72", "49.73", + new OsmMapValues(getTstring(R.string.lorraine), "4.84", "47.77", "7.72", "49.73", 330777318L, 2), - new osm_map_values(Navit.getInstance().getTstring(R.string.midi_pyrenees), "-0.37", "42.18", "3.50", + new OsmMapValues(getTstring(R.string.midi_pyrenees), "-0.37", "42.18", "3.50", "45.10", 462618363L, 2), - new osm_map_values(Navit.getInstance().getTstring(R.string.nord_pas_de_calais), "1.42", "49.92", "4.49", + new OsmMapValues(getTstring(R.string.nord_pas_de_calais), "1.42", "49.92", "4.49", "51.31", 368467511L, 2), - new osm_map_values(Navit.getInstance().getTstring(R.string.pays_de_la_loire), "-2.88", "46.20", "0.97", + new OsmMapValues(getTstring(R.string.pays_de_la_loire), "-2.88", "46.20", "0.97", "48.62", 499471143L, 2), - new osm_map_values(Navit.getInstance().getTstring(R.string.picardie), "1.25", "48.79", "4.31", "50.43", + new OsmMapValues(getTstring(R.string.picardie), "1.25", "48.79", "4.31", "50.43", 374308041L, 2), - new osm_map_values(Navit.getInstance().getTstring(R.string.poitou_charentes), "-1.69", "45.04", "1.26", + new OsmMapValues(getTstring(R.string.poitou_charentes), "-1.69", "45.04", "1.26", "47.23", 342125526L, 2), - new osm_map_values(Navit.getInstance().getTstring(R.string.provence_alpes_cote_d_azur), "4.21", "42.91", + new OsmMapValues(getTstring(R.string.provence_alpes_cote_d_azur), "4.21", "42.91", "7.99", "45.18", 390306134L, 2), - new osm_map_values(Navit.getInstance().getTstring(R.string.rhone_alpes), "3.65", "44.07", "7.88", + new OsmMapValues(getTstring(R.string.rhone_alpes), "3.65", "44.07", "7.88", "46.64", 510797942L, 2), - new osm_map_values(Navit.getInstance().getTstring(R.string.luxembourg), "5.7", "49.4", "6.5", "50.2", + new OsmMapValues(getTstring(R.string.luxembourg), "5.7", "49.4", "6.5", "50.2", 1771971595L, 1), - new osm_map_values(Navit.getInstance().getTstring(R.string.germany), "5.18", "46.84", "15.47", "55.64", + new OsmMapValues(getTstring(R.string.germany), "5.18", "46.84", "15.47", "55.64", 3521359466L, 1), - new osm_map_values(Navit.getInstance().getTstring(R.string.baden_wuerttemberg), "7.32", "47.14", + new OsmMapValues(getTstring(R.string.baden_wuerttemberg), "7.32", "47.14", "10.57", "49.85", 674361124L, 2), - new osm_map_values(Navit.getInstance().getTstring(R.string.bayern), "8.92", "47.22", "13.90", "50.62", + new OsmMapValues(getTstring(R.string.bayern), "8.92", "47.22", "13.90", "50.62", 860161150L, 2), - new osm_map_values(Navit.getInstance().getTstring(R.string.mittelfranken), "9.86", "48.78", "11.65", + new OsmMapValues(getTstring(R.string.mittelfranken), "9.86", "48.78", "11.65", "49.84", 203055195L, 2), - new osm_map_values(Navit.getInstance().getTstring(R.string.niederbayern), "11.55", "47.75", "14.12", + new OsmMapValues(getTstring(R.string.niederbayern), "11.55", "47.75", "14.12", "49.42", 312924770L, 2), - new osm_map_values(Navit.getInstance().getTstring(R.string.oberbayern), "10.67", "47.05", "13.57", + new OsmMapValues(getTstring(R.string.oberbayern), "10.67", "47.05", "13.57", "49.14", 382734883L, 2), - new osm_map_values(Navit.getInstance().getTstring(R.string.oberfranken), "10.31", "49.54", "12.49", + new OsmMapValues(getTstring(R.string.oberfranken), "10.31", "49.54", "12.49", "50.95", 235258691L, 2), - new osm_map_values(Navit.getInstance().getTstring(R.string.oberpfalz), "11.14", "48.71", "13.47", + new OsmMapValues(getTstring(R.string.oberpfalz), "11.14", "48.71", "13.47", "50.43", 264536012L, 2), - new osm_map_values(Navit.getInstance().getTstring(R.string.schwaben), "9.27", "47.10", "11.36", "49.09", + new OsmMapValues(getTstring(R.string.schwaben), "9.27", "47.10", "11.36", "49.09", 321141607L, 2), - new osm_map_values(Navit.getInstance().getTstring(R.string.unterfranken), "8.59", "49.16", "10.93", + new OsmMapValues(getTstring(R.string.unterfranken), "8.59", "49.16", "10.93", "50.67", 303720890L, 2), - new osm_map_values(Navit.getInstance().getTstring(R.string.berlin), "13.03", "52.28", "13.81", "52.73", + new OsmMapValues(getTstring(R.string.berlin), "13.03", "52.28", "13.81", "52.73", 169019946L, 2), - new osm_map_values(Navit.getInstance().getTstring(R.string.brandenburg), "11.17", "51.30", "14.83", + new OsmMapValues(getTstring(R.string.brandenburg), "11.17", "51.30", "14.83", "53.63", 323497599L, 2), - new osm_map_values(Navit.getInstance().getTstring(R.string.bremen), "8.43", "52.96", "9.04", "53.66", + new OsmMapValues(getTstring(R.string.bremen), "8.43", "52.96", "9.04", "53.66", 150963608L, 2), - new osm_map_values(Navit.getInstance().getTstring(R.string.hamburg), "9.56", "53.34", "10.39", "53.80", + new OsmMapValues(getTstring(R.string.hamburg), "9.56", "53.34", "10.39", "53.80", 156284421L, 2), - new osm_map_values(Navit.getInstance().getTstring(R.string.hessen), "7.72", "49.34", "10.29", "51.71", + new OsmMapValues(getTstring(R.string.hessen), "7.72", "49.34", "10.29", "51.71", 432279328L, 2), - new osm_map_values(Navit.getInstance().getTstring(R.string.mecklenburg_vorpommern), "10.54", "53.05", + new OsmMapValues(getTstring(R.string.mecklenburg_vorpommern), "10.54", "53.05", "14.48", "55.05", 213183908L, 2), - new osm_map_values(Navit.getInstance().getTstring(R.string.niedersachsen), "6.40", "51.24", "11.69", + new OsmMapValues(getTstring(R.string.niedersachsen), "6.40", "51.24", "11.69", "54.22", 819766939L, 2), - new osm_map_values(Navit.getInstance().getTstring(R.string.nordrhein_westfalen), "5.46", "50.26", + new OsmMapValues(getTstring(R.string.nordrhein_westfalen), "5.46", "50.26", "9.52", "52.59", 967053517L, 2), - new osm_map_values(Navit.getInstance().getTstring(R.string.rheinland_pfalz), "6.06", "48.91", "8.56", + new OsmMapValues(getTstring(R.string.rheinland_pfalz), "6.06", "48.91", "8.56", "51.00", 442868899L, 2), - new osm_map_values(Navit.getInstance().getTstring(R.string.saarland), "6.30", "49.06", "7.46", "49.69", + new OsmMapValues(getTstring(R.string.saarland), "6.30", "49.06", "7.46", "49.69", 157721162L, 2), - new osm_map_values(Navit.getInstance().getTstring(R.string.sachsen_anhalt), "10.50", "50.88", "13.26", + new OsmMapValues(getTstring(R.string.sachsen_anhalt), "10.50", "50.88", "13.26", "53.11", 287785088L, 2), - new osm_map_values(Navit.getInstance().getTstring(R.string.sachsen), "11.82", "50.11", "15.10", "51.73", + new OsmMapValues(getTstring(R.string.sachsen), "11.82", "50.11", "15.10", "51.73", 342620834L, 2), - new osm_map_values(Navit.getInstance().getTstring(R.string.schleswig_holstein), "7.41", "53.30", + new OsmMapValues(getTstring(R.string.schleswig_holstein), "7.41", "53.30", "11.98", "55.20", 280293910L, 2), - new osm_map_values(Navit.getInstance().getTstring(R.string.thueringen), "9.81", "50.15", "12.72", + new OsmMapValues(getTstring(R.string.thueringen), "9.81", "50.15", "12.72", "51.70", 269428239L, 2), - new osm_map_values(Navit.getInstance().getTstring(R.string.iceland), "-25.3", "62.8", "-11.4", "67.5", + new OsmMapValues(getTstring(R.string.iceland), "-25.3", "62.8", "-11.4", "67.5", 124837162L, 1), - new osm_map_values(Navit.getInstance().getTstring(R.string.ireland), "-11.17", "51.25", "-5.23", "55.9", + new OsmMapValues(getTstring(R.string.ireland), "-11.17", "51.25", "-5.23", "55.9", 234750271L, 1), - new osm_map_values(Navit.getInstance().getTstring(R.string.italy), "6.52", "36.38", "18.96", "47.19", + new OsmMapValues(getTstring(R.string.italy), "6.52", "36.38", "18.96", "47.19", 1610171395L, 1), - new osm_map_values( - Navit.getInstance().getTstring(R.string.spain) + "+" - + Navit.getInstance().getTstring(R.string.portugal), + new OsmMapValues(getTstring(R.string.spain) + "+" + getTstring(R.string.portugal), "-11.04", "34.87", "4.62", "44.41", 1039624918L, 1), - new osm_map_values(Navit.getInstance().getTstring(R.string.mallorca), "2.2", "38.8", "4.7", "40.2", + new OsmMapValues(getTstring(R.string.mallorca), "2.2", "38.8", "4.7", "40.2", 137200636L, 2), - new osm_map_values(Navit.getInstance().getTstring(R.string.galicia), "-10.0", "41.7", "-6.3", "44.1", + new OsmMapValues(getTstring(R.string.galicia), "-10.0", "41.7", "-6.3", "44.1", 174549553L, 2), - new osm_map_values(Navit.getInstance().getTstring(R.string.scandinavia), "4.0", "54.4", "32.1", "71.5", + new OsmMapValues(getTstring(R.string.scandinavia), "4.0", "54.4", "32.1", "71.5", 1398661090L, 1), - new osm_map_values(Navit.getInstance().getTstring(R.string.finland), "18.6", "59.2", "32.3", "70.3", + new OsmMapValues(getTstring(R.string.finland), "18.6", "59.2", "32.3", "70.3", 460997178L, 1), - new osm_map_values(Navit.getInstance().getTstring(R.string.denmark), "7.49", "54.33", "13.05", "57.88", + new OsmMapValues(getTstring(R.string.denmark), "7.49", "54.33", "13.05", "57.88", 321870414L, 1), - new osm_map_values(Navit.getInstance().getTstring(R.string.switzerland), "5.79", "45.74", "10.59", + new OsmMapValues(getTstring(R.string.switzerland), "5.79", "45.74", "10.59", "47.84", 552565332L, 1), - new osm_map_values(Navit.getInstance().getTstring(R.string.united_kingdom), "-9.7", "49.6", "2.2", + new OsmMapValues(getTstring(R.string.united_kingdom), "-9.7", "49.6", "2.2", "61.2", 901724648L, 1), - new osm_map_values(Navit.getInstance().getTstring(R.string.england), "-7.80", "48.93", "2.41", "56.14", + new OsmMapValues(getTstring(R.string.england), "-7.80", "48.93", "2.41", "56.14", 937728414L, 1), - new osm_map_values(Navit.getInstance().getTstring(R.string.buckinghamshire), "-1.19", "51.44", "-0.43", + new OsmMapValues(getTstring(R.string.buckinghamshire), "-1.19", "51.44", "-0.43", "52.25", 142256978L, 2), - new osm_map_values(Navit.getInstance().getTstring(R.string.cambridgeshire), "-0.55", "51.96", "0.56", + new OsmMapValues(getTstring(R.string.cambridgeshire), "-0.55", "51.96", "0.56", "52.79", 142334001L, 2), - new osm_map_values(Navit.getInstance().getTstring(R.string.cumbria), "-3.96", "53.85", "-2.11", "55.24", + new OsmMapValues(getTstring(R.string.cumbria), "-3.96", "53.85", "-2.11", "55.24", 144422460L, 2), - new osm_map_values(Navit.getInstance().getTstring(R.string.east_yorkshire_with_hull), "-1.16", "53.50", + new OsmMapValues(getTstring(R.string.east_yorkshire_with_hull), "-1.16", "53.50", "0.54", "54.26", 141518744L, 2), - new osm_map_values(Navit.getInstance().getTstring(R.string.essex), "-0.07", "51.40", "1.36", "52.14", + new OsmMapValues(getTstring(R.string.essex), "-0.07", "51.40", "1.36", "52.14", 162542730L, 2), - new osm_map_values(Navit.getInstance().getTstring(R.string.herefordshire), "-3.19", "51.78", "-2.29", + new OsmMapValues(getTstring(R.string.herefordshire), "-3.19", "51.78", "-2.29", "52.45", 129368660L, 2), - new osm_map_values(Navit.getInstance().getTstring(R.string.kent), "-0.02", "50.81", "1.65", "51.53", + new OsmMapValues(getTstring(R.string.kent), "-0.02", "50.81", "1.65", "51.53", 145482562L, 2), - new osm_map_values(Navit.getInstance().getTstring(R.string.lancashire), "-3.20", "53.43", "-2.00", + new OsmMapValues(getTstring(R.string.lancashire), "-3.20", "53.43", "-2.00", "54.29", 148964975L, 2), - new osm_map_values(Navit.getInstance().getTstring(R.string.leicestershire), "-1.65", "52.34", "-0.61", + new OsmMapValues(getTstring(R.string.leicestershire), "-1.65", "52.34", "-0.61", "53.03", 154199956L, 2), - new osm_map_values(Navit.getInstance().getTstring(R.string.norfolk), "0.10", "52.30", "2.04", "53.41", + new OsmMapValues(getTstring(R.string.norfolk), "0.10", "52.30", "2.04", "53.41", 146017009L, 2), - new osm_map_values(Navit.getInstance().getTstring(R.string.nottinghamshire), "-1.39", "52.73", "-0.62", + new OsmMapValues(getTstring(R.string.nottinghamshire), "-1.39", "52.73", "-0.62", "53.55", 147986548L, 2), - new osm_map_values(Navit.getInstance().getTstring(R.string.oxfordshire), "-1.77", "51.41", "-0.82", + new OsmMapValues(getTstring(R.string.oxfordshire), "-1.77", "51.41", "-0.82", "52.22", 142240992L, 2), - new osm_map_values(Navit.getInstance().getTstring(R.string.shropshire), "-3.29", "52.26", "-2.18", + new OsmMapValues(getTstring(R.string.shropshire), "-3.29", "52.26", "-2.18", "53.05", 136909363L, 2), - new osm_map_values(Navit.getInstance().getTstring(R.string.somerset), "-3.89", "50.77", "-2.20", + new OsmMapValues(getTstring(R.string.somerset), "-3.89", "50.77", "-2.20", "51.40", 145186096L, 2), - new osm_map_values(Navit.getInstance().getTstring(R.string.south_yorkshire), "-1.88", "53.25", "-0.80", + new OsmMapValues(getTstring(R.string.south_yorkshire), "-1.88", "53.25", "-0.80", "53.71", 145902650L, 2), - new osm_map_values(Navit.getInstance().getTstring(R.string.suffolk), "0.29", "51.88", "1.81", "52.60", + new OsmMapValues(getTstring(R.string.suffolk), "0.29", "51.88", "1.81", "52.60", 143799697L, 2), - new osm_map_values(Navit.getInstance().getTstring(R.string.surrey), "-0.90", "51.02", "0.10", "51.52", + new OsmMapValues(getTstring(R.string.surrey), "-0.90", "51.02", "0.10", "51.52", 157987139L, 2), - new osm_map_values(Navit.getInstance().getTstring(R.string.wiltshire), "-2.41", "50.90", "-1.44", + new OsmMapValues(getTstring(R.string.wiltshire), "-2.41", "50.90", "-1.44", "51.76", 138652346L, 2), - new osm_map_values(Navit.getInstance().getTstring(R.string.scotland), "-8.13", "54.49", "-0.15", + new OsmMapValues(getTstring(R.string.scotland), "-8.13", "54.49", "-0.15", "61.40", 258853845L, 2), - new osm_map_values(Navit.getInstance().getTstring(R.string.wales), "-5.56", "51.28", "-2.60", "53.60", + new OsmMapValues(getTstring(R.string.wales), "-5.56", "51.28", "-2.60", "53.60", 193593409L, 2), - new osm_map_values(Navit.getInstance().getTstring(R.string.albania), "19.09", "39.55", "21.12", "42.72", + new OsmMapValues(getTstring(R.string.albania), "19.09", "39.55", "21.12", "42.72", 146199817L, 1), - new osm_map_values(Navit.getInstance().getTstring(R.string.belarus), "23.12", "51.21", "32.87", "56.23", + new OsmMapValues(getTstring(R.string.belarus), "23.12", "51.21", "32.87", "56.23", 324470696L, 1), - new osm_map_values(Navit.getInstance().getTstring(R.string.russian_federation), "27.9", "41.5", "190.4", + new OsmMapValues(getTstring(R.string.russian_federation), "27.9", "41.5", "190.4", "77.6", 2148314279L, 1), - new osm_map_values(Navit.getInstance().getTstring(R.string.bulgaria), "24.7", "42.1", "24.8", "42.1", + new OsmMapValues(getTstring(R.string.bulgaria), "24.7", "42.1", "24.8", "42.1", 109869373L, 1), - new osm_map_values(Navit.getInstance().getTstring(R.string.bosnia_and_herzegovina), "15.69", "42.52", + new OsmMapValues(getTstring(R.string.bosnia_and_herzegovina), "15.69", "42.52", "19.67", "45.32", 187122485L, 1), - new osm_map_values(Navit.getInstance().getTstring(R.string.czech_republic), "11.91", "48.48", "19.02", + new OsmMapValues(getTstring(R.string.czech_republic), "11.91", "48.48", "19.02", "51.17", 904838442L, 1), - new osm_map_values(Navit.getInstance().getTstring(R.string.croatia), "13.4", "42.1", "19.4", "46.9", + new OsmMapValues(getTstring(R.string.croatia), "13.4", "42.1", "19.4", "46.9", 460854751L, 1), - new osm_map_values(Navit.getInstance().getTstring(R.string.estonia), "21.5", "57.5", "28.2", "59.6", + new OsmMapValues(getTstring(R.string.estonia), "21.5", "57.5", "28.2", "59.6", 173378927L, 1), - new osm_map_values(Navit.getInstance().getTstring(R.string.greece), "28.9", "37.8", "29.0", "37.8", + new OsmMapValues(getTstring(R.string.greece), "28.9", "37.8", "29.0", "37.8", 109435051L, 1), - new osm_map_values(Navit.getInstance().getTstring(R.string.crete), "23.3", "34.5", "26.8", "36.0", + new OsmMapValues(getTstring(R.string.crete), "23.3", "34.5", "26.8", "36.0", 115985063L, 1), - new osm_map_values(Navit.getInstance().getTstring(R.string.hungary), "16.08", "45.57", "23.03", "48.39", + new OsmMapValues(getTstring(R.string.hungary), "16.08", "45.57", "23.03", "48.39", 350318541L, 1), - new osm_map_values(Navit.getInstance().getTstring(R.string.latvia), "20.7", "55.6", "28.3", "58.1", + new OsmMapValues(getTstring(R.string.latvia), "20.7", "55.6", "28.3", "58.1", 188188140L, 1), - new osm_map_values(Navit.getInstance().getTstring(R.string.lithuania), "20.9", "53.8", "26.9", "56.5", + new OsmMapValues(getTstring(R.string.lithuania), "20.9", "53.8", "26.9", "56.5", 217852597L, 1), - new osm_map_values(Navit.getInstance().getTstring(R.string.poland), "13.6", "48.8", "24.5", "55.0", + new OsmMapValues(getTstring(R.string.poland), "13.6", "48.8", "24.5", "55.0", 1464968657L, 1), - new osm_map_values(Navit.getInstance().getTstring(R.string.romania), "20.3", "43.5", "29.9", "48.4", + new OsmMapValues(getTstring(R.string.romania), "20.3", "43.5", "29.9", "48.4", 347931565L, 1), - new osm_map_values(Navit.getInstance().getTstring(R.string.slovakia), "16.8", "47.7", "22.6", "49.7", + new OsmMapValues(getTstring(R.string.slovakia), "16.8", "47.7", "22.6", "49.7", 420533039L, 1), - new osm_map_values(Navit.getInstance().getTstring(R.string.ukraine), "22.0", "44.3", "40.4", "52.4", + new OsmMapValues(getTstring(R.string.ukraine), "22.0", "44.3", "40.4", "52.4", 793611912L, 1), - new osm_map_values(Navit.getInstance().getTstring(R.string.north_america), "-178.1", "6.5", "-10.4", + new OsmMapValues(getTstring(R.string.north_america), "-178.1", "6.5", "-10.4", "84.0", 5601866516L, 0), - new osm_map_values(Navit.getInstance().getTstring(R.string.alaska), "-179.5", "49.5", "-129", "71.6", + new OsmMapValues(getTstring(R.string.alaska), "-179.5", "49.5", "-129", "71.6", 207746039L, 1), - new osm_map_values(Navit.getInstance().getTstring(R.string.canada), "-141.3", "41.5", "-52.2", "70.2", + new OsmMapValues(getTstring(R.string.canada), "-141.3", "41.5", "-52.2", "70.2", 2635719651L, 1), - new osm_map_values(Navit.getInstance().getTstring(R.string.hawaii), "-161.07", "18.49", "-154.45", + new OsmMapValues(getTstring(R.string.hawaii), "-161.07", "18.49", "-154.45", "22.85", 115016656L, 1), - new osm_map_values(Navit.getInstance().getTstring(R.string.usa) + Navit.getInstance() - .getTstring(R.string.except_alaska_and_hawaii), "-125.4", "24.3", "-66.5", "49.3", - 4060487198L, 1), - new osm_map_values(Navit.getInstance().getTstring(R.string.midwest), "-104.11", "35.92", "-80.46", + new OsmMapValues(getTstring(R.string.usa) + getTstring(R.string.except_alaska_and_hawaii), + "-125.4", "24.3", "-66.5", "49.3", 4060487198L, 1), + new OsmMapValues(getTstring(R.string.midwest), "-104.11", "35.92", "-80.46", "49.46", 1145596450L, 2), - new osm_map_values(Navit.getInstance().getTstring(R.string.michigan), "-90.47", "41.64", "-79.00", + new OsmMapValues(getTstring(R.string.michigan), "-90.47", "41.64", "-79.00", "49.37", 538247019L, 2), - new osm_map_values(Navit.getInstance().getTstring(R.string.ohio), "-84.87", "38.05", "-79.85", "43.53", + new OsmMapValues(getTstring(R.string.ohio), "-84.87", "38.05", "-79.85", "43.53", 277022336L, 2), - new osm_map_values(Navit.getInstance().getTstring(R.string.northeast), "-80.58", "38.72", "-66.83", + new OsmMapValues(getTstring(R.string.northeast), "-80.58", "38.72", "-66.83", "47.53", 1017160709L, 2), - new osm_map_values(Navit.getInstance().getTstring(R.string.massachusetts), "-73.56", "40.78", "-68.67", + new OsmMapValues(getTstring(R.string.massachusetts), "-73.56", "40.78", "-68.67", "42.94", 340055487L, 2), - new osm_map_values(Navit.getInstance().getTstring(R.string.vermont), "-73.49", "42.68", "-71.41", + new OsmMapValues(getTstring(R.string.vermont), "-73.49", "42.68", "-71.41", "45.07", 139626067L, 2), - new osm_map_values(Navit.getInstance().getTstring(R.string.pacific), "-180.05", "15.87", "-129.75", + new OsmMapValues(getTstring(R.string.pacific), "-180.05", "15.87", "-129.75", "73.04", 207090640L, 2), - new osm_map_values(Navit.getInstance().getTstring(R.string.south), "-106.70", "23.98", "-71.46", + new OsmMapValues(getTstring(R.string.south), "-106.70", "23.98", "-71.46", "40.70", 1747935356L, 2), - new osm_map_values(Navit.getInstance().getTstring(R.string.arkansas), "-94.67", "32.95", "-89.59", + new OsmMapValues(getTstring(R.string.arkansas), "-94.67", "32.95", "-89.59", "36.60", 155658661L, 2), - new osm_map_values(Navit.getInstance().getTstring(R.string.district_of_columbia), "-77.17", "38.74", + new OsmMapValues(getTstring(R.string.district_of_columbia), "-77.17", "38.74", "-76.86", "39.05", 129235755L, 2), - new osm_map_values(Navit.getInstance().getTstring(R.string.florida), "-88.75", "23.63", "-77.67", + new OsmMapValues(getTstring(R.string.florida), "-88.75", "23.63", "-77.67", "31.05", 224022108L, 2), - new osm_map_values(Navit.getInstance().getTstring(R.string.louisiana), "-94.09", "28.09", "-88.62", + new OsmMapValues(getTstring(R.string.louisiana), "-94.09", "28.09", "-88.62", "33.07", 210120605L, 2), - new osm_map_values(Navit.getInstance().getTstring(R.string.maryland), "-79.54", "37.83", "-74.99", + new OsmMapValues(getTstring(R.string.maryland), "-79.54", "37.83", "-74.99", "40.22", 276462622L, 2), - new osm_map_values(Navit.getInstance().getTstring(R.string.mississippi), "-91.71", "29.99", "-88.04", + new OsmMapValues(getTstring(R.string.mississippi), "-91.71", "29.99", "-88.04", "35.05", 177858031L, 2), - new osm_map_values(Navit.getInstance().getTstring(R.string.oklahoma), "-103.41", "33.56", "-94.38", + new OsmMapValues(getTstring(R.string.oklahoma), "-103.41", "33.56", "-94.38", "37.38", 200061473L, 2), - new osm_map_values(Navit.getInstance().getTstring(R.string.texas), "-106.96", "25.62", "-92.97", + new OsmMapValues(getTstring(R.string.texas), "-106.96", "25.62", "-92.97", "36.58", 430089141L, 2), - new osm_map_values(Navit.getInstance().getTstring(R.string.virginia), "-83.73", "36.49", "-74.25", + new OsmMapValues(getTstring(R.string.virginia), "-83.73", "36.49", "-74.25", "39.52", 384187569L, 2), - new osm_map_values(Navit.getInstance().getTstring(R.string.west_virginia), "-82.70", "37.15", "-77.66", + new OsmMapValues(getTstring(R.string.west_virginia), "-82.70", "37.15", "-77.66", "40.97", 220552071L, 2), - new osm_map_values(Navit.getInstance().getTstring(R.string.west), "-133.11", "31.28", "-101.99", + new OsmMapValues(getTstring(R.string.west), "-133.11", "31.28", "-101.99", "49.51", 1152909162L, 2), - new osm_map_values(Navit.getInstance().getTstring(R.string.arizona), "-114.88", "30.01", "-108.99", + new OsmMapValues(getTstring(R.string.arizona), "-114.88", "30.01", "-108.99", "37.06", 182826833L, 2), - new osm_map_values(Navit.getInstance().getTstring(R.string.california), "-125.94", "32.43", "-114.08", + new OsmMapValues(getTstring(R.string.california), "-125.94", "32.43", "-114.08", "42.07", 586923326L, 2), - new osm_map_values(Navit.getInstance().getTstring(R.string.colorado), "-109.11", "36.52", "-100.41", + new OsmMapValues(getTstring(R.string.colorado), "-109.11", "36.52", "-100.41", "41.05", 228623724L, 2), - new osm_map_values(Navit.getInstance().getTstring(R.string.idaho), "-117.30", "41.93", "-110.99", + new OsmMapValues(getTstring(R.string.idaho), "-117.30", "41.93", "-110.99", "49.18", 170684507L, 2), - new osm_map_values(Navit.getInstance().getTstring(R.string.montana), "-116.10", "44.31", "-102.64", + new OsmMapValues(getTstring(R.string.montana), "-116.10", "44.31", "-102.64", "49.74", 176229800L, 2), - new osm_map_values(Navit.getInstance().getTstring(R.string.new_mexico), "-109.10", "26.98", "-96.07", + new OsmMapValues(getTstring(R.string.new_mexico), "-109.10", "26.98", "-96.07", "37.05", 361793070L, 2), - new osm_map_values(Navit.getInstance().getTstring(R.string.nevada), "-120.2", "35.0", "-113.8", "42.1", + new OsmMapValues(getTstring(R.string.nevada), "-120.2", "35.0", "-113.8", "42.1", 200614482L, 2), - new osm_map_values(Navit.getInstance().getTstring(R.string.oregon), "-124.8", "41.8", "-116.3", "46.3", + new OsmMapValues(getTstring(R.string.oregon), "-124.8", "41.8", "-116.3", "46.3", 211462685L, 2), - new osm_map_values(Navit.getInstance().getTstring(R.string.utah), "-114.11", "36.95", "-108.99", + new OsmMapValues(getTstring(R.string.utah), "-114.11", "36.95", "-108.99", "42.05", 151590197L, 2), - new osm_map_values(Navit.getInstance().getTstring(R.string.washington_state), "-125.0", "45.5", + new OsmMapValues(getTstring(R.string.washington_state), "-125.0", "45.5", "-116.9", "49.0", 222553768L, 2), - new osm_map_values(Navit.getInstance().getTstring(R.string.south_middle_america), "-83.5", "-56.3", + new OsmMapValues(getTstring(R.string.south_middle_america), "-83.5", "-56.3", "-30.8", "13.7", 958895383L, 0), - new osm_map_values(Navit.getInstance().getTstring(R.string.argentina), "-73.9", "-57.3", "-51.6", + new OsmMapValues(getTstring(R.string.argentina), "-73.9", "-57.3", "-51.6", "-21.0", 376857648L, 1), - new osm_map_values( - Navit.getInstance().getTstring(R.string.argentina) + "+" - + Navit.getInstance().getTstring(R.string.chile), + new OsmMapValues(getTstring(R.string.argentina) + "+" + getTstring(R.string.chile), "-77.2", "-56.3", "-52.7", "-16.1", 420275812L, 1), - new osm_map_values(Navit.getInstance().getTstring(R.string.bolivia), "-70.5", "-23.1", "-57.3", "-9.3", + new OsmMapValues(getTstring(R.string.bolivia), "-70.5", "-23.1", "-57.3", "-9.3", 175937824L, 1), - new osm_map_values(Navit.getInstance().getTstring(R.string.brazil), "-71.4", "-34.7", "-32.8", "5.4", + new OsmMapValues(getTstring(R.string.brazil), "-71.4", "-34.7", "-32.8", "5.4", 664872975L, 1), - new osm_map_values(Navit.getInstance().getTstring(R.string.chile), "-81.77", "-58.50", "-65.46", + new OsmMapValues(getTstring(R.string.chile), "-81.77", "-58.50", "-65.46", "-17.41", 241657330L, 1), - new osm_map_values(Navit.getInstance().getTstring(R.string.cuba), "-85.3", "19.6", "-74.0", "23.6", + new OsmMapValues(getTstring(R.string.cuba), "-85.3", "19.6", "-74.0", "23.6", 129043575L, 1), - new osm_map_values(Navit.getInstance().getTstring(R.string.colombia), "-79.1", "-4.0", "-66.7", "12.6", + new OsmMapValues(getTstring(R.string.colombia), "-79.1", "-4.0", "-66.7", "12.6", 212016580L, 1), - new osm_map_values(Navit.getInstance().getTstring(R.string.ecuador), "-82.6", "-5.4", "-74.4", "2.3", + new OsmMapValues(getTstring(R.string.ecuador), "-82.6", "-5.4", "-74.4", "2.3", 158857591L, 1), - new osm_map_values( - Navit.getInstance().getTstring(R.string.guyana) + "+" - + Navit.getInstance().getTstring(R.string.suriname) + "+" - + Navit.getInstance().getTstring(R.string.guyane_francaise), "-62.0", "1.0", "-51.2", + new OsmMapValues(getTstring(R.string.guyana) + "+" + getTstring(R.string.suriname) + "+" + + getTstring(R.string.guyane_francaise), "-62.0", "1.0", "-51.2", "8.9", 123000072L, 1), - new osm_map_values(Navit.getInstance().getTstring(R.string.haiti) + "+" - + Navit.getInstance().getTstring(R.string.dominican_republic), "-74.8", "17.3", "-68.2", "20.1", - 149925689L, 1), - new osm_map_values(Navit.getInstance().getTstring(R.string.jamaica), "-78.6", "17.4", "-75.9", "18.9", + new OsmMapValues(getTstring(R.string.haiti) + "+" + getTstring(R.string.dominican_republic), + "-74.8", "17.3", "-68.2", "20.1", 149925689L, 1), + new OsmMapValues(getTstring(R.string.jamaica), "-78.6", "17.4", "-75.9", "18.9", 113961998L, 1), - new osm_map_values(Navit.getInstance().getTstring(R.string.mexico), "-117.6", "14.1", "-86.4", "32.8", + new OsmMapValues(getTstring(R.string.mexico), "-117.6", "14.1", "-86.4", "32.8", 551307973L, 1), - new osm_map_values(Navit.getInstance().getTstring(R.string.paraguay), "-63.8", "-28.1", "-53.6", + new OsmMapValues(getTstring(R.string.paraguay), "-63.8", "-28.1", "-53.6", "-18.8", 159498397L, 1), - new osm_map_values(Navit.getInstance().getTstring(R.string.peru), "-82.4", "-18.1", "-67.5", "0.4", + new OsmMapValues(getTstring(R.string.peru), "-82.4", "-18.1", "-67.5", "0.4", 212490557L, 1), - new osm_map_values(Navit.getInstance().getTstring(R.string.uruguay), "-59.2", "-36.5", "-51.7", "-29.7", - 157482719L, 1), - new osm_map_values(Navit.getInstance().getTstring(R.string.venezuela), "-73.6", "0.4", "-59.7", "12.8", - 167295729L, 1) + new OsmMapValues(getTstring(R.string.uruguay), "-59.2", "-36.5", "-51.7", "-29.7", + 157482719L, 1), + new OsmMapValues(getTstring(R.string.venezuela), "-73.6", "0.4", "-59.7", "12.8", + 167295729L, 1) }; //we should try to resume private static final int SOCKET_CONNECT_TIMEOUT = 60000; // 60 secs. @@ -488,23 +472,23 @@ public class NavitMapDownloader extends Thread { private static final int MAP_READ_FILE_BUFFER = 1024 * 64; private static final int UPDATE_PROGRESS_TIME_NS = 1000 * 1000000; // 1ns=1E-9s private static final int MAX_RETRIES = 5; - private final String TAG = this.getClass().getName(); - private final String map_filename_path; - private final osm_map_values map_values; - private final int map_id; - private Boolean stop_me = false; - private long uiLastUpdated = -1; - private Boolean retryDownload = false; //Download failed, but - private int retry_counter = 0; - - NavitMapDownloader(int map_id) { - this.map_values = osm_maps[map_id]; - this.map_id = map_id; - this.map_filename_path = Navit.map_filename_path; + private static final String TAG = "NavitMapDownLoader"; + private final String mMapFilenamePath; + private final OsmMapValues mMapValues; + private final int mMapId; + private Boolean mStopMe = false; + private long mUiLastUpdated = -1; + private Boolean mRetryDownload = false; //Download failed, but + private int mRetryCounter = 0; + + NavitMapDownloader(int mapId) { + this.mMapValues = osm_maps[mapId]; + this.mMapId = mapId; + this.mMapFilenamePath = Navit.sMapFilenamePath; } - public static NavitMap[] getAvailableMaps() { - class filterMaps implements FilenameFilter { + static NavitMap[] getAvailableMaps() { + class FilterMaps implements FilenameFilter { public boolean accept(File dir, String filename) { return (filename.endsWith(".bin")); @@ -512,75 +496,76 @@ public class NavitMapDownloader extends Thread { } NavitMap[] maps = new NavitMap[0]; - File map_dir = new File(Navit.map_filename_path); - String[] map_file_names = map_dir.list(new filterMaps()); - if (map_file_names != null) { - maps = new NavitMap[map_file_names.length]; - for (int map_file_index = 0; map_file_index < map_file_names.length; map_file_index++) { - maps[map_file_index] = new NavitMap(Navit.map_filename_path, - map_file_names[map_file_index]); + File mapDir = new File(Navit.sMapFilenamePath); + String[] mapFileNames = mapDir.list(new FilterMaps()); + if (mapFileNames != null) { + maps = new NavitMap[mapFileNames.length]; + for (int mapFileIndex = 0; mapFileIndex < mapFileNames.length; mapFileIndex++) { + maps[mapFileIndex] = new NavitMap(Navit.sMapFilenamePath, + mapFileNames[mapFileIndex]); } } return maps; } + @Override public void run() { - stop_me = false; - retry_counter = 0; + mStopMe = false; + mRetryCounter = 0; - Log.v(TAG, "start download " + map_values.map_name); - updateProgress(0, map_values.est_size_bytes, - Navit.getInstance().getTstring(R.string.map_downloading) + ": " + map_values.map_name); + Log.v(TAG, "start download " + mMapValues.mMapName); + updateProgress(0, mMapValues.mEstSizeBytes, + getTstring(R.string.map_downloading) + ": " + mMapValues.mMapName); boolean success; do { try { - Thread.sleep(10 + retry_counter * 1000); + Thread.sleep(10 + mRetryCounter * 1000); } catch (InterruptedException e) { e.printStackTrace(); } - retryDownload = false; + mRetryDownload = false; success = download_osm_map(); } while (!success - && retryDownload - && retry_counter < MAX_RETRIES - && !stop_me); + && mRetryDownload + && mRetryCounter < MAX_RETRIES + && !mStopMe); if (success) { - toast(map_values.map_name + " " + Navit.getInstance().getTstring(R.string.map_download_ready)); + toast(mMapValues.mMapName + " " + getTstring(R.string.map_download_ready)); getMapInfoFile().delete(); Log.d(TAG, "success"); } - if (success || stop_me) { + if (success || mStopMe) { NavitDialogs.sendDialogMessage(NavitDialogs.MSG_MAP_DOWNLOAD_FINISHED, - map_filename_path + map_values.map_name + ".bin", null, -1, success ? 1 : 0, map_id); + mMapFilenamePath + mMapValues.mMapName + ".bin", null, -1, success ? 1 : 0, mMapId); } } - public void stop_thread() { - stop_me = true; - Log.d(TAG, "stop_me -> true"); + void stop_thread() { + mStopMe = true; + Log.d(TAG, "mStopMe -> true"); } - private boolean checkFreeSpace(long needed_bytes) { - long free_space = getFreeSpace(); + private boolean checkFreeSpace(long neededBytes) { + long freeSpace = getFreeSpace(); - if (needed_bytes <= 0) { - needed_bytes = MAP_WRITE_FILE_BUFFER; + if (neededBytes <= 0) { + neededBytes = MAP_WRITE_FILE_BUFFER; } - if (free_space < needed_bytes) { + if (freeSpace < neededBytes) { String msg; Log.e(TAG, "Not enough free space or media not available. Please free at least " - + needed_bytes / 1024 / 1024 + "Mb."); - if (free_space < 0) { - msg = Navit.getInstance().getTstring(R.string.map_download_medium_unavailable); + + neededBytes / 1024 / 1024 + "Mb."); + if (freeSpace < 0) { + msg = getTstring(R.string.map_download_medium_unavailable); } else { - msg = Navit.getInstance().getTstring(R.string.map_download_not_enough_free_space); + msg = getTstring(R.string.map_download_not_enough_free_space); } - updateProgress(free_space, needed_bytes, - Navit.getInstance().getTstring(R.string.map_download_download_error) + "\n" + msg); + updateProgress(freeSpace, neededBytes, + getTstring(R.string.map_download_download_error) + "\n" + msg); return false; } return true; @@ -590,8 +575,8 @@ public class NavitMapDownloader extends Thread { File finalOutputFile = getMapFile(); if (finalOutputFile.exists()) { - Message msg = Message.obtain(Navit.getInstance().getNavitGraphics().callback_handler, - NavitGraphics.msg_type.CLB_DELETE_MAP.ordinal()); + Message msg = Message.obtain(NavitGraphics.sCallbackHandler, + NavitGraphics.MsgType.CLB_DELETE_MAP.ordinal()); Bundle b = new Bundle(); b.putString("title", finalOutputFile.getAbsolutePath()); msg.setData(b); @@ -603,15 +588,15 @@ public class NavitMapDownloader extends Thread { private boolean download_osm_map() { - long already_read = 0; - long real_size_bytes; + long alreadyRead = 0; + long realSizeBytes; boolean resume = true; File outputFile = getDestinationFile(); - long old_download_size = outputFile.length(); + long oldDownloadSize = outputFile.length(); URL url = null; - if (old_download_size > 0) { + if (oldDownloadSize > 0) { url = readFileInfo(); } @@ -625,32 +610,32 @@ public class NavitMapDownloader extends Thread { if (c != null) { if (resume) { - c.setRequestProperty("Range", "bytes=" + old_download_size + "-"); - already_read = old_download_size; + c.setRequestProperty("Range", "bytes=" + oldDownloadSize + "-"); + alreadyRead = oldDownloadSize; } try { - real_size_bytes = Long.parseLong(c.getHeaderField("Content-Length")) + already_read; + realSizeBytes = Long.parseLong(c.getHeaderField("Content-Length")) + alreadyRead; } catch (Exception e) { - real_size_bytes = -1; + realSizeBytes = -1; } long fileTime = c.getLastModified(); if (!resume) { outputFile.delete(); - writeFileInfo(c, real_size_bytes); + writeFileInfo(c, realSizeBytes); } - if (real_size_bytes <= 0) { - real_size_bytes = map_values.est_size_bytes; + if (realSizeBytes <= 0) { + realSizeBytes = mMapValues.mEstSizeBytes; } - Log.d(TAG, "size: " + real_size_bytes + ", read: " + already_read + ", timestamp: " + Log.d(TAG, "size: " + realSizeBytes + ", read: " + alreadyRead + ", timestamp: " + fileTime + ", Connection ref: " + c.getURL()); - if (checkFreeSpace(real_size_bytes - already_read) - && downloadData(c, already_read, real_size_bytes, resume, outputFile)) { + if (checkFreeSpace(realSizeBytes - alreadyRead) + && downloadData(c, alreadyRead, realSizeBytes, resume, outputFile)) { File finalOutputFile = getMapFile(); // delete an already existing file first @@ -664,19 +649,19 @@ public class NavitMapDownloader extends Thread { } private File getDestinationFile() { - File outputFile = new File(map_filename_path, map_values.map_name + ".tmp"); + File outputFile = new File(mMapFilenamePath, mMapValues.mMapName + ".tmp"); outputFile.getParentFile().mkdir(); return outputFile; } - private boolean downloadData(URLConnection c, long already_read, long real_size_bytes, boolean resume, + private boolean downloadData(URLConnection c, long alreadyRead, long realSizeBytes, boolean resume, File outputFile) { boolean success = false; BufferedOutputStream buf = getOutputStream(outputFile, resume); BufferedInputStream bif = getInputStream(c); if (buf != null && bif != null) { - success = readData(buf, bif, already_read, real_size_bytes); + success = readData(buf, bif, alreadyRead, realSizeBytes); // always cleanup, as we might get errors when trying to resume try { buf.flush(); @@ -694,11 +679,11 @@ public class NavitMapDownloader extends Thread { URL url; try { url = - new URL("http://maps.navit-project.org/api/map/?bbox=" + map_values.lon1 + "," - + map_values.lat1 - + "," + map_values.lon2 + "," + map_values.lat2); + new URL("http://maps.navit-project.org/api/map/?bbox=" + mMapValues.mLon1 + "," + + mMapValues.mLat1 + + "," + mMapValues.mLon2 + "," + mMapValues.mLat2); } catch (MalformedURLException e) { - Log.e(TAG, "We failed to create a URL to " + map_values.map_name); + Log.e(TAG, "We failed to create a URL to " + mMapValues.mMapName); e.printStackTrace(); return null; } @@ -708,7 +693,7 @@ public class NavitMapDownloader extends Thread { private long getFreeSpace() { try { - StatFs fsInfo = new StatFs(map_filename_path); + StatFs fsInfo = new StatFs(mMapFilenamePath); return (long) fsInfo.getAvailableBlocks() * fsInfo.getBlockSize(); } catch (Exception e) { return -1; @@ -721,7 +706,7 @@ public class NavitMapDownloader extends Thread { bif = new BufferedInputStream(c.getInputStream(), MAP_READ_FILE_BUFFER); } catch (FileNotFoundException e) { Log.e(TAG, "File not found on server: " + e); - if (retry_counter > 0) { + if (mRetryCounter > 0) { getMapInfoFile().delete(); } enableRetry(); @@ -735,11 +720,11 @@ public class NavitMapDownloader extends Thread { } private File getMapFile() { - return new File(map_filename_path, map_values.map_name + ".bin"); + return new File(mMapFilenamePath, mMapValues.mMapName + ".bin"); } private File getMapInfoFile() { - return new File(map_filename_path, map_values.map_name + ".tmp.info"); + return new File(mMapFilenamePath, mMapValues.mMapName + ".tmp.info"); } private BufferedOutputStream getOutputStream(File outputFile, boolean resume) { @@ -770,44 +755,44 @@ public class NavitMapDownloader extends Thread { return c; } - private boolean readData(OutputStream buf, InputStream bif, long already_read, - long real_size_bytes) { - long start_timestamp = System.nanoTime(); + private boolean readData(OutputStream buf, InputStream bif, long alreadyRead, + long realSizeBytes) { + long startTimestamp = System.nanoTime(); byte[] buffer = new byte[MAP_WRITE_MEM_BUFFER]; int len1; - long startOffset = already_read; + long startOffset = alreadyRead; boolean success = false; try { - while (!stop_me && (len1 = bif.read(buffer)) != -1) { - already_read += len1; - updateProgress(start_timestamp, startOffset, already_read, real_size_bytes); + while (!mStopMe && (len1 = bif.read(buffer)) != -1) { + alreadyRead += len1; + updateProgress(startTimestamp, startOffset, alreadyRead, realSizeBytes); try { buf.write(buffer, 0, len1); } catch (IOException e) { Log.d(TAG, "Error: " + e); - if (!checkFreeSpace(real_size_bytes - already_read + MAP_WRITE_FILE_BUFFER)) { + if (!checkFreeSpace(realSizeBytes - alreadyRead + MAP_WRITE_FILE_BUFFER)) { if (deleteMap()) { enableRetry(); } else { - updateProgress(already_read, real_size_bytes, - Navit.getInstance().getTstring(R.string.map_download_download_error) + "\n" - + Navit.getInstance().getTstring(R.string.map_download_not_enough_free_space)); + updateProgress(alreadyRead, realSizeBytes, + getTstring(R.string.map_download_download_error) + "\n" + + getTstring(R.string.map_download_not_enough_free_space)); } } else { - updateProgress(already_read, real_size_bytes, - Navit.getInstance().getTstring(R.string.map_download_error_writing_map)); + updateProgress(alreadyRead, realSizeBytes, + getTstring(R.string.map_download_error_writing_map)); } return false; } } - if (stop_me) { - toast(Navit.getInstance().getTstring(R.string.map_download_download_aborted)); - } else if (already_read < real_size_bytes) { - Log.d(TAG, "Server send only " + already_read + " bytes of " + real_size_bytes); + if (mStopMe) { + toast(getTstring(R.string.map_download_download_aborted)); + } else if (alreadyRead < realSizeBytes) { + Log.d(TAG, "Server send only " + alreadyRead + " bytes of " + realSizeBytes); enableRetry(); } else { success = true; @@ -816,8 +801,8 @@ public class NavitMapDownloader extends Thread { Log.d(TAG, "Error: " + e); enableRetry(); - updateProgress(already_read, real_size_bytes, - Navit.getInstance().getTstring(R.string.map_download_download_error)); + updateProgress(alreadyRead, realSizeBytes, + getTstring(R.string.map_download_download_error)); } return success; @@ -828,13 +813,13 @@ public class NavitMapDownloader extends Thread { try { ObjectInputStream infoStream = new ObjectInputStream( new FileInputStream(getMapInfoFile())); - String resume_proto = infoStream.readUTF(); infoStream.readUTF(); // read the host name (unused for now) - String resume_file = infoStream.readUTF(); + String resumeFile = infoStream.readUTF(); infoStream.close(); // looks like the same file, try to resume Log.v(TAG, "Try to resume download"); - url = new URL(resume_proto + "://" + "maps.navit-project.org" + resume_file); + String resumeProto = infoStream.readUTF(); + url = new URL(resumeProto + "://" + "maps.navit-project.org" + resumeFile); } catch (Exception e) { getMapInfoFile().delete(); } @@ -848,36 +833,36 @@ public class NavitMapDownloader extends Thread { private void updateProgress(long startTime, long offsetBytes, long readBytes, long maxBytes) { long currentTime = System.nanoTime(); - if ((currentTime > uiLastUpdated + UPDATE_PROGRESS_TIME_NS) && startTime != currentTime) { - float per_second_overall = (readBytes - offsetBytes) / ((currentTime - startTime) / 1000000000f); - long bytes_remaining = maxBytes - readBytes; - int eta_seconds = (int) (bytes_remaining / per_second_overall); + if ((currentTime > mUiLastUpdated + UPDATE_PROGRESS_TIME_NS) && startTime != currentTime) { + float perSecondOverall = (readBytes - offsetBytes) / ((currentTime - startTime) / 1000000000f); + long bytesRemaining = maxBytes - readBytes; + int etaSeconds = (int) (bytesRemaining / perSecondOverall); - String eta_string; - if (eta_seconds > 60) { - eta_string = (int) (eta_seconds / 60f) + " m"; + String etaString; + if (etaSeconds > 60) { + etaString = (int) (etaSeconds / 60f) + " m"; } else { - eta_string = eta_seconds + " s"; + etaString = etaSeconds + " s"; } String info = String.format("%s: %s\n %dMb / %dMb\n %.1f kb/s %s: %s", - Navit.getInstance().getTstring(R.string.map_downloading), - map_values.map_name, readBytes / 1024 / 1024, maxBytes / 1024 / 1024, - per_second_overall / 1024f, Navit.getInstance().getTstring(R.string.map_download_eta), - eta_string); + getTstring(R.string.map_downloading), + mMapValues.mMapName, readBytes / 1024 / 1024, maxBytes / 1024 / 1024, + perSecondOverall / 1024f, getTstring(R.string.map_download_eta), + etaString); - if (retry_counter > 0) { - info += "\n Retry " + retry_counter + "/" + MAX_RETRIES; + if (mRetryCounter > 0) { + info += "\n Retry " + mRetryCounter + "/" + MAX_RETRIES; } Log.d(TAG, "info: " + info); updateProgress(readBytes, maxBytes, info); - uiLastUpdated = currentTime; + mUiLastUpdated = currentTime; } } private void updateProgress(long positionBytes, long maximumBytes, String infoText) { NavitDialogs.sendDialogMessage(NavitDialogs.MSG_PROGRESS_BAR, - Navit.getInstance().getTstring(R.string.map_download_title), infoText, + getTstring(R.string.map_download_title), infoText, NavitDialogs.DIALOG_MAPDOWNLOAD, (int) (maximumBytes / 1024), (int) (positionBytes / 1024)); } @@ -899,53 +884,45 @@ public class NavitMapDownloader extends Thread { } private void enableRetry() { - retryDownload = true; - retry_counter++; + mRetryDownload = true; + mRetryCounter++; } - public static class osm_map_values { - - final String lon1; - final String lat1; - final String lon2; - final String lat2; - final String map_name; - final long est_size_bytes; - final int level; - - - private osm_map_values(String mapname, String lon_1, String lat_1, String lon_2, - String lat_2, - long bytes_est, int level) { - this.map_name = mapname; - this.lon1 = lon_1; - this.lat1 = lat_1; - this.lon2 = lon_2; - this.lat2 = lat_2; - this.est_size_bytes = bytes_est; - this.level = level; + static class OsmMapValues { + + final String mLon1; + final String mLat1; + final String mLon2; + final String mLat2; + final String mMapName; + final long mEstSizeBytes; + final int mLevel; + + + private OsmMapValues(String mapName, String lon1, String lat1, String lon2, + String lat2, + long bytesEst, int level) { + this.mMapName = mapName; + this.mLon1 = lon1; + this.mLat1 = lat1; + this.mLon2 = lon2; + this.mLat2 = lat2; + this.mEstSizeBytes = bytesEst; + this.mLevel = level; } - public boolean isInMap(Location location) { - double longitude_1 = Double.valueOf(this.lon1); - double latitude_1 = Double.valueOf(this.lat1); - double longitude_2 = Double.valueOf(this.lon2); - double latitude_2 = Double.valueOf(this.lat2); + boolean isInMap(Location location) { - if (location.getLongitude() < longitude_1) { + if (location.getLongitude() < Double.valueOf(this.mLon1)) { return false; } - if (location.getLongitude() > longitude_2) { + if (location.getLongitude() > Double.valueOf(this.mLon2)) { return false; } - if (location.getLatitude() < latitude_1) { + if (location.getLatitude() < Double.valueOf(this.mLat1)) { return false; } - if (location.getLatitude() > latitude_2) { - return false; - } - - return true; + return !(location.getLatitude() > Double.valueOf(this.mLat2)); } } } |