exit shield in top bar

OsmAnd-java/src/main/java/net/osmand/binary/RouteDataObject.java

@@ -742,6 +742,28 @@ public class RouteDataObject {
 		return null;
 	}
 
+	public String getShieldColor() {
+		int sz = types.length;
+		for (int i = 0; i < sz; i++) {
+			RouteTypeRule r = region.quickGetEncodingRule(types[i]);
+			if (r.getTag().equals("road_shield_color_1")) {
+				return r.getValue();
+			}
+		}
+		return null;
+	}
+
+	public String getShieldShape() {
+		int sz = types.length;
+		for (int i = 0; i < sz; i++) {
+			RouteTypeRule r = region.quickGetEncodingRule(types[i]);
+			if (r.getTag().equals("road_shield_shape_1")) {
+				return r.getValue();
+			}
+		}
+		return null;
+	}
+
 	public int getOneway() {
 		int sz = types.length;
 		for (int i = 0; i < sz; i++) {

OsmAnd-java/src/main/java/net/osmand/router/ExitInfo.java

@@ -0,0 +1,45 @@
+package net.osmand.router;
+
+
+public class ExitInfo {
+
+    private String ref;
+
+    private String shieldName;
+
+    private String shieldIconName;
+
+    private String exitStreetName;
+
+    public String getRef() {
+        return ref;
+    }
+
+    public void setRef(String ref) {
+        this.ref = ref;
+    }
+
+    public String getShieldName() {
+        return shieldName;
+    }
+
+    public void setShieldName(String shieldName) {
+        this.shieldName = shieldName;
+    }
+
+    public String getExitStreetName() {
+        return exitStreetName;
+    }
+
+    public void setExitStreetName(String exitStreetName) {
+        this.exitStreetName = exitStreetName;
+    }
+
+    public String getShieldIconName() {
+        return shieldIconName;
+    }
+
+    public void setShieldIconName(String shieldIconName) {
+        this.shieldIconName = shieldIconName;
+    }
+}

OsmAnd/res/drawable/bg_topbar_shield_exit_ref.xml

@@ -1,9 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
-    <item>
+    <solid android:color="@color/active_color_primary_light" />
-        <shape>
+    <corners android:radius="3dp" />
-            <solid android:color="@color/active_color_primary_light" />
+</shape>
-            <corners android:radius="3dp" />
-        </shape>
-    </item>
-</layer-list>

OsmAnd/res/layout/map_hud_top.xml

@@ -124,22 +124,22 @@
 
 			<TextView
 				android:id="@+id/map_exit_ref"
-				android:layout_width="32dp"
+				android:layout_width="wrap_content"
-				android:layout_height="32dp"
+				android:layout_height="wrap_content"
-				android:background="@drawable/bg_topbar_shield_exit_ref"
-				android:textColor="@color/color_black"
 				android:textSize="@dimen/map_widget_text_size"
-				android:textAlignment="gravity"
 				android:gravity="center"
+				android:minWidth="@dimen/map_widget_height"
+				android:background="@drawable/bg_topbar_shield_exit_ref"
+				android:textColor="@color/color_white"
 				android:visibility="gone"
-				tools:text="99"
+				tools:text="8"
 				tools:visibility="visible" />
 
 			<ImageView
 				android:id="@+id/map_turn_icon"
-				android:layout_width="32dp"
+				android:layout_width="@dimen/map_widget_height"
-				android:layout_height="32dp"
+				android:layout_height="@dimen/map_widget_height"
-				android:scaleType="center"
+				android:scaleType="fitCenter"
 				tools:src="@drawable/map_turn_right_small" />
 
 			<LinearLayout
@@ -152,11 +152,11 @@
 					android:id="@+id/map_exit_shield_name"
 					android:layout_width="wrap_content"
 					android:layout_height="wrap_content"
-					android:layout_marginEnd="8dp"
+					android:layout_marginEnd="@dimen/content_padding_half"
-					android:layout_marginRight="8dp"
+					android:layout_marginRight="@dimen/content_padding_half"
-					android:padding="8dp"
+					android:padding="@dimen/content_padding_half"
 					android:textColor="@color/color_black"
-					tools:background="@drawable/h_white_octagon_bgblue_2_road_shield"
+					tools:background="@drawable/h_white_pillow_4_road_shield"
 					tools:text="S108" />
 
 				<FrameLayout

OsmAnd/src/net/osmand/plus/render/OsmandRenderer.java

@@ -49,6 +49,8 @@ import android.graphics.Rect;
 import android.graphics.RectF;
 import android.graphics.Shader;
 import android.graphics.Shader.TileMode;
+import android.graphics.drawable.BitmapDrawable;
+import android.graphics.drawable.Drawable;
 import android.os.Handler;
 import android.os.Looper;
 import android.util.DisplayMetrics;
@@ -389,6 +391,11 @@ public class OsmandRenderer {
 		}
 	}
 
+	public Drawable getShieldDrawable(String shieldId){
+		Bitmap shield = RenderingIcons.getIcon(context, shieldId, true);
+		return new BitmapDrawable(context.getResources(),shield);
+	}
+
 	protected void drawBitmap(Canvas cv, Bitmap ico, RectF rf) {
 		if(ico == null) {
 			return;

OsmAnd/src/net/osmand/plus/routing/RouteCalculationResult.java

@@ -14,6 +14,7 @@ import net.osmand.plus.ApplicationMode;
 import net.osmand.plus.OsmandApplication;
 import net.osmand.plus.R;
 import net.osmand.plus.routing.AlarmInfo.AlarmInfoType;
+import net.osmand.router.ExitInfo;
 import net.osmand.router.RouteSegmentResult;
 import net.osmand.router.RoutingContext;
 import net.osmand.router.TurnType;
@@ -325,9 +326,28 @@ public class RouteCalculationResult {
 					info.setDestinationName(next.getObject().getDestinationName(ctx.getSettings().MAP_PREFERRED_LOCALE.get(),
 							ctx.getSettings().MAP_TRANSLITERATE_NAMES.get(), next.isForwardDirection()));
 					if (s.getObject().isExitPoint() && next.getObject().isMotorWayLink()) {
-						info.setExitRef(next.getObject().getExitRef());
+						ExitInfo exitInfo = new ExitInfo();
-						info.setExitShieldName(next.getObject().getDestinationRef(next.isForwardDirection()));
+						exitInfo.setRef(next.getObject().getExitRef());
-						info.setExitStreetName(next.getObject().getExitName());
+						exitInfo.setExitStreetName(next.getObject().getExitName());
+						String shieldName = next.getObject().getDestinationRef(next.isForwardDirection());
+						exitInfo.setShieldName(shieldName);
+						//	Search for nearest shield properties
+						for (int j = lind; j < list.size(); j++) {
+							RouteSegmentResult segment = list.get(j);
+							String segmentRef = segment.getObject().getRef("", false, segment.isForwardDirection());
+								//	if it's the same road
+								if (segmentRef != null && segmentRef.equals(shieldName)) {
+								String shieldColor = segment.getObject().getShieldColor();
+								String shieldShape = segment.getObject().getShieldShape();
+								if (shieldColor != null && shieldShape != null) {
+									exitInfo.setShieldIconName(shieldColor + "_" + shieldShape + "_"
+									+ shieldName.length() + "_" + "road_shield");
+									//	we found it
+									break;
+								}
+							}
+						}
+						info.setExitInfo(exitInfo);
 					}
 				}
 

OsmAnd/src/net/osmand/plus/routing/RouteDirectionInfo.java

@@ -1,7 +1,10 @@
 package net.osmand.plus.routing;
 
+import android.support.annotation.Nullable;
+
 import net.osmand.plus.OsmAndFormatter;
 import net.osmand.plus.OsmandApplication;
+import net.osmand.router.ExitInfo;
 import net.osmand.router.TurnType;
 
 public class RouteDirectionInfo {
@@ -22,11 +25,8 @@ public class RouteDirectionInfo {
 	
 	private String destinationName;
 
-	private String exitRef;
+	@Nullable
-
+	private ExitInfo exitInfo;
-	private String exitShieldName;
-
-	private String exitStreetName;
 
 	public String getDestinationName() {
 		return destinationName;
@@ -113,27 +113,12 @@ public class RouteDirectionInfo {
 		 this.distance = distance;
 	}
 
-	public String getExitRef() {
+	@Nullable
-		return exitRef;
+	public ExitInfo getExitInfo() {
+		return exitInfo;
 	}
 
-	public void setExitRef(String exitRef) {
+	public void setExitInfo(@Nullable ExitInfo exitInfo) {
-		this.exitRef = exitRef;
+		this.exitInfo = exitInfo;
-	}
-
-	public String getExitShieldName() {
-		return exitShieldName;
-	}
-
-	public void setExitShieldName(String exitShieldName) {
-		this.exitShieldName = exitShieldName;
-	}
-
-	public String getExitStreetName() {
-		return exitStreetName;
-	}
-
-	public void setExitStreetName(String exitStreetName) {
-		this.exitStreetName = exitStreetName;
 	}
 }

OsmAnd/src/net/osmand/plus/views/mapwidgets/MapInfoWidgetsFactory.java

@@ -4,7 +4,6 @@ import android.annotation.SuppressLint;
 import android.app.Activity;
 import android.content.Context;
 import android.content.Intent;
-import android.graphics.Bitmap;
 import android.graphics.Typeface;
 import android.graphics.drawable.Drawable;
 import android.os.Bundle;
@@ -51,7 +50,6 @@ import net.osmand.plus.helpers.WaypointDialogHelper;
 import net.osmand.plus.helpers.WaypointHelper;
 import net.osmand.plus.helpers.WaypointHelper.LocationPointWrapper;
 import net.osmand.plus.render.MapRenderRepositories;
-import net.osmand.plus.render.OsmandRenderer;
 import net.osmand.plus.routepreparationmenu.MapRouteInfoMenu;
 import net.osmand.plus.routepreparationmenu.ShowAlongTheRouteBottomSheet;
 import net.osmand.plus.routing.RouteCalculationResult;
@@ -62,6 +60,7 @@ import net.osmand.plus.views.OsmandMapTileView;
 import net.osmand.plus.views.RulerControlLayer;
 import net.osmand.plus.views.mapwidgets.MapWidgetRegistry.WidgetState;
 import net.osmand.plus.views.mapwidgets.NextTurnInfoWidget.TurnDrawable;
+import net.osmand.router.ExitInfo;
 import net.osmand.router.TurnType;
 import net.osmand.util.Algorithms;
 import net.osmand.util.MapUtils;
@@ -947,6 +946,8 @@ public class MapInfoWidgetsFactory {
 			TextInfoWidget.updateTextColor((TextView) waypointInfoBar.findViewById(R.id.waypoint_text),
 					(TextView) waypointInfoBar.findViewById(R.id.waypoint_text_shadow),
 					textColor, textShadowColor, bold, rad / 2);
+			exitRefText.setTextColor(nightMode ? map.getResources().getColor(R.color.text_color_primary_dark) :
+					map.getResources().getColor(R.color.color_white));
 
 			ImageView all = (ImageView) waypointInfoBar.findViewById(R.id.waypoint_more);
 			ImageView remove = (ImageView) waypointInfoBar.findViewById(R.id.waypoint_close);
@@ -962,36 +963,27 @@ public class MapInfoWidgetsFactory {
 			TurnType[] type = new TurnType[1];
 			boolean showNextTurn = false;
 			boolean showMarker = this.showMarker;
-			boolean showShield = false;
+			boolean showExitInfo = false;
-			String exitRef = null;
+			ExitInfo exitInfo = null;
-			String exitShieldName = null;
-			String exitStreetName = null;
 
 			if (routingHelper != null && routingHelper.isRouteCalculated() && !routingHelper.isDeviatedFromRoute()) {
 				RouteCalculationResult.NextDirectionInfo nextDirectionInfo =
 						routingHelper.getNextRouteDirectionInfo(new RouteCalculationResult.NextDirectionInfo(), false);
 				if (nextDirectionInfo != null) {
 					RouteDirectionInfo directionInfo = nextDirectionInfo.directionInfo;
-					if (directionInfo != null) {
+					if (directionInfo != null && directionInfo.getExitInfo() != null) {
-						exitRef = directionInfo.getExitRef();
+						exitInfo = directionInfo.getExitInfo();
-						exitShieldName = directionInfo.getExitShieldName();
+						showExitInfo = true;
-						exitStreetName = directionInfo.getExitStreetName();
+					} else {
-						if (exitRef != null) {
+						showExitInfo = false;
-							showShield = true;
-							exitRefText.setText(exitRef);
-							AndroidUiHelper.updateVisibility(exitRefText, true);
-						} else {
-							showShield = false;
-							AndroidUiHelper.updateVisibility(exitRefText, false);
-						}
 					}
 				}
 
 				if (routingHelper.isFollowingMode()) {
 					if (settings.SHOW_STREET_NAME.get()) {
 						text = routingHelper.getCurrentName(type);
-						if (showShield) {
+						if (showExitInfo) {
-							text = exitStreetName;
+							text = exitInfo.getExitStreetName();
 						}
 						if (text == null) {
 							text = "";
@@ -1063,29 +1055,41 @@ public class MapInfoWidgetsFactory {
 				AndroidUiHelper.updateVisibility(addressTextShadow, shadowRad > 0);
 				boolean update = turnDrawable.setTurnType(type[0]) || showMarker != this.showMarker;
 				this.showMarker = showMarker;
-				int h = addressText.getHeight() / 4 * 3;
+				if (!showExitInfo) {
-				if (h != turnDrawable.getBounds().bottom) {
+					int h = addressText.getHeight() / 4 * 3;
-					turnDrawable.setBounds(0, 0, h, h);
+					if (h != turnDrawable.getBounds().bottom) {
+						turnDrawable.setBounds(0, 0, h, h);
+					}
 				}
-				if (update) {
+				if (showExitInfo) {
-					if (type[0] != null) {
+					addressTextShadow.setCompoundDrawables(null, null, null, null);
-						if (showShield) {
+					addressText.setCompoundDrawables(null, null, null, null);
-							addressTextShadow.setCompoundDrawables(null, null, null, null);
+					turnIcon.setImageDrawable(turnDrawable);
-							addressTextShadow.setCompoundDrawablePadding(4);
+					AndroidUiHelper.updateVisibility(turnIcon, true);
-							addressText.setCompoundDrawables(null, null, null, null);
+					String ref = exitInfo.getRef();
-							addressText.setCompoundDrawablePadding(4);
+					if (!Algorithms.isEmpty(ref)){
-							exitShield.setText(exitShieldName);
+						exitRefText.setText(ref);
-							turnIcon.setImageDrawable(turnDrawable);
+						AndroidUiHelper.updateVisibility(exitRefText, true);
-							AndroidUiHelper.updateVisibility(turnIcon, true);
+					}
-							AndroidUiHelper.updateVisibility(exitShield, true);
+					String shieldName = exitInfo.getShieldName();
-						} else {
+					if (!Algorithms.isEmpty(shieldName)){
-							addressTextShadow.setCompoundDrawables(turnDrawable, null, null, null);
+						exitShield.setText(shieldName);
-							addressTextShadow.setCompoundDrawablePadding(4);
+						AndroidUiHelper.updateVisibility(exitShield, true);
-							addressText.setCompoundDrawables(turnDrawable, null, null, null);
+						if (exitInfo.getShieldIconName() != null) {
-							addressText.setCompoundDrawablePadding(4);
+							MapRenderRepositories mapRenderRepo = map.getMyApplication().getResourceManager().getRenderer();
-							AndroidUiHelper.updateVisibility(turnIcon, false);
+							Drawable shield = mapRenderRepo.getRenderer().getShieldDrawable(exitInfo.getShieldIconName());
-							AndroidUiHelper.updateVisibility(exitShield, false);
+							exitShield.setBackgroundDrawable(shield);
 						}
+					}
+				} else if (update) {
+					if (type[0] != null) {
+						addressTextShadow.setCompoundDrawables(turnDrawable, null, null, null);
+						addressTextShadow.setCompoundDrawablePadding(4);
+						addressText.setCompoundDrawables(turnDrawable, null, null, null);
+						addressText.setCompoundDrawablePadding(4);
+						AndroidUiHelper.updateVisibility(turnIcon, false);
+						AndroidUiHelper.updateVisibility(exitRefText, false);
+						AndroidUiHelper.updateVisibility(exitShield, false);
 					} else if (showMarker) {
 						Drawable marker = map.getMyApplication().getUIUtilities().getIcon(R.drawable.ic_action_start_navigation, R.color.color_myloc_distance);
 						addressTextShadow.setCompoundDrawablesWithIntrinsicBounds(marker, null, null, null);