From d83ecbc50776eee78e50c7cc0a00bd8eb1455789 Mon Sep 17 00:00:00 2001
From: Victor Shcherb <victor.shcherb@gmail.com>
Date: Wed, 1 Apr 2015 15:38:27 +0200
Subject: [PATCH] Parking drawable

---
 OsmAnd/res/layout/dash_parking_fragment.xml   |  2 +-
 .../parkingpoint/DashParkingFragment.java     |  7 +-----
 .../osmand/plus/views/DirectionDrawable.java  | 22 ++++++++++++++++---
 3 files changed, 21 insertions(+), 10 deletions(-)

diff --git a/OsmAnd/res/layout/dash_parking_fragment.xml b/OsmAnd/res/layout/dash_parking_fragment.xml
index db362acbee..9abda1a58a 100644
--- a/OsmAnd/res/layout/dash_parking_fragment.xml
+++ b/OsmAnd/res/layout/dash_parking_fragment.xml
@@ -21,7 +21,7 @@
 			android:layout_marginLeft="@dimen/dashboard_parking_left_margin"
 			android:layout_marginRight="@dimen/dashFavIconMargin"
 			android:src="@drawable/ic_action_start_navigation"
-			android:scaleType="centerInside"
+			android:scaleType="center"
 			android:background="@drawable/btn_inset_circle_no_shadow"/>
 
 		<LinearLayout
diff --git a/OsmAnd/src/net/osmand/plus/parkingpoint/DashParkingFragment.java b/OsmAnd/src/net/osmand/plus/parkingpoint/DashParkingFragment.java
index b303936966..ff3aca7f94 100644
--- a/OsmAnd/src/net/osmand/plus/parkingpoint/DashParkingFragment.java
+++ b/OsmAnd/src/net/osmand/plus/parkingpoint/DashParkingFragment.java
@@ -114,13 +114,8 @@ public class DashParkingFragment extends DashLocationFragment {
 		ImageView direction = (ImageView) mainView.findViewById(R.id.direction_icon);
 		if (loc != null) {
 			DashLocationView dv = new DashLocationView(direction, (TextView) mainView.findViewById(R.id.distance), position);
-//			Drawable dds = getMyApplication().getIconsCache().getIcon(R.drawable.ic_action_start_navigation,
-//					R.color.color_distance);
-//			DirectionDrawable dd = new DirectionDrawable(mainView.getContext(), 
-//					dds.getIntrinsicWidth(), dds.getIntrinsicHeight());
-//			direction.setImageDrawable(dd);
 			dv.paint = false;
-			dv.arrowResId = R.drawable.ic_action_start_navigation;
+			dv.arrowResId = R.drawable.ic_action_start_navigation; 
 			distances.add(dv);
 		}
 
diff --git a/OsmAnd/src/net/osmand/plus/views/DirectionDrawable.java b/OsmAnd/src/net/osmand/plus/views/DirectionDrawable.java
index 94593f415f..69d84584eb 100644
--- a/OsmAnd/src/net/osmand/plus/views/DirectionDrawable.java
+++ b/OsmAnd/src/net/osmand/plus/views/DirectionDrawable.java
@@ -73,19 +73,35 @@ public class DirectionDrawable extends Drawable {
 	public void setAngle(float angle) {
 		this.angle = angle;
 	}
+	
+
+	@Override
+	public int getIntrinsicWidth() {
+		if (arrowImage != null) {
+			return arrowImage.getIntrinsicWidth();
+		}
+		return super.getIntrinsicWidth();
+	}
+	
+	@Override
+	public int getIntrinsicHeight() {
+		if (arrowImage != null) {
+			return arrowImage.getIntrinsicHeight();
+		}
+		return super.getIntrinsicHeight();
+	}
 
 	@Override
 	public void draw(Canvas canvas) {
 		canvas.save();
-		
 		if (arrowImage != null) {
 			int w = arrowImage.getIntrinsicWidth();
 			int h = arrowImage.getIntrinsicHeight();
 			int dx = canvas.getWidth() - w;
 			int dy = canvas.getHeight() - h;
 			arrowImage.setBounds(0, 0, w, h);
-			canvas.rotate(angle, canvas.getWidth() / 2, canvas.getHeight() / 2);
-			canvas.translate(dx/2, dy/2);
+			canvas.rotate(angle, w / 2, h / 2);
+			canvas.translate(dx / 3, dy / 3);
 			arrowImage.draw(canvas);
 		} else {
 			canvas.rotate(angle, canvas.getWidth() / 2, canvas.getHeight() / 2);