From c07b8eb4051d200fe4883932208297141d95541a Mon Sep 17 00:00:00 2001
From: Victor Shcherb <victor.shcherb@gmail.com>
Date: Mon, 14 Dec 2015 01:30:56 +0100
Subject: [PATCH] Add info about motorway_junction to route description

---
 OsmAnd-java/src/net/osmand/Reshaper.java            | 13 +++++++++++--
 .../osmand/plus/routing/RouteCalculationResult.java |  8 +++++++-
 .../osmand/parkingPlugin/ParkingPluginActivity.java |  3 ++-
 3 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/OsmAnd-java/src/net/osmand/Reshaper.java b/OsmAnd-java/src/net/osmand/Reshaper.java
index 78c2247c13..6332a8b722 100644
--- a/OsmAnd-java/src/net/osmand/Reshaper.java
+++ b/OsmAnd-java/src/net/osmand/Reshaper.java
@@ -74,7 +74,6 @@ public class Reshaper {
 		}
 
 	}
-	/*
 	public static void main(String[] args) {
 //		char[] c = new char[] {'א', 'ד','ם', ' ', '1', '2'} ;
 //		String reshape = "אדם";
@@ -83,6 +82,16 @@ public class Reshaper {
 		for(int i=0; i < reshape.length(); i++) {
 			System.out.println(reshape.charAt(i));
 		}
-	}*/
+		test2();
+	}
+
+	private static void test2() {
+		String s = "گچ پژ نمکی باللغة العربي";
+		String reshape = reshape(s);
+
+		if (!reshape.equals("ﻲﺑﺮﻌﻟﺍ ﺔﻐﻠﻟﺎﺑ ﯽﮑﻤﻧ ﮋﭘ ﭻﮔ")) {
+			throw new IllegalArgumentException("BUG!!!");
+		}
+	}
 
 }
diff --git a/OsmAnd/src/net/osmand/plus/routing/RouteCalculationResult.java b/OsmAnd/src/net/osmand/plus/routing/RouteCalculationResult.java
index 4575a1886a..78afc59c3d 100644
--- a/OsmAnd/src/net/osmand/plus/routing/RouteCalculationResult.java
+++ b/OsmAnd/src/net/osmand/plus/routing/RouteCalculationResult.java
@@ -173,8 +173,8 @@ public class RouteCalculationResult {
 
 	private static void attachAlarmInfo(List<AlarmInfo> alarms, RouteSegmentResult res, int intId, int locInd) {
 		int[] pointTypes = res.getObject().getPointTypes(intId);
-		RouteRegion reg = res.getObject().region;
 		if (pointTypes != null) {
+			RouteRegion reg = res.getObject().region;
 			for (int r = 0; r < pointTypes.length; r++) {
 				RouteTypeRule typeRule = reg.quickGetEncodingRule(pointTypes[r]);
 				int x31 = res.getObject().getPoint31XTile(intId);
@@ -261,6 +261,12 @@ public class RouteCalculationResult {
 
                 String description = toString(turn, ctx) + " " + RoutingHelper.formatStreetName(info.getStreetName(),
 						info.getRef(), info.getDestinationName());
+                String[] pointNames = s.getObject().getPointNames(s.getStartPointIndex());
+                if(pointNames != null) {
+					for (int t = 0; t < pointNames.length; t++) {
+						description += " " + pointNames[t];
+					}
+                }
 				info.setDescriptionRoute(description);
 				info.routePointOffset = prevLocationSize;
 				if(directions.size() > 0 && prevDirectionTime > 0 && prevDirectionDistance > 0) {
diff --git a/plugins/Osmand-ParkingPlugin/src/net/osmand/parkingPlugin/ParkingPluginActivity.java b/plugins/Osmand-ParkingPlugin/src/net/osmand/parkingPlugin/ParkingPluginActivity.java
index 98ed6992b0..732f720950 100644
--- a/plugins/Osmand-ParkingPlugin/src/net/osmand/parkingPlugin/ParkingPluginActivity.java
+++ b/plugins/Osmand-ParkingPlugin/src/net/osmand/parkingPlugin/ParkingPluginActivity.java
@@ -1,6 +1,8 @@
 package net.osmand.parkingPlugin;
 
+
 import android.app.Activity;
+import android.app.AlertDialog;
 import android.content.ActivityNotFoundException;
 import android.content.ComponentName;
 import android.content.DialogInterface;
@@ -9,7 +11,6 @@ import android.content.pm.PackageManager;
 import android.content.pm.ResolveInfo;
 import android.net.Uri;
 import android.os.Bundle;
-import android.support.v7.app.AlertDialog;
 
 public class ParkingPluginActivity extends Activity {
 	private static final String OSMAND_COMPONENT = "net.osmand"; //$NON-NLS-1$