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