From d8928258cef2cf1fdc26bbeedfb677c0357c1220 Mon Sep 17 00:00:00 2001
From: Victor Shcherb <victor.shcherb@gmail.com>
Date: Mon, 5 Aug 2013 01:36:33 +0200
Subject: [PATCH] Fix exception

---
 .../drawable-hdpi/warnings_speed_limit_us.png | Bin 1267 -> 3035 bytes
 .../warnings_speed_limit_us.png               | Bin 1267 -> 3035 bytes
 .../src/net/osmand/plus/OsmandSettings.java   |   7 ++++++-
 .../mapwidgets/RouteInfoWidgetsFactory.java   |   6 +++++-
 4 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/OsmAnd/res/drawable-hdpi/warnings_speed_limit_us.png b/OsmAnd/res/drawable-hdpi/warnings_speed_limit_us.png
index 4eb97b9163908a207da14bbc87fded7fa8a0662a..b721c082532a587164be7a8c3fc8dbfea76a4797 100644
GIT binary patch
literal 3035
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
LHOu!F-YNeBxvsRJ

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

diff --git a/OsmAnd/res/drawable-large/warnings_speed_limit_us.png b/OsmAnd/res/drawable-large/warnings_speed_limit_us.png
index 4eb97b9163908a207da14bbc87fded7fa8a0662a..b721c082532a587164be7a8c3fc8dbfea76a4797 100644
GIT binary patch
literal 3035
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
LHOu!F-YNeBxvsRJ

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

diff --git a/OsmAnd/src/net/osmand/plus/OsmandSettings.java b/OsmAnd/src/net/osmand/plus/OsmandSettings.java
index b022562cd9..869c594b9d 100644
--- a/OsmAnd/src/net/osmand/plus/OsmandSettings.java
+++ b/OsmAnd/src/net/osmand/plus/OsmandSettings.java
@@ -563,7 +563,12 @@ public class OsmandSettings {
 			"default_application_mode", ApplicationMode.DEFAULT, ApplicationMode.values()).makeGlobal();
 	
 	public final OsmandPreference<DrivingRegion> DRIVING_REGION = new EnumIntPreference<DrivingRegion>(
-			"default_driving_region", DrivingRegion.EUROPE_ASIA, DrivingRegion.values()).makeGlobal().cache();
+			"default_driving_region", DrivingRegion.EUROPE_ASIA, DrivingRegion.values()) {
+		protected boolean setValue(Object prefs, DrivingRegion val) {
+			((CommonPreference<MetricsConstants>)METRIC_SYSTEM).cachedValue = null;
+			return super.setValue(prefs, val);
+		};
+	}.makeGlobal().cache();
 	
 	// this value string is synchronized with settings_pref.xml preference name
 	// cache of metrics constants as they are used very often
diff --git a/OsmAnd/src/net/osmand/plus/views/mapwidgets/RouteInfoWidgetsFactory.java b/OsmAnd/src/net/osmand/plus/views/mapwidgets/RouteInfoWidgetsFactory.java
index 3d9c921db4..eb879ff50b 100644
--- a/OsmAnd/src/net/osmand/plus/views/mapwidgets/RouteInfoWidgetsFactory.java
+++ b/OsmAnd/src/net/osmand/plus/views/mapwidgets/RouteInfoWidgetsFactory.java
@@ -622,6 +622,7 @@ public class RouteInfoWidgetsFactory {
 		ptext.setTextAlign(Align.CENTER);
 		
 		final BaseMapWidget alarm = new BaseMapWidget(ma) {
+			private int textDy = 0;
 			private String text = "";
 			private Bitmap img = null;
 			private int imgId;
@@ -646,11 +647,13 @@ public class RouteInfoWidgetsFactory {
 					}
 					if(alarm != null) {
 						int locimgId = 0;
+						int textDy = 0;
 						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;
+								textDy = (int) (-12 * scaleCoefficient);
 							}
 						} else if(alarm.getType() == AlarmInfo.SPEED_CAMERA) {
 							locimgId = R.drawable.warnings_speed_camera;
@@ -683,6 +686,7 @@ public class RouteInfoWidgetsFactory {
 							}
 							if(text != null && !text.equals(this.text)) {
 								this.text = text;
+								this.textDy = textDy;
 								invalidate();
 							}
 						}
@@ -702,7 +706,7 @@ public class RouteInfoWidgetsFactory {
 					canvas.drawBitmap(img, 0, 0, paintCircle);
 				}
 				if(text.length() > 0) {
-					canvas.drawText(text, getWidth() / 2, getHeight() / 2 + ptext.descent() + 3 * scaleCoefficient, ptext);
+					canvas.drawText(text, getWidth() / 2 , getHeight() / 2 + ptext.descent() + 3 * scaleCoefficient - textDy, ptext);
 				}
 			}