Fix:android:Code cleanup
authorrikky <rikky@ffa7fe5e-494d-0410-b361-a75ebd5db220>
Sun, 27 Mar 2011 19:51:01 +0000 (19:51 +0000)
committerrikky <rikky@ffa7fe5e-494d-0410-b361-a75ebd5db220>
Sun, 27 Mar 2011 19:51:01 +0000 (19:51 +0000)
git-svn-id: https://navit.svn.sourceforge.net/svnroot/navit/trunk@4391 ffa7fe5e-494d-0410-b361-a75ebd5db220

navit/navit/android/src/org/navitproject/navit/Navit.java
navit/navit/android/src/org/navitproject/navit/NavitMapDownloader.java

index 4776ae4..e4103ca 100644 (file)
@@ -1314,7 +1314,7 @@ public class Navit extends Activity implements Handler.Callback
                                mapdownloader_dialog_pri.setOnDismissListener(mOnDismissListener1);\r
                                mapdownloader_pri = new NavitMapDownloader(this);\r
                                progressThread_pri = mapdownloader_pri.new ProgressThread(progress_handler,\r
-                                               NavitMapDownloader.OSM_MAPS[Navit.download_map_id], MAP_NUM_PRIMARY);\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(),\r
@@ -1342,7 +1342,7 @@ public class Navit extends Activity implements Handler.Callback
                                mapdownloader_dialog_sec.setOnDismissListener(mOnDismissListener2);\r
                                mapdownloader_sec = new NavitMapDownloader(this);\r
                                progressThread_sec = mapdownloader_sec.new ProgressThread(progress_handler,\r
-                                               NavitMapDownloader.OSM_MAPS[Navit.download_map_id], MAP_NUM_SECONDARY);\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(),\r
index b80f493..c18796e 100644 (file)
@@ -67,465 +67,99 @@ public class NavitMapDownloader
                        this.text_for_select_list = this.map_name + " " + this.est_size_bytes_human_string;\r
                }\r
        }\r
-\r
        //\r
        // define the maps here\r
        //\r
-\r
-       static final osm_map_values     Whole_Planet                                                                    = new osm_map_values(\r
-                                                                                                                                                                                                               "Whole Planet",\r
-                                                                                                                                                                                                               "-180", "-90", "180",\r
-                                                                                                                                                                                                               "90", 5985878379L,\r
-                                                                                                                                                                                                               true, 0);\r
-       static final osm_map_values     Africa                                                                                  = new osm_map_values(\r
-                                                                                                                                                                                                               "Africa", "-20.8",\r
-                                                                                                                                                                                                               "-35.2", "52.5",\r
-                                                                                                                                                                                                               "37.4", 180836389L,\r
-                                                                                                                                                                                                               true, 1);\r
-       static final osm_map_values     Angola                                                                                  = new osm_map_values(\r
-                                                                                                                                                                                                               "Angola", "11.4",\r
-                                                                                                                                                                                                               "-18.1", "24.2",\r
-                                                                                                                                                                                                               "-5.3", 56041641L,\r
-                                                                                                                                                                                                               false, 1);\r
-       static final osm_map_values     Burundi                                                                                 = new osm_map_values(\r
-                                                                                                                                                                                                               "Burundi", "28.9",\r
-                                                                                                                                                                                                               "-4.5", "30.9",\r
-                                                                                                                                                                                                               "-2.2", 56512924L,\r
-                                                                                                                                                                                                               false, 1);\r
-       static final osm_map_values     Democratic_Republic_of_the_Congo                        = new osm_map_values(\r
-                                                                                                                                                                                                               "Democratic Republic of the Congo",\r
-                                                                                                                                                                                                               "11.7", "-13.6",\r
-                                                                                                                                                                                                               "31.5", "5.7",\r
-                                                                                                                                                                                                               65026791L, false, 1);\r
-       static final osm_map_values     Kenya                                                                                           = new osm_map_values(\r
-                                                                                                                                                                                                               "Kenya", "33.8",\r
-                                                                                                                                                                                                               "-5.2", "42.4",\r
-                                                                                                                                                                                                               "4.9", 58545273L,\r
-                                                                                                                                                                                                               false, 1);\r
-       static final osm_map_values     Lesotho                                                                                 = new osm_map_values(\r
-                                                                                                                                                                                                               "Lesotho", "26.9",\r
-                                                                                                                                                                                                               "-30.7", "29.6",\r
-                                                                                                                                                                                                               "-28.4", 54791041L,\r
-                                                                                                                                                                                                               false, 1);\r
-       static final osm_map_values     Madagascar                                                                              = new osm_map_values(\r
-                                                                                                                                                                                                               "Madagascar", "43.0",\r
-                                                                                                                                                                                                               "-25.8", "50.8",\r
-                                                                                                                                                                                                               "-11.8", 56801099L,\r
-                                                                                                                                                                                                               false, 1);\r
-       static final osm_map_values     Nambia_Botswana                                                         = new osm_map_values(\r
-                                                                                                                                                                                                               "Nambia+Botswana",\r
-                                                                                                                                                                                                               "11.4", "-29.1",\r
-                                                                                                                                                                                                               "29.5", "-16.9",\r
-                                                                                                                                                                                                               61807049L, false, 1);\r
-       static final osm_map_values     Reunion                                                                                 = new osm_map_values(\r
-                                                                                                                                                                                                               "Reunion", "55.2",\r
-                                                                                                                                                                                                               "-21.4", "55.9",\r
-                                                                                                                                                                                                               "-20.9", 58537419L,\r
-                                                                                                                                                                                                               false, 1);\r
-       static final osm_map_values     Rwanda                                                                                  = new osm_map_values(\r
-                                                                                                                                                                                                               "Rwanda", "28.8",\r
-                                                                                                                                                                                                               "-2.9", "30.9",\r
-                                                                                                                                                                                                               "-1.0", 56313710L,\r
-                                                                                                                                                                                                               false, 1);\r
-       static final osm_map_values     South_Africa                                                                    = new osm_map_values(\r
-                                                                                                                                                                                                               "South Africa",\r
-                                                                                                                                                                                                               "15.6", "-35.2",\r
-                                                                                                                                                                                                               "33.3", "-21.9",\r
-                                                                                                                                                                                                               73545245L, false, 1);\r
-       static final osm_map_values     Uganda                                                                                  = new osm_map_values(\r
-                                                                                                                                                                                                               "Uganda", "29.3",\r
-                                                                                                                                                                                                               "-1.6", "35.1",\r
-                                                                                                                                                                                                               "4.3", 57376589L,\r
-                                                                                                                                                                                                               false, 1);\r
-       static final osm_map_values     Asia                                                                                            = new osm_map_values(\r
-                                                                                                                                                                                                               "Asia", "23.8",\r
-                                                                                                                                                                                                               "0.1", "195.0",\r
-                                                                                                                                                                                                               "82.4", 797725952L,\r
-                                                                                                                                                                                                               true, 2);\r
-       static final osm_map_values     China                                                                                           = new osm_map_values(\r
-                                                                                                                                                                                                               "China", "67.3",\r
-                                                                                                                                                                                                               "5.3", "135.0",\r
-                                                                                                                                                                                                               "54.5", 259945160L,\r
-                                                                                                                                                                                                               false, 2);\r
-       static final osm_map_values     Cyprus                                                                                  = new osm_map_values(\r
-                                                                                                                                                                                                               "Cyprus", "32.0",\r
-                                                                                                                                                                                                               "34.5", "34.9",\r
-                                                                                                                                                                                                               "35.8", 58585278L,\r
-                                                                                                                                                                                                               false, 2);\r
-       static final osm_map_values     India_Nepal                                                                             = new osm_map_values(\r
-                                                                                                                                                                                                               "India+Nepal",\r
-                                                                                                                                                                                                               "67.9", "5.5",\r
-                                                                                                                                                                                                               "89.6", "36.0",\r
-                                                                                                                                                                                                               82819344L, false, 2);\r
-       static final osm_map_values     Indonesia                                                                               = new osm_map_values(\r
-                                                                                                                                                                                                               "Indonesia", "93.7",\r
-                                                                                                                                                                                                               "-17.3", "155.5",\r
-                                                                                                                                                                                                               "7.6", 74648081L,\r
-                                                                                                                                                                                                               false, 2);\r
-       static final osm_map_values     Iran                                                                                            = new osm_map_values(\r
-                                                                                                                                                                                                               "Iran", "43.5",\r
-                                                                                                                                                                                                               "24.4", "63.6",\r
-                                                                                                                                                                                                               "40.4", 69561312L,\r
-                                                                                                                                                                                                               false, 2);\r
-       static final osm_map_values     Iraq                                                                                            = new osm_map_values(\r
-                                                                                                                                                                                                               "Iraq", "38.7",\r
-                                                                                                                                                                                                               "28.5", "49.2",\r
-                                                                                                                                                                                                               "37.4", 59146383L,\r
-                                                                                                                                                                                                               false, 2);\r
-       static final osm_map_values     Israel                                                                                  = new osm_map_values(\r
-                                                                                                                                                                                                               "Israel", "33.99",\r
-                                                                                                                                                                                                               "29.8", "35.95",\r
-                                                                                                                                                                                                               "33.4", 65065351L,\r
-                                                                                                                                                                                                               false, 2);\r
-       static final osm_map_values     Japan_Korea_Taiwan                                                      = new osm_map_values(\r
-                                                                                                                                                                                                               "Japan+Korea+Taiwan",\r
-                                                                                                                                                                                                               "117.6", "20.5",\r
-                                                                                                                                                                                                               "151.3", "47.1",\r
-                                                                                                                                                                                                               305538751L, false, 2);\r
-       static final osm_map_values     Malasia_Singapore                                                               = new osm_map_values(\r
-                                                                                                                                                                                                               "Malasia+Singapore",\r
-                                                                                                                                                                                                               "94.3", "-5.9",\r
-                                                                                                                                                                                                               "108.6", "6.8",\r
-                                                                                                                                                                                                               58849792L, false, 2);\r
-       static final osm_map_values     Mongolia                                                                                        = new osm_map_values(\r
-                                                                                                                                                                                                               "Mongolia", "87.5",\r
-                                                                                                                                                                                                               "41.4", "120.3",\r
-                                                                                                                                                                                                               "52.7", 60871187L,\r
-                                                                                                                                                                                                               false, 2);\r
-       static final osm_map_values     Thailand                                                                                        = new osm_map_values(\r
-                                                                                                                                                                                                               "Thailand", "97.5",\r
-                                                                                                                                                                                                               "5.7", "105.2",\r
-                                                                                                                                                                                                               "19.7", 62422864L,\r
-                                                                                                                                                                                                               false, 2);\r
-       static final osm_map_values     Turkey                                                                                  = new osm_map_values(\r
-                                                                                                                                                                                                               "Turkey", "25.1",\r
-                                                                                                                                                                                                               "35.8", "46.4",\r
-                                                                                                                                                                                                               "42.8", 81758047L,\r
-                                                                                                                                                                                                               false, 2);\r
-       static final osm_map_values     UAE_Other                                                                               = new osm_map_values(\r
-                                                                                                                                                                                                               "UAE+Other", "51.5",\r
-                                                                                                                                                                                                               "22.6", "56.7",\r
-                                                                                                                                                                                                               "26.5", 57419510L,\r
-                                                                                                                                                                                                               false, 2);\r
-       static final osm_map_values     Australia2                                                                              = new osm_map_values(\r
-                                                                                                                                                                                                               "Australia", "110.5",\r
-                                                                                                                                                                                                               "-44.2", "154.9",\r
-                                                                                                                                                                                                               "-9.2", 128502185L,\r
-                                                                                                                                                                                                               true, 3);\r
-       static final osm_map_values     Australia                                                                               = new osm_map_values(\r
-                                                                                                                                                                                                               "Australia", "110.5",\r
-                                                                                                                                                                                                               "-44.2", "154.9",\r
-                                                                                                                                                                                                               "-9.2", 128502185L,\r
-                                                                                                                                                                                                               false, 3);\r
-       static final osm_map_values     Tasmania                                                                                        = new osm_map_values(\r
-                                                                                                                                                                                                               "Tasmania", "144.0",\r
-                                                                                                                                                                                                               "-45.1", "155.3",\r
-                                                                                                                                                                                                               "-24.8", 103573989L,\r
-                                                                                                                                                                                                               false, 3);\r
-       static final osm_map_values     Victoria_New_South_Wales                                        = new osm_map_values(\r
-                                                                                                                                                                                                               "Victoria+New South Wales",\r
-                                                                                                                                                                                                               "140.7", "-39.4",\r
-                                                                                                                                                                                                               "153.7", "-26.9",\r
-                                                                                                                                                                                                               99307594L, false, 3);\r
-       static final osm_map_values     New_Zealand                                                                             = new osm_map_values(\r
-                                                                                                                                                                                                               "New Zealand",\r
-                                                                                                                                                                                                               "165.2", "-47.6",\r
-                                                                                                                                                                                                               "179.1", "-33.7",\r
-                                                                                                                                                                                                               64757454L, false, 3);\r
-       static final osm_map_values     Europe                                                                                  = new osm_map_values(\r
-                                                                                                                                                                                                               "Europe", "-12.97",\r
-                                                                                                                                                                                                               "33.59", "34.15",\r
-                                                                                                                                                                                                               "72.10", 2753910015L,\r
-                                                                                                                                                                                                               true, 4);\r
-       static final osm_map_values     Western_Europe                                                                  = new osm_map_values(\r
-                                                                                                                                                                                                               "Western Europe",\r
-                                                                                                                                                                                                               "-17.6", "34.5",\r
-                                                                                                                                                                                                               "42.9", "70.9",\r
-                                                                                                                                                                                                               2832986851L, false, 4);\r
-       static final osm_map_values     Austria                                                                                 = new osm_map_values(\r
-                                                                                                                                                                                                               "Austria", "9.4",\r
-                                                                                                                                                                                                               "46.32", "17.21",\r
-                                                                                                                                                                                                               "49.1", 222359992L,\r
-                                                                                                                                                                                                               false, 4);\r
-       static final osm_map_values     BeNeLux                                                                                 = new osm_map_values(\r
-                                                                                                                                                                                                               "BeNeLux", "2.08",\r
-                                                                                                                                                                                                               "48.87", "7.78",\r
-                                                                                                                                                                                                               "54.52", 533865194L,\r
-                                                                                                                                                                                                               false, 4);\r
-       static final osm_map_values     Faroe_Islands                                                                   = new osm_map_values(\r
-                                                                                                                                                                                                               "Faroe Islands",\r
-                                                                                                                                                                                                               "-7.8", "61.3",\r
-                                                                                                                                                                                                               "-6.1", "62.5",\r
-                                                                                                                                                                                                               54526101L, false, 4);\r
-       static final osm_map_values     France                                                                                  = new osm_map_values(\r
-                                                                                                                                                                                                               "France", "-5.45",\r
-                                                                                                                                                                                                               "42.00", "8.44",\r
-                                                                                                                                                                                                               "51.68", 1112047845L,\r
-                                                                                                                                                                                                               false, 4);\r
-       static final osm_map_values     Germany                                                                                 = new osm_map_values(\r
-                                                                                                                                                                                                               "Germany", "5.18",\r
-                                                                                                                                                                                                               "46.84", "15.47",\r
-                                                                                                                                                                                                               "55.64", 944716238L,\r
-                                                                                                                                                                                                               false, 4);\r
-       static final osm_map_values     Bavaria                                                                                 = new osm_map_values(\r
-                                                                                                                                                                                                               "Bavaria", "10.3",\r
-                                                                                                                                                                                                               "47.8", "13.6",\r
-                                                                                                                                                                                                               "49.7", 131799419L,\r
-                                                                                                                                                                                                               false, 4);\r
-       static final osm_map_values     Saxonia                                                                                 = new osm_map_values(\r
-                                                                                                                                                                                                               "Saxonia", "11.8",\r
-                                                                                                                                                                                                               "50.1", "15.0",\r
-                                                                                                                                                                                                               "51.7", 112073909L,\r
-                                                                                                                                                                                                               false, 4);\r
-       static final osm_map_values     Germany_Austria_Switzerland                             = new osm_map_values(\r
-                                                                                                                                                                                                               "Germany+Austria+Switzerland",\r
-                                                                                                                                                                                                               "3.4", "44.5",\r
-                                                                                                                                                                                                               "18.6", "55.1",\r
-                                                                                                                                                                                                               1385785353L, false, 4);\r
-       static final osm_map_values     Iceland                                                                                 = new osm_map_values(\r
-                                                                                                                                                                                                               "Iceland", "-25.3",\r
-                                                                                                                                                                                                               "62.8", "-11.4",\r
-                                                                                                                                                                                                               "67.5", 57281405L,\r
-                                                                                                                                                                                                               false, 4);\r
-       static final osm_map_values     Ireland                                                                                 = new osm_map_values(\r
-                                                                                                                                                                                                               "Ireland", "-11.17",\r
-                                                                                                                                                                                                               "51.25", "-5.23",\r
-                                                                                                                                                                                                               "55.9", 70186936L,\r
-                                                                                                                                                                                                               false, 4);\r
-       static final osm_map_values     Italy                                                                                           = new osm_map_values(\r
-                                                                                                                                                                                                               "Italy", "6.52",\r
-                                                                                                                                                                                                               "36.38", "18.96",\r
-                                                                                                                                                                                                               "47.19", 291401314L,\r
-                                                                                                                                                                                                               false, 4);\r
-       static final osm_map_values     Spain_Portugal                                                                  = new osm_map_values(\r
-                                                                                                                                                                                                               "Spain+Portugal",\r
-                                                                                                                                                                                                               "-11.04", "34.87",\r
-                                                                                                                                                                                                               "4.62", "44.41",\r
-                                                                                                                                                                                                               292407746L, false, 4);\r
-       static final osm_map_values     Mallorca                                                                                        = new osm_map_values(\r
-                                                                                                                                                                                                               "Mallorca", "2.2",\r
-                                                                                                                                                                                                               "38.8", "4.7",\r
-                                                                                                                                                                                                               "40.2", 59700600L,\r
-                                                                                                                                                                                                               false, 4);\r
-       static final osm_map_values     Galicia                                                                                 = new osm_map_values(\r
-                                                                                                                                                                                                               "Galicia", "-10.0",\r
-                                                                                                                                                                                                               "41.7", "-6.3",\r
-                                                                                                                                                                                                               "44.1", 64605237L,\r
-                                                                                                                                                                                                               false, 4);\r
-       static final osm_map_values     Scandinavia                                                                             = new osm_map_values(\r
-                                                                                                                                                                                                               "Scandinavia", "4.0",\r
-                                                                                                                                                                                                               "54.4", "32.1",\r
-                                                                                                                                                                                                               "71.5", 299021928L,\r
-                                                                                                                                                                                                               false, 4);\r
-       static final osm_map_values     Finland                                                                                 = new osm_map_values(\r
-                                                                                                                                                                                                               "Finland", "18.6",\r
-                                                                                                                                                                                                               "59.2", "32.3",\r
-                                                                                                                                                                                                               "70.3", 128871467L,\r
-                                                                                                                                                                                                               false, 4);\r
-       static final osm_map_values     Denmark                                                                                 = new osm_map_values(\r
-                                                                                                                                                                                                               "Denmark", "7.49",\r
-                                                                                                                                                                                                               "54.33", "13.05",\r
-                                                                                                                                                                                                               "57.88", 120025875L,\r
-                                                                                                                                                                                                               false, 4);\r
-       static final osm_map_values     Switzerland                                                                             = new osm_map_values(\r
-                                                                                                                                                                                                               "Switzerland",\r
-                                                                                                                                                                                                               "5.79", "45.74",\r
-                                                                                                                                                                                                               "10.59", "47.84",\r
-                                                                                                                                                                                                               162616817L, false, 4);\r
-       static final osm_map_values     UK                                                                                                      = new osm_map_values("UK",\r
-                                                                                                                                                                                                               "-9.7", "49.6",\r
-                                                                                                                                                                                                               "2.2", "61.2",\r
-                                                                                                                                                                                                               245161510L, false, 4);\r
-       static final osm_map_values     Bulgaria                                                                                        = new osm_map_values(\r
-                                                                                                                                                                                                               "Bulgaria", "24.7",\r
-                                                                                                                                                                                                               "42.1", "24.8",\r
-                                                                                                                                                                                                               "42.1", 56607427L,\r
-                                                                                                                                                                                                               false, 4);\r
-       static final osm_map_values     Czech_Republic                                                                  = new osm_map_values(\r
-                                                                                                                                                                                                               "Czech Republic",\r
-                                                                                                                                                                                                               "11.91", "48.48",\r
-                                                                                                                                                                                                               "19.02", "51.17",\r
-                                                                                                                                                                                                               234138824L, false, 4);\r
-       static final osm_map_values     Croatia                                                                                 = new osm_map_values(\r
-                                                                                                                                                                                                               "Croatia", "13.4",\r
-                                                                                                                                                                                                               "42.1", "19.4",\r
-                                                                                                                                                                                                               "46.9", 99183280L,\r
-                                                                                                                                                                                                               false, 4);\r
-       static final osm_map_values     Estonia                                                                                 = new osm_map_values(\r
-                                                                                                                                                                                                               "Estonia", "21.5",\r
-                                                                                                                                                                                                               "57.5", "28.2",\r
-                                                                                                                                                                                                               "59.6", 79276178L,\r
-                                                                                                                                                                                                               false, 4);\r
-       static final osm_map_values     Greece                                                                                  = new osm_map_values(\r
-                                                                                                                                                                                                               "Greece", "28.9",\r
-                                                                                                                                                                                                               "37.8", "29.0",\r
-                                                                                                                                                                                                               "37.8", 55486527L,\r
-                                                                                                                                                                                                               false, 4);\r
-       static final osm_map_values     Crete                                                                                           = new osm_map_values(\r
-                                                                                                                                                                                                               "Crete", "23.3",\r
-                                                                                                                                                                                                               "34.5", "26.8",\r
-                                                                                                                                                                                                               "36.0", 57032630L,\r
-                                                                                                                                                                                                               false, 4);\r
-       static final osm_map_values     Hungary                                                                                 = new osm_map_values(\r
-                                                                                                                                                                                                               "Hungary", "16.08",\r
-                                                                                                                                                                                                               "45.57", "23.03",\r
-                                                                                                                                                                                                               "48.39", 109831319L,\r
-                                                                                                                                                                                                               false, 4);\r
-       static final osm_map_values     Latvia                                                                                  = new osm_map_values(\r
-                                                                                                                                                                                                               "Latvia", "20.7",\r
-                                                                                                                                                                                                               "55.6", "28.3",\r
-                                                                                                                                                                                                               "58.1", 71490706L,\r
-                                                                                                                                                                                                               false, 4);\r
-       static final osm_map_values     Lithuania                                                                               = new osm_map_values(\r
-                                                                                                                                                                                                               "Lithuania", "20.9",\r
-                                                                                                                                                                                                               "53.8", "26.9",\r
-                                                                                                                                                                                                               "56.5", 67992457L,\r
-                                                                                                                                                                                                               false, 4);\r
-       static final osm_map_values     Poland                                                                                  = new osm_map_values(\r
-                                                                                                                                                                                                               "Poland", "13.6",\r
-                                                                                                                                                                                                               "48.8", "24.5",\r
-                                                                                                                                                                                                               "55.0", 266136768L,\r
-                                                                                                                                                                                                               false, 4);\r
-       static final osm_map_values     Romania                                                                                 = new osm_map_values(\r
-                                                                                                                                                                                                               "Romania", "20.3",\r
-                                                                                                                                                                                                               "43.5", "29.9",\r
-                                                                                                                                                                                                               "48.4", 134525863L,\r
-                                                                                                                                                                                                               false, 4);\r
-       static final osm_map_values     North_America                                                                   = new osm_map_values(\r
-                                                                                                                                                                                                               "North America",\r
-                                                                                                                                                                                                               "-178.1", "6.5",\r
-                                                                                                                                                                                                               "-10.4", "84.0",\r
-                                                                                                                                                                                                               2477309662L, true, 5);\r
-       static final osm_map_values     Alaska                                                                                  = new osm_map_values(\r
-                                                                                                                                                                                                               "Alaska", "-179.5",\r
-                                                                                                                                                                                                               "49.5", "-129",\r
-                                                                                                                                                                                                               "71.6", 72320027L,\r
-                                                                                                                                                                                                               false, 5);\r
-       static final osm_map_values     Canada                                                                                  = new osm_map_values(\r
-                                                                                                                                                                                                               "Canada", "-141.3",\r
-                                                                                                                                                                                                               "41.5", "-52.2",\r
-                                                                                                                                                                                                               "70.2", 937813467L,\r
-                                                                                                                                                                                                               false, 5);\r
-       static final osm_map_values     Hawaii                                                                                  = new osm_map_values(\r
-                                                                                                                                                                                                               "Hawaii", "-161.07",\r
-                                                                                                                                                                                                               "18.49", "-154.45",\r
-                                                                                                                                                                                                               "22.85", 57311788L,\r
-                                                                                                                                                                                                               false, 5);\r
-       static final osm_map_values     USA__except_Alaska_and_Hawaii_                  = new osm_map_values(\r
-                                                                                                                                                                                                               "USA (except Alaska and Hawaii)",\r
-                                                                                                                                                                                                               "-125.4", "24.3",\r
-                                                                                                                                                                                                               "-66.5", "49.3",\r
-                                                                                                                                                                                                               2216912004L, false, 5);\r
-       static final osm_map_values     Nevada                                                                                  = new osm_map_values(\r
-                                                                                                                                                                                                               "Nevada", "-120.2",\r
-                                                                                                                                                                                                               "35.0", "-113.8",\r
-                                                                                                                                                                                                               "42.1", 136754975L,\r
-                                                                                                                                                                                                               false, 5);\r
-       static final osm_map_values     Oregon                                                                                  = new osm_map_values(\r
-                                                                                                                                                                                                               "Oregon", "-124.8",\r
-                                                                                                                                                                                                               "41.8", "-116.3",\r
-                                                                                                                                                                                                               "46.3", 101627308L,\r
-                                                                                                                                                                                                               false, 5);\r
-       static final osm_map_values     Washington_State                                                                = new osm_map_values(\r
-                                                                                                                                                                                                               "Washington State",\r
-                                                                                                                                                                                                               "-125.0", "45.5",\r
-                                                                                                                                                                                                               "-116.9", "49.0",\r
-                                                                                                                                                                                                               98178877L, false, 5);\r
-       static final osm_map_values     South_Middle_America                                                    = new osm_map_values(\r
-                                                                                                                                                                                                               "South+Middle America",\r
-                                                                                                                                                                                                               "-83.5", "-56.3",\r
-                                                                                                                                                                                                               "-30.8", "13.7",\r
-                                                                                                                                                                                                               159615197L, true, 6);\r
-       static final osm_map_values     Argentina                                                                               = new osm_map_values(\r
-                                                                                                                                                                                                               "Argentina", "-73.9",\r
-                                                                                                                                                                                                               "-57.3", "-51.6",\r
-                                                                                                                                                                                                               "-21.0", 87516152L,\r
-                                                                                                                                                                                                               false, 6);\r
-       static final osm_map_values     Argentina_Chile                                                         = new osm_map_values(\r
-                                                                                                                                                                                                               "Argentina+Chile",\r
-                                                                                                                                                                                                               "-77.2", "-56.3",\r
-                                                                                                                                                                                                               "-52.7", "-16.1",\r
-                                                                                                                                                                                                               91976696L, false, 6);\r
-       static final osm_map_values     Bolivia                                                                                 = new osm_map_values(\r
-                                                                                                                                                                                                               "Bolivia", "-70.5",\r
-                                                                                                                                                                                                               "-23.1", "-57.3",\r
-                                                                                                                                                                                                               "-9.3", 58242168L,\r
-                                                                                                                                                                                                               false, 6);\r
-       static final osm_map_values     Brazil                                                                                  = new osm_map_values(\r
-                                                                                                                                                                                                               "Brazil", "-71.4",\r
-                                                                                                                                                                                                               "-34.7", "-32.8",\r
-                                                                                                                                                                                                               "5.4", 105527899L,\r
-                                                                                                                                                                                                               false, 6);\r
-       static final osm_map_values     Cuba                                                                                            = new osm_map_values(\r
-                                                                                                                                                                                                               "Cuba", "-85.3",\r
-                                                                                                                                                                                                               "19.6", "-74.0",\r
-                                                                                                                                                                                                               "23.6", 56608942L,\r
-                                                                                                                                                                                                               false, 6);\r
-       static final osm_map_values     Colombia                                                                                        = new osm_map_values(\r
-                                                                                                                                                                                                               "Colombia", "-79.1",\r
-                                                                                                                                                                                                               "-4.0", "-66.7",\r
-                                                                                                                                                                                                               "12.6", 78658454L,\r
-                                                                                                                                                                                                               false, 6);\r
-       static final osm_map_values     Ecuador                                                                                 = new osm_map_values(\r
-                                                                                                                                                                                                               "Ecuador", "-82.6",\r
-                                                                                                                                                                                                               "-5.4", "-74.4",\r
-                                                                                                                                                                                                               "2.3", 61501914L,\r
-                                                                                                                                                                                                               false, 6);\r
-       static final osm_map_values     Guyana_Suriname_Guyane_Francaise                        = new osm_map_values(\r
-                                                                                                                                                                                                               "Guyana+Suriname+Guyane Francaise",\r
-                                                                                                                                                                                                               "-62.0", "1.0",\r
-                                                                                                                                                                                                               "-51.2", "8.9",\r
-                                                                                                                                                                                                               57040689L, false, 6);\r
-       static final osm_map_values     Haiti_Republica_Dominicana                                      = new osm_map_values(\r
-                                                                                                                                                                                                               "Haiti+Republica Dominicana",\r
-                                                                                                                                                                                                               "-74.8", "17.3",\r
-                                                                                                                                                                                                               "-68.2", "20.1",\r
-                                                                                                                                                                                                               63528584L, false, 6);\r
-       static final osm_map_values     Jamaica                                                                                 = new osm_map_values(\r
-                                                                                                                                                                                                               "Jamaica", "-78.6",\r
-                                                                                                                                                                                                               "17.4", "-75.9",\r
-                                                                                                                                                                                                               "18.9", 53958307L,\r
-                                                                                                                                                                                                               false, 6);\r
-       static final osm_map_values     Mexico                                                                                  = new osm_map_values(\r
-                                                                                                                                                                                                               "Mexico", "-117.6",\r
-                                                                                                                                                                                                               "14.1", "-86.4",\r
-                                                                                                                                                                                                               "32.8", 251108617L,\r
-                                                                                                                                                                                                               false, 6);\r
-       static final osm_map_values     Paraguay                                                                                        = new osm_map_values(\r
-                                                                                                                                                                                                               "Paraguay", "-63.8",\r
-                                                                                                                                                                                                               "-28.1", "-53.6",\r
-                                                                                                                                                                                                               "-18.8", 57188715L,\r
-                                                                                                                                                                                                               false, 6);\r
-       static final osm_map_values     Peru                                                                                            = new osm_map_values(\r
-                                                                                                                                                                                                               "Peru", "-82.4",\r
-                                                                                                                                                                                                               "-18.1", "-67.5",\r
-                                                                                                                                                                                                               "0.4", 65421441L,\r
-                                                                                                                                                                                                               false, 6);\r
-       static final osm_map_values     Uruguay                                                                                 = new osm_map_values(\r
-                                                                                                                                                                                                               "Uruguay", "-59.2",\r
-                                                                                                                                                                                                               "-36.5", "-51.7",\r
-                                                                                                                                                                                                               "-29.7", 63542225L,\r
-                                                                                                                                                                                                               false, 6);\r
-       static final osm_map_values     Venezuela                                                                               = new osm_map_values(\r
-                                                                                                                                                                                                               "Venezuela", "-73.6",\r
-                                                                                                                                                                                                               "0.4", "-59.7",\r
-                                                                                                                                                                                                               "12.8", 64838882L,\r
-                                                                                                                                                                                                               false, 6);\r
-\r
-       static final osm_map_values[]   OSM_MAPS                                                                                        = new osm_map_values[]{\r
-                       Whole_Planet, Africa, Angola, Burundi, Democratic_Republic_of_the_Congo, Kenya, Lesotho,\r
-                       Madagascar, Nambia_Botswana, Reunion, Rwanda, South_Africa, Uganda, Asia, China, Cyprus,\r
-                       India_Nepal, Indonesia, Iran, Iraq, Israel, Japan_Korea_Taiwan, Malasia_Singapore,\r
-                       Mongolia, Nambia_Botswana, Thailand, Turkey, UAE_Other, Australia2, Australia, Tasmania,\r
-                       Victoria_New_South_Wales, New_Zealand, Europe, Western_Europe, Austria, BeNeLux,\r
-                       Faroe_Islands, France, Germany, Bavaria, Saxonia, Germany_Austria_Switzerland, Iceland,\r
-                       Ireland, Italy, Spain_Portugal, Mallorca, Galicia, Scandinavia, Finland, Denmark,\r
-                       Switzerland, UK, Bulgaria, Czech_Republic, Croatia, Estonia, Greece, Crete, Hungary,\r
-                       Latvia, Lithuania, Poland, Romania, North_America, Alaska, Canada, Hawaii,\r
-                       USA__except_Alaska_and_Hawaii_, Nevada, Oregon, Washington_State, South_Middle_America,\r
-                       Argentina, Argentina_Chile, Bolivia, Brazil, Cuba, Colombia, Ecuador,\r
-                       Guyana_Suriname_Guyane_Francaise, Haiti_Republica_Dominicana, Jamaica, Mexico, Paraguay,\r
-                       Peru, Uruguay, Venezuela                                                                                                        };\r
+       static final osm_map_values[] osm_maps = {\r
+               new osm_map_values("Whole Planet", "-180", "-90", "180", "90", 5985878379L, true, 0),\r
+               new osm_map_values("Africa", "-20.8", "-35.2", "52.5", "37.4", 180836389L, true, 1),\r
+               new osm_map_values("Angola", "11.4", "-18.1", "24.2", "-5.3", 56041641L, false, 1),\r
+               new osm_map_values("Burundi", "28.9", "-4.5", "30.9", "-2.2", 56512924L, false, 1),\r
+               new osm_map_values("Democratic Republic of the Congo", "11.7", "-13.6", "31.5", "5.7",65026791L, false, 1),\r
+               new osm_map_values("Kenya", "33.8","-5.2", "42.4", "4.9", 58545273L, false, 1),\r
+               new osm_map_values("Lesotho", "26.9", "-30.7", "29.6","-28.4", 54791041L, false, 1),\r
+               new osm_map_values("Madagascar", "43.0","-25.8", "50.8","-11.8", 56801099L, false, 1),\r
+               new osm_map_values("Nambia+Botswana","11.4", "-29.1","29.5", "-16.9", 61807049L, false, 1),\r
+               new osm_map_values("Reunion", "55.2","-21.4", "55.9","-20.9", 58537419L, false, 1),\r
+               new osm_map_values("Rwanda", "28.8","-2.9", "30.9","-1.0", 56313710L, false, 1),\r
+               new osm_map_values("South Africa","15.6", "-35.2","33.3", "-21.9", 73545245L, false, 1),\r
+               new osm_map_values("Uganda", "29.3","-1.6", "35.1","4.3", 57376589L, false, 1),\r
+               new osm_map_values("Asia", "23.8","0.1", "195.0","82.4", 797725952L, true, 2),\r
+               new osm_map_values("China", "67.3","5.3", "135.0","54.5", 259945160L, false, 2),\r
+               new osm_map_values("Cyprus", "32.0","34.5", "34.9","35.8", 58585278L, false, 2),\r
+               new osm_map_values("India+Nepal","67.9", "5.5","89.6", "36.0", 82819344L, false, 2),\r
+               new osm_map_values("Indonesia", "93.7","-17.3", "155.5","7.6", 74648081L, false, 2),\r
+               new osm_map_values("Iran", "43.5","24.4", "63.6","40.4", 69561312L, false, 2),\r
+               new osm_map_values("Iraq", "38.7","28.5", "49.2","37.4", 59146383L, false, 2),\r
+               new osm_map_values("Israel", "33.99","29.8", "35.95","33.4", 65065351L, false, 2),\r
+               new osm_map_values("Japan+Korea+Taiwan","117.6", "20.5","151.3", "47.1", 305538751L, false, 2),\r
+               new osm_map_values("Malasia+Singapore","94.3", "-5.9","108.6", "6.8", 58849792L, false, 2),\r
+               new osm_map_values("Mongolia", "87.5","41.4", "120.3","52.7", 60871187L, false, 2),\r
+               new osm_map_values("Thailand", "97.5","5.7", "105.2","19.7", 62422864L, false, 2),\r
+               new osm_map_values("Turkey", "25.1","35.8", "46.4","42.8", 81758047L, false, 2),\r
+               new osm_map_values("UAE+Other", "51.5","22.6", "56.7","26.5", 57419510L, false, 2),\r
+               new osm_map_values("Australia", "110.5","-44.2", "154.9","-9.2", 128502185L, true, 3),\r
+               new osm_map_values("Australia", "110.5","-44.2", "154.9","-9.2", 128502185L, false, 3),\r
+               new osm_map_values("Tasmania", "144.0","-45.1", "155.3","-24.8", 103573989L, false, 3),\r
+               new osm_map_values("Victoria+New South Wales","140.7", "-39.4","153.7", "-26.9", 99307594L, false, 3),\r
+               new osm_map_values("New Zealand","165.2", "-47.6","179.1", "-33.7", 64757454L, false, 3),\r
+               new osm_map_values("Europe", "-12.97","33.59", "34.15","72.10", 2753910015L, true, 4),\r
+               new osm_map_values("Western Europe","-17.6", "34.5","42.9", "70.9", 2832986851L, false, 4),\r
+               new osm_map_values("Austria", "9.4","46.32", "17.21","49.1", 222359992L, false, 4),\r
+               new osm_map_values("BeNeLux", "2.08","48.87", "7.78","54.52", 533865194L, false, 4),\r
+               new osm_map_values("Faroe Islands","-7.8", "61.3","-6.1", "62.5", 54526101L, false, 4),\r
+               new osm_map_values("France", "-5.45","42.00", "8.44","51.68", 1112047845L, false, 4),\r
+               new osm_map_values("Germany", "5.18","46.84", "15.47","55.64", 944716238L, false, 4),\r
+               new osm_map_values("Bavaria", "10.3","47.8", "13.6","49.7", 131799419L, false, 4),\r
+               new osm_map_values("Saxonia", "11.8","50.1", "15.0","51.7", 112073909L, false, 4),\r
+               new osm_map_values("Germany+Austria+Switzerland","3.4", "44.5","18.6", "55.1", 1385785353L, false, 4),\r
+               new osm_map_values("Iceland", "-25.3","62.8", "-11.4","67.5", 57281405L, false, 4),\r
+               new osm_map_values("Ireland", "-11.17","51.25", "-5.23","55.9", 70186936L, false, 4),\r
+               new osm_map_values("Italy", "6.52","36.38", "18.96","47.19", 291401314L, false, 4),\r
+               new osm_map_values("Spain+Portugal","-11.04", "34.87","4.62", "44.41", 292407746L, false, 4),\r
+               new osm_map_values("Mallorca", "2.2","38.8", "4.7","40.2", 59700600L, false, 4),\r
+               new osm_map_values("Galicia", "-10.0","41.7", "-6.3","44.1", 64605237L, false, 4),\r
+               new osm_map_values("Scandinavia", "4.0","54.4", "32.1","71.5", 299021928L, false, 4),\r
+               new osm_map_values("Finland", "18.6","59.2", "32.3","70.3", 128871467L, false, 4),\r
+               new osm_map_values("Denmark", "7.49","54.33", "13.05","57.88", 120025875L, false, 4),\r
+               new osm_map_values("Switzerland","5.79", "45.74","10.59", "47.84", 162616817L, false, 4),\r
+               new osm_map_values("UK", "-9.7", "49.6","2.2", "61.2", 245161510L, false, 4),\r
+               new osm_map_values("Bulgaria", "24.7","42.1", "24.8","42.1", 56607427L, false, 4),\r
+               new osm_map_values("Czech Republic","11.91", "48.48","19.02", "51.17", 234138824L, false, 4),\r
+               new osm_map_values("Croatia", "13.4","42.1", "19.4","46.9", 99183280L, false, 4),\r
+               new osm_map_values("Estonia", "21.5","57.5", "28.2","59.6", 79276178L, false, 4),\r
+               new osm_map_values("Greece", "28.9","37.8", "29.0","37.8", 55486527L, false, 4),\r
+               new osm_map_values("Crete", "23.3","34.5", "26.8","36.0", 57032630L, false, 4),\r
+               new osm_map_values("Hungary", "16.08","45.57", "23.03","48.39", 109831319L, false, 4),\r
+               new osm_map_values("Latvia", "20.7","55.6", "28.3","58.1", 71490706L, false, 4),\r
+               new osm_map_values("Lithuania", "20.9","53.8", "26.9","56.5", 67992457L, false, 4),\r
+               new osm_map_values("Poland", "13.6","48.8", "24.5","55.0", 266136768L, false, 4),\r
+               new osm_map_values("Romania", "20.3","43.5", "29.9","48.4", 134525863L, false, 4),\r
+               new osm_map_values("North America","-178.1", "6.5","-10.4", "84.0", 2477309662L, true, 5),\r
+               new osm_map_values("Alaska", "-179.5","49.5", "-129","71.6", 72320027L, false, 5),\r
+               new osm_map_values("Canada", "-141.3","41.5", "-52.2","70.2", 937813467L, false, 5),\r
+               new osm_map_values("Hawaii", "-161.07","18.49", "-154.45","22.85", 57311788L, false, 5),\r
+               new osm_map_values("USA (except Alaska and Hawaii)","-125.4", "24.3","-66.5", "49.3", 2216912004L, false, 5),\r
+               new osm_map_values("Nevada", "-120.2","35.0", "-113.8","42.1", 136754975L, false, 5),\r
+               new osm_map_values("Oregon", "-124.8","41.8", "-116.3","46.3", 101627308L, false, 5),\r
+               new osm_map_values("Washington State","-125.0", "45.5","-116.9", "49.0", 98178877L, false, 5),\r
+               new osm_map_values("South+Middle America","-83.5", "-56.3","-30.8", "13.7", 159615197L, true, 6),\r
+               new osm_map_values("Argentina", "-73.9","-57.3", "-51.6","-21.0", 87516152L, false, 6),\r
+               new osm_map_values("Argentina+Chile","-77.2", "-56.3","-52.7", "-16.1", 91976696L, false, 6),\r
+               new osm_map_values("Bolivia", "-70.5","-23.1", "-57.3","-9.3", 58242168L, false, 6),\r
+               new osm_map_values("Brazil", "-71.4","-34.7", "-32.8","5.4", 105527899L, false, 6),\r
+               new osm_map_values("Cuba", "-85.3","19.6", "-74.0","23.6", 56608942L, false, 6),\r
+               new osm_map_values("Colombia", "-79.1","-4.0", "-66.7","12.6", 78658454L, false, 6),\r
+               new osm_map_values("Ecuador", "-82.6","-5.4", "-74.4","2.3", 61501914L, false, 6),\r
+               new osm_map_values("Guyana+Suriname+Guyane Francaise","-62.0", "1.0","-51.2", "8.9", 57040689L, false, 6),\r
+               new osm_map_values("Haiti+Republica Dominicana","-74.8", "17.3","-68.2", "20.1", 63528584L, false, 6),\r
+               new osm_map_values("Jamaica", "-78.6","17.4", "-75.9","18.9", 53958307L, false, 6),\r
+               new osm_map_values("Mexico", "-117.6","14.1", "-86.4","32.8", 251108617L, false, 6),\r
+               new osm_map_values("Paraguay", "-63.8","-28.1", "-53.6","-18.8", 57188715L, false, 6),\r
+               new osm_map_values("Peru", "-82.4","-18.1", "-67.5","0.4", 65421441L, false, 6),\r
+               new osm_map_values("Uruguay", "-59.2","-36.5", "-51.7","-29.7", 63542225L, false, 6),\r
+               new osm_map_values("Venezuela", "-73.6","0.4", "-59.7","12.8", 64838882L, false, 6)\r
+       };\r
 \r
        public static String[]                  OSM_MAP_NAME_LIST_inkl_SIZE_ESTIMATE    = null;\r
 \r
@@ -607,19 +241,19 @@ public class NavitMapDownloader
                //String[] temp_m = new String[MAX_MAP_COUNT];\r
                String[] temp_ml = new String[MAX_MAP_COUNT];\r
                int[] temp_i = new int[MAX_MAP_COUNT];\r
-               Boolean[] already_added = new Boolean[OSM_MAPS.length];\r
+               Boolean[] already_added = new Boolean[osm_maps.length];\r
                int cur_continent = -1;\r
                int count = 0;\r
                Log.v("NavitMapDownloader", "init maps");\r
-               for (int i = 0; i < OSM_MAPS.length; i++)\r
+               for (int i = 0; i < osm_maps.length; i++)\r
                {\r
                        already_added[i] = false;\r
                }\r
-               for (int i = 0; i < OSM_MAPS.length; i++)\r
+               for (int i = 0; i < osm_maps.length; i++)\r
                {\r
                        //Log.v("NavitMapDownloader", "i=" + i);\r
                        // look for continents only\r
-                       if (OSM_MAPS[i].is_continent)\r
+                       if (osm_maps[i].is_continent)\r
                        {\r
                                if (count > 0)\r
                                {\r
@@ -630,26 +264,26 @@ public class NavitMapDownloader
                                        count++;\r
                                }\r
 \r
-                               cur_continent = OSM_MAPS[i].continent_id;\r
+                               cur_continent = osm_maps[i].continent_id;\r
                                //Log.v("NavitMapDownloader", "found cont=" + cur_continent);\r
                                // add this cont.\r
                                //temp_m[count] = OSM_MAPS[i].map_name;\r
-                               temp_ml[count] = OSM_MAPS[i].text_for_select_list;\r
+                               temp_ml[count] = osm_maps[i].text_for_select_list;\r
                                temp_i[count] = i;\r
                                count++;\r
                                already_added[i] = true;\r
-                               for (int j = 0; j < OSM_MAPS.length; j++)\r
+                               for (int j = 0; j < osm_maps.length; j++)\r
                                {\r
                                        // if (already_added[j] == null)\r
                                        if (!already_added[j])\r
                                        {\r
                                                // look for maps in that continent\r
-                                               if ((OSM_MAPS[j].continent_id == cur_continent) && (!OSM_MAPS[j].is_continent))\r
+                                               if ((osm_maps[j].continent_id == cur_continent) && (!osm_maps[j].is_continent))\r
                                                {\r
                                                        //Log.v("NavitMapDownloader", "found map=" + j + " c=" + cur_continent);\r
                                                        // add this map.\r
                                                        //temp_m[count] = OSM_MAPS[j].map_name;\r
-                                                       temp_ml[count] = " * " + OSM_MAPS[j].text_for_select_list;\r
+                                                       temp_ml[count] = " * " + osm_maps[j].text_for_select_list;\r
                                                        temp_i[count] = j;\r
                                                        count++;\r
                                                        already_added[j] = true;\r
@@ -661,7 +295,7 @@ public class NavitMapDownloader
                // add the rest of the list (dont have a continent)\r
                cur_continent = 9999; // unknown\r
                int found = 0;\r
-               for (int i = 0; i < OSM_MAPS.length; i++)\r
+               for (int i = 0; i < osm_maps.length; i++)\r
                {\r
                        if (!already_added[i])\r
                        {\r
@@ -678,7 +312,7 @@ public class NavitMapDownloader
                                //Log.v("NavitMapDownloader", "found map(loose)=" + i + " c=" + cur_continent);\r
                                // add this map.\r
                                //temp_m[count] = OSM_MAPS[i].map_name;\r
-                               temp_ml[count] = " # " + OSM_MAPS[i].text_for_select_list;\r
+                               temp_ml[count] = " # " + osm_maps[i].text_for_select_list;\r
                                temp_i[count] = i;\r
                                count++;\r
                                already_added[i] = true;\r
@@ -686,7 +320,7 @@ public class NavitMapDownloader
                }\r
 \r
                Log.e("NavitMapDownloader", "count=" + count);\r
-               Log.e("NavitMapDownloader", "size1 " + OSM_MAPS.length);\r
+               Log.e("NavitMapDownloader", "size1 " + osm_maps.length);\r
                //Log.e("NavitMapDownloader", "size2 " + temp_m.length);\r
                Log.e("NavitMapDownloader", "size3 " + temp_ml.length);\r
 \r