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

Merge pull request #165 from yvecai/master

Browse source 
Change Australia prefix to Oceania
This commit is contained in:
Pavol Zibrita 2012-02-21 15:35:53 -08:00
commit 59d4a45939
3 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
OsmAnd/res/values/strings.xml
View file

@ -50,7 +50,7 @@
<string name="index_name_russia">Europe/Asia - Russia</string> <string name="index_name_russia">Europe/Asia - Russia</string>
<string name="index_name_africa">Africa</string> <string name="index_name_africa">Africa</string>
<string name="index_name_asia">Asia</string> <string name="index_name_asia">Asia</string>
<string name="index_name_australia">Australia</string> <string name="index_name_oceania">Oceania</string>
<string name="index_name_other">Worldwide and topic maps</string> <string name="index_name_other">Worldwide and topic maps</string>
<string name="index_name_wiki">Worldwide Wikipedia</string> <string name="index_name_wiki">Worldwide Wikipedia</string>
<string name="index_name_voice">Voice packs (recorded)</string> <string name="index_name_voice">Voice packs (recorded)</string>

4
OsmAnd/src/net/osmand/plus/activities/DownloadIndexActivity.java
View file

@ -814,8 +814,8 @@ public class DownloadIndexActivity extends OsmandExpandableListActivity {
} else if(lc.contains("_asia_")) { } else if(lc.contains("_asia_")) {
nameId = R.string.index_name_asia; nameId = R.string.index_name_asia;
order = 50; order = 50;
} else if(lc.contains("australia")) { } else if(lc.contains("_oceania_")) {
nameId = R.string.index_name_australia; nameId = R.string.index_name_oceania;
order = 70; order = 70;
} else if(lc.contains("_wiki_")) { } else if(lc.contains("_wiki_")) {
nameId = R.string.index_name_wiki; nameId = R.string.index_name_wiki;

2
build-scripts/regions/7_indexes_australia.xml
View file

@ -8,7 +8,7 @@
</regions> </regions>
<!-- 7. NEW ZEALAND-AUSTRALIA [SOURCE: GEOFABRIK.DE] --> <!-- 7. NEW ZEALAND-AUSTRALIA [SOURCE: GEOFABRIK.DE] -->
<regions siteToDownload="http://download.geofabrik.de/osm/australia-oceania/{0}.osm.pbf" region_prefix="" region_suffix="_Australia" skip="false"> <regions siteToDownload="http://download.geofabrik.de/osm/australia-oceania/{0}.osm.pbf" region_prefix="" region_suffix="_Oceania" skip="false">
<region name="new-zealand" esize=""/> <region name="new-zealand" esize=""/>
<region name="new-caledonia" esize=""/> <region name="new-caledonia" esize=""/>
</regions> </regions>