Merge remote-tracking branch 'origin/master'

This commit is contained in:
Weblate 2016-06-16 17:14:48 +02:00
commit 89014d1eb9
2 changed files with 8 additions and 1 deletions

View file

@ -68,6 +68,7 @@ android {
jniLibs.srcDirs = ["libs"] jniLibs.srcDirs = ["libs"]
aidl.srcDirs = ["src"] aidl.srcDirs = ["src"]
java.srcDirs = ["src"] java.srcDirs = ["src"]
resources.srcDirs = ["src"]
renderscript.srcDirs = ["src"] renderscript.srcDirs = ["src"]
res.srcDirs = ["res"] res.srcDirs = ["res"]
assets.srcDirs = ["assets"] assets.srcDirs = ["assets"]

View file

@ -6,7 +6,13 @@ import android.os.Environment;
import net.osmand.osm.AbstractPoiType; import net.osmand.osm.AbstractPoiType;
import net.osmand.osm.MapPoiTypes; import net.osmand.osm.MapPoiTypes;
import java.io.BufferedReader;
import java.io.File; import java.io.File;
import java.io.FileInputStream;
import java.io.FileReader;
import java.io.IOException;
import java.io.InputStream;
import java.io.StringReader;
import java.lang.reflect.Field; import java.lang.reflect.Field;
public class SampleApplication extends Application public class SampleApplication extends Application
@ -27,7 +33,7 @@ public class SampleApplication extends Application
private void initPoiTypes() { private void initPoiTypes() {
poiTypes = MapPoiTypes.getDefaultNoInit(); poiTypes = MapPoiTypes.getDefaultNoInit();
poiTypes.init(new File(Environment.getExternalStorageDirectory(), "poi_types.xml").getAbsolutePath()); poiTypes.init(Environment.getExternalStorageDirectory() + "/osmand/poi_types.xml");
poiTypes.setPoiTranslator(new MapPoiTypes.PoiTranslator() { poiTypes.setPoiTranslator(new MapPoiTypes.PoiTranslator() {
@Override @Override