Fix distanceToLineString in CheapRuler to avoid lint warnings

davecraig · davecraig · commit d1498cdfe3c9 · 2025-05-28T09:27:28.000+01:00
distanceToLineString wasn't using values it had already saved which was
throwing up a lint warning. Fixing it should make the code even more
efficient.
diff --git a/app/src/main/java/org/scottishtecharmy/soundscape/geoengine/utils/rulers/CheapRuler.kt b/app/src/main/java/org/scottishtecharmy/soundscape/geoengine/utils/rulers/CheapRuler.kt
@@ -320,10 +320,9 @@ class CheapRuler(val lat: Double) : Ruler() {
             }
         }
 
-        val nearestPoint = cheapInterpolate(line.coordinates[minI], line.coordinates[minI+1], max(0.0, min(1.0, minT)))
         return PointAndDistanceAndHeading(
-            nearestPoint,
-            this.distance(p, nearestPoint),
+            LngLatAlt(minX, minY),
+            sqrt(minDist),
             bearingFromTwoPoints(line.coordinates[minI], line.coordinates[minI + 1]),
             minI,
             minI.toDouble() + max(0.0, min(1.0, minT))

Original file line number	Diff line number	Diff line change
`@@ -320,10 +320,9 @@ class CheapRuler(val lat: Double) : Ruler() {`
`320`	`320`	`}`
`321`	`321`	`}`
`322`	`322`
`323`		`- val nearestPoint = cheapInterpolate(line.coordinates[minI], line.coordinates[minI+1], max(0.0, min(1.0, minT)))`
`324`	`323`	`return PointAndDistanceAndHeading(`
`325`		`- nearestPoint,`
`326`		`- this.distance(p, nearestPoint),`
	`324`	`+ LngLatAlt(minX, minY),`
	`325`	`+ sqrt(minDist),`
`327`	`326`	`bearingFromTwoPoints(line.coordinates[minI], line.coordinates[minI + 1]),`
`328`	`327`	`minI,`
`329`	`328`	`minI.toDouble() + max(0.0, min(1.0, minT))`