osmandapp#8108, osmandapp#3721 Code review fixes part 2:

- Refactor AlarmInfo to always accept maxSpeed in meters per second, and provide it either in meters per second or in accordance with requested speed constants settings.

Author: AlexNcUa

OsmAnd/src/net/osmand/plus/helpers/WaypointHelper.java

@@ -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;
@@ -329,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++) {
@@ -366,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;
@@ -493,7 +487,7 @@ public void announceVisibleLocations() {
 								// Set actual distance and copy max speed to speed camera
 								if (alarmCopy.getType() == AlarmInfoType.SPEED_CAMERA) {
 									alarmCopy.setFloatValue(route.getDistanceToPoint(alarm.getLocationIndex()));
-									alarmCopy.setIntValue(alarm.getIntValue());
+									alarmCopy.setMaxSpeed(alarm.getMaxSpeed());
 								}
 
 								voiceRouter.announceAlarm(alarmCopy, lastKnownLocation.getSpeed());

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

@@ -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 {
@@ -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;
@@ -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;
@@ -75,10 +86,6 @@ public double getLongitude() {
 		return longitude;
 	}
 
-	public int getIntValue() {
-		return intValue;
-	}
-	
 	public int getLocationIndex() {
 		return locationIndex;
 	}
@@ -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;
 	}
 

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

@@ -273,7 +273,7 @@ private static double getDistanceToLocation(List<Location> locations, LatLon p,
 				locations.get(currentLocation).getLatitude(), locations.get(currentLocation).getLongitude());
 	}
 
-	private static void attachAlarmInfo(List<AlarmInfo> alarms, RouteSegmentResult res, int intId, int locInd, SpeedConstants sc) {
+	private static void attachAlarmInfo(List<AlarmInfo> alarms, RouteSegmentResult res, int intId, int locInd) {
 		int[] pointTypes = res.getObject().getPointTypes(intId);
 		if (pointTypes != null) {
 			RouteRegion reg = res.getObject().region;
@@ -308,11 +308,7 @@ private static void attachAlarmInfo(List<AlarmInfo> alarms, RouteSegmentResult r
 				}
 
 				if (maxSpeed > 0 && maxSpeed != RouteDataObject.NONE_MAX_SPEED) {
-					if (sc.imperial) {
-						speedCameraAlarmInfo.setIntValue(Math.round(maxSpeed * 3.6f / 1.6f));
-					} else {
-						speedCameraAlarmInfo.setIntValue(Math.round(maxSpeed * 3.6f));
-					}
+					speedCameraAlarmInfo.setMaxSpeed(maxSpeed);
 				}
 			}
 		}
@@ -416,7 +412,7 @@ private static List<RouteSegmentResult> convertVectorResult(List<RouteDirectionI
 					lastHeight = h;
 				}
 				locations.add(n);
-				attachAlarmInfo(alarms, s, i, locations.size(), ctx.getSettings().SPEED_SYSTEM.get());
+				attachAlarmInfo(alarms, s, i, locations.size());
 				segmentsToPopulate.add(s);
 				if (i == s.getEndPointIndex()) {
 					break;

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

@@ -319,15 +319,15 @@ protected String getText(Location location, List<LocationPointWrapper> points, d
 
 	public void announceAlarm(AlarmInfo info, float speed) {
 		AlarmInfoType type = info.getType();
+		OsmandSettings settings = router.getSettings();
+
 		if (type == AlarmInfoType.SPEED_LIMIT) {
-			announceSpeedAlarm(info.getIntValue(), speed);
+			announceSpeedAlarm(info.getMaxSpeed(settings.SPEED_SYSTEM.get()), speed);
 		} else if (type == AlarmInfoType.SPEED_CAMERA) {
-			OsmandSettings settings = router.getSettings();
 			if (settings.SPEAK_SPEED_CAMERA.get()) {
-				announceSpeedCameraAlarm(info.getFloatValue(), info.getIntValue());
+				announceSpeedCameraAlarm(info.getFloatValue(), info.getMaxSpeed(settings.SPEED_SYSTEM.get()));
 			}
 		} else {
-			OsmandSettings settings = router.getSettings();
 			boolean speakTrafficWarnings = settings.SPEAK_TRAFFIC_WARNINGS.get();
 			boolean speakTunnels = type == AlarmInfoType.TUNNEL && settings.SPEAK_TUNNELS.get();
 			boolean speakPedestrian = type == AlarmInfoType.PEDESTRIAN && settings.SPEAK_PEDESTRIAN.get();

OsmAnd/src/net/osmand/plus/views/mapwidgets/widgets/AlarmWidget.java

@@ -316,9 +316,9 @@ public AlarmWidgetInfo createWidgetInfo(@NonNull AlarmInfo alarm) {
 				locImgId = R.drawable.warnings_speed_limit_us;
 				//else case is done by drawing red ring
 			}
-			text = alarm.getIntValue() + "";
+			text = alarm.getMaxSpeed(settings.SPEED_SYSTEM.get()) + "";
 		} else if (alarm.getType() == AlarmInfo.AlarmInfoType.SPEED_CAMERA) {
-			int maxSpeed = alarm.getIntValue();
+			int maxSpeed = alarm.getMaxSpeed(settings.SPEED_SYSTEM.get());
 			if (maxSpeed > 0) {
 				if (americanType) {
 					locImgId = R.drawable.warnings_speed_camera_dist_lim_us;