Android-builders-club/OsmAnd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Fix geo intent/ ukranian incomplete

Browse source
This commit is contained in:
Victor Shcherb 2013-06-01 11:48:51 +02:00
parent 4421f3ccc2
commit b033779327
2 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
OsmAnd/src/net/osmand/plus/activities/SettingsGeneralActivity.java
View file

@ -143,7 +143,7 @@ public class SettingsGeneralActivity extends SettingsBaseActivity {
//getResources().getAssets().getLocales();
entrieValues = new String[] { "",
"en", "af", "hy", "eu", "bs", "bg",
"ca", "cs", "nl", "fi", "fr", "ka",
"ca", "cs", "da", "nl", "fi", "fr", "ka",
"de", "el", "he", "hi", "hu", "id",
"it", "ja", "ko", "lv", "lt", "mr",
"no", "pl", "pt", "ro", "ru", "sk",
@ -151,11 +151,11 @@ public class SettingsGeneralActivity extends SettingsBaseActivity {
"cy" };
entries = new String[] { getString(R.string.system_locale),
"English", "Afrikaans", "Armenian" + incompleteSuffix, "Basque" + incompleteSuffix, "Bosnian" + incompleteSuffix, "Bulgarian" + incompleteSuffix,
"Catalan", "Czech", "Dutch", "Finnish" + incompleteSuffix, "French", "Georgian",
"Catalan", "Czech", "Danish", "Dutch", "Finnish" + incompleteSuffix, "French", "Georgian",
"German", "Greek", "Hebrew", "Hindi" + incompleteSuffix, "Hungarian", "Indonesian" + incompleteSuffix,
"Italian", "Japanese" + incompleteSuffix, "Korean" + incompleteSuffix, "Latvian", "Lithuanian", "Marathi",
"Italian", "Japanese" + incompleteSuffix, "Korean" + incompleteSuffix, "Latvian", "Lithuanian", "Marathi" +incompleteSuffix,
"Norwegian" + incompleteSuffix, "Polish", "Portuguese", "Romanian", "Russian", "Slovak",
"Slovenian", "Spanish", "Swedish" + incompleteSuffix, "Turkish" + incompleteSuffix, "Ukrainian" + incompleteSuffix, "Vietnamese",
"Slovenian", "Spanish", "Swedish", "Turkish" , "Ukrainian" , "Vietnamese",
"Welsh" + incompleteSuffix };
registerListPreference(settings.PREFERRED_LOCALE, screen, entries, entrieValues);

5
OsmAnd/src/net/osmand/plus/activities/search/GeoIntentActivity.java
View file

@ -64,6 +64,9 @@ public class GeoIntentActivity extends OsmandListActivity {
@Override
public void run() {
try {
while(getMyApplication().isApplicationInitializing()) {
Thread.sleep(200);
}
Collection<? extends MapObject> results = extract(
intent.getData()).execute();
// show the first result on map, and populate the list!
@ -351,7 +354,7 @@ public class GeoIntentActivity extends OsmandListActivity {
connectedStreets.add(s);
} else {
boolean tooFar = true;
for(City c : cityIds.values()) {
for(City c : cityIds.valueCollection()) {
if(MapUtils.getDistance(c.getLocation(), s.getLocation()) < 50000) {
tooFar = false;
break;