Remove some code duplication

MarcusWolschon · Nov 4, 2023 · a5b040c · a5b040c
1 parent cf966d2
commit a5b040c
Showing 1 changed file with 15 additions and 9 deletions.
diff --git a/src/main/java/de/blau/android/util/Util.java b/src/main/java/de/blau/android/util/Util.java
@@ -225,14 +225,7 @@ public static IntCoordinates getCenter(@NonNull final StorageDelegator delegator
      */
     @NonNull
     public static String getBearingString(@NonNull Context context, double sLon, double sLat, double eLon, double eLat) {
-        long bearing = GeoMath.bearing(sLon, sLat, eLon, eLat);
-
-        int index = (int) (bearing - 22.5);
-        if (index < 0) {
-            index += 360;
-        }
-        index = index / 45;
-        return context.getString(bearingStrings[index]);
+        return context.getString(bearingStrings[getBearingIndex(sLon, sLat, eLon, eLat)]);
     }
 
     private static final char[] bearingArrows = { '↗', '→', '↘', '↓', '↙', '←', '↖', '↑' };
@@ -248,14 +241,27 @@ public static String getBearingString(@NonNull Context context, double sLon, dou
      */
     @NonNull
     public static char getBearingArrow(double sLon, double sLat, double eLon, double eLat) {
+        return bearingArrows[getBearingIndex(sLon, sLat, eLon, eLat)];
+    }
+
+    /**
+     * Calculate the bearing and return an index in to an array holding display values
+     * 
+     * @param sLon start lon
+     * @param sLat start lat
+     * @param eLon end lon
+     * @param eLat end lat
+     * @return the index
+     */
+    private static int getBearingIndex(double sLon, double sLat, double eLon, double eLat) {
         long bearing = GeoMath.bearing(sLon, sLat, eLon, eLat);
 
         int index = (int) (bearing - 22.5);
         if (index < 0) {
             index += 360;
         }
         index = index / 45;
-        return bearingArrows[index];
+        return index;
     }
 
     /**