Skip to content

Implements distance / speed limit voice announcement and displaying for speed cameras (#3721 and #8108, android part) + minor fix for alert icon resizing on large screens #12923

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
AlexNcUa wants to merge 7 commits into
base: master
Choose a base branch
from
Open

Implements distance / speed limit voice announcement and displaying for speed cameras (#3721 and #8108, android part) + minor fix for alert icon resizing on large screens #12923

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
2a5c946
#3721 and #8108 initial implementation.
AlexNcUa Oct 4, 2021
70ff0c2
#8108, #3721
AlexNcUa Oct 29, 2021
6327ea5
Merge branch 'master' into 8108_3721_initial_impl
AlexNcUa Dec 17, 2021
b829487
Fix build after master backmerge + minor AlarmWidget createWidgetBitm…
AlexNcUa Dec 17, 2021
09688ec
Merge branch 'master' into 8108_3721_initial_impl
AlexNcUa Dec 20, 2021
7bd8351
#8108, #3721 Code review fixes part 1:
AlexNcUa Dec 20, 2021
c70a074
#8108, #3721 Code review fixes part 2:
AlexNcUa Dec 21, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
39 changes: 39 additions & 0 deletions OsmAnd/res/drawable/warnings_speed_camera_dist.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="92dp"
android:height="92dp"
android:viewportWidth="92"
android:viewportHeight="92">

<path
android:pathData="M14,7H78C81.866,7 85,10.134 85,14V77C85,80.866 81.866,84 78,84H14C10.134,84 7,80.866 7,77V14C7,10.134 10.134,7 14,7Z"
android:fillColor="#000000"
android:fillAlpha="0.2"
android:fillType="evenOdd"/>
<path
android:pathData="M8,14C8,10.6863 10.6863,8 14,8H78C81.3137,8 84,10.6863 84,14V77C84,80.3137 81.3137,83 78,83H14C10.6863,83 8,80.3137 8,77V14Z"
android:fillColor="#0055FF"/>
<path
android:pathData="M78,11H14C12.3431,11 11,12.3431 11,14V77C11,78.6569 12.3431,80 14,80H78C79.6569,80 81,78.6569 81,77V14C81,12.3431 79.6569,11 78,11ZM14,8C10.6863,8 8,10.6863 8,14V77C8,80.3137 10.6863,83 14,83H78C81.3137,83 84,80.3137 84,77V14C84,10.6863 81.3137,8 78,8H14Z"
android:fillColor="#FFFFFF"
android:fillType="evenOdd"/>
<path
android:pathData="M14,15C14,14.4477 14.4477,14 15,14H77C77.5523,14 78,14.4477 78,15V55C78,55.5523 77.5523,56 77,56H15C14.4477,56 14,55.5523 14,55V15Z"
android:fillColor="#FFFFFF"/>

<path
android:pathData="M29,20H47C48.657,20 50,21.343 50,23V47C50,48.657 48.657,50 47,50H29C27.343,50 26,48.657 26,47V23C26,21.343 27.343,20 29,20ZM36,34C39.314,34 42,36.686 42,40C42,43.314 39.314,46 36,46C32.686,46 30,43.314 30,40C30,36.686 32.686,34 36,34ZM42,22C44.209,22 46,23.791 46,26C46,28.209 44.209,30 42,30C39.791,30 38,28.209 38,26C38,23.791 39.791,22 42,22Z"
android:fillColor="#000000"
android:fillType="evenOdd"/>
<path
android:pathData="M36,38C37.105,38 38,38.895 38,40C38,41.105 37.105,42 36,42C34.895,42 34,41.105 34,40C34,38.895 34.895,38 36,38Z"
android:fillColor="#000000"/>
<path
android:pathData="M42,25C42.552,25 43,25.448 43,26C43,26.552 42.552,27 42,27C41.448,27 41,26.552 41,26C41,25.448 41.448,25 42,25Z"
android:fillColor="#000000"/>
<path
android:pathData="M52,26H56V42H52V26Z"
android:fillColor="#000000"/>
<path
android:pathData="M58,30H62V34H66V42H62V50H52V46H58V30Z"
android:fillColor="#000000"/>
</vector>
46 changes: 46 additions & 0 deletions OsmAnd/res/drawable/warnings_speed_camera_dist_lim.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="92dp"
android:height="92dp"
android:viewportWidth="92"
android:viewportHeight="92">

<path
android:pathData="M14,7H78C81.866,7 85,10.134 85,14V77C85,80.866 81.866,84 78,84H14C10.134,84 7,80.866 7,77V14C7,10.134 10.134,7 14,7Z"
android:fillColor="#000000"
android:fillAlpha="0.2"
android:fillType="evenOdd"/>
<path
android:pathData="M8,14C8,10.6863 10.6863,8 14,8H78C81.3137,8 84,10.6863 84,14V77C84,80.3137 81.3137,83 78,83H14C10.6863,83 8,80.3137 8,77V14Z"
android:fillColor="#0055FF"/>
<path
android:pathData="M78,11H14C12.3431,11 11,12.3431 11,14V77C11,78.6569 12.3431,80 14,80H78C79.6569,80 81,78.6569 81,77V14C81,12.3431 79.6569,11 78,11ZM14,8C10.6863,8 8,10.6863 8,14V77C8,80.3137 10.6863,83 14,83H78C81.3137,83 84,80.3137 84,77V14C84,10.6863 81.3137,8 78,8H14Z"
android:fillColor="#FFFFFF"
android:fillType="evenOdd"/>
<path
android:pathData="M14,15C14,14.4477 14.4477,14 15,14H77C77.5523,14 78,14.4477 78,15V55C78,55.5523 77.5523,56 77,56H15C14.4477,56 14,55.5523 14,55V15Z"
android:fillColor="#FFFFFF"/>

<path
android:pathData="M19,24H37C38.657,24 40,25.343 40,27V51C40,52.657 38.657,54 37,54H19C17.343,54 16,52.657 16,51V27C16,25.343 17.343,24 19,24ZM26,38C29.314,38 32,40.686 32,44C32,47.314 29.314,50 26,50C22.686,50 20,47.314 20,44C20,40.686 22.686,38 26,38ZM32,26C34.209,26 36,27.791 36,30C36,32.209 34.209,34 32,34C29.791,34 28,32.209 28,30C28,27.791 29.791,26 32,26Z"
android:fillColor="#000000"
android:fillType="evenOdd"/>
<path
android:pathData="M26,42C27.105,42 28,42.895 28,44C28,45.105 27.105,46 26,46C24.895,46 24,45.105 24,44C24,42.895 24.895,42 26,42Z"
android:fillColor="#000000"/>
<path
android:pathData="M32,29C32.552,29 33,29.448 33,30C33,30.552 32.552,31 32,31C31.448,31 31,30.552 31,30C31,29.448 31.448,29 32,29Z"
android:fillColor="#000000"/>
<path
android:pathData="M42,30H46V46H42V30Z"
android:fillColor="#000000"/>
<path
android:pathData="M48,34H52V38H56V46H52V54H42V50H48V34Z"
android:fillColor="#000000"/>

<path
android:pathData="M74,0C83.941,0 92,8.059 92,18C92,27.941 83.941,36 74,36C64.059,36 56,27.941 56,18C56,8.059 64.059,0 74,0Z"
android:fillColor="#FF0000"/>
<path
android:pathData="M74,3C82.284,3 89,9.716 89,18C89,26.284 82.284,33 74,33C65.716,33 59,26.284 59,18C59,9.716 65.716,3 74,3Z"
android:fillColor="#FFFFFF"/>
</vector>
38 changes: 38 additions & 0 deletions OsmAnd/res/drawable/warnings_speed_camera_dist_lim_us.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="92dp"
android:height="92dp"
android:viewportWidth="92"
android:viewportHeight="92">

<path
android:pathData="M8,14C8,10.6863 10.6863,8 14,8H78C81.3137,8 84,10.6863 84,14V77C84,80.3137 81.3137,83 78,83H14C10.6863,83 8,80.3137 8,77V14Z"
android:fillColor="#FFD200"/>
<path
android:pathData="M78,11H14C12.3431,11 11,12.3431 11,14V77C11,78.6569 12.3431,80 14,80H78C79.6569,80 81,78.6569 81,77V14C81,12.3431 79.6569,11 78,11ZM14,8C10.6863,8 8,10.6863 8,14V77C8,80.3137 10.6863,83 14,83H78C81.3137,83 84,80.3137 84,77V14C84,10.6863 81.3137,8 78,8H14Z"
android:fillColor="#000000"
android:fillType="evenOdd"/>

<path
android:pathData="M59,0H89C90.657,0 92,1.343 92,3V33C92,34.657 90.657,36 89,36H59C57.343,36 56,34.657 56,33V3C56,1.343 57.343,0 59,0Z"
android:fillColor="#000000"/>
<path
android:pathData="M60,2H88C89.105,2 90,2.895 90,4V32C90,33.105 89.105,34 88,34H60C58.895,34 58,33.105 58,32V4C58,2.895 58.895,2 60,2Z"
android:fillColor="#FFFFFF"/>

<path
android:pathData="M19,24H37C38.657,24 40,25.343 40,27V51C40,52.657 38.657,54 37,54H19C17.343,54 16,52.657 16,51V27C16,25.343 17.343,24 19,24ZM26,38C29.314,38 32,40.686 32,44C32,47.314 29.314,50 26,50C22.686,50 20,47.314 20,44C20,40.686 22.686,38 26,38ZM32,26C34.209,26 36,27.791 36,30C36,32.209 34.209,34 32,34C29.791,34 28,32.209 28,30C28,27.791 29.791,26 32,26Z"
android:fillColor="#000000"
android:fillType="evenOdd"/>
<path
android:pathData="M26,42C27.105,42 28,42.895 28,44C28,45.105 27.105,46 26,46C24.895,46 24,45.105 24,44C24,42.895 24.895,42 26,42Z"
android:fillColor="#000000"/>
<path
android:pathData="M32,29C32.552,29 33,29.448 33,30C33,30.552 32.552,31 32,31C31.448,31 31,30.552 31,30C31,29.448 31.448,29 32,29Z"
android:fillColor="#000000"/>
<path
android:pathData="M42,30H46V46H42V30Z"
android:fillColor="#000000"/>
<path
android:pathData="M48,34H52V38H56V46H52V54H42V50H48V34Z"
android:fillColor="#000000"/>
</vector>
31 changes: 31 additions & 0 deletions OsmAnd/res/drawable/warnings_speed_camera_dist_us.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="92dp"
android:height="92dp"
android:viewportWidth="92"
android:viewportHeight="92">

<path
android:pathData="M8,14C8,10.6863 10.6863,8 14,8H78C81.3137,8 84,10.6863 84,14V77C84,80.3137 81.3137,83 78,83H14C10.6863,83 8,80.3137 8,77V14Z"
android:fillColor="#FFD200"/>
<path
android:pathData="M78,11H14C12.3431,11 11,12.3431 11,14V77C11,78.6569 12.3431,80 14,80H78C79.6569,80 81,78.6569 81,77V14C81,12.3431 79.6569,11 78,11ZM14,8C10.6863,8 8,10.6863 8,14V77C8,80.3137 10.6863,83 14,83H78C81.3137,83 84,80.3137 84,77V14C84,10.6863 81.3137,8 78,8H14Z"
android:fillColor="#000000"
android:fillType="evenOdd"/>

<path
android:pathData="M29,20H47C48.657,20 50,21.343 50,23V47C50,48.657 48.657,50 47,50H29C27.343,50 26,48.657 26,47V23C26,21.343 27.343,20 29,20ZM36,34C39.314,34 42,36.686 42,40C42,43.314 39.314,46 36,46C32.686,46 30,43.314 30,40C30,36.686 32.686,34 36,34ZM42,22C44.209,22 46,23.791 46,26C46,28.209 44.209,30 42,30C39.791,30 38,28.209 38,26C38,23.791 39.791,22 42,22Z"
android:fillColor="#000000"
android:fillType="evenOdd"/>
<path
android:pathData="M36,38C37.105,38 38,38.895 38,40C38,41.105 37.105,42 36,42C34.895,42 34,41.105 34,40C34,38.895 34.895,38 36,38Z"
android:fillColor="#000000"/>
<path
android:pathData="M42,25C42.552,25 43,25.448 43,26C43,26.552 42.552,27 42,27C41.448,27 41,26.552 41,26C41,25.448 41.448,25 42,25Z"
android:fillColor="#000000"/>
<path
android:pathData="M52,26H56V42H52V26Z"
android:fillColor="#000000"/>
<path
android:pathData="M58,30H62V34H66V42H62V50H52V46H58V30Z"
android:fillColor="#000000"/>
</vector>
4 changes: 2 additions & 2 deletions OsmAnd/res/layout-land/map_hud_bottom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,8 @@

<androidx.appcompat.widget.AppCompatImageView
android:id="@+id/map_alarm_warning_icon"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_gravity="center"
osmand:srcCompat="@drawable/warnings_limit"/>

Expand Down
4 changes: 2 additions & 2 deletions OsmAnd/res/layout/map_hud_bottom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@

<androidx.appcompat.widget.AppCompatImageView
android:id="@+id/map_alarm_warning_icon"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_gravity="center"
osmand:srcCompat="@drawable/warnings_limit"/>

Expand Down
4 changes: 3 additions & 1 deletion OsmAnd/res/values-large/sizes.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,13 +23,15 @@
<dimen name="map_button_shadow_margin">6dp</dimen>
<dimen name="map_button_shadow_width">84dp</dimen>
<dimen name="map_alarm_size">138dp</dimen>
<dimen name="map_alarm_bottom_text_margin">12dp</dimen>
<dimen name="map_alarm_bottom_text_margin">15dp</dimen>
<dimen name="map_alarm_text_size">35sp</dimen>
<dimen name="map_alarm_text_top_padding">30dp</dimen>
<dimen name="map_alarm_bottom_text_size">22sp</dimen>
<dimen name="map_alarm_bottom_si_text_size">18sp</dimen>
<dimen name="map_alarm_bottom_margin">131dp</dimen>
<dimen name="map_alarm_bottom_margin_land">81dp</dimen>
<dimen name="map_alarm_speed_camera_speed_info_size">54dp</dimen>
<dimen name="map_alarm_speed_camera_speed_info_text_size">22sp</dimen>

<dimen name="map_widget_icon">36dp</dimen>
<dimen name="map_widget_height">48dp</dimen>
Expand Down
4 changes: 3 additions & 1 deletion OsmAnd/res/values/sizes.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@
<dimen name="map_ruler_width">120dp</dimen>
<dimen name="map_ruler_bottom_margin">9dp</dimen>
<dimen name="map_alarm_size">92dp</dimen>
<dimen name="map_alarm_bottom_text_margin">8dp</dimen>
<dimen name="map_alarm_bottom_text_margin">10dp</dimen>


<dimen name="map_alarm_bottom_margin">87dp</dimen>
Expand Down Expand Up @@ -157,6 +157,8 @@
<dimen name="map_alarm_text_top_padding">20dp</dimen>
<dimen name="map_alarm_bottom_text_size">16sp</dimen>
<dimen name="map_alarm_bottom_si_text_size">12sp</dimen>
<dimen name="map_alarm_speed_camera_speed_info_size">36dp</dimen>
<dimen name="map_alarm_speed_camera_speed_info_text_size">16sp</dimen>
<dimen name="map_widget_text_bottom_margin">1sp</dimen>
<dimen name="map_widget_text_small_bottom_margin">3sp</dimen>
<dimen name="map_widget_icon_margin">2dp</dimen>
Expand Down
34 changes: 21 additions & 13 deletions OsmAnd/src/net/osmand/plus/helpers/WaypointHelper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -225,9 +225,9 @@ public AlarmInfo getMostImportantAlarm(SpeedConstants sc, boolean showCameras) {
Location lastProjection = app.getRoutingHelper().getLastProjection();
float mxspeed = route.getCurrentMaxSpeed();
float delta = app.getSettings().SPEED_LIMIT_EXCEED_KMH.get() / 3.6f;
AlarmInfo speedAlarm = createSpeedAlarm(sc, mxspeed, lastProjection, delta);
AlarmInfo speedAlarm = createSpeedAlarm(mxspeed, lastProjection, delta);
if (speedAlarm != null) {
getVoiceRouter().announceSpeedAlarm(speedAlarm.getIntValue(), lastProjection.getSpeed());
getVoiceRouter().announceSpeedAlarm(speedAlarm.getMaxSpeed(sc), lastProjection.getSpeed());
}
AlarmInfo mostImportant = speedAlarm;
int value = speedAlarm != null ? speedAlarm.updateDistanceAndGetPriority(0, 0) : Integer.MAX_VALUE;
Expand All @@ -252,6 +252,12 @@ public AlarmInfo getMostImportantAlarm(SpeedConstants sc, boolean showCameras) {
if (!atd.isTurnStateActive(0, d, STATE_LONG_PNT_APPROACH)) {
break;
}

// Set actual distance to speed camera
if (inf.getType() == AlarmInfoType.SPEED_CAMERA) {
inf.setFloatValue(d);
}

float time = speed > 0 ? d / speed : Integer.MAX_VALUE;
int vl = inf.updateDistanceAndGetPriority(time, d);
if (vl < value && (showCameras || inf.getType() != AlarmInfoType.SPEED_CAMERA)) {
Expand Down Expand Up @@ -323,9 +329,9 @@ public AlarmInfo calculateMostImportantAlarm(RouteDataObject ro, Location loc, M
SpeedConstants sc, boolean showCameras) {
float mxspeed = ro.getMaximumSpeed(ro.bearingVsRouteDirection(loc));
float delta = app.getSettings().SPEED_LIMIT_EXCEED_KMH.get() / 3.6f;
AlarmInfo speedAlarm = createSpeedAlarm(sc, mxspeed, loc, delta);
AlarmInfo speedAlarm = createSpeedAlarm(mxspeed, loc, delta);
if (speedAlarm != null) {
getVoiceRouter().announceSpeedAlarm(speedAlarm.getIntValue(), loc.getSpeed());
getVoiceRouter().announceSpeedAlarm(speedAlarm.getMaxSpeed(sc), loc.getSpeed());
return speedAlarm;
}
for (int i = 0; i < ro.getPointsLength(); i++) {
Expand Down Expand Up @@ -360,17 +366,11 @@ public AlarmInfo calculateMostImportantAlarm(RouteDataObject ro, Location loc, M
return null;
}

private static AlarmInfo createSpeedAlarm(SpeedConstants sc, float mxspeed, Location loc, float delta) {
private static AlarmInfo createSpeedAlarm(float mxspeed, Location loc, float delta) {
AlarmInfo speedAlarm = null;
if (mxspeed != 0 && loc != null && loc.hasSpeed() && mxspeed != RouteDataObject.NONE_MAX_SPEED) {
if (loc.getSpeed() > mxspeed + delta) {
int speed;
if (sc.imperial) {
speed = Math.round(mxspeed * 3.6f / 1.6f);
} else {
speed = Math.round(mxspeed * 3.6f);
}
speedAlarm = AlarmInfo.createSpeedLimit(speed, loc);
speedAlarm = AlarmInfo.createSpeedLimit(mxspeed, loc);
}
}
return speedAlarm;
Expand Down Expand Up @@ -482,7 +482,15 @@ public void announceVisibleLocations() {
} else if (type == ALARMS) {
for (LocationPointWrapper pw : approachPoints) {
AlarmInfo alarm = (AlarmInfo) pw.point;
voiceRouter.announceAlarm(new AlarmInfo(alarm.getType(), -1), lastKnownLocation.getSpeed());
AlarmInfo alarmCopy = new AlarmInfo(alarm.getType(), -1);

// Set actual distance and copy max speed to speed camera
if (alarmCopy.getType() == AlarmInfoType.SPEED_CAMERA) {
alarmCopy.setFloatValue(route.getDistanceToPoint(alarm.getLocationIndex()));
alarmCopy.setMaxSpeed(alarm.getMaxSpeed());
}

voiceRouter.announceAlarm(alarmCopy, lastKnownLocation.getSpeed());
lastAnnouncedAlarms.put(alarm.getType(), alarm);
}
} else if (type == FAVORITES) {
Expand Down
17 changes: 9 additions & 8 deletions OsmAnd/src/net/osmand/plus/plugins/development/TestVoiceActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -214,14 +214,15 @@ private void addButtons(final LinearLayout ll, CommandPlayer p) {

addButton(ll, "Attention prompts:", builder(p));
addButton(ll, "\u25BA (9.1) You are exceeding the speed limit '50' (18 m/s)", builder(p).speedAlarm(50, 18f));
addButton(ll, "\u25BA (9.2) Attention, speed camera", builder(p).attention("SPEED_CAMERA"));
addButton(ll, "\u25BA (9.3) Attention, border control", builder(p).attention("BORDER_CONTROL"));
addButton(ll, "\u25BA (9.4) Attention, railroad crossing", builder(p).attention("RAILWAY"));
addButton(ll, "\u25BA (9.5) Attention, traffic calming", builder(p).attention("TRAFFIC_CALMING"));
addButton(ll, "\u25BA (9.6) Attention, toll booth", builder(p).attention("TOLL_BOOTH"));
addButton(ll, "\u25BA (9.7) Attention, stop sign", builder(p).attention("STOP"));
addButton(ll, "\u25BA (9.8) Attention, pedestrian crosswalk", builder(p).attention("PEDESTRIAN"));
addButton(ll, "\u25BA (9.9) Attention, tunnel", builder(p).attention("TUNNEL"));
addButton(ll, "\u25BA (9.2) Attention, speed camera, distance 650m, speed limit '50' (18 m/s)", builder(p).speedCameraAlarm(650f, 50, "SPEED_CAMERA"));
addButton(ll, "\u25BA (9.3) Attention, speed camera", builder(p).attention("SPEED_CAMERA"));
addButton(ll, "\u25BA (9.4) Attention, border control", builder(p).attention("BORDER_CONTROL"));
addButton(ll, "\u25BA (9.5) Attention, railroad crossing", builder(p).attention("RAILWAY"));
addButton(ll, "\u25BA (9.6) Attention, traffic calming", builder(p).attention("TRAFFIC_CALMING"));
addButton(ll, "\u25BA (9.7) Attention, toll booth", builder(p).attention("TOLL_BOOTH"));
addButton(ll, "\u25BA (9.8) Attention, stop sign", builder(p).attention("STOP"));
addButton(ll, "\u25BA (9.9) Attention, pedestrian crosswalk", builder(p).attention("PEDESTRIAN"));
addButton(ll, "\u25BA (9.10) Attention, tunnel", builder(p).attention("TUNNEL"));

addButton(ll, "Other prompts:", builder(p));
addButton(ll, "\u25BA (10.1) GPS signal lost", builder(p).gpsLocationLost());
Expand Down
27 changes: 15 additions & 12 deletions OsmAnd/src/net/osmand/plus/routing/AlarmInfo.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
import net.osmand.data.LocationPoint;
import net.osmand.data.PointDescription;
import net.osmand.plus.R;
import net.osmand.plus.settings.enums.SpeedConstants;

public class AlarmInfo implements LocationPoint {
public enum AlarmInfoType {
Expand Down Expand Up @@ -42,7 +43,7 @@ public String getVisualName(Context ctx) {
private final AlarmInfoType type;
protected final int locationIndex;
private int lastLocationIndex = -1;
private int intValue;
private float maxSpeed;
private float floatValue;
private double latitude;
private double longitude;
Expand All @@ -64,7 +65,17 @@ public float getFloatValue() {
public void setFloatValue(float floatValue) {
this.floatValue = floatValue;
}


public int getMaxSpeed(SpeedConstants sc) {
return sc.imperial
? Math.round(getMaxSpeed() * 3.6f / 1.6f)
: Math.round(getMaxSpeed() * 3.6f);
}

public float getMaxSpeed() { return maxSpeed; }

public void setMaxSpeed(float maxSpeed) { this.maxSpeed = maxSpeed; }

@Override
public double getLatitude() {
return latitude;
Expand All @@ -75,10 +86,6 @@ public double getLongitude() {
return longitude;
}

public int getIntValue() {
return intValue;
}

public int getLocationIndex() {
return locationIndex;
}
Expand All @@ -91,14 +98,10 @@ public void setLastLocationIndex(int lastLocationIndex) {
this.lastLocationIndex = lastLocationIndex;
}

public void setIntValue(int intValue) {
this.intValue = intValue;
}

public static AlarmInfo createSpeedLimit(int speed, Location loc){
public static AlarmInfo createSpeedLimit(float maxSpeed, Location loc){
AlarmInfo info = new AlarmInfo(AlarmInfoType.SPEED_LIMIT, 0);
info.setLatLon(loc.getLatitude(), loc.getLongitude());
info.setIntValue(speed);
info.setMaxSpeed(maxSpeed);
return info;
}

Expand Down
Loading