diff --git a/OsmAnd-java/src/main/java/net/osmand/IndexConstants.java b/OsmAnd-java/src/main/java/net/osmand/IndexConstants.java index 0f3468db83..0bde0dca08 100644 --- a/OsmAnd-java/src/main/java/net/osmand/IndexConstants.java +++ b/OsmAnd-java/src/main/java/net/osmand/IndexConstants.java @@ -67,4 +67,5 @@ public class IndexConstants { public static final String VOICE_INDEX_DIR = "voice/"; //$NON-NLS-1$ public static final String RENDERERS_DIR = "rendering/"; //$NON-NLS-1$ public static final String ROUTING_XML_FILE= "routing.xml"; + public static final String SETTINGS_DIR = "settings/"; //$NON-NLS-1$ } diff --git a/OsmAnd/src/net/osmand/plus/AppInitializer.java b/OsmAnd/src/net/osmand/plus/AppInitializer.java index e488dbd9fd..91c5e19cf6 100644 --- a/OsmAnd/src/net/osmand/plus/AppInitializer.java +++ b/OsmAnd/src/net/osmand/plus/AppInitializer.java @@ -335,8 +335,8 @@ public class AppInitializer implements IProgress { } private void initPoiTypes() { - if(app.getAppPath("poi_types.xml").exists()) { - app.poiTypes.init(app.getAppPath("poi_types.xml").getAbsolutePath()); + if (app.getAppPath(IndexConstants.SETTINGS_DIR + "poi_types.xml").exists()) { + app.poiTypes.init(app.getAppPath(IndexConstants.SETTINGS_DIR + "poi_types.xml").getAbsolutePath()); } else { app.poiTypes.init(); } diff --git a/OsmAnd/src/net/osmand/plus/resources/ResourceManager.java b/OsmAnd/src/net/osmand/plus/resources/ResourceManager.java index 0f2e4041f5..8e3e85ae94 100644 --- a/OsmAnd/src/net/osmand/plus/resources/ResourceManager.java +++ b/OsmAnd/src/net/osmand/plus/resources/ResourceManager.java @@ -497,7 +497,7 @@ public class ResourceManager { private void copyPoiTypes() { try { - File file = context.getAppPath("poi_types.xml"); + File file = context.getAppPath(IndexConstants.SETTINGS_DIR + "poi_types.xml"); if (file != null) { FileOutputStream fout = new FileOutputStream(file); Algorithms.streamCopy(MapPoiTypes.class.getResourceAsStream("poi_types.xml"), fout);