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

Add basemap to application, allow to add other resources to apk (assets)

Browse source
This commit is contained in:
Victor Shcherb 2011-06-22 02:00:21 +02:00
parent f85acc3c4c
commit 1480761354
5 changed files with 55 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
OsmAnd/.gitignore vendored
View file

@ -1,5 +1,4 @@
bin/
gen/
assets/
local.properties
raw/

BIN
OsmAnd/assets/Basemap.obf Normal file
View file

Binary file not shown.

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

@ -1,5 +1,6 @@
<?xml version="1.0" encoding="utf-8" standalone="no"?>
<resources>
<string name="installing_new_resources">Unpacking new data...</string>
<string name="internet_connection_required_for_online_route">You are about to use online routing but you do not have internet connection. You can try experimental offline routing (switch in settings).</string>
<string name="tts_language_not_supported_title">Language unsupported</string>
<string name="tts_language_not_supported">The selected language is not supported by the installed TTS engine. Do you want to go to market and search for other TTS engine? Else preset TTS language will be used.</string>

3
OsmAnd/src/net/osmand/plus/OsmandSettings.java
View file

@ -8,6 +8,7 @@ import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
import net.osmand.Version;
import net.osmand.map.ITileSource;
import net.osmand.map.TileSourceManager;
import net.osmand.map.TileSourceManager.TileSourceTemplate;
@ -557,6 +558,8 @@ public class OsmandSettings {
return internetAvailableSourceTemplates;
}
public final CommonPreference<String> PREVIOUS_INSTALLED_VERSION = new StringPreference("previous_installed_version", "0.6.5", true);
public ITileSource getMapTileSource(boolean warnWhenSelected) {
String tileName = MAP_TILE_SOURCES.get();
if (tileName != null) {

51
OsmAnd/src/net/osmand/plus/ResourceManager.java
View file

@ -2,7 +2,10 @@ package net.osmand.plus;
import java.io.File;
import java.io.FileInputStream;
import java.io.FileOutputStream;
import java.io.IOException;
import java.io.InputStream;
import java.io.RandomAccessFile;
import java.text.Collator;
import java.text.MessageFormat;
@ -15,8 +18,10 @@ import java.util.Map;
import java.util.Stack;
import java.util.TreeMap;
import net.osmand.Algoritms;
import net.osmand.IProgress;
import net.osmand.LogUtil;
import net.osmand.Version;
import net.osmand.binary.BinaryMapIndexReader;
import net.osmand.data.Amenity;
import net.osmand.data.IndexConstants;
@ -34,6 +39,8 @@ import net.osmand.plus.views.POIMapLayer;
import org.apache.commons.logging.Log;
import android.content.res.AssetFileDescriptor;
import android.content.res.AssetManager;
import android.database.sqlite.SQLiteException;
import android.graphics.Bitmap;
import android.graphics.BitmapFactory;
@ -347,6 +354,8 @@ public class ResourceManager {
public List<String> reloadIndexes(IProgress progress){
close();
// check we have some assets to copy to sdcard
checkAssets(progress);
initRenderers(progress);
// do it lazy
// indexingImageTiles(progress);
@ -356,6 +365,48 @@ public class ResourceManager {
return warnings;
}
private void checkAssets(IProgress progress) {
File file = context.getSettings().extendOsmandPath(APP_DIR);
file.mkdirs();
if(file.canWrite()){
if(!Version.APP_VERSION.equalsIgnoreCase(context.getSettings().PREVIOUS_INSTALLED_VERSION.get())){
try {
progress.startTask(context.getString(R.string.installing_new_resources), -1);
AssetManager assetManager = context.getAssets();
copyingAssets(assetManager, "", file, progress);
context.getSettings().PREVIOUS_INSTALLED_VERSION.set(Version.APP_VERSION);
} catch (IOException e) {
log.error(e.getMessage(), e);
}
}
}
}
private void copyingAssets(AssetManager assetManager, String ref, File dir, IProgress progress) throws IOException {
for(String asset : assetManager.list(ref)) {
boolean isDirectory = !asset.contains(".");
File file = new File(dir, asset);
String fullName = ref+asset;
if(isDirectory){
file.mkdirs();
copyingAssets(assetManager, fullName +"/", file , progress);
} else {
// asset descriptor can not be opened for some files
// AssetFileDescriptor fd = assetManager.openFd(fullName);
// long declaredLength = fd.getDeclaredLength();
// fd.close();
//if(!file.exists() || file.length() != declaredLength){
InputStream is = assetManager.open(fullName, AssetManager.ACCESS_STREAMING);
FileOutputStream out = new FileOutputStream(file);
Algoritms.streamCopy(is, out);
out.close();
is.close();
//}
}
}
}
private void initRenderers(IProgress progress) {
File file = context.getSettings().extendOsmandPath(APP_DIR + IndexConstants.RENDERERS_DIR);
file.mkdirs();