From 4e30966dac90a01bf653726fa7084450996566f9 Mon Sep 17 00:00:00 2001
From: Victor Shcherb <victor.shcherb@gmail.com>
Date: Mon, 5 Aug 2013 01:01:01 +0200
Subject: [PATCH] Add us specific sign

---
 .../drawable-hdpi/warnings_speed_limit_us.png    | Bin 0 -> 1267 bytes
 .../drawable-large/warnings_speed_limit_us.png   | Bin 0 -> 1267 bytes
 .../mapwidgets/RouteInfoWidgetsFactory.java      |  11 +++++++----
 3 files changed, 7 insertions(+), 4 deletions(-)
 create mode 100644 OsmAnd/res/drawable-hdpi/warnings_speed_limit_us.png
 create mode 100644 OsmAnd/res/drawable-large/warnings_speed_limit_us.png

diff --git a/OsmAnd/res/drawable-hdpi/warnings_speed_limit_us.png b/OsmAnd/res/drawable-hdpi/warnings_speed_limit_us.png
new file mode 100644
index 0000000000000000000000000000000000000000..4eb97b9163908a207da14bbc87fded7fa8a0662a
GIT binary patch
literal 1267
zcmeAS@N?(olHy`uVBq!ia0vp^6(G#P1|%(0%q{^bmSQK*5Dp-y;YjHK@;M7UB8!3Q
zuY)k7lg4b24#^VNh?3y^w370~qEv?R@^Zb*yzJuS#DY}4{G#;P?`))i1{HX^IEGZr
zd3(#>LpfdI_{VgkLRsyMTRnY8>RmV+yBJkn1iDPymnxi1)sO4?GO1ZTm6JoL!}g29
z%8HN6nzpgO+_?OnO@$DX?TQwzMFANXrz}b_T&DK^^5Lw=i1f267pE-W&u_DwGymSh
z*^=xsT<wSJH}vM1opyPWQC3#=W?C~_fnZ15fkTQL3OICRn7G?VB6H`AnQ!^BW<9HL
zTpHpl-Sn&I?!9~ea?3Al(mBp8CnIxZi{c9X@Pz?8wpqXUSaIU<M~kR}^78G^d>#Mp
zm=aVU7aM!C?!f!+)=>tNPX^e{Utby@psttp@9Ud4XTC8XK76=OOlPW>NdNJd%=Nb(
zO1|`3Iq&1gkNRzGZE`h>^78YSzkQqQ-Yq95Hz}w~O<n!<CeIbUqP=eQ$<kh$K-*K4
zifmSfbgf^%{_V83^an}LK3@ic&!0cDzs{cJ_OW8ms(3%Gsf!#G9A?j+9ilgVbrf^f
zVnbuewvSIAJ$m&0WXh($3;FNfxpU#g3ysvxH&^Xnv3vJyr-cHn&5m4b%~!5pci*)x
ze6L(c$9+4Vmj@F*glMK#uYCXh{pNMAL+`FK?3KPA`=rQjetdjvZ0+ZN{twoAs5o(R
zbC<P0+}}0x{raSEfB*CP$B!T17QQj4D?L43`rqm!7BhYyD4)pg?&emfKmD|PjghyC
zQ15+<W0eVM%li8Iu6uiXhxgmoEx(+Z2LyjO6Xvk0DV=@(`R|^6`~E%Kc*5P?U8d7T
zs$OWuDdzjG*J|zV`)6lo|2(cV-AmPP`Q@BhX^;Kcf+HX7KA|`N{P)MFPMuo3Jv;50
z)4~JN($X?qty1+tGmbOwFW!A`*8KVZS4ZfCU79&_=J#*kEN1$AI&y?Xy6xhR$$#Yg
zkBR=de*E><x~o^OetmoG+BAI`KI^Kp%OiAx)Fv;SJX!eE)1oP-pT2nXs7X&>|Kqpg
z#w#=o1Sc-by!Y?lKl!AMH*S3T^yzq8qRq!^3*@x;YR;RS4PTa7XKrque)h~630+-X
z|1G8~*pD}Mc9{5PoB4izy=~jJohw(a>~m52=$W7YUO0z8D>U>$`OdrV&j0%Td;iDZ
ze-FNVnVD}QRcmNq5U~8M<Jv5~KkuDpUAubg)~`#O)`aJ6|9#m(;X|N~*yq09Ueofj
zvPqe<u3WhiGW~tisjIpls=2dgrAi!oJ}q_cmD0V@npYRTt~%Xqowxn=+R)FBOf5d~
Z&z1g^y`yV-2C#r)@O1TaS?83{1OO_AM~naf

literal 0
HcmV?d00001

diff --git a/OsmAnd/res/drawable-large/warnings_speed_limit_us.png b/OsmAnd/res/drawable-large/warnings_speed_limit_us.png
new file mode 100644
index 0000000000000000000000000000000000000000..4eb97b9163908a207da14bbc87fded7fa8a0662a
GIT binary patch
literal 1267
zcmeAS@N?(olHy`uVBq!ia0vp^6(G#P1|%(0%q{^bmSQK*5Dp-y;YjHK@;M7UB8!3Q
zuY)k7lg4b24#^VNh?3y^w370~qEv?R@^Zb*yzJuS#DY}4{G#;P?`))i1{HX^IEGZr
zd3(#>LpfdI_{VgkLRsyMTRnY8>RmV+yBJkn1iDPymnxi1)sO4?GO1ZTm6JoL!}g29
z%8HN6nzpgO+_?OnO@$DX?TQwzMFANXrz}b_T&DK^^5Lw=i1f267pE-W&u_DwGymSh
z*^=xsT<wSJH}vM1opyPWQC3#=W?C~_fnZ15fkTQL3OICRn7G?VB6H`AnQ!^BW<9HL
zTpHpl-Sn&I?!9~ea?3Al(mBp8CnIxZi{c9X@Pz?8wpqXUSaIU<M~kR}^78G^d>#Mp
zm=aVU7aM!C?!f!+)=>tNPX^e{Utby@psttp@9Ud4XTC8XK76=OOlPW>NdNJd%=Nb(
zO1|`3Iq&1gkNRzGZE`h>^78YSzkQqQ-Yq95Hz}w~O<n!<CeIbUqP=eQ$<kh$K-*K4
zifmSfbgf^%{_V83^an}LK3@ic&!0cDzs{cJ_OW8ms(3%Gsf!#G9A?j+9ilgVbrf^f
zVnbuewvSIAJ$m&0WXh($3;FNfxpU#g3ysvxH&^Xnv3vJyr-cHn&5m4b%~!5pci*)x
ze6L(c$9+4Vmj@F*glMK#uYCXh{pNMAL+`FK?3KPA`=rQjetdjvZ0+ZN{twoAs5o(R
zbC<P0+}}0x{raSEfB*CP$B!T17QQj4D?L43`rqm!7BhYyD4)pg?&emfKmD|PjghyC
zQ15+<W0eVM%li8Iu6uiXhxgmoEx(+Z2LyjO6Xvk0DV=@(`R|^6`~E%Kc*5P?U8d7T
zs$OWuDdzjG*J|zV`)6lo|2(cV-AmPP`Q@BhX^;Kcf+HX7KA|`N{P)MFPMuo3Jv;50
z)4~JN($X?qty1+tGmbOwFW!A`*8KVZS4ZfCU79&_=J#*kEN1$AI&y?Xy6xhR$$#Yg
zkBR=de*E><x~o^OetmoG+BAI`KI^Kp%OiAx)Fv;SJX!eE)1oP-pT2nXs7X&>|Kqpg
z#w#=o1Sc-by!Y?lKl!AMH*S3T^yzq8qRq!^3*@x;YR;RS4PTa7XKrque)h~630+-X
z|1G8~*pD}Mc9{5PoB4izy=~jJohw(a>~m52=$W7YUO0z8D>U>$`OdrV&j0%Td;iDZ
ze-FNVnVD}QRcmNq5U~8M<Jv5~KkuDpUAubg)~`#O)`aJ6|9#m(;X|N~*yq09Ueofj
zvPqe<u3WhiGW~tisjIpls=2dgrAi!oJ}q_cmD0V@npYRTt~%Xqowxn=+R)FBOf5d~
Z&z1g^y`yV-2C#r)@O1TaS?83{1OO_AM~naf

literal 0
HcmV?d00001

diff --git a/OsmAnd/src/net/osmand/plus/views/mapwidgets/RouteInfoWidgetsFactory.java b/OsmAnd/src/net/osmand/plus/views/mapwidgets/RouteInfoWidgetsFactory.java
index 2d60b8ea58..3d9c921db4 100644
--- a/OsmAnd/src/net/osmand/plus/views/mapwidgets/RouteInfoWidgetsFactory.java
+++ b/OsmAnd/src/net/osmand/plus/views/mapwidgets/RouteInfoWidgetsFactory.java
@@ -10,6 +10,7 @@ import net.osmand.plus.OsmAndFormatter;
 import net.osmand.plus.OsmAndLocationProvider;
 import net.osmand.plus.OsmandApplication;
 import net.osmand.plus.OsmandSettings;
+import net.osmand.plus.OsmandSettings.DrivingRegion;
 import net.osmand.plus.OsmandSettings.OsmandPreference;
 import net.osmand.plus.R;
 import net.osmand.plus.TargetPointsHelper;
@@ -648,16 +649,16 @@ public class RouteInfoWidgetsFactory {
 						String text = null;
 						if(alarm.getType() == AlarmInfo.SPEED_LIMIT) {
 							text = alarm.getIntValue() +"";
+							if(settings.DRIVING_REGION.get() == DrivingRegion.US_CANADA){
+								locimgId = R.drawable.warnings_speed_limit_us;
+							}
 						} else if(alarm.getType() == AlarmInfo.SPEED_CAMERA) {
-							text = "CAM";
 							locimgId = R.drawable.warnings_speed_camera;
 						} else if(alarm.getType() == AlarmInfo.BORDER_CONTROL) {
 							text = "CLO";
 						} else if(alarm.getType() == AlarmInfo.TOLL_BOOTH) {
 							text = "$";
 						} else if(alarm.getType() == AlarmInfo.TRAFFIC_CALMING) {
-							// temporary omega
-							text = "~^~";
 							locimgId = R.drawable.warnings_speed_bump;
 						} else if(alarm.getType() == AlarmInfo.STOP) {
 							// text = "STOP";
@@ -697,10 +698,12 @@ public class RouteInfoWidgetsFactory {
 					RectF f = new RectF(th / 2, th / 2, getWidth() - th / 2, getHeight() - th / 2);
 					canvas.drawOval(f, content);
 					canvas.drawOval(f, paintCircle);
-					canvas.drawText(text, getWidth() / 2, getHeight() / 2 + ptext.descent() + 3 * scaleCoefficient, ptext);
 				} else {
 					canvas.drawBitmap(img, 0, 0, paintCircle);
 				}
+				if(text.length() > 0) {
+					canvas.drawText(text, getWidth() / 2, getHeight() / 2 + ptext.descent() + 3 * scaleCoefficient, ptext);
+				}
 			}
 
 		};