/[zanavi_public1]/navit/navit/android/src/com/zoffcc/applications/zanavi/NavitMapDownloader.java
ZANavi

Diff of /navit/navit/android/src/com/zoffcc/applications/zanavi/NavitMapDownloader.java

Parent Directory Parent Directory | Revision Log Revision Log | View Patch Patch

Revision 30 Revision 31
… …
73import android.util.Log; 73import android.util.Log;
74 74
75public class NavitMapDownloader 75public class NavitMapDownloader
76{ 76{
77 static final String ZANAVI_MAPS_AGE_URL = "http://maps.zanavi.cc/maps_age.html"; 77 static final String ZANAVI_MAPS_AGE_URL = "http://maps.zanavi.cc/maps_age.html";
78
79 // ------- RELEASE SETTINGS --------
80 // ------- RELEASE SETTINGS --------
78 static final String ZANAVI_MAPS_BASE_URL = "http://dl.zanavi.cc/data/"; 81 static final String ZANAVI_MAPS_BASE_URL = "http://dl.zanavi.cc/data/";
79 static final String ZANAVI_MAPS_SEVERTEXT_URL = "http://dl.zanavi.cc/server.txt"; 82 static final String ZANAVI_MAPS_SEVERTEXT_URL = "http://dl.zanavi.cc/server.txt";
80 static final String ZANAVI_MAPS_BASE_URL_PROTO = "http://"; 83 static final String ZANAVI_MAPS_BASE_URL_PROTO = "http://";
81 static final String ZANAVI_MAPS_BASE_URL_WO_SERVERNAME = "/data/"; 84 static final String ZANAVI_MAPS_BASE_URL_WO_SERVERNAME = "/data/";
85 // ------- RELEASE SETTINGS --------
86 // ------- RELEASE SETTINGS --------
87
88 // ------- DEBUG DEBUG SETTINGS --------
89 // ------- DEBUG DEBUG SETTINGS --------
82 //static final String ZANAVI_MAPS_BASE_URL = "https://192.168.0.3:446/maps/"; 90 //static final String ZANAVI_MAPS_BASE_URL = "https://192.168.0.3:446/maps/";
83 //static final String ZANAVI_MAPS_SEVERTEXT_URL = "https://192.168.0.3:446/maps/server.txt"; 91 //static final String ZANAVI_MAPS_SEVERTEXT_URL = "https://192.168.0.3:446/maps/server.txt";
84 //static final String ZANAVI_MAPS_BASE_URL_PROTO = "https://"; 92 //static final String ZANAVI_MAPS_BASE_URL_PROTO = "https://";
85 //static final String ZANAVI_MAPS_BASE_URL_WO_SERVERNAME = "/maps/"; 93 //static final String ZANAVI_MAPS_BASE_URL_WO_SERVERNAME = "/maps/";
94 // ------- DEBUG DEBUG SETTINGS --------
95 // ------- DEBUG DEBUG SETTINGS --------
86 96
87 static int MULTI_NUM_THREADS = 1; // how many download streams for a file 97 static int MULTI_NUM_THREADS = 1; // how many download streams for a file
88 static int MULTI_NUM_THREADS_LOCAL = 1; // how many download streams for the current file from the current server 98 static int MULTI_NUM_THREADS_LOCAL = 1; // how many download streams for the current file from the current server
89 99
90 public static class zanavi_osm_map_values 100 public static class zanavi_osm_map_values
… …
132 // 142 //
133 static final zanavi_osm_map_values z_North_America = new zanavi_osm_map_values("North America", "north_america.bin", -2, true, 6); 143 static final zanavi_osm_map_values z_North_America = new zanavi_osm_map_values("North America", "north_america.bin", -2, true, 6);
134 static final zanavi_osm_map_values z_Country_borders = new zanavi_osm_map_values("Country borders [detail]", "borders.bin", 6271108L, true, 0); 144 static final zanavi_osm_map_values z_Country_borders = new zanavi_osm_map_values("Country borders [detail]", "borders.bin", 6271108L, true, 0);
135 static final zanavi_osm_map_values z_Coastline = new zanavi_osm_map_values("Coastline", "coastline.bin", 202836110L, true, 0); 145 static final zanavi_osm_map_values z_Coastline = new zanavi_osm_map_values("Coastline", "coastline.bin", 202836110L, true, 0);
136 static final zanavi_osm_map_values z_Restl_welt = new zanavi_osm_map_values("Rest of the World", "restl_welt.bin", 128693232L, true, 0); 146 static final zanavi_osm_map_values z_Restl_welt = new zanavi_osm_map_values("Rest of the World", "restl_welt.bin", 128693232L, true, 0);
137 static zanavi_osm_map_values z_Planet = new zanavi_osm_map_values("Planet", "planet.bin", 7257701554L, true, 1); 147 static zanavi_osm_map_values z_Planet = new zanavi_osm_map_values("Planet", "planet.bin", 12602823892L, true, 1);
138 static zanavi_osm_map_values z_Europe = new zanavi_osm_map_values("Europe", "europe.bin", 3812430242L, true, 3); 148 static zanavi_osm_map_values z_Europe = new zanavi_osm_map_values("Europe", "europe.bin", 4591607513L, true, 3);
139 static final zanavi_osm_map_values z_Africa = new zanavi_osm_map_values("Africa", "africa.bin", 144067447L, true, 4); 149 static final zanavi_osm_map_values z_Africa = new zanavi_osm_map_values("Africa", "africa.bin", 181729912L, true, 4);
140 static final zanavi_osm_map_values z_Asia = new zanavi_osm_map_values("Asia", "asia.bin", 791894440L, true, 5); 150 static final zanavi_osm_map_values z_Asia = new zanavi_osm_map_values("Asia", "asia.bin", 1060290831L, true, 5);
141 static zanavi_osm_map_values z_USA = new zanavi_osm_map_values("USA", "usa.bin", 1913676437L, true, 27); 151 static zanavi_osm_map_values z_USA = new zanavi_osm_map_values("USA", "usa.bin", 2004502679L, true, 27);
142 static final zanavi_osm_map_values z_Central_America = new zanavi_osm_map_values("Central America", "central_america.bin", 82087567L, true, 7); 152 static final zanavi_osm_map_values z_Central_America = new zanavi_osm_map_values("Central America", "central_america.bin", 85755028L, true, 7);
143 static final zanavi_osm_map_values z_South_America = new zanavi_osm_map_values("South America", "south_america.bin", 155856431L, true, 8); 153 static final zanavi_osm_map_values z_South_America = new zanavi_osm_map_values("South America", "south_america.bin", 198785352L, true, 8);
144 static final zanavi_osm_map_values z_Australia_and_Oceania = new zanavi_osm_map_values("Australia and Oceania", "australia_oceania.bin", 116587684L, true, 9); 154 static final zanavi_osm_map_values z_Australia_and_Oceania = new zanavi_osm_map_values("Australia and Oceania", "australia_oceania.bin", 100802136L, true, 9);
145 static final zanavi_osm_map_values z_Albania = new zanavi_osm_map_values("Albania", "albania.bin", 2743112L, false, 3); 155 static final zanavi_osm_map_values z_Albania = new zanavi_osm_map_values("Albania", "albania.bin", 2707162L, false, 3);
146 static final zanavi_osm_map_values z_Alps = new zanavi_osm_map_values("Alps", "alps.bin", 484242183L, false, 3); 156 static final zanavi_osm_map_values z_Alps = new zanavi_osm_map_values("Alps", "alps.bin", 607357380L, false, 3);
147 static final zanavi_osm_map_values z_Andorra = new zanavi_osm_map_values("Andorra", "andorra.bin", 215301L, false, 3); 157 static final zanavi_osm_map_values z_Andorra = new zanavi_osm_map_values("Andorra", "andorra.bin", 209729L, false, 3);
148 static final zanavi_osm_map_values z_Austria = new zanavi_osm_map_values("Austria", "austria.bin", 104153554L, false, 3); 158 static final zanavi_osm_map_values z_Austria = new zanavi_osm_map_values("Austria", "austria.bin", 135024402L, false, 3);
149 static final zanavi_osm_map_values z_Azores = new zanavi_osm_map_values("Azores", "azores.bin", 561818L, false, 3); 159 static final zanavi_osm_map_values z_Azores = new zanavi_osm_map_values("Azores", "azores.bin", 786952L, false, 3);
150 static final zanavi_osm_map_values z_Belarus = new zanavi_osm_map_values("Belarus", "belarus.bin", 27494671L, false, 3); 160 static final zanavi_osm_map_values z_Belarus = new zanavi_osm_map_values("Belarus", "belarus.bin", 35370454L, false, 3);
151 static final zanavi_osm_map_values z_Belgium = new zanavi_osm_map_values("Belgium", "belgium.bin", 55288004L, false, 3); 161 static final zanavi_osm_map_values z_Belgium = new zanavi_osm_map_values("Belgium", "belgium.bin", 59776296L, false, 3);
152 static final zanavi_osm_map_values z_Bosnia_Herzegovina = new zanavi_osm_map_values("Bosnia-Herzegovina", "bosnia-herzegovina.bin", 6382766L, false, 3); 162 static final zanavi_osm_map_values z_Bosnia_Herzegovina = new zanavi_osm_map_values("Bosnia-Herzegovina", "bosnia-herzegovina.bin", 20965766L, false, 3);
153 static final zanavi_osm_map_values z_British_Isles = new zanavi_osm_map_values("British Isles", "british_isles.bin", 249766346L, false, 3); 163 static final zanavi_osm_map_values z_British_Isles = new zanavi_osm_map_values("British Isles", "british_isles.bin", 287714717L, false, 3);
154 static final zanavi_osm_map_values z_Bulgaria = new zanavi_osm_map_values("Bulgaria", "bulgaria.bin", 10915862L, false, 3); 164 static final zanavi_osm_map_values z_Bulgaria = new zanavi_osm_map_values("Bulgaria", "bulgaria.bin", 187458L, false, 3);
155 static final zanavi_osm_map_values z_Croatia = new zanavi_osm_map_values("Croatia", "croatia.bin", 18399655L, false, 3); 165 static final zanavi_osm_map_values z_Croatia = new zanavi_osm_map_values("Croatia", "croatia.bin", 19816810L, false, 3);
156 static final zanavi_osm_map_values z_Cyprus = new zanavi_osm_map_values("Cyprus", "cyprus.bin", 3246334L, false, 3); 166 static final zanavi_osm_map_values z_Cyprus = new zanavi_osm_map_values("Cyprus", "cyprus.bin", 3062844L, false, 3);
157 static final zanavi_osm_map_values z_Czech_Republic = new zanavi_osm_map_values("Czech Republic", "czech_republic.bin", 149919268L, false, 3); 167 static final zanavi_osm_map_values z_Czech_Republic = new zanavi_osm_map_values("Czech Republic", "czech_republic.bin", 163908356L, false, 3);
158 static final zanavi_osm_map_values z_Denmark = new zanavi_osm_map_values("Denmark", "denmark.bin", 72644642L, false, 3); 168 static final zanavi_osm_map_values z_Denmark = new zanavi_osm_map_values("Denmark", "denmark.bin", 67254793L, false, 3);
159 static final zanavi_osm_map_values z_Estonia = new zanavi_osm_map_values("Estonia", "estonia.bin", 15672674L, false, 3); 169 static final zanavi_osm_map_values z_Estonia = new zanavi_osm_map_values("Estonia", "estonia.bin", 16299316L, false, 3);
160 static final zanavi_osm_map_values z_Faroe_Islands = new zanavi_osm_map_values("Faroe Islands", "faroe_islands.bin", 745423L, false, 3); 170 static final zanavi_osm_map_values z_Faroe_Islands = new zanavi_osm_map_values("Faroe Islands", "faroe_islands.bin", 601782L, false, 3);
161 static final zanavi_osm_map_values z_Finland = new zanavi_osm_map_values("Finland", "finland.bin", 74152027L, false, 3); 171 static final zanavi_osm_map_values z_Finland = new zanavi_osm_map_values("Finland", "finland.bin", 79130118L, false, 3);
162 static final zanavi_osm_map_values z_France = new zanavi_osm_map_values("France", "france.bin", 1139293586L, false, 3); 172 static final zanavi_osm_map_values z_France = new zanavi_osm_map_values("France", "france.bin", 1326166093L, false, 3);
163 static final zanavi_osm_map_values z_Germany = new zanavi_osm_map_values("Germany", "germany.bin", 622438494L, false, 3); 173 static final zanavi_osm_map_values z_Germany = new zanavi_osm_map_values("Germany", "germany.bin", 753234730L, false, 3);
164 static final zanavi_osm_map_values z_Great_Britain = new zanavi_osm_map_values("Great Britain", "great_britain.bin", 226752913L, false, 3); 174 static final zanavi_osm_map_values z_Great_Britain = new zanavi_osm_map_values("Great Britain", "great_britain.bin", 256173213L, false, 3);
165 static final zanavi_osm_map_values z_Greece = new zanavi_osm_map_values("Greece", "greece.bin", 33662627L, false, 3); 175 static final zanavi_osm_map_values z_Greece = new zanavi_osm_map_values("Greece", "greece.bin", 36331613L, false, 3);
166 static final zanavi_osm_map_values z_Hungary = new zanavi_osm_map_values("Hungary", "hungary.bin", 16618127L, false, 3); 176 static final zanavi_osm_map_values z_Hungary = new zanavi_osm_map_values("Hungary", "hungary.bin", 20996247L, false, 3);
167 static final zanavi_osm_map_values z_Iceland = new zanavi_osm_map_values("Iceland", "iceland.bin", 4927694L, false, 3); 177 static final zanavi_osm_map_values z_Iceland = new zanavi_osm_map_values("Iceland", "iceland.bin", 5949356L, false, 3);
168 static final zanavi_osm_map_values z_Ireland = new zanavi_osm_map_values("Ireland", "ireland.bin", 20402776L, false, 3); 178 static final zanavi_osm_map_values z_Ireland = new zanavi_osm_map_values("Ireland", "ireland.bin", 30020687L, false, 3);
169 static final zanavi_osm_map_values z_Isle_of_man = new zanavi_osm_map_values("Isle of man", "isle_of_man.bin", 926380L, false, 3); 179 static final zanavi_osm_map_values z_Isle_of_man = new zanavi_osm_map_values("Isle of man", "isle_of_man.bin", 876966L, false, 3);
170 static final zanavi_osm_map_values z_Italy = new zanavi_osm_map_values("Italy", "italy.bin", 246690915L, false, 3); 180 static final zanavi_osm_map_values z_Italy = new zanavi_osm_map_values("Italy", "italy.bin", 344050769L, false, 3);
171 static final zanavi_osm_map_values z_Kosovo = new zanavi_osm_map_values("Kosovo", "kosovo.bin", 5279208L, false, 3); 181 static final zanavi_osm_map_values z_Kosovo = new zanavi_osm_map_values("Kosovo", "kosovo.bin", 2726077L, false, 3);
172 static final zanavi_osm_map_values z_Latvia = new zanavi_osm_map_values("Latvia", "latvia.bin", 15247896L, false, 3); 182 static final zanavi_osm_map_values z_Latvia = new zanavi_osm_map_values("Latvia", "latvia.bin", 19153876L, false, 3);
173 static final zanavi_osm_map_values z_Liechtenstein = new zanavi_osm_map_values("Liechtenstein", "liechtenstein.bin", 289127L, false, 3); 183 static final zanavi_osm_map_values z_Liechtenstein = new zanavi_osm_map_values("Liechtenstein", "liechtenstein.bin", 329042L, false, 3);
174 static final zanavi_osm_map_values z_Lithuania = new zanavi_osm_map_values("Lithuania", "lithuania.bin", 11211874L, false, 3); 184 static final zanavi_osm_map_values z_Lithuania = new zanavi_osm_map_values("Lithuania", "lithuania.bin", 15062324L, false, 3);
175 static final zanavi_osm_map_values z_Luxembourg = new zanavi_osm_map_values("Luxembourg", "luxembourg.bin", 5526557L, false, 3); 185 static final zanavi_osm_map_values z_Luxembourg = new zanavi_osm_map_values("Luxembourg", "luxembourg.bin", 5555131L, false, 3);
176 static final zanavi_osm_map_values z_Macedonia = new zanavi_osm_map_values("Macedonia", "macedonia.bin", 2483694L, false, 3); 186 static final zanavi_osm_map_values z_Macedonia = new zanavi_osm_map_values("Macedonia", "macedonia.bin", 3652744L, false, 3);
177 static final zanavi_osm_map_values z_Malta = new zanavi_osm_map_values("Malta", "malta.bin", 706285L, false, 3); 187 static final zanavi_osm_map_values z_Malta = new zanavi_osm_map_values("Malta", "malta.bin", 665042L, false, 3);
178 static final zanavi_osm_map_values z_Moldova = new zanavi_osm_map_values("Moldova", "moldova.bin", 6956958L, false, 3); 188 static final zanavi_osm_map_values z_Moldova = new zanavi_osm_map_values("Moldova", "moldova.bin", 7215780L, false, 3);
179 static final zanavi_osm_map_values z_Monaco = new zanavi_osm_map_values("Monaco", "monaco.bin", 86325L, false, 3); 189 static final zanavi_osm_map_values z_Monaco = new zanavi_osm_map_values("Monaco", "monaco.bin", 91311L, false, 3);
180 static final zanavi_osm_map_values z_Montenegro = new zanavi_osm_map_values("Montenegro", "montenegro.bin", 1264304L, false, 3); 190 static final zanavi_osm_map_values z_Montenegro = new zanavi_osm_map_values("Montenegro", "montenegro.bin", 2377175L, false, 3);
181 static final zanavi_osm_map_values z_Netherlands = new zanavi_osm_map_values("Netherlands", "netherlands.bin", 217437801L, false, 3); 191 static final zanavi_osm_map_values z_Netherlands = new zanavi_osm_map_values("Netherlands", "netherlands.bin", 231414741L, false, 3);
182 static final zanavi_osm_map_values z_Norway = new zanavi_osm_map_values("Norway", "norway.bin", 42651542L, false, 3); 192 static final zanavi_osm_map_values z_Norway = new zanavi_osm_map_values("Norway", "norway.bin", 45117034L, false, 3);
183 static final zanavi_osm_map_values z_Poland = new zanavi_osm_map_values("Poland", "poland.bin", 90243619L, false, 3); 193 static final zanavi_osm_map_values z_Poland = new zanavi_osm_map_values("Poland", "poland.bin", 113291596L, false, 3);
184 static final zanavi_osm_map_values z_Portugal = new zanavi_osm_map_values("Portugal", "portugal.bin", 29058988L, false, 3); 194 static final zanavi_osm_map_values z_Portugal = new zanavi_osm_map_values("Portugal", "portugal.bin", 30029993L, false, 3);
185 static final zanavi_osm_map_values z_Romania = new zanavi_osm_map_values("Romania", "romania.bin", 33265442L, false, 3); 195 static final zanavi_osm_map_values z_Romania = new zanavi_osm_map_values("Romania", "romania.bin", 39689553L, false, 3);
186 static final zanavi_osm_map_values z_Russia_European_part = new zanavi_osm_map_values("Russia European part", "russia-european-part.bin", 182888939L, false, 3); 196 static final zanavi_osm_map_values z_Russia_European_part = new zanavi_osm_map_values("Russia European part", "russia-european-part.bin", 264245236L, false, 3);
187 static final zanavi_osm_map_values z_Serbia = new zanavi_osm_map_values("Serbia", "serbia.bin", 8666368L, false, 3); 197 static final zanavi_osm_map_values z_Serbia = new zanavi_osm_map_values("Serbia", "serbia.bin", 11166698L, false, 3);
188 static final zanavi_osm_map_values z_Slovakia = new zanavi_osm_map_values("Slovakia", "slovakia.bin", 68912557L, false, 3); 198 static final zanavi_osm_map_values z_Slovakia = new zanavi_osm_map_values("Slovakia", "slovakia.bin", 69898534L, false, 3);
189 static final zanavi_osm_map_values z_Slovenia = new zanavi_osm_map_values("Slovenia", "slovenia.bin", 10395693L, false, 3); 199 static final zanavi_osm_map_values z_Slovenia = new zanavi_osm_map_values("Slovenia", "slovenia.bin", 10406937L, false, 3);
190 static final zanavi_osm_map_values z_Spain = new zanavi_osm_map_values("Spain", "spain.bin", 148546725L, false, 3); 200 static final zanavi_osm_map_values z_Spain = new zanavi_osm_map_values("Spain", "spain.bin", 183072016L, false, 3);
191 static final zanavi_osm_map_values z_Sweden = new zanavi_osm_map_values("Sweden", "sweden.bin", 73636690L, false, 3); 201 static final zanavi_osm_map_values z_Sweden = new zanavi_osm_map_values("Sweden", "sweden.bin", 79947733L, false, 3);
192 static final zanavi_osm_map_values z_Switzerland = new zanavi_osm_map_values("Switzerland", "switzerland.bin", 67602527L, false, 3); 202 static final zanavi_osm_map_values z_Switzerland = new zanavi_osm_map_values("Switzerland", "switzerland.bin", 73051065L, false, 3);
193 static final zanavi_osm_map_values z_Turkey = new zanavi_osm_map_values("Turkey", "turkey.bin", 30040205L, false, 3); 203 static final zanavi_osm_map_values z_Turkey = new zanavi_osm_map_values("Turkey", "turkey.bin", 33231427L, false, 3);
194 static final zanavi_osm_map_values z_Ukraine = new zanavi_osm_map_values("Ukraine", "ukraine.bin", 43276291L, false, 3); 204 static final zanavi_osm_map_values z_Ukraine = new zanavi_osm_map_values("Ukraine", "ukraine.bin", 58070734L, false, 3);
195 static final zanavi_osm_map_values z_Canari_Islands = new zanavi_osm_map_values("Canari Islands", "canari_islands.bin", 7229435L, false, 4); 205 static final zanavi_osm_map_values z_Canari_Islands = new zanavi_osm_map_values("Canari Islands", "canari_islands.bin", 7125254L, false, 4);
196 static final zanavi_osm_map_values z_India = new zanavi_osm_map_values("India", "india.bin", 41352179L, false, 5); 206 static final zanavi_osm_map_values z_India = new zanavi_osm_map_values("India", "india.bin", 46569907L, false, 5);
197 static final zanavi_osm_map_values z_Israel_and_Palestine = new zanavi_osm_map_values("Israel and Palestine", "israel_and_palestine.bin", 14431019L, false, 5); 207 static final zanavi_osm_map_values z_Israel_and_Palestine = new zanavi_osm_map_values("Israel and Palestine", "israel_and_palestine.bin", 15630491L, false, 5);
198 static final zanavi_osm_map_values z_China = new zanavi_osm_map_values("China", "china.bin", 44230354L, false, 5); 208 static final zanavi_osm_map_values z_China = new zanavi_osm_map_values("China", "china.bin", 49738512L, false, 5);
199 static final zanavi_osm_map_values z_Japan = new zanavi_osm_map_values("Japan", "japan.bin", 322588619L, false, 5); 209 static final zanavi_osm_map_values z_Japan = new zanavi_osm_map_values("Japan", "japan.bin", 413065433L, false, 5);
200 static final zanavi_osm_map_values z_Taiwan = new zanavi_osm_map_values("Taiwan", "taiwan.bin", 5009368L, false, 5); 210 static final zanavi_osm_map_values z_Taiwan = new zanavi_osm_map_values("Taiwan", "taiwan.bin", 5689334L, false, 5);
201 static final zanavi_osm_map_values z_Canada = new zanavi_osm_map_values("Canada", "canada.bin", 499312961L, false, 6); 211 static final zanavi_osm_map_values z_Canada = new zanavi_osm_map_values("Canada", "canada.bin", 830908722L, false, 6);
202 static final zanavi_osm_map_values z_Greenland = new zanavi_osm_map_values("Greenland", "greenland.bin", 432616L, false, 6); 212 static final zanavi_osm_map_values z_Greenland = new zanavi_osm_map_values("Greenland", "greenland.bin", 500803L, false, 6);
203 static final zanavi_osm_map_values z_Mexico = new zanavi_osm_map_values("Mexico", "mexico.bin", 26196974L, false, 6); 213 static final zanavi_osm_map_values z_Mexico = new zanavi_osm_map_values("Mexico", "mexico.bin", 29858297L, false, 6);
204 static zanavi_osm_map_values z_US_Midwest = new zanavi_osm_map_values("US-Midwest", "us-midwest.bin", 460545121L, false, 27); 214 static zanavi_osm_map_values z_US_Midwest = new zanavi_osm_map_values("US-Midwest", "us-midwest.bin", 495302706L, false, 27);
205 static zanavi_osm_map_values z_US_Northeast = new zanavi_osm_map_values("US-Northeast", "us-northeast.bin", 197331583L, false, 27); 215 static zanavi_osm_map_values z_US_Northeast = new zanavi_osm_map_values("US-Northeast", "us-northeast.bin", 206503509L, false, 27);
206 static zanavi_osm_map_values z_US_Pacific = new zanavi_osm_map_values("US-Pacific", "us-pacific.bin", 11858780L, false, 27); 216 static zanavi_osm_map_values z_US_Pacific = new zanavi_osm_map_values("US-Pacific", "us-pacific.bin", 11527206L, false, 27);
207 static zanavi_osm_map_values z_US_South = new zanavi_osm_map_values("US-South", "us-south.bin", 765677845L, false, 27); 217 static zanavi_osm_map_values z_US_South = new zanavi_osm_map_values("US-South", "us-south.bin", 803391332L, false, 27);
208 static zanavi_osm_map_values z_US_West = new zanavi_osm_map_values("US-West", "us-west.bin", 494044176L, false, 27); 218 static zanavi_osm_map_values z_US_West = new zanavi_osm_map_values("US-West", "us-west.bin", 506304481L, false, 27);
209 static final zanavi_osm_map_values z_Alabama = new zanavi_osm_map_values("Alabama", "alabama.bin", 46035181L, false, 27); 219 static final zanavi_osm_map_values z_Alabama = new zanavi_osm_map_values("Alabama", "alabama.bin", 35081542L, false, 27);
210 static final zanavi_osm_map_values z_Alaska = new zanavi_osm_map_values("Alaska", "alaska.bin", 6785486L, false, 27); 220 static final zanavi_osm_map_values z_Alaska = new zanavi_osm_map_values("Alaska", "alaska.bin", 7844950L, false, 27);
211 static final zanavi_osm_map_values z_Arizona = new zanavi_osm_map_values("Arizona", "arizona.bin", 36575906L, false, 27); 221 static final zanavi_osm_map_values z_Arizona = new zanavi_osm_map_values("Arizona", "arizona.bin", 33938704L, false, 27);
212 static final zanavi_osm_map_values z_Arkansas = new zanavi_osm_map_values("Arkansas", "arkansas.bin", 28352591L, false, 27); 222 static final zanavi_osm_map_values z_Arkansas = new zanavi_osm_map_values("Arkansas", "arkansas.bin", 22029069L, false, 27);
213 static final zanavi_osm_map_values z_California = new zanavi_osm_map_values("California", "california.bin", 198190467L, false, 27); 223 static final zanavi_osm_map_values z_California = new zanavi_osm_map_values("California", "california.bin", 203758150L, false, 27);
214 static final zanavi_osm_map_values z_North_Carolina = new zanavi_osm_map_values("North Carolina", "north-carolina.bin", 124929760L, false, 27); 224 static final zanavi_osm_map_values z_North_Carolina = new zanavi_osm_map_values("North Carolina", "north-carolina.bin", 128642801L, false, 27);
215 static final zanavi_osm_map_values z_South_Carolina = new zanavi_osm_map_values("South Carolina", "south-carolina.bin", 47633210L, false, 27); 225 static final zanavi_osm_map_values z_South_Carolina = new zanavi_osm_map_values("South Carolina", "south-carolina.bin", 41257655L, false, 27);
216 static final zanavi_osm_map_values z_Colorado = new zanavi_osm_map_values("Colorado", "colorado.bin", 73200351L, false, 27); 226 static final zanavi_osm_map_values z_Colorado = new zanavi_osm_map_values("Colorado", "colorado.bin", 67174144L, false, 27);
217 static final zanavi_osm_map_values z_North_Dakota = new zanavi_osm_map_values("North Dakota", "north-dakota.bin", 53011946L, false, 27); 227 static final zanavi_osm_map_values z_North_Dakota = new zanavi_osm_map_values("North Dakota", "north-dakota.bin", 45925872L, false, 27);
218 static final zanavi_osm_map_values z_South_Dakota = new zanavi_osm_map_values("South Dakota", "south-dakota.bin", 20292394L, false, 27); 228 static final zanavi_osm_map_values z_South_Dakota = new zanavi_osm_map_values("South Dakota", "south-dakota.bin", 13888265L, false, 27);
219 static final zanavi_osm_map_values z_District_of_Columbia = new zanavi_osm_map_values("District of Columbia", "district-of-columbia.bin", 5212731L, false, 27); 229 static final zanavi_osm_map_values z_District_of_Columbia = new zanavi_osm_map_values("District of Columbia", "district-of-columbia.bin", 5693682L, false, 27);
220 static final zanavi_osm_map_values z_Connecticut = new zanavi_osm_map_values("Connecticut", "connecticut.bin", 7965171L, false, 27); 230 static final zanavi_osm_map_values z_Connecticut = new zanavi_osm_map_values("Connecticut", "connecticut.bin", 7189491L, false, 27);
221 static final zanavi_osm_map_values z_Delaware = new zanavi_osm_map_values("Delaware", "delaware.bin", 3323818L, false, 27); 231 static final zanavi_osm_map_values z_Delaware = new zanavi_osm_map_values("Delaware", "delaware.bin", 3089068L, false, 27);
222 static final zanavi_osm_map_values z_Florida = new zanavi_osm_map_values("Florida", "florida.bin", 54112908L, false, 27); 232 static final zanavi_osm_map_values z_Florida = new zanavi_osm_map_values("Florida", "florida.bin", 49772033L, false, 27);
223 static final zanavi_osm_map_values z_Georgia = new zanavi_osm_map_values("Georgia", "georgia.bin", 93525831L, false, 27); 233 static final zanavi_osm_map_values z_Georgia = new zanavi_osm_map_values("Georgia", "georgia.bin", 83076475L, false, 27);
224 static final zanavi_osm_map_values z_New_Hampshire = new zanavi_osm_map_values("New Hampshire", "new-hampshire.bin", 15639970L, false, 27); 234 static final zanavi_osm_map_values z_New_Hampshire = new zanavi_osm_map_values("New Hampshire", "new-hampshire.bin", 13900082L, false, 27);
225 static final zanavi_osm_map_values z_Hawaii = new zanavi_osm_map_values("Hawaii", "hawaii.bin", 5056789L, false, 27); 235 static final zanavi_osm_map_values z_Hawaii = new zanavi_osm_map_values("Hawaii", "hawaii.bin", 3670926L, false, 27);
226 static final zanavi_osm_map_values z_Idaho = new zanavi_osm_map_values("Idaho", "idaho.bin", 39333659L, false, 27); 236 static final zanavi_osm_map_values z_Idaho = new zanavi_osm_map_values("Idaho", "idaho.bin", 27122570L, false, 27);
227 static final zanavi_osm_map_values z_Illinois = new zanavi_osm_map_values("Illinois", "illinois.bin", 66454448L, false, 27); 237 static final zanavi_osm_map_values z_Illinois = new zanavi_osm_map_values("Illinois", "illinois.bin", 64992622L, false, 27);
228 static final zanavi_osm_map_values z_Indiana = new zanavi_osm_map_values("Indiana", "indiana.bin", 28278682L, false, 27); 238 static final zanavi_osm_map_values z_Indiana = new zanavi_osm_map_values("Indiana", "indiana.bin", 23877847L, false, 27);
229 static final zanavi_osm_map_values z_Iowa = new zanavi_osm_map_values("Iowa", "iowa.bin", 50760824L, false, 27); 239 static final zanavi_osm_map_values z_Iowa = new zanavi_osm_map_values("Iowa", "iowa.bin", 47021367L, false, 27);
230 static final zanavi_osm_map_values z_New_Jersey = new zanavi_osm_map_values("New Jersey", "new-jersey.bin", 29183280L, false, 27); 240 static final zanavi_osm_map_values z_New_Jersey = new zanavi_osm_map_values("New Jersey", "new-jersey.bin", 25412463L, false, 27);
231 static final zanavi_osm_map_values z_Kansas = new zanavi_osm_map_values("Kansas", "kansas.bin", 27910209L, false, 27); 241 static final zanavi_osm_map_values z_Kansas = new zanavi_osm_map_values("Kansas", "kansas.bin", 22432235L, false, 27);
232 static final zanavi_osm_map_values z_Kentucky = new zanavi_osm_map_values("Kentucky", "kentucky.bin", 51079926L, false, 27); 242 static final zanavi_osm_map_values z_Kentucky = new zanavi_osm_map_values("Kentucky", "kentucky.bin", 34892443L, false, 27);
233 static final zanavi_osm_map_values z_Louisiana = new zanavi_osm_map_values("Louisiana", "louisiana.bin", 45890527L, false, 27); 243 static final zanavi_osm_map_values z_Louisiana = new zanavi_osm_map_values("Louisiana", "louisiana.bin", 40739401L, false, 27);
234 static final zanavi_osm_map_values z_Maine = new zanavi_osm_map_values("Maine", "maine.bin", 16045000L, false, 27); 244 static final zanavi_osm_map_values z_Maine = new zanavi_osm_map_values("Maine", "maine.bin", 14716304L, false, 27);
235 static final zanavi_osm_map_values z_Maryland = new zanavi_osm_map_values("Maryland", "maryland.bin", 31260203L, false, 27); 245 static final zanavi_osm_map_values z_Maryland = new zanavi_osm_map_values("Maryland", "maryland.bin", 27470086L, false, 27);
236 static final zanavi_osm_map_values z_Massachusetts = new zanavi_osm_map_values("Massachusetts", "massachusetts.bin", 48819722L, false, 27); 246 static final zanavi_osm_map_values z_Massachusetts = new zanavi_osm_map_values("Massachusetts", "massachusetts.bin", 42398142L, false, 27);
237 static final zanavi_osm_map_values z_New_Mexico = new zanavi_osm_map_values("New Mexico", "new-mexico.bin", 32360275L, false, 27); 247 static final zanavi_osm_map_values z_New_Mexico = new zanavi_osm_map_values("New Mexico", "new-mexico.bin", 26815652L, false, 27);
238 static final zanavi_osm_map_values z_Michigan = new zanavi_osm_map_values("Michigan", "michigan.bin", 47178281L, false, 27); 248 static final zanavi_osm_map_values z_Michigan = new zanavi_osm_map_values("Michigan", "michigan.bin", 44192808L, false, 27);
239 static final zanavi_osm_map_values z_Minnesota = new zanavi_osm_map_values("Minnesota", "minnesota.bin", 78611082L, false, 27); 249 static final zanavi_osm_map_values z_Minnesota = new zanavi_osm_map_values("Minnesota", "minnesota.bin", 82203062L, false, 27);
240 static final zanavi_osm_map_values z_Mississippi = new zanavi_osm_map_values("Mississippi", "mississippi.bin", 31625610L, false, 27); 250 static final zanavi_osm_map_values z_Mississippi = new zanavi_osm_map_values("Mississippi", "mississippi.bin", 31680044L, false, 27);
241 static final zanavi_osm_map_values z_Missouri = new zanavi_osm_map_values("Missouri", "missouri.bin", 50639636L, false, 27); 251 static final zanavi_osm_map_values z_Missouri = new zanavi_osm_map_values("Missouri", "missouri.bin", 39762823L, false, 27);
242 static final zanavi_osm_map_values z_Montana = new zanavi_osm_map_values("Montana", "montana.bin", 28464213L, false, 27); 252 static final zanavi_osm_map_values z_Montana = new zanavi_osm_map_values("Montana", "montana.bin", 22707427L, false, 27);
243 static final zanavi_osm_map_values z_Nebraska = new zanavi_osm_map_values("Nebraska", "nebraska.bin", 29788541L, false, 27); 253 static final zanavi_osm_map_values z_Nebraska = new zanavi_osm_map_values("Nebraska", "nebraska.bin", 25624308L, false, 27);
244 static final zanavi_osm_map_values z_Nevada = new zanavi_osm_map_values("Nevada", "nevada.bin", 31637431L, false, 27); 254 static final zanavi_osm_map_values z_Nevada = new zanavi_osm_map_values("Nevada", "nevada.bin", 21979548L, false, 27);
245 static final zanavi_osm_map_values z_Ohio = new zanavi_osm_map_values("Ohio", "ohio.bin", 51407120L, false, 27); 255 static final zanavi_osm_map_values z_Ohio = new zanavi_osm_map_values("Ohio", "ohio.bin", 40769081L, false, 27);
246 static final zanavi_osm_map_values z_Oklahoma = new zanavi_osm_map_values("Oklahoma", "oklahoma.bin", 61702065L, false, 27); 256 static final zanavi_osm_map_values z_Oklahoma = new zanavi_osm_map_values("Oklahoma", "oklahoma.bin", 55866120L, false, 27);
247 static final zanavi_osm_map_values z_Oregon = new zanavi_osm_map_values("Oregon", "oregon.bin", 44238403L, false, 27); 257 static final zanavi_osm_map_values z_Oregon = new zanavi_osm_map_values("Oregon", "oregon.bin", 36940277L, false, 27);
248 static final zanavi_osm_map_values z_Pennsylvania = new zanavi_osm_map_values("Pennsylvania", "pennsylvania.bin", 62818050L, false, 27); 258 static final zanavi_osm_map_values z_Pennsylvania = new zanavi_osm_map_values("Pennsylvania", "pennsylvania.bin", 51500049L, false, 27);
249 static final zanavi_osm_map_values z_Rhode_Island = new zanavi_osm_map_values("Rhode Island", "rhode-island.bin", 4469038L, false, 27); 259 static final zanavi_osm_map_values z_Rhode_Island = new zanavi_osm_map_values("Rhode Island", "rhode-island.bin", 3691209L, false, 27);
250 static final zanavi_osm_map_values z_Tennessee = new zanavi_osm_map_values("Tennessee", "tennessee.bin", 34457875L, false, 27); 260 static final zanavi_osm_map_values z_Tennessee = new zanavi_osm_map_values("Tennessee", "tennessee.bin", 30511825L, false, 27);
251 static final zanavi_osm_map_values z_Texas = new zanavi_osm_map_values("Texas", "texas.bin", 122360070L, false, 27); 261 static final zanavi_osm_map_values z_Texas = new zanavi_osm_map_values("Texas", "texas.bin", 108367999L, false, 27);
252 static final zanavi_osm_map_values z_Utah = new zanavi_osm_map_values("Utah", "utah.bin", 22504486L, false, 27); 262 static final zanavi_osm_map_values z_Utah = new zanavi_osm_map_values("Utah", "utah.bin", 19254246L, false, 27);
253 static final zanavi_osm_map_values z_Vermont = new zanavi_osm_map_values("Vermont", "vermont.bin", 10310709L, false, 27); 263 static final zanavi_osm_map_values z_Vermont = new zanavi_osm_map_values("Vermont", "vermont.bin", 7917383L, false, 27);
254 static final zanavi_osm_map_values z_Virginia = new zanavi_osm_map_values("Virginia", "virginia.bin", 128766172L, false, 27); 264 static final zanavi_osm_map_values z_Virginia = new zanavi_osm_map_values("Virginia", "virginia.bin", 98109314L, false, 27);
255 static final zanavi_osm_map_values z_West_Virginia = new zanavi_osm_map_values("West Virginia", "west-virginia.bin", 15986587L, false, 27); 265 static final zanavi_osm_map_values z_West_Virginia = new zanavi_osm_map_values("West Virginia", "west-virginia.bin", 12267128L, false, 27);
256 static final zanavi_osm_map_values z_Washington = new zanavi_osm_map_values("Washington", "washington.bin", 40566463L, false, 27); 266 static final zanavi_osm_map_values z_Washington = new zanavi_osm_map_values("Washington", "washington.bin", 34281164L, false, 27);
257 static final zanavi_osm_map_values z_Wisconsin = new zanavi_osm_map_values("Wisconsin", "wisconsin.bin", 45505217L, false, 27); 267 static final zanavi_osm_map_values z_Wisconsin = new zanavi_osm_map_values("Wisconsin", "wisconsin.bin", 44033160L, false, 27);
258 static final zanavi_osm_map_values z_Wyoming = new zanavi_osm_map_values("Wyoming", "wyoming.bin", 19076762L, false, 27); 268 static final zanavi_osm_map_values z_Wyoming = new zanavi_osm_map_values("Wyoming", "wyoming.bin", 15865183L, false, 27);
259 static final zanavi_osm_map_values z_New_York = new zanavi_osm_map_values("New York", "new-york.bin", 47606755L, false, 27); 269 static final zanavi_osm_map_values z_New_York = new zanavi_osm_map_values("New York", "new-york.bin", 39570304L, false, 27);
260 static final zanavi_osm_map_values z_USA_minor_Islands = new zanavi_osm_map_values("USA minor Islands", "usa_minor_islands.bin", 95926723L, false, 27); 270 static final zanavi_osm_map_values z_USA_minor_Islands = new zanavi_osm_map_values("USA minor Islands", "usa_minor_islands.bin", 82368743L, false, 27);
261 static final zanavi_osm_map_values z_Panama = new zanavi_osm_map_values("Panama", "panama.bin", 1157660L, false, 7); 271 static final zanavi_osm_map_values z_Panama = new zanavi_osm_map_values("Panama", "panama.bin", 1083594L, false, 7);
262 static final zanavi_osm_map_values z_Haiti_and_Dom_Rep_ = new zanavi_osm_map_values("Haiti and Dom.Rep.", "haiti_and_domrep.bin", 12902807L, false, 136); 272 static final zanavi_osm_map_values z_Haiti_and_Dom_Rep_ = new zanavi_osm_map_values("Haiti and Dom.Rep.", "haiti_and_domrep.bin", 11542018L, false, 136);
263 static final zanavi_osm_map_values z_Cuba = new zanavi_osm_map_values("Cuba", "cuba.bin", 3743027L, false, 136); 273 static final zanavi_osm_map_values z_Cuba = new zanavi_osm_map_values("Cuba", "cuba.bin", 4227465L, false, 136);
274 static final zanavi_osm_map_values z_Rest_of_World = new zanavi_osm_map_values("Rest of World", "restl_welt.bin", 200171328L, false, 1);
264 // 275 //
265 // 276 //
266 // 277 //
267 static final zanavi_osm_map_values[] z_OSM_MAPS = new zanavi_osm_map_values[] { z_Country_borders, z_Coastline, z_Restl_welt, z_Planet, z_Europe, z_North_America, z_USA, z_Central_America, z_South_America, z_Africa, z_Asia, z_Australia_and_Oceania, z_Caribbean, z_Albania, z_Alps, z_Andorra, z_Austria, z_Azores, z_Belarus, z_Belgium, z_Bosnia_Herzegovina, z_British_Isles, z_Bulgaria, z_Croatia, z_Cyprus, z_Czech_Republic, z_Denmark, z_Estonia, z_Faroe_Islands, z_Finland, z_France, z_Germany, 278 static final zanavi_osm_map_values[] z_OSM_MAPS = new zanavi_osm_map_values[] { z_Country_borders, z_Coastline, z_Rest_of_World, z_Planet, z_Europe, z_North_America, z_USA, z_Central_America, z_South_America, z_Africa, z_Asia, z_Australia_and_Oceania, z_Caribbean, z_Albania, z_Alps, z_Andorra, z_Austria, z_Azores, z_Belarus, z_Belgium, z_Bosnia_Herzegovina, z_British_Isles, z_Bulgaria, z_Croatia, z_Cyprus, z_Czech_Republic, z_Denmark, z_Estonia, z_Faroe_Islands, z_Finland, z_France, z_Germany,
268 z_Great_Britain, z_Greece, z_Hungary, z_Iceland, z_Ireland, z_Isle_of_man, z_Italy, z_Kosovo, z_Latvia, z_Liechtenstein, z_Lithuania, z_Luxembourg, z_Macedonia, z_Malta, z_Moldova, z_Monaco, z_Montenegro, z_Netherlands, z_Norway, z_Poland, z_Portugal, z_Romania, z_Russia_European_part, z_Serbia, z_Slovakia, z_Slovenia, z_Spain, z_Sweden, z_Switzerland, z_Turkey, z_Ukraine, z_Canari_Islands, z_India, z_Israel_and_Palestine, z_China, z_Japan, z_Taiwan, z_Canada, z_Greenland, z_Mexico, 279 z_Great_Britain, z_Greece, z_Hungary, z_Iceland, z_Ireland, z_Isle_of_man, z_Italy, z_Kosovo, z_Latvia, z_Liechtenstein, z_Lithuania, z_Luxembourg, z_Macedonia, z_Malta, z_Moldova, z_Monaco, z_Montenegro, z_Netherlands, z_Norway, z_Poland, z_Portugal, z_Romania, z_Russia_European_part, z_Serbia, z_Slovakia, z_Slovenia, z_Spain, z_Sweden, z_Switzerland, z_Turkey, z_Ukraine, z_Canari_Islands, z_India, z_Israel_and_Palestine, z_China, z_Japan, z_Taiwan, z_Canada, z_Greenland, z_Mexico,
269 z_US_Midwest, z_US_Northeast, z_US_Pacific, z_US_South, z_US_West, z_Alabama, z_Alaska, z_Arizona, z_Arkansas, z_California, z_North_Carolina, z_South_Carolina, z_Colorado, z_North_Dakota, z_South_Dakota, z_District_of_Columbia, z_Connecticut, z_Delaware, z_Florida, z_Georgia, z_New_Hampshire, z_Hawaii, z_Idaho, z_Illinois, z_Indiana, z_Iowa, z_New_Jersey, z_Kansas, z_Kentucky, z_Louisiana, z_Maine, z_Maryland, z_Massachusetts, z_New_Mexico, z_Michigan, z_Minnesota, z_Mississippi, 280 z_US_Midwest, z_US_Northeast, z_US_Pacific, z_US_South, z_US_West, z_Alabama, z_Alaska, z_Arizona, z_Arkansas, z_California, z_North_Carolina, z_South_Carolina, z_Colorado, z_North_Dakota, z_South_Dakota, z_District_of_Columbia, z_Connecticut, z_Delaware, z_Florida, z_Georgia, z_New_Hampshire, z_Hawaii, z_Idaho, z_Illinois, z_Indiana, z_Iowa, z_New_Jersey, z_Kansas, z_Kentucky, z_Louisiana, z_Maine, z_Maryland, z_Massachusetts, z_New_Mexico, z_Michigan, z_Minnesota, z_Mississippi,
270 z_Missouri, z_Montana, z_Nebraska, z_Nevada, z_Ohio, z_Oklahoma, z_Oregon, z_Pennsylvania, z_Rhode_Island, z_Tennessee, z_Texas, z_Utah, z_Vermont, z_Virginia, z_West_Virginia, z_Washington, z_Wisconsin, z_Wyoming, z_New_York, z_USA_minor_Islands, z_Panama, z_Haiti_and_Dom_Rep_, z_Cuba }; 281 z_Missouri, z_Montana, z_Nebraska, z_Nevada, z_Ohio, z_Oklahoma, z_Oregon, z_Pennsylvania, z_Rhode_Island, z_Tennessee, z_Texas, z_Utah, z_Vermont, z_Virginia, z_West_Virginia, z_Washington, z_Wisconsin, z_Wyoming, z_New_York, z_USA_minor_Islands, z_Panama, z_Haiti_and_Dom_Rep_, z_Cuba };
271 282
272 // 283 //
… …
352 tmp_downloadfileSplit.delete(); 363 tmp_downloadfileSplit.delete();
353 } 364 }
354 // 365 //
355 File tmp_downloadfile_md5 = new File(Navit.MAPMD5_FILENAME_PATH, MD5_DOWNLOAD_TEMPFILE); 366 File tmp_downloadfile_md5 = new File(Navit.MAPMD5_FILENAME_PATH, MD5_DOWNLOAD_TEMPFILE);
356 tmp_downloadfile_md5.delete(); 367 tmp_downloadfile_md5.delete();
368 File tmp_downloadfile_idx = new File(Navit.CFG_FILENAME_PATH, DOWNLOAD_FILENAME + ".idx");
369 tmp_downloadfile_idx.delete();
357 Log.d("NavitMapDownloader", "(a)removed " + tmp_downloadfile.getAbsolutePath()); 370 Log.d("NavitMapDownloader", "(a)removed " + tmp_downloadfile.getAbsolutePath());
358 // ok, remove dialog 371 // ok, remove dialog
359 Message msg = mHandler.obtainMessage(); 372 Message msg = mHandler.obtainMessage();
360 Bundle b = new Bundle(); 373 Bundle b = new Bundle();
361 msg.what = 0; 374 msg.what = 0;
… …
380 tmp_downloadfileSplit.delete(); 393 tmp_downloadfileSplit.delete();
381 } 394 }
382 // 395 //
383 File tmp_downloadfile_md5 = new File(Navit.MAPMD5_FILENAME_PATH, MD5_DOWNLOAD_TEMPFILE); 396 File tmp_downloadfile_md5 = new File(Navit.MAPMD5_FILENAME_PATH, MD5_DOWNLOAD_TEMPFILE);
384 tmp_downloadfile_md5.delete(); 397 tmp_downloadfile_md5.delete();
398 File tmp_downloadfile_idx = new File(Navit.CFG_FILENAME_PATH, DOWNLOAD_FILENAME + ".idx");
399 tmp_downloadfile_idx.delete();
385 Log.d("NavitMapDownloader", "(b)removed " + tmp_downloadfile.getAbsolutePath()); 400 Log.d("NavitMapDownloader", "(b)removed " + tmp_downloadfile.getAbsolutePath());
386 } 401 }
387 } 402 }
388 403
389 private class MultiStreamDownloaderThread extends Thread 404 private class MultiStreamDownloaderThread extends Thread
… …
718 b.putString("text", Navit.get_text("Error downloading map, resuming")); //TRANS 733 b.putString("text", Navit.get_text("Error downloading map, resuming")); //TRANS
719 msg.setData(b); 734 msg.setData(b);
720 handler.sendMessage(msg); 735 handler.sendMessage(msg);
721 736
722 Log.d("NavitMapDownloader", this.my_num + " Error7: " + e); 737 Log.d("NavitMapDownloader", this.my_num + " Error7: " + e);
723
724 // ******* ********* D/NavitMapDownloader( 266): 1 Error7: java.io.IOException: No space left on device 738 // ******* ********* D/NavitMapDownloader( 266): 1 Error7: java.io.IOException: No space left on device
725 739
726 try 740 try
727 { 741 {
728 bif.close(); 742 bif.close();
… …
798 } 812 }
799 System.out.println("MultiStreamDownloaderThread " + this.my_num + " finished"); 813 System.out.println("MultiStreamDownloaderThread " + this.my_num + " finished");
800 } 814 }
801 } 815 }
802 816
803 public Navit navit_jmain = null; 817 //public Navit navit_jmain = null;
804 818
805 public NavitMapDownloader(Navit main) 819 public NavitMapDownloader(Navit main)
806 { 820 {
807 this.navit_jmain = main; 821 //this.navit_jmain = main;
808 } 822 }
809 823
810 public static void init_maps_without_donate_largemaps() 824 public static void init_maps_without_donate_largemaps()
811 { 825 {
812 if (Navit.Navit_Largemap_DonateVersion_Installed != true) 826 if (Navit.Navit_Largemap_DonateVersion_Installed != true)
… …
1476 num_threads = 1; 1490 num_threads = 1;
1477 bytes_diff = map_values.est_size_bytes; 1491 bytes_diff = map_values.est_size_bytes;
1478 } 1492 }
1479 else 1493 else
1480 { 1494 {
1495 // use only 1 thread ALWAYS!! (there seem to be some bugs on multithreaded downloads)
1496 num_threads = 1;
1497 bytes_diff = map_values.est_size_bytes;
1498 }
1499 //{
1481 num_threads = MULTI_NUM_THREADS; 1500 // num_threads = MULTI_NUM_THREADS;
1482 bytes_diff = (long) (map_values.est_size_bytes / num_threads); 1501 // bytes_diff = (long) (map_values.est_size_bytes / num_threads);
1483 if (bytes_diff * num_threads < map_values.est_size_bytes) 1502 // if (bytes_diff * num_threads < map_values.est_size_bytes)
1484 { 1503 // {
1485 bytes_leftover = map_values.est_size_bytes - (bytes_diff * num_threads); 1504 // bytes_leftover = map_values.est_size_bytes - (bytes_diff * num_threads);
1486 System.out.println("bytes_leftover=" + bytes_leftover); 1505 // System.out.println("bytes_leftover=" + bytes_leftover);
1487 } 1506 // }
1488 } 1507 //}
1489 } 1508 }
1490 1509
1491 // stupid workaround to have this value available :-( 1510 // stupid workaround to have this value available :-(
1492 MULTI_NUM_THREADS_LOCAL = num_threads; 1511 MULTI_NUM_THREADS_LOCAL = num_threads;
1493 1512
1494 System.out.println("bytes_diff=" + bytes_diff); 1513 System.out.println("num_threads=" + num_threads + " bytes_diff=" + bytes_diff);
1495 1514
1496 Boolean split_mapfile = false; 1515 Boolean split_mapfile = false;
1497 int num_splits = 0; 1516 int num_splits = 0;
1498 // check if we need to split the file into pieces 1517 // check if we need to split the file into pieces
1499 if (map_values.est_size_bytes > MAX_SINGLE_BINFILE_SIZE) 1518 if (map_values.est_size_bytes > MAX_SINGLE_BINFILE_SIZE)
… …
1514 File outputFileSplit = new File(file99, fileName + "." + String.valueOf(jkl)); 1533 File outputFileSplit = new File(file99, fileName + "." + String.valueOf(jkl));
1515 System.out.println("delete:" + file99 + "/" + fileName + "." + String.valueOf(jkl)); 1534 System.out.println("delete:" + file99 + "/" + fileName + "." + String.valueOf(jkl));
1516 outputFileSplit.delete(); 1535 outputFileSplit.delete();
1517 } 1536 }
1518 1537
1538 /*
1519 // pre create the big file 1539 * // pre create the big file
1520 msg = handler.obtainMessage(); 1540 * msg = handler.obtainMessage();
1521 b = new Bundle(); 1541 * b = new Bundle();
1522 msg.what = 1; 1542 * msg.what = 1;
1523 b.putInt("max", 20); // use a dummy number here 1543 * b.putInt("max", 20); // use a dummy number here
1524 b.putInt("cur", 0); 1544 * b.putInt("cur", 0);
1525 b.putInt("dialog_num", my_dialog_num); 1545 * b.putInt("dialog_num", my_dialog_num);
1526 b.putString("title", Navit.get_text("Mapdownload")); //TRANS 1546 * b.putString("title", Navit.get_text("Mapdownload")); //TRANS
1527 b.putString("text", Navit.get_text("Creating outputfile, long time")); //TRANS 1547 * b.putString("text", Navit.get_text("Creating outputfile, long time")); //TRANS
1528 msg.setData(b); 1548 * msg.setData(b);
1529 handler.sendMessage(msg); 1549 * handler.sendMessage(msg);
1550 */
1530 1551
1531 d_pre_create_file(PATH2 + fileName, map_values.est_size_bytes, handler, my_dialog_num); 1552 // --disabled-- // d_pre_create_file(PATH2 + fileName, map_values.est_size_bytes, handler, my_dialog_num);
1532 1553
1533 // 1554 //
1534 // 1555 //
1535 MultiStreamDownloaderThread[] m = new MultiStreamDownloaderThread[num_threads]; 1556 MultiStreamDownloaderThread[] m = new MultiStreamDownloaderThread[num_threads];
1536 int k; 1557 int k;
… …
1625 System.out.println("delete final filename:" + file + "/" + final_fileName + "." + String.valueOf(jkl)); 1646 System.out.println("delete final filename:" + file + "/" + final_fileName + "." + String.valueOf(jkl));
1626 outputFileSplit.delete(); 1647 outputFileSplit.delete();
1627 } 1648 }
1628 // rename file to final name 1649 // rename file to final name
1629 outputFile.renameTo(final_outputFile); 1650 outputFile.renameTo(final_outputFile);
1651 System.out.println("rename1:" + outputFile + " to:" + final_outputFile);
1630 if (split_mapfile) 1652 if (split_mapfile)
1631 { 1653 {
1632 for (int jkl = 1; jkl < (num_splits + 1); jkl++) 1654 for (int jkl = 1; jkl < (num_splits + 1); jkl++)
1633 { 1655 {
1634 File outputFileSplit = new File(file, final_fileName + "." + String.valueOf(jkl)); 1656 File outputFileSplit = new File(file, final_fileName + "." + String.valueOf(jkl));
1635 File outputFileSplitSrc = new File(file99, fileName + "." + String.valueOf(jkl)); 1657 File outputFileSplitSrc = new File(file99, fileName + "." + String.valueOf(jkl));
1636 System.out.println("rename:" + outputFileSplitSrc + " to:" + outputFileSplit); 1658 System.out.println("rename2:" + outputFileSplitSrc + " to:" + outputFileSplit);
1637 outputFileSplitSrc.renameTo(outputFileSplit); 1659 outputFileSplitSrc.renameTo(outputFileSplit);
1638 } 1660 }
1639 } 1661 }
1640 1662
1641 // delete an already there md5 file, first 1663 // delete an already there md5 file, first
1642 File md5_final_filename = new File(Navit.MAPMD5_FILENAME_PATH + map_values.url + ".md5"); 1664 File md5_final_filename = new File(Navit.MAPMD5_FILENAME_PATH + map_values.url + ".md5");
1643 md5_final_filename.delete(); 1665 md5_final_filename.delete();
1644 // rename file to final name 1666 // rename file to final name
1645 File tmp_downloadfile_md5 = new File(Navit.MAPMD5_FILENAME_PATH, MD5_DOWNLOAD_TEMPFILE); 1667 File tmp_downloadfile_md5 = new File(Navit.MAPMD5_FILENAME_PATH, MD5_DOWNLOAD_TEMPFILE);
1646 tmp_downloadfile_md5.renameTo(md5_final_filename); 1668 tmp_downloadfile_md5.renameTo(md5_final_filename);
1669
1670 // ------------ download idx file ------------
1671 // ------------ download idx file ------------
1672 zanavi_osm_map_values z_dummy_for_idx = new zanavi_osm_map_values("index file", map_values.url + ".idx", 1000000, false, 3);
1673 // z_dummy_for_idx.map_name = "index file";
1674
1675 boolean index_file_download = false;
1676 if ((Navit.Navit_DonateVersion_Installed) || (Navit.Navit_Largemap_DonateVersion_Installed))
1677 {
1678 index_file_download = true;
1679 }
1680
1681 if (index_file_download == true)
1682 {
1683 long real_file_size_idx = d_get_real_download_filesize(z_dummy_for_idx, this_server_name, map_num3);
1684 if (real_file_size_idx <= 0)
1685 {
1686 msg = handler.obtainMessage();
1687 b = new Bundle();
1688 msg.what = 2;
1689 b.putInt("dialog_num", my_dialog_num);
1690 b.putString("text", Navit.get_text("Error downloading index!")); //TRANS
1691 msg.setData(b);
1692 handler.sendMessage(msg);
1693
1694 index_file_download = false;
1695 }
1696 else
1697 {
1698 z_dummy_for_idx.est_size_bytes = real_file_size_idx;
1699 }
1700 }
1701
1702 if (index_file_download == true)
1703 {
1704 num_threads = 1;
1705 bytes_leftover = 0;
1706 num_threads = 1;
1707 bytes_diff = z_dummy_for_idx.est_size_bytes;
1708
1709 Message msg_idx = handler.obtainMessage();
1710 Bundle b_idx = new Bundle();
1711 msg_idx.what = 1;
1712 b_idx.putInt("max", (int) (z_dummy_for_idx.est_size_bytes / 1024)); // use a dummy number here
1713 b_idx.putInt("cur", 0);
1714 b_idx.putInt("dialog_num", my_dialog_num);
1715 b_idx.putString("title", Navit.get_text("Index download")); //TRANS
1716 b_idx.putString("text", Navit.get_text("downloading indexfile")); //TRANS
1717 msg_idx.setData(b);
1718 handler.sendMessage(msg_idx);
1719
1720 MultiStreamDownloaderThread[] m_idx = new MultiStreamDownloaderThread[num_threads];
1721 int k_idx;
1722
1723 mapdownload_error_code_clear();
1724 mapdownload_already_read = new long[num_threads];
1725 mapdownload_byte_per_second_overall = new float[num_threads];
1726 for (k_idx = 0; k_idx < num_threads; k_idx++)
1727 {
1728 mapdownload_already_read[k_idx] = 0;
1729 mapdownload_byte_per_second_overall[k_idx] = 0;
1730 }
1731
1732 // start downloader threads here --------------------------
1733 // start downloader threads here --------------------------
1734 for (k_idx = 0; k_idx < num_threads; k_idx++)
1735 {
1736 if (k_idx == (num_threads - 1))
1737 {
1738 m[k_idx] = new MultiStreamDownloaderThread(handler, z_dummy_for_idx, map_num3, k_idx + 1, PATH, PATH2, fileName + ".idx", final_fileName + ".idx", this_server_name, "xyzdummydummy", bytes_diff * k_idx, z_dummy_for_idx.est_size_bytes);
1739 }
1740 else
1741 {
1742 m[k_idx] = new MultiStreamDownloaderThread(handler, z_dummy_for_idx, map_num3, k_idx + 1, PATH, PATH2, fileName + ".idx", final_fileName + ".idx", this_server_name, "xyzdummydummy", bytes_diff * k_idx, bytes_diff * (k_idx + 1));
1743 }
1744 m[k_idx].start();
1745 }
1746
1747 // wait for downloader threads to finish --------------------------
1748 for (k_idx = 0; k_idx < num_threads; k_idx++)
1749 {
1750 try
1751 {
1752 m[k_idx].join();
1753 }
1754 catch (InterruptedException e)
1755 {
1756 e.printStackTrace();
1757 }
1758 catch (Exception e)
1759 {
1760 e.printStackTrace();
1761 }
1762 }
1763
1764 if (mapdownload_error_code > 0)
1765 {
1766 mapdownload_error_code_clear();
1767 index_file_download = false;
1768 }
1769 else
1770 {
1771 // delete an already there idx file, first
1772 //System.out.println("idx 001:" + Navit.MAP_FILENAME_PATH + final_fileName + ".idx");
1773 File idx_final_filename = new File(Navit.MAP_FILENAME_PATH + final_fileName + ".idx");
1774 idx_final_filename.delete();
1775 // rename file to final name
1776 File tmp_downloadfile_idx = new File(Navit.CFG_FILENAME_PATH, fileName + ".idx");
1777 //System.out.println("idx 002:" + Navit.CFG_FILENAME_PATH + fileName + ".idx");
1778 File final_outputFile_idx = new File(Navit.MAP_FILENAME_PATH + final_fileName + ".idx");
1779 //System.out.println("idx 003:" + Navit.MAP_FILENAME_PATH + final_fileName + ".idx");
1780 tmp_downloadfile_idx.renameTo(final_outputFile_idx);
1781 }
1782 }
1783 // ------------ download idx file ------------
1784 // ------------ download idx file ------------
1647 1785
1648 // remove 1786 // remove
1649 NavitMapDownloader.remove_from_cat_file(up_map); 1787 NavitMapDownloader.remove_from_cat_file(up_map);
1650 // remove any duplicates (junk in file) 1788 // remove any duplicates (junk in file)
1651 NavitMapDownloader.remove_from_cat_file_disk_name(final_fileName); 1789 NavitMapDownloader.remove_from_cat_file_disk_name(final_fileName);
… …
1716 public String d_get_servername() 1854 public String d_get_servername()
1717 { 1855 {
1718 // this is only for debugging 1856 // this is only for debugging
1719 // NEVER enable this on a production release!!!!!!!!!! 1857 // NEVER enable this on a production release!!!!!!!!!!
1720 // NEVER enable this on a production release!!!!!!!!!! 1858 // NEVER enable this on a production release!!!!!!!!!!
1721 // **** trust_Every_ssl_cert(); 1859 // ------- // trust_Every_ssl_cert();
1722 // NEVER enable this on a production release!!!!!!!!!! 1860 // NEVER enable this on a production release!!!!!!!!!!
1723 // NEVER enable this on a production release!!!!!!!!!! 1861 // NEVER enable this on a production release!!!!!!!!!!
1724 1862
1725 String servername = null; 1863 String servername = null;
1726 try 1864 try
… …
2145 // ****EEEE**** W/System.err( 266): java.io.IOException: No space left on device 2283 // ****EEEE**** W/System.err( 266): java.io.IOException: No space left on device
2146 System.out.println("pre 9"); 2284 System.out.println("pre 9");
2147 2285
2148 try 2286 try
2149 { 2287 {
2150 System.out.println("f len=" + f.length()); 2288 System.out.println("d_pre_create_file:f len=" + f.length());
2151 } 2289 }
2152 catch (Exception e) 2290 catch (Exception e)
2153 { 2291 {
2154 e.printStackTrace(); 2292 e.printStackTrace();
2155 } 2293 }
… …
2182 } 2320 }
2183 2321
2184 public RandomAccessFile d_open_file(String filename, long pos) 2322 public RandomAccessFile d_open_file(String filename, long pos)
2185 { 2323 {
2186 RandomAccessFile f = null; 2324 RandomAccessFile f = null;
2187 System.out.println("seek (start):" + pos); 2325 System.out.println("d_open_file: " + filename + " seek (start):" + pos);
2188 try 2326 try
2189 { 2327 {
2190 f = new RandomAccessFile(filename, "rw"); 2328 f = new RandomAccessFile(filename, "rw");
2191 if (pos > 1900000000L) 2329 if (pos > 1900000000L)
2192 { 2330 {
… …
2236 } 2374 }
2237 catch (Exception e) 2375 catch (Exception e)
2238 { 2376 {
2239 e.printStackTrace(); 2377 e.printStackTrace();
2240 } 2378 }
2241 System.out.println("seek (end):" + pos); 2379 System.out.println("d_open_file:seek (end):" + pos);
2242 2380
2243 try 2381 try
2244 { 2382 {
2245 System.out.println("f len(seek)=" + f.length()); 2383 System.out.println("d_open_file:f len(seek)=" + f.length());
2246 } 2384 }
2247 catch (Exception e) 2385 catch (Exception e)
2248 { 2386 {
2249 e.printStackTrace(); 2387 e.printStackTrace();
2250 } 2388 }
… …
2254 2392
2255 public void d_close_file(RandomAccessFile f) 2393 public void d_close_file(RandomAccessFile f)
2256 { 2394 {
2257 try 2395 try
2258 { 2396 {
2259 System.out.println("f len=" + f.length()); 2397 System.out.println("d_close_file:f len=" + f.length());
2260 } 2398 }
2261 catch (Exception e) 2399 catch (Exception e)
2262 { 2400 {
2263 e.printStackTrace(); 2401 e.printStackTrace();
2264 } 2402 }
Legend:
Removed from v.30  
changed lines
  Added in v.31
   
Visit the ZANavi Wiki