Update release notes

README.md

@@ -34,7 +34,7 @@ After installing this app on your Karoo and opening it once from the main menu,
 The app can use OpenMeteo or OpenWeatherMap as providers for live weather data.
 
 - OpenMeteo is the default provider and does not require any configuration. Wind speed will be reported in km/h if your karoo is set to metric units or mph if set to imperial.
-- OpenWeatherMap can provide more accurate data for some locations. Forecasts along the loaded route are not available using OpenWeatherMap. OpenWeatherMap is free for personal use, but you need to register at https://openweathermap.org/home/sign_in and obtain a one call API key (e. g. by subscribing to "One Call API 3.0" from the [pricing page](https://openweathermap.org/price)). You can enter your API key in the app settings. Please note that it can take a few hours before OpenWeatherMap enables the key. You can check if your key is enabled by entering it in the app settings and pressing "Test API Key". Wind speed will be reported in meters per second if your Karoo is set to metric units and miles per hour if set to imperial.
+- OpenWeatherMap can provide more accurate data for some locations. Forecasts along the loaded route are not available using OpenWeatherMap. OpenWeatherMap is free for personal use, but you need to register at https://openweathermap.org/home/sign_in and obtain a one call API key (e. g. by subscribing to "One Call API 3.0" from the [pricing page](https://openweathermap.org/price)). You can enter your API key in the app settings. Please note that it can take a few hours before OpenWeatherMap enables the key. You can check if your key is enabled by entering it in the app settings and pressing "Test API Key". Wind speed will be reported in km/h if your Karoo is set to metric units and miles per hour if set to imperial.
 
 The app will automatically attempt to download weather data from the selected data provider once your device has acquired a GPS fix. Your location is rounded to approximately three kilometers to maintain privacy.
 New weather data is downloaded when you ride more than three kilometers from the location where the weather data was downloaded for or after one hour at the latest.
@@ -57,4 +57,4 @@ has not been set up. Otherwise, the value is the headwind direction in degrees.
 - The `windDirection` datatype contains a single field with the *absolute* wind direction in degrees (so 0 = North, 90 = East etc.)
 - The `headwindSpeed` datatype contains a single field that contains the *relative*  headwind speed in meters per second.
 - The `windSpeed` datatype contains a single field that contains the *absolute* wind speed in meters per second.
-- Other datatypes like `windGusts` etc. are also available, see [extension_info.xml](https://github.com/timklge/karoo-headwind/blob/master/app/src/main/res/xml/extension_info.xml)
+- Other datatypes like `windGusts` etc. are also available, see [extension_info.xml](https://github.com/timklge/karoo-headwind/blob/master/app/src/main/res/xml/extension_info.xml)

app/build.gradle.kts

@@ -72,7 +72,7 @@ tasks.register("generateManifest") {
             "latestVersionCode" to android.defaultConfig.versionCode,
             "developer" to "github.com/timklge",
             "description" to "Open-source extension that provides headwind direction, wind speed, forecast and other weather data fields.",
-            "releaseNotes" to "* Add UV-index datafield (thx @saversux!)\n* Readd a datafield that shows headwind direction and absolute wind speed datafield\n* Split wind forecast field into wind and headwind forecast fields",
+            "releaseNotes" to "* Fix unit of plain wind gust / speed datafield\n* Fix headwind forecast preview\n* Add UV-index datafield (thx @saversux!)\n* Readd a datafield that shows headwind direction and absolute wind speed datafield",
             "screenshotUrls" to listOf(
                 "$baseUrl/preview1.png",
                 "$baseUrl/preview3.png",

app/src/main/kotlin/de/timklge/karooheadwind/datatypes/HeadwindForecastDataType.kt

@@ -55,68 +55,69 @@ class HeadwindForecastDataType(karooSystem: KarooSystemService) : LineGraphForec
         }
 
         val headwindPoints = try {
-            if (upcomingRoute != null){
+            (0..<HEADWIND_SAMPLE_COUNT).mapNotNull { i ->
-                (0..<HEADWIND_SAMPLE_COUNT).mapNotNull { i ->
+                val t = i / HEADWIND_SAMPLE_COUNT.toDouble()
-                    val t = i / HEADWIND_SAMPLE_COUNT.toDouble()
 
-                    if (isPreview) {
+                if (isPreview) {
-                        // Use a sine wave for headwind preview speed
+                    // Use a sine wave for headwind preview speed
-                        val headwindSpeed = 10f * kotlin.math.sin(i * Math.PI * 2 / HEADWIND_SAMPLE_COUNT).toFloat()
+                    val headwindSpeed = 10f * kotlin.math.sin(i * Math.PI * 2 / HEADWIND_SAMPLE_COUNT).toFloat()
 
-                        return@mapNotNull LineGraphBuilder.DataPoint(x = i.toFloat() * (windPoints.size / HEADWIND_SAMPLE_COUNT.toFloat()),
+                    return@mapNotNull LineGraphBuilder.DataPoint(x = i.toFloat() * (windPoints.size / HEADWIND_SAMPLE_COUNT.toFloat()),
-                            y = headwindSpeed)
+                        y = headwindSpeed)
-                    }
-
-                    val beforeLineData = lineData.getOrNull(floor((lineData.size) * t).toInt().coerceAtLeast(0)) ?: lineData.firstOrNull()
-                    val afterLineData = lineData.getOrNull(ceil((lineData.size) * t).toInt().coerceAtLeast(0)) ?: lineData.lastOrNull()
-
-                    if (beforeLineData?.weatherData == null || afterLineData?.weatherData == null || beforeLineData.distance == null
-                        || afterLineData.distance == null || beforeLineData == afterLineData) return@mapNotNull null
-
-                    val dt = remap(t.toFloat(),
-                        floor(lineData.size * t).toFloat() / lineData.size,
-                        ceil(lineData.size * t).toFloat() / lineData.size,
-                        0.0f, 1.0f
-                    ).toDouble()
-                    val interpolatedWeather = lerpWeather(beforeLineData.weatherData, afterLineData.weatherData, dt)
-                    val beforeDistanceAlongRoute = beforeLineData.distance
-                    val afterDistanceAlongRoute = afterLineData.distance
-                    val distanceAlongRoute = (beforeDistanceAlongRoute + (afterDistanceAlongRoute - beforeDistanceAlongRoute) * dt).coerceIn(0.0, upcomingRoute.routeLength)
-                    val coordsAlongRoute = try {
-                        TurfMeasurement.along(upcomingRoute.routePolyline, distanceAlongRoute, TurfConstants.UNIT_METERS)
-                    } catch(e: Exception) {
-                        Log.e(KarooHeadwindExtension.TAG, "Error getting coordinates along route", e)
-                        return@mapNotNull null
-                    }
-                    val nextCoordsAlongRoute = try {
-                        TurfMeasurement.along(upcomingRoute.routePolyline, distanceAlongRoute + 5, TurfConstants.UNIT_METERS)
-                    } catch(e: Exception) {
-                        Log.e(KarooHeadwindExtension.TAG, "Error getting next coordinates along route", e)
-                        return@mapNotNull null
-                    }
-                    val bearingAlongRoute = try {
-                        TurfMeasurement.bearing(coordsAlongRoute, nextCoordsAlongRoute)
-                    } catch(e: Exception) {
-                        Log.e(KarooHeadwindExtension.TAG, "Error calculating bearing along route", e)
-                        return@mapNotNull null
-                    }
-                    val windBearing = interpolatedWeather.windDirection + 180
-                    val diff = signedAngleDifference(bearingAlongRoute, windBearing)
-                    val headwindSpeed = cos( (diff + 180) * Math.PI / 180.0) * interpolatedWeather.windSpeed
-
-                    val headwindSpeedInUserUnit = if (isImperial) {
-                        headwindSpeed * 2.23694 // Convert m/s to mph
-                    } else {
-                        headwindSpeed * 3.6 // Convert m/s to km/h
-                    }
-
-                    LineGraphBuilder.DataPoint(
-                        x = i.toFloat() * (windPoints.size / HEADWIND_SAMPLE_COUNT.toFloat()),
-                        y = headwindSpeedInUserUnit.toFloat()
-                    )
                 }
-            } else {
+
-                emptyList()
+                if (upcomingRoute == null) {
+                    Log.e(KarooHeadwindExtension.TAG, "Upcoming route is null")
+                    return@mapNotNull null
+                }
+
+                val beforeLineData = lineData.getOrNull(floor((lineData.size) * t).toInt().coerceAtLeast(0)) ?: lineData.firstOrNull()
+                val afterLineData = lineData.getOrNull(ceil((lineData.size) * t).toInt().coerceAtLeast(0)) ?: lineData.lastOrNull()
+
+                if (beforeLineData?.weatherData == null || afterLineData?.weatherData == null || beforeLineData.distance == null
+                    || afterLineData.distance == null || beforeLineData == afterLineData) return@mapNotNull null
+
+                val dt = remap(t.toFloat(),
+                    floor(lineData.size * t).toFloat() / lineData.size,
+                    ceil(lineData.size * t).toFloat() / lineData.size,
+                    0.0f, 1.0f
+                ).toDouble()
+                val interpolatedWeather = lerpWeather(beforeLineData.weatherData, afterLineData.weatherData, dt)
+                val beforeDistanceAlongRoute = beforeLineData.distance
+                val afterDistanceAlongRoute = afterLineData.distance
+                val distanceAlongRoute = (beforeDistanceAlongRoute + (afterDistanceAlongRoute - beforeDistanceAlongRoute) * dt).coerceIn(0.0, upcomingRoute.routeLength)
+                val coordsAlongRoute = try {
+                    TurfMeasurement.along(upcomingRoute.routePolyline, distanceAlongRoute, TurfConstants.UNIT_METERS)
+                } catch(e: Exception) {
+                    Log.e(KarooHeadwindExtension.TAG, "Error getting coordinates along route", e)
+                    return@mapNotNull null
+                }
+                val nextCoordsAlongRoute = try {
+                    TurfMeasurement.along(upcomingRoute.routePolyline, distanceAlongRoute + 5, TurfConstants.UNIT_METERS)
+                } catch(e: Exception) {
+                    Log.e(KarooHeadwindExtension.TAG, "Error getting next coordinates along route", e)
+                    return@mapNotNull null
+                }
+                val bearingAlongRoute = try {
+                    TurfMeasurement.bearing(coordsAlongRoute, nextCoordsAlongRoute)
+                } catch(e: Exception) {
+                    Log.e(KarooHeadwindExtension.TAG, "Error calculating bearing along route", e)
+                    return@mapNotNull null
+                }
+                val windBearing = interpolatedWeather.windDirection + 180
+                val diff = signedAngleDifference(bearingAlongRoute, windBearing)
+                val headwindSpeed = cos( (diff + 180) * Math.PI / 180.0) * interpolatedWeather.windSpeed
+
+                val headwindSpeedInUserUnit = if (isImperial) {
+                    headwindSpeed * 2.23694 // Convert m/s to mph
+                } else {
+                    headwindSpeed * 3.6 // Convert m/s to km/h
+                }
+
+                LineGraphBuilder.DataPoint(
+                    x = i.toFloat() * (windPoints.size / HEADWIND_SAMPLE_COUNT.toFloat()),
+                    y = headwindSpeedInUserUnit.toFloat()
+                )
             }
         } catch(e: Exception) {
             Log.e(KarooHeadwindExtension.TAG, "Error calculating headwind points", e)

app/src/main/kotlin/de/timklge/karooheadwind/datatypes/WindGustsDataType.kt

@@ -3,10 +3,15 @@ package de.timklge.karooheadwind.datatypes
 import android.content.Context
 import de.timklge.karooheadwind.weatherprovider.WeatherData
 import io.hammerhead.karooext.KarooSystemService
+import io.hammerhead.karooext.models.DataType
 import io.hammerhead.karooext.models.UserProfile
 
 class WindGustsDataType(karooSystemService: KarooSystemService, context: Context) : BaseDataType(karooSystemService, context, "windGusts"){
     override fun getValue(data: WeatherData, userProfile: UserProfile): Double {
         return data.windGusts
     }
+
+    override fun getFormatDataType(): String {
+        return DataType.Type.SPEED
+    }
 }

app/src/main/kotlin/de/timklge/karooheadwind/datatypes/WindSpeedDataType.kt

@@ -3,10 +3,15 @@ package de.timklge.karooheadwind.datatypes
 import android.content.Context
 import de.timklge.karooheadwind.weatherprovider.WeatherData
 import io.hammerhead.karooext.KarooSystemService
+import io.hammerhead.karooext.models.DataType
 import io.hammerhead.karooext.models.UserProfile
 
 class WindSpeedDataType(karooSystemService: KarooSystemService, context: Context) : BaseDataType(karooSystemService, context, "windSpeed"){
     override fun getValue(data: WeatherData, userProfile: UserProfile): Double {
         return data.windSpeed
     }
+
+    override fun getFormatDataType(): String {
+        return DataType.Type.SPEED
+    }
 }