From 7bdb75e20c9094fb72e8e10b389bad6a7e03ba8b Mon Sep 17 00:00:00 2001
From: sonora <hm.gglmail@googlemail.com>
Date: Sat, 14 Jan 2012 10:56:26 +0100
Subject: [PATCH] region names - geographical sorting

---
 OsmAnd/res/values/strings.xml                 |  6 +-
 .../activities/DownloadIndexActivity.java     | 56 +++++++++----------
 2 files changed, 31 insertions(+), 31 deletions(-)

diff --git a/OsmAnd/res/values/strings.xml b/OsmAnd/res/values/strings.xml
index 212e2cb8d5..1a15ece078 100644
--- a/OsmAnd/res/values/strings.xml
+++ b/OsmAnd/res/values/strings.xml
@@ -1,7 +1,5 @@
 <?xml version="1.0" encoding="utf-8" standalone="no"?>
 <resources>
-	<string name="index_name_voice">_Voice packs (recorded)</string>
-	<string name="index_name_tts_voice">_Voice packs (TTS)</string>
 	<string name="index_name_us">North America - United States</string>
 	<string name="index_name_north_america">North America - other maps</string>
 	<string name="index_name_central_america">Central America</string>
@@ -13,8 +11,10 @@
 	<string name="index_name_africa">Africa</string>
 	<string name="index_name_asia">Asia</string>
 	<string name="index_name_australia">Australia</string>
-	<string name="index_name_other">Worldwide and topic maps</string>
+	<string name="index_name_other">Other (Worldwide and topic maps)</string>
 	<string name="index_name_wiki">Worldwide Wikipedia</string>
+	<string name="index_name_voice">_Voice packs (recorded)</string>
+	<string name="index_name_tts_voice">_Voice packs (TTS)</string>
 
 	<string name="amenity_type_wikiosm">Wikipedia (offline)</string>
 	<string name="amenity_type_user_defined">User defined</string>
diff --git a/OsmAnd/src/net/osmand/plus/activities/DownloadIndexActivity.java b/OsmAnd/src/net/osmand/plus/activities/DownloadIndexActivity.java
index 88c2afe503..3fb29bdf2a 100644
--- a/OsmAnd/src/net/osmand/plus/activities/DownloadIndexActivity.java
+++ b/OsmAnd/src/net/osmand/plus/activities/DownloadIndexActivity.java
@@ -684,50 +684,50 @@ public class DownloadIndexActivity extends ExpandableListActivity {
 		final Map<String, IndexItemCategory> cats = new TreeMap<String, DownloadIndexActivity.IndexItemCategory>();
 		for(IndexItem i : indexItems){
 			int nameId = R.string.index_name_other;
-			int order = 100;
+			int order = 80;
 			String lc = i.getFileName().toLowerCase();
 			if(lc.endsWith(".voice.zip")) {
 				nameId = R.string.index_name_voice;
-				order = 1; 
+				order = 95; 
 			} else if(lc.contains(".ttsvoice.zip")) {
 				nameId = R.string.index_name_tts_voice;
-				order = 3;
-			} else if(lc.contains("_wiki_")) {
-				nameId = R.string.index_name_wiki;
-				order = 5;
-			} else if(lc.startsWith("germany_")) {
-				nameId = R.string.index_name_germany;
-				order = 40;
-			} else if(lc.startsWith("france_")) {
-				nameId = R.string.index_name_france;
-				order = 45;
-			} else if(lc.startsWith("russia_")) {
-				nameId = R.string.index_name_russia;
-				order = 50;
+				order = 96;
 			} else if(lc.startsWith("us")) {
 				nameId = R.string.index_name_us;
-				order = 60;
-			} else if(lc.contains("_europe_")) {
-				nameId = R.string.index_name_europe;
 				order = 10;
-			} else if(lc.contains("_asia_")) {
-				nameId = R.string.index_name_asia;
-				order = 80;
 			} else if(lc.contains("_northamerica_")) {
 				nameId = R.string.index_name_north_america;
-				order = 65;
+				order = 19;
 			} else if(lc.contains("_centralamerica_") || lc.contains("central-america")) {
 				nameId = R.string.index_name_central_america;
-				order = 70;
+				order = 20;
 			} else if(lc.contains("_southamerica_") || lc.contains("south-america")) {
 				nameId = R.string.index_name_south_america;
-				order = 75;
-			} else if(lc.contains("australia")) {
-				nameId = R.string.index_name_australia;
-				order = 80;
+				order = 30;
+			} else if(lc.startsWith("france_")) {
+				nameId = R.string.index_name_france;
+				order = 40;
+			} else if(lc.startsWith("germany_")) {
+				nameId = R.string.index_name_germany;
+				order = 41;
+			} else if(lc.contains("_europe_")) {
+				nameId = R.string.index_name_europe;
+				order = 48;
+			} else if(lc.startsWith("russia_")) {
+				nameId = R.string.index_name_russia;
+				order = 49;
 			} else if(lc.contains("africa")) {
 				nameId = R.string.index_name_africa;
-				order = 85;
+				order = 50;
+			} else if(lc.contains("_asia_")) {
+				nameId = R.string.index_name_asia;
+				order = 60;
+			} else if(lc.contains("australia")) {
+				nameId = R.string.index_name_australia;
+				order = 70;
+			} else if(lc.contains("_wiki_")) {
+				nameId = R.string.index_name_wiki;
+				order = 90;
 			}
 			
 			String name = getString(nameId);