fix: hardcoded query unix time format

Please note that the `Query.TimeFormat` still exists to let the underlying `toMap` method append the parameter only if the query is a `TimeFormat` one.
open-meteo · Jun 4, 2023 · a7709c0 · a7709c0
1 parent 25e1fd8
commit a7709c0
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 30 deletions.
diff --git a/lib/src/main/kotlin/com/openmeteo/api/common/query/Query.kt b/lib/src/main/kotlin/com/openmeteo/api/common/query/Query.kt
@@ -1,7 +1,6 @@
 package com.openmeteo.api.common.query
 
 import com.openmeteo.api.common.time.Date
-import com.openmeteo.api.common.time.TimeFormat.UnixTime
 import kotlinx.serialization.ExperimentalSerializationApi
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.properties.Properties
@@ -21,6 +20,13 @@ interface Query {
         inline fun <reified T : Query> toMap(query: T) =
             Properties.encodeToStringMap(query)
                 .filter { (k) -> k != "type" }
+                .let {
+                    // if resource has timestamps
+                    if (query is TimeFormat)
+                        // always force unix timestamps
+                        it.plus("timeformat" to "unixtime")
+                    else it
+                }
 
         /**
          * Like `.toMap().toList()`
@@ -60,16 +66,10 @@ interface Query {
 
     /**
      * Query for resources that have (formatted) time fields.
+     *
+     * Used internally to hardcode Unix timestamps.
      */
-    interface TimeFormat : Query {
-        /**
-         * The time format that should be used in the response.
-         *
-         * Hardcoded to unix time, since it is easier to parse.
-         */
-        @SerialName("timeformat")
-        val timeFormat get() = UnixTime
-    }
+    interface TimeFormat : Query
 
     /**
      * Query for resources that have daily fields.

diff --git a/lib/src/main/kotlin/com/openmeteo/api/common/time/TimeFormat.kt b/lib/src/main/kotlin/com/openmeteo/api/common/time/TimeFormat.kt
diff --git a/lib/src/main/kotlin/com/openmeteo/api/common/units/Unit.kt b/lib/src/main/kotlin/com/openmeteo/api/common/units/Unit.kt
@@ -1,6 +1,5 @@
 package com.openmeteo.api.common.units
 
-import com.openmeteo.api.common.time.TimeFormat
 import kotlinx.serialization.Contextual
 import kotlinx.serialization.SerialName
 import kotlinx.serialization.Serializable
@@ -9,7 +8,7 @@ import kotlinx.serialization.Serializable
 enum class Unit(vararg val alias: @Contextual Any) {
     Unknown,
     @SerialName("unixtime")
-    UnixTime(TimeFormat.UnixTime),
+    UnixTime,
     @SerialName("")
     Dimensionless,
     @SerialName("wmo code")