Differentiate 'to' and 'from' wind direction; arrow rotated by 'to'

davidtakac · May 26, 2024 · bd72da7 · bd72da7
1 parent adec818
commit bd72da7
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 13 deletions.
diff --git a/app/src/main/java/com/davidtakac/bura/summary/wind/WindSummary.kt b/app/src/main/java/com/davidtakac/bura/summary/wind/WindSummary.kt
@@ -78,7 +78,7 @@ fun WindSummary(state: WindSummary, modifier: Modifier = Modifier) {
                         contentDescription = null,
                         modifier = Modifier
                             .fillMaxSize()
-                            .rotate(state.windNow.direction.degrees.toFloat())
+                            .rotate(state.windNow.to.degrees.toFloat())
                     )
                 }
             )
@@ -107,7 +107,7 @@ private fun WindSummaryPreview() {
                 state = WindSummary(
                     windNow = Wind(
                         speed = WindSpeed.fromMetersPerSecond(9.0),
-                        direction = WindDirection(76.0)
+                        from = WindDirection(76.0)
                     ),
                     gustNow = WindSpeed.fromMetersPerSecond(20.0)
                 ),

diff --git a/app/src/main/java/com/davidtakac/bura/wind/Wind.kt b/app/src/main/java/com/davidtakac/bura/wind/Wind.kt
@@ -16,12 +16,14 @@ import java.util.Objects
 
 class Wind(
     val speed: WindSpeed,
-    val direction: WindDirection
+    val from: WindDirection
 ) {
+    val to: WindDirection = WindDirection(degrees = from.degrees + 180)
+
     override fun equals(other: Any?): Boolean =
-        other is Wind && other.speed == speed && other.direction == direction
+        other is Wind && other.speed == speed && other.from == from
 
-    override fun hashCode(): Int = Objects.hash(speed, direction)
+    override fun hashCode(): Int = Objects.hash(speed, from)
 
-    override fun toString(): String = "$speed, $direction"
+    override fun toString(): String = "$speed from $from"
 }
diff --git a/app/src/main/java/com/davidtakac/bura/wind/WindDirection.kt b/app/src/main/java/com/davidtakac/bura/wind/WindDirection.kt
@@ -13,14 +13,11 @@
 package com.davidtakac.bura.wind
 
 import java.util.Objects
+import kotlin.math.ceil
 
-class WindDirection(val degrees: Double) {
-    val compass: Compass
-
-    init {
-        val index = (degrees / 22.5 + 0.5).toInt() % 16
-        compass = Compass.values()[index]
-    }
+class WindDirection(degrees: Double) {
+    val degrees: Double = degrees + ceil(-degrees / 360) * 360
+    val compass: Compass = Compass.entries[(degrees / 22.5 + 0.5).toInt() % 16]
 
     enum class Compass {
         N, NNE, NE, ENE,

diff --git a/app/src/test/java/com/davidtakac/bura/WindDirectionTest.kt b/app/src/test/java/com/davidtakac/bura/WindDirectionTest.kt
@@ -25,6 +25,14 @@ class WindDirectionTest {
         assertEquals(WindDirection.Compass.NNW, WindDirection(338.0).compass)
     }
 
+    @Test
+    fun `normalizes degrees to 0-359`() {
+        assertEquals(WindDirection(30.0), WindDirection(350.0 + 40.0))
+        assertEquals(WindDirection(0.0), WindDirection(360.0))
+        assertEquals(WindDirection(1.0), WindDirection(361.0))
+        assertEquals(WindDirection(359.0), WindDirection(359.0))
+    }
+
     @Test
     fun equals() {
         assertEquals(WindDirection(0.0), WindDirection(0.0))