[android] Add Speed class

Signed-off-by: Gonzalo Pesquero <gpesquero@yahoo.es>
organicmaps · Apr 20, 2024 · e0143e6 · e0143e6
1 parent a7f0292
commit e0143e6
Show file tree

Hide file tree

Showing 5 changed files with 183 additions and 4 deletions.
diff --git a/android/app/src/main/cpp/app/organicmaps/Framework.cpp b/android/app/src/main/cpp/app/organicmaps/Framework.cpp
@@ -1936,4 +1936,10 @@ Java_app_organicmaps_Framework_nativeGetKayakHotelLink(JNIEnv * env, jclass, jst
   return url.empty() ? nullptr : jni::ToJavaString(env, url);
 }
 
+JNIEXPORT jint JNICALL
+Java_app_organicmaps_Framework_nativeGetUnits(JNIEnv *, jclass)
+{
+  return static_cast<jint>(measurement_utils::GetMeasurementUnits());
+}
+
 }  // extern "C"
diff --git a/android/app/src/main/java/app/organicmaps/Framework.java b/android/app/src/main/java/app/organicmaps/Framework.java
@@ -61,6 +61,10 @@ public class Framework
   public static final int ROUTER_TYPE_TRANSIT = 3;
   public static final int ROUTER_TYPE_RULER = 4;
 
+  // Units values shall be the same as the ones defined in c++ in <platform/measurement_utils.hpp>.
+  public static final int UNITS_METRIC = 0;
+  public static final int UNITS_IMPERIAL = 1;
+
   @Retention(RetentionPolicy.SOURCE)
   @IntDef({ROUTE_REBUILD_AFTER_POINTS_LOADING})
   public @interface RouteRecommendationType {}
@@ -455,4 +459,6 @@ public static native void nativeSetChoosePositionMode(@ChoosePositionMode int mo
   @Nullable
   public static native String nativeGetKayakHotelLink(@NonNull String countryIsoCode, @NonNull String uri,
                                                       long firstDaySec, long lastDaySec, boolean isReferral);
+
+  public static native int nativeGetUnits();
 }
diff --git a/android/app/src/main/java/app/organicmaps/routing/NavigationController.java b/android/app/src/main/java/app/organicmaps/routing/NavigationController.java
@@ -155,7 +155,7 @@ public void update(@Nullable RoutingInfo info)
       updateVehicle(info);
 
     updateStreetView(info);
-    mNavMenu.update(info);
+    mNavMenu.update(info, Framework.nativeGetUnits());
   }
 
   private void updateStreetView(@NonNull RoutingInfo info)

diff --git a/android/app/src/main/java/app/organicmaps/util/Speed.java b/android/app/src/main/java/app/organicmaps/util/Speed.java
@@ -0,0 +1,138 @@
+package app.organicmaps.util;
+
+import android.content.Context;
+import android.util.Pair;
+
+import java.text.DecimalFormat;
+import java.text.DecimalFormatSymbols;
+import java.util.Locale;
+
+import app.organicmaps.Framework;
+import app.organicmaps.util.log.Logger;
+
+public class Speed
+{
+  private static String mUnitStringKmh = "km/h";
+  private static String mUnitStringMiph = "mph";
+
+  private static char mDecimalSeparator = Character.MIN_VALUE;
+
+  public static double MpsToKmph(double mps) { return mps * 3.6; }
+  public static double MpsToMiph(double mps) { return mps * 2.236936; }
+
+  public static void setUnitStringKmh(String unitStringKmh) { mUnitStringKmh = unitStringKmh; }
+  public static void setUnitStringMiph(String unitStringMiph) { mUnitStringMiph = unitStringMiph; }
+
+  private final static DecimalFormat mDecimalFormatNoDecimal = new DecimalFormat("#");
+  private final static DecimalFormat mDecimalFormatOneDecimal = new DecimalFormat("#.#");
+
+  public static Pair<String, String> formatMeasurements(double speedInMetersPerSecond, int units,
+                                            Context context)
+  {
+    double speedValue;
+    String unitsString;
+
+    if (units == Framework.UNITS_IMPERIAL)
+    {
+      speedValue = MpsToMiph(speedInMetersPerSecond);
+      unitsString = mUnitStringMiph;
+    }
+    else
+    {
+      speedValue = MpsToKmph(speedInMetersPerSecond);
+      unitsString = mUnitStringKmh;
+    }
+
+    long start1 = System.nanoTime();
+    String formatString = (speedValue < 10.0)? "%.1f" : "%.0f";
+    String speedString = String.format(Locale.getDefault(), formatString, speedValue);
+    long elapsed1 = System.nanoTime() - start1;
+
+    Logger.i("LOCALE_MEASURE", "1) " + speedString);
+
+    long start2 = System.nanoTime();
+    if (speedValue < 10.0)
+      speedString = mDecimalFormatOneDecimal.format(speedValue);
+    else
+      speedString = mDecimalFormatNoDecimal.format(speedValue);
+    long elapsed2 = System.nanoTime() - start2;
+
+    Logger.i("LOCALE_MEASURE", "2) " + speedString);
+
+    long start3 = System.nanoTime();
+    if (speedValue < 10.0)
+    {
+      speedString = Long.toString(Math.round(speedValue * 10.0));
+
+      StringBuffer buffer = new StringBuffer(speedString);
+
+      if (mDecimalSeparator == Character.MIN_VALUE)
+        mDecimalSeparator = DecimalFormatSymbols.getInstance().getDecimalSeparator();
+
+      // For low values (< 1.0), force to have 2 characters in string.
+      if (buffer.length() < 2)
+        buffer.insert(0, "0");
+
+      buffer.insert(1, mDecimalSeparator);
+
+      speedString = buffer.toString();
+    }
+    else
+      speedString = Long.toString(Math.round(speedValue));
+    long elapsed3 = System.nanoTime() - start3;
+
+    Logger.i("LOCALE_MEASURE", "3) " + speedString);
+
+    String text = String.format(Locale.US,
+            "%5d / %5d / %5d",
+            Math.round(0.001 * elapsed1),
+            Math.round(0.001 * elapsed2),
+            Math.round(0.001 * elapsed3));
+
+    Logger.i("LOCALE_MEASURE", text);
+
+    return new Pair<>(speedString, unitsString);
+  }
+
+  public static Pair<String, String> format(double speedInMetersPerSecond, int units,
+                                                        Context context)
+  {
+    double speedValue;
+    String unitsString;
+
+    if (units == Framework.UNITS_IMPERIAL)
+    {
+      speedValue = MpsToMiph(speedInMetersPerSecond);
+      unitsString = mUnitStringMiph;
+    }
+    else
+    {
+      speedValue = MpsToKmph(speedInMetersPerSecond);
+      unitsString = mUnitStringKmh;
+    }
+
+    String speedString;
+
+    if (speedValue < 10.0)
+    {
+      speedString = Long.toString(Math.round(speedValue * 10.0));
+
+      StringBuffer buffer = new StringBuffer(speedString);
+
+      if (mDecimalSeparator == Character.MIN_VALUE)
+        mDecimalSeparator = DecimalFormatSymbols.getInstance().getDecimalSeparator();
+
+      // For low values (< 1.0), force to have 2 characters in string.
+      if (buffer.length() < 2)
+        buffer.insert(0, "0");
+
+      buffer.insert(1, mDecimalSeparator);
+
+      speedString = buffer.toString();
+    }
+    else
+      speedString = Long.toString(Math.round(speedValue));
+
+    return new Pair<>(speedString, unitsString);
+  }
+}
diff --git a/android/app/src/main/java/app/organicmaps/widget/menu/NavMenu.java b/android/app/src/main/java/app/organicmaps/widget/menu/NavMenu.java
@@ -1,6 +1,7 @@
 package app.organicmaps.widget.menu;
 
 import android.location.Location;
+import android.util.Log;
 import android.util.Pair;
 import android.view.View;
 import android.widget.Button;
@@ -15,12 +16,16 @@
 import app.organicmaps.routing.RoutingInfo;
 import app.organicmaps.sound.TtsPlayer;
 import app.organicmaps.util.Graphics;
+import app.organicmaps.util.Speed;
 import app.organicmaps.util.StringUtils;
 import app.organicmaps.util.UiUtils;
+import app.organicmaps.util.log.Logger;
+
 import com.google.android.material.progressindicator.LinearProgressIndicator;
 
 import java.time.LocalTime;
 import java.time.format.DateTimeFormatter;
+import java.util.Locale;
 import java.util.concurrent.TimeUnit;
 
 public class NavMenu
@@ -203,22 +208,46 @@ private void updateTimeEstimate(int seconds)
     mTimeEstimate.setText(localTime.format(DateTimeFormatter.ofPattern(format)));
   }
 
-  private void updateSpeedView(@NonNull RoutingInfo info)
+  private void updateSpeedView(@NonNull RoutingInfo info, int units)
   {
     final Location last = LocationHelper.from(mActivity).getSavedLocation();
     if (last == null)
       return;
 
+    // Log measurements for different Java implementations.
+    Speed.formatMeasurements(last.getSpeed(), units, mActivity.getApplicationContext());
+
+    // Speed formatting using native calls.
+    long start1 = System.nanoTime();
     Pair<String, String> speedAndUnits = StringUtils.nativeFormatSpeedAndUnits(last.getSpeed());
+    long elapsed1 = System.nanoTime() - start1;
 
     mSpeedUnits.setText(speedAndUnits.second);
     mSpeedValue.setText(speedAndUnits.first);
+
+    // Speed formatting using Android calls.
+    long start2 = System.nanoTime();
+    speedAndUnits = Speed.format(last.getSpeed(), units, mActivity.getApplicationContext());
+    long elapsed2 = System.nanoTime() - start2;
+
+    mSpeedUnits.setText(speedAndUnits.second);
+    mSpeedValue.setText(speedAndUnits.first);
+
+    String text = String.format(Locale.US,
+            "Current / New / Diff (us): %4d / %4d / %4d (x%.1f)",
+            Math.round(0.001 * elapsed1),
+            Math.round(0.001 * elapsed2),
+            Math.round(0.001 * (elapsed2 - elapsed1)),
+            1.0 * elapsed2 / elapsed1);
+
+    Logger.i("LOCALE_MEASURE", text);
+
     mSpeedViewContainer.setActivated(info.isSpeedLimitExceeded());
   }
 
-  public void update(@NonNull RoutingInfo info)
+  public void update(@NonNull RoutingInfo info, int units)
   {
-    updateSpeedView(info);
+    updateSpeedView(info, units);
     updateTime(info.totalTimeInSeconds);
     mDistanceValue.setText(info.distToTarget.mDistanceStr);
     mDistanceUnits.setText(info.distToTarget.getUnitsStr(mActivity.getApplicationContext()));