From 00448eca4da0679c250c809ef6c6c797ebf3c1cc Mon Sep 17 00:00:00 2001 From: Victor Shcherb Date: Sat, 11 Aug 2012 00:14:05 +0200 Subject: [PATCH] Update speed cameras icons --- .../res/drawable-hdpi/warnings_speed_bump.png | Bin 4373 -> 7664 bytes .../drawable-hdpi/warnings_speed_camera.png | Bin 2949 -> 5457 bytes .../plus/routing/RouteCalculationResult.java | 4 +-- .../osmand/plus/routing/RoutingHelper.java | 4 +-- .../net/osmand/plus/views/MapInfoLayer.java | 2 +- .../osmand/plus/views/RouteInfoControls.java | 32 +++++++++++++++--- 6 files changed, 32 insertions(+), 10 deletions(-) diff --git a/OsmAnd/res/drawable-hdpi/warnings_speed_bump.png b/OsmAnd/res/drawable-hdpi/warnings_speed_bump.png index ce09cf4c3a6daae5ade08eb4d5833a72262cf0e5..8d24847d55b0456b1166170de95e1147eab1b1fd 100644 GIT binary patch literal 7664 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 PH2~07H&Cks+rRxEKcj(9 literal 4373 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 P00000NkvXXu0mjfmDi36 diff --git a/OsmAnd/res/drawable-hdpi/warnings_speed_camera.png b/OsmAnd/res/drawable-hdpi/warnings_speed_camera.png index 7e15ced9b3c5a5b09917ef0f37bb6a28eb95ab51..6f640f7ffa55617237c19a312b03092308770a65 100644 GIT binary patch literal 5457 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 literal 2949 zcmV;03wrd4P)MLOce^dyQn+}_m9`=*Eyc#5G$EQ8Qv`EwwZRm% zQm&*`>5Vaf3HU|~7%E1?-&EogtS@|u)GJX!V|+-8HfT!;HL)ck7qAr{3X#^POKHn) z_u>3s%%0uZ?Y4BfQwpWuWHLK*X6Bsz%z60z&YW{#N>iHBl%{lDOI+dmu2xAS7svj2 zp*tsHws_Z1Hc27?Wz2CD0!CC=W$^#Lt_1}GT%t&T+~JgA3e4Q)0c39#$- zwosTp*G)D_BB1=hU}*D&Hh(Bg+K7O#pg~ForU9v;V_WE45|Lat*`$i0g5?iw9-tq% zq`yuH% zfVp$$>JM#zgNXHDRV|?&oIP}ml!m;ENh81CuRl~~SlCw88@I~pw;G9HaBvWh$CG$U z<48)$j2Sb=<=FU}|w(wrm+Lmy4#RCO-S@Gs?@$NlQx$H$)1a+wEra z=FMEXbm=lr9ADWke@R69_U*&(_nQJt0eSxU=c%fyiV9n~awTiltf8W!g3iv)sQ6l2 zTdA+Fr?|K{;WUg@hH_d%LxZW2uUfT=s;VlwySsVnsi$x{ovc`~g0H{+nxdj2UVZgd ztX6AOjtc|={QUFJrl!NF3_oX-%DJ6Ehoedi{Af@EVC!fUSa&hL&8S3lnDJ?DK z)TvXHm6dVpt+x)j|BpZZFeM#hm7(Hkv6$B@QbFwOSb%7~t)<-=?jtE$*`m3JS&z+Jto|_VxAA*w{!$Mg|)%hq7gb;#(fdOi2Y5>U1&848A z;F=mYk}$N}Zo3VD-+%v|Q>RXi`o3?z`38WLl$7u@##5?SICcYVz>ATWmT*I$dJo)g zx1oqTJ3GU_uSD^*+wC|Ujv?-nl#ZSAp&dVd9DuB>Eb{a7X>M*F)qVHhe?OoB`|-yg z4aKScXl7<67cN|gdRYpf!{La6IcwIeunn205{6b+S4Ur8A8Bc6tY5#L=H})RT_h_k&(gf-Mi`T?vA=HH#e8(o_j8w%j)Xtc=z3R4aaA-TIuia zXZ!Z;alb9ZlbI$>!q9{eoI7`pM;>{E{rmTmot@1KFTB8`k3P!b!-qL>;si-aNi12i zguCv#EBqPl=+UE8R#wvA-*4E3QUHt$lQ1*K8G<%k#6k#~o11yyfd|;NYZrxuh2-Vs zk(ZYj_xgSN_OW^MX3m{EHzuFcX0zdNIM}{@`>@4RFR$0j?YG}o;`cSN>%Ti_xASE-ri1odwaNrO!S*(NlD2Sal1y6A!xa|xwu>|l9Q98 ze7E6bWKi;O())>b+;ImxckUe55kaGoVTXOys#Sdc`R5cA6kxO2hINF^+CX!;%FD~C zt*s?9Gt+bkMm45acJICS($LUAU0of=j~^emo>wU)vu4d=*|KHhHb8GQ$%s8+i#e$# zykFK5bT}N8l$20XQes~6u1=}B?TU-E#003-0j3mD0Bz!bfEZ{&w3)L$wAr%~xUA7Q zSryaJ_yI4G)e^7~y#|FB4VneC54=Z?9Kq>y4m%EFGD(dZKYH}2{`4T)1X;C;LU`hT zkjUB-Z9umWV$Pp`{z*|$5$Wmargp7dtx}Ua&YwT88nys%5^bpomD{9h2-MOF9^j0W z^1nieO+pCK+uIxWbKGQC2-+dwFd8rq8nj?6v;nl4wELx$7lja|LWm3^tG}SzPd4eN zN?wvu9s&*k-M~e(BI*NzY67TQmm>vjU5+%gdD}C9EVKnq)bcr3#gJ2zrK|^4>7Pe~ zHGl?8LGu7Um21=*Lv|u-bU4r;+I3<295>md8bej#d(l7*5NQZ}KtNyQVi#!AZz@dX z%*iHY%&Qfw^yZgZpeek 0 ? d / speed : 0; int vl = inf.updateDistanceAndGetPriority(time, d); - if(vl < value){ + if(vl < value && (!showCameras || inf.getType() == AlarmInfo.SPEED_CAMERA)){ mostImportant = inf; value = vl; } diff --git a/OsmAnd/src/net/osmand/plus/routing/RoutingHelper.java b/OsmAnd/src/net/osmand/plus/routing/RoutingHelper.java index 4b091803f8..6777259e77 100644 --- a/OsmAnd/src/net/osmand/plus/routing/RoutingHelper.java +++ b/OsmAnd/src/net/osmand/plus/routing/RoutingHelper.java @@ -467,7 +467,7 @@ public class RoutingHelper { return i; } - public synchronized AlarmInfo getMostImportantAlarm(MetricsConstants mc){ + public synchronized AlarmInfo getMostImportantAlarm(MetricsConstants mc, boolean showCameras){ float mxspeed = route.getCurrentMaxSpeed(); AlarmInfo speedAlarm = null; if(mxspeed != 0 && lastFixedLocation != null && lastFixedLocation.hasSpeed()) { @@ -482,7 +482,7 @@ public class RoutingHelper { speedAlarm = AlarmInfo.createSpeedLimit(speed); } } - return route.getMostImportantAlarm(lastFixedLocation, speedAlarm); + return route.getMostImportantAlarm(lastFixedLocation, speedAlarm, showCameras); } public String formatStreetName(String name, String ref) { diff --git a/OsmAnd/src/net/osmand/plus/views/MapInfoLayer.java b/OsmAnd/src/net/osmand/plus/views/MapInfoLayer.java index a09ccc355f..69fb8270d9 100644 --- a/OsmAnd/src/net/osmand/plus/views/MapInfoLayer.java +++ b/OsmAnd/src/net/osmand/plus/views/MapInfoLayer.java @@ -321,7 +321,7 @@ public class MapInfoLayer extends OsmandMapLayer { flp = new FrameLayout.LayoutParams((int)(78 * scaleCoefficient), (int)(78 * scaleCoefficient), Gravity.RIGHT | Gravity.BOTTOM); - flp.rightMargin = STATUS_BAR_MARGIN_X; + flp.rightMargin = (int) (10*scaleCoefficient); flp.bottomMargin = (int) (85*scaleCoefficient); alarmControl.setLayoutParams(flp); diff --git a/OsmAnd/src/net/osmand/plus/views/RouteInfoControls.java b/OsmAnd/src/net/osmand/plus/views/RouteInfoControls.java index 37674c94ec..10eebbeeb3 100644 --- a/OsmAnd/src/net/osmand/plus/views/RouteInfoControls.java +++ b/OsmAnd/src/net/osmand/plus/views/RouteInfoControls.java @@ -16,6 +16,8 @@ import net.osmand.plus.routing.RouteDirectionInfo; import net.osmand.plus.routing.RoutingHelper; import net.osmand.router.TurnType; import android.content.Context; +import android.graphics.Bitmap; +import android.graphics.BitmapFactory; import android.graphics.Canvas; import android.graphics.Color; import android.graphics.Matrix; @@ -516,6 +518,7 @@ public class RouteInfoControls { paintCircle.setStrokeWidth(11 * scaleCoefficient); paintCircle.setStyle(Style.STROKE); paintCircle.setAntiAlias(true); + paintCircle.setDither(true); final Paint content = new Paint(); content.setColor(Color.WHITE); content.setStyle(Style.FILL); @@ -527,18 +530,22 @@ public class RouteInfoControls { final MapInfoControl alarm = new MapInfoControl(ctx) { private String text = ""; + private Bitmap img = null; + private int imgId; @Override public boolean updateInfo() { boolean limits = settings.SHOW_SPEED_LIMITS.get(); boolean cams = settings.SHOW_CAMERAS.get(); boolean visible = false; if ((limits || cams) && routingHelper != null && routingHelper.isFollowingMode()) { - AlarmInfo alarm = routingHelper.getMostImportantAlarm(settings.METRIC_SYSTEM.get()); + AlarmInfo alarm = routingHelper.getMostImportantAlarm(settings.METRIC_SYSTEM.get(), cams); if(alarm != null) { + int locimgId = 0; if(alarm.getType() == AlarmInfo.SPEED_LIMIT) { text = alarm.getIntValue() +""; } 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) { @@ -546,6 +553,7 @@ public class RouteInfoControls { } else if(alarm.getType() == AlarmInfo.TRAFFIC_CALMING) { // temporary omega text = "~^~"; + locimgId = R.drawable.warnings_speed_bump; } else if(alarm.getType() == AlarmInfo.STOP) { // text = "STOP"; } @@ -557,6 +565,16 @@ public class RouteInfoControls { visible = limits; } } + if(visible) { + if(locimgId != imgId) { + imgId = locimgId; + if(imgId == 0) { + img = null; + } else { + img = BitmapFactory.decodeResource(getResources(), locimgId); + } + } + } } } updateVisibility(visible); @@ -565,10 +583,14 @@ public class RouteInfoControls { @Override protected void onDraw(Canvas canvas) { - 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); + if(img == null) { + 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); + } } };