Fix another bug in LineString distance calculation

The iterating over segments was off by one. Add centralized formatting for the distance strings.
davecraig · Feb 5, 2025 · 32e332a · 32e332a
1 parent 7c3ada7
commit 32e332a
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 2 deletions.
diff --git a/app/src/main/java/org/scottishtecharmy/soundscape/geoengine/GeoEngine.kt b/app/src/main/java/org/scottishtecharmy/soundscape/geoengine/GeoEngine.kt
@@ -341,7 +341,7 @@ class GeoEngine {
                         if(feature == null) continue
                         val poiLocation = getDistanceToFeature(userGeometry.location, feature)
                         val name = getTextForFeature(localizedContext, feature)
-                        val text = "${name.text}. ${localizedContext.getString(R.string.distance_format_meters, poiLocation.distance.toString())}"
+                        val text = "${name.text}. ${formatDistance(poiLocation.distance, localizedContext)}"
                         list.add(
                             PositionedString(
                                 text,
@@ -559,4 +559,14 @@ fun getTextForFeature(localizedContext: Context, feature: Feature) : TextForFeat
     }
 
     return TextForFeature(text, generic)
+}
+
+fun formatDistance(distance: Double, localizedContext: Context) : String {
+    if(distance > 1000) {
+        val km = (distance.toInt() / 100).toFloat() / 10
+        return localizedContext.getString(R.string.distance_format_km, km.toString())
+    } else {
+        val metres = distance.toInt()
+        return  localizedContext.getString(R.string.distance_format_meters, metres.toString())
+    }
 }
diff --git a/app/src/main/java/org/scottishtecharmy/soundscape/geojsonparser/geojson/LngLatAlt.kt b/app/src/main/java/org/scottishtecharmy/soundscape/geojsonparser/geojson/LngLatAlt.kt
@@ -61,7 +61,7 @@ open class LngLatAlt(
 
         var shortestDistance = Double.MAX_VALUE
         var bestNearestPoint = LngLatAlt()
-        for(i in 1 until lineStringCoordinates.coordinates.size - 1) {
+        for(i in 1 until lineStringCoordinates.coordinates.size) {
             val nearestPointOnSegment = LngLatAlt()
             val distance = distanceToLine(
                 lineStringCoordinates.coordinates[i-1],