From acd342ce1e422711a40726c4fe342a3ccb2d4972 Mon Sep 17 00:00:00 2001
From: Victor Shcherb <victor.shcherb@gmail.com>
Date: Sun, 16 Jan 2011 13:46:47 +0100
Subject: [PATCH] Prepare release 0.5.2

---
 DataExtractionOSM/src/net/osmand/Version.java       | 4 ++--
 OsmAnd/.gitignore                                   | 3 +++
 OsmAnd/AndroidManifest.xml                          | 2 +-
 OsmAnd/src/net/osmand/OsmandSettings.java           | 7 ++++---
 OsmAnd/src/net/osmand/activities/RouteProvider.java | 2 --
 5 files changed, 10 insertions(+), 8 deletions(-)
 create mode 100644 OsmAnd/.gitignore

diff --git a/DataExtractionOSM/src/net/osmand/Version.java b/DataExtractionOSM/src/net/osmand/Version.java
index a7fba7c692..eecc858eb3 100644
--- a/DataExtractionOSM/src/net/osmand/Version.java
+++ b/DataExtractionOSM/src/net/osmand/Version.java
@@ -4,8 +4,8 @@ public class Version {
 	
 	public static final String APP_NAME = "OsmAnd"; //$NON-NLS-1$
 	public static final String APP_MAP_CREATOR_NAME = "OsmAndMapCreator"; //$NON-NLS-1$
-	public static final String APP_VERSION = "0.5.1"; //$NON-NLS-1$
-	public static final String APP_DESCRIPTION = "beta (b3)"; //$NON-NLS-1$
+	public static final String APP_VERSION = "0.5.2"; //$NON-NLS-1$
+	public static final String APP_DESCRIPTION = "beta (b1)"; //$NON-NLS-1$
 	public static final boolean VELCOM_EDITION = false;
 	
 	public static final String APP_NAME_VERSION = APP_NAME + " " + APP_VERSION; //$NON-NLS-1$
diff --git a/OsmAnd/.gitignore b/OsmAnd/.gitignore
new file mode 100644
index 0000000000..e10b2d23b3
--- /dev/null
+++ b/OsmAnd/.gitignore
@@ -0,0 +1,3 @@
+/use
+/gen
+/assets
diff --git a/OsmAnd/AndroidManifest.xml b/OsmAnd/AndroidManifest.xml
index 124b471b29..8076023521 100644
--- a/OsmAnd/AndroidManifest.xml
+++ b/OsmAnd/AndroidManifest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-	package="net.osmand" android:versionName="0.5.1" android:installLocation="auto" android:versionCode="24">
+	package="net.osmand" android:installLocation="auto" android:versionName="0.5.2" android:versionCode="25">
 	<application android:icon="@drawable/icon" android:label="@string/app_name"
 		android:debuggable="false" android:name=".activities.OsmandApplication" android:description="@string/app_description">
 		<activity android:name=".activities.MainMenuActivity"
diff --git a/OsmAnd/src/net/osmand/OsmandSettings.java b/OsmAnd/src/net/osmand/OsmandSettings.java
index 62494196d8..6f72ec8ca8 100644
--- a/OsmAnd/src/net/osmand/OsmandSettings.java
+++ b/OsmAnd/src/net/osmand/OsmandSettings.java
@@ -266,11 +266,12 @@ public class OsmandSettings {
 	public static final String ROUTER_SERVICE = "router_service"; //$NON-NLS-1$
 
 	public static RouteService getRouterService(SharedPreferences prefs) {
-		int ord = prefs.getInt(ROUTER_SERVICE, RouteService.OSMAND.ordinal());
-		if(ord < RouteService.values().length){
+		int ord = prefs.getInt(ROUTER_SERVICE, RouteService.CLOUDMADE.ordinal());
+		// that fix specially for 0.5.2 release
+		if(ord < 2){
 			return RouteService.values()[ord];
 		} else {
-			return RouteService.OSMAND;
+			return RouteService.CLOUDMADE;
 		}
 	}
 
diff --git a/OsmAnd/src/net/osmand/activities/RouteProvider.java b/OsmAnd/src/net/osmand/activities/RouteProvider.java
index 061f500466..ceca2d56e3 100644
--- a/OsmAnd/src/net/osmand/activities/RouteProvider.java
+++ b/OsmAnd/src/net/osmand/activities/RouteProvider.java
@@ -20,10 +20,8 @@ import net.osmand.R;
 import net.osmand.OsmandSettings.ApplicationMode;
 import net.osmand.activities.RoutingHelper.RouteDirectionInfo;
 import net.osmand.activities.RoutingHelper.TurnType;
-import net.osmand.binary.BinaryMapDataObject;
 import net.osmand.binary.BinaryMapIndexReader;
 import net.osmand.binary.BinaryRouteDataReader;
-import net.osmand.binary.BinaryMapIndexReader.TagValuePair;
 import net.osmand.binary.BinaryRouteDataReader.RouteSegment;
 import net.osmand.binary.BinaryRouteDataReader.RouteSegmentResult;
 import net.osmand.binary.BinaryRouteDataReader.RoutingContext;