feat: scoped query and invoke single call

Cleans implementation code: ```kotlin Forecast(City.Amsterdam) { hourly = Forecast.Hourly { listOf( temperature2m, precipitation ) } currentWeather = true }.getOrThrow().run { println(currentWeather!!.weatherCode.message) } ```
open-meteo · Jun 11, 2023 · 6d4e943 · 6d4e943
1 parent 2d50ed8
commit 6d4e943
Show file tree

Hide file tree

Showing 9 changed files with 143 additions and 0 deletions.
diff --git a/lib/src/main/kotlin/com/openmeteo/api/AirQuality.kt b/lib/src/main/kotlin/com/openmeteo/api/AirQuality.kt
@@ -2,6 +2,7 @@ package com.openmeteo.api
 
 import com.openmeteo.api.common.Options
 import com.openmeteo.api.common.http.Endpoint
+import com.openmeteo.api.common.query.City
 import com.openmeteo.api.common.time.Date
 import com.openmeteo.api.common.time.Timezone
 import com.openmeteo.api.common.units.Units
@@ -18,6 +19,22 @@ object AirQuality : Endpoint(
     operator fun invoke(query: Query, context: URL = this.context) =
         query<Response, Query>(query, context)
 
+    operator fun invoke(
+        city: City,
+        context: URL = this.context,
+        query: Query.() -> Unit,
+    ) = this(city.latitude, city.longitude, context, query)
+
+    operator fun invoke(
+        latitude: Float,
+        longitude: Float,
+        context: URL = this.context,
+        query: Query.() -> Unit,
+    ) = Query(latitude, longitude).let {
+        it.query()
+        this(it, context)
+    }
+
     @Serializable
     open class Query(
         override var latitude: Float,

diff --git a/lib/src/main/kotlin/com/openmeteo/api/ClimateChange.kt b/lib/src/main/kotlin/com/openmeteo/api/ClimateChange.kt
@@ -3,6 +3,7 @@ package com.openmeteo.api
 import com.openmeteo.api.common.CellSelection
 import com.openmeteo.api.common.Options
 import com.openmeteo.api.common.http.Endpoint
+import com.openmeteo.api.common.query.City
 import com.openmeteo.api.common.time.Date
 import com.openmeteo.api.common.time.Timezone
 import com.openmeteo.api.common.units.PrecipitationUnit
@@ -22,6 +23,28 @@ object ClimateChange : Endpoint(
     operator fun invoke(query: Query, context: URL = this.context) =
         query<Response, Query>(query, context)
 
+    operator fun invoke(
+        city: City,
+        models: String,
+        startDate: Date,
+        endDate: Date,
+        context: URL = this.context,
+        query: Query.() -> Unit,
+    ) = this(city.latitude, city.longitude, models, startDate, endDate, context, query)
+
+    operator fun invoke(
+        latitude: Float,
+        longitude: Float,
+        models: String,
+        startDate: Date,
+        endDate: Date,
+        context: URL = this.context,
+        query: Query.() -> Unit,
+    ) = Query(latitude, longitude, models, startDate, endDate).let {
+        it.query()
+        this(it, context)
+    }
+
     @Serializable
     open class Query(
         override var latitude: Float,

diff --git a/lib/src/main/kotlin/com/openmeteo/api/Ensemble.kt b/lib/src/main/kotlin/com/openmeteo/api/Ensemble.kt
@@ -3,6 +3,7 @@ package com.openmeteo.api
 import com.openmeteo.api.common.CellSelection
 import com.openmeteo.api.common.Options
 import com.openmeteo.api.common.http.Endpoint
+import com.openmeteo.api.common.query.City
 import com.openmeteo.api.common.time.Date
 import com.openmeteo.api.common.time.Timezone
 import com.openmeteo.api.common.units.PrecipitationUnit
@@ -22,6 +23,22 @@ object Ensemble : Endpoint(
     operator fun invoke(query: Query, context: URL = this.context) =
         query<Response, Query>(query, context)
 
+    operator fun invoke(
+        city: City,
+        context: URL = this.context,
+        query: Query.() -> Unit,
+    ) = this(city.latitude, city.longitude, context, query)
+
+    operator fun invoke(
+        latitude: Float,
+        longitude: Float,
+        context: URL = this.context,
+        query: Query.() -> Unit,
+    ) = Query(latitude, longitude).let {
+        it.query()
+        this(it, context)
+    }
+
     @Serializable
     open class Query(
         override var latitude: Float,

diff --git a/lib/src/main/kotlin/com/openmeteo/api/Flood.kt b/lib/src/main/kotlin/com/openmeteo/api/Flood.kt
@@ -3,6 +3,7 @@ package com.openmeteo.api
 import com.openmeteo.api.common.CellSelection
 import com.openmeteo.api.common.Options
 import com.openmeteo.api.common.http.Endpoint
+import com.openmeteo.api.common.query.City
 import com.openmeteo.api.common.time.Date
 import com.openmeteo.api.common.time.Timezone
 import com.openmeteo.api.common.units.Units
@@ -19,6 +20,22 @@ object Flood : Endpoint(
     operator fun invoke(query: Query, context: URL = this.context) =
         query<Response, Query>(query, context)
 
+    operator fun invoke(
+        city: City,
+        context: URL = this.context,
+        query: Query.() -> Unit,
+    ) = this(city.latitude, city.longitude, context, query)
+
+    operator fun invoke(
+        latitude: Float,
+        longitude: Float,
+        context: URL = this.context,
+        query: Query.() -> Unit,
+    ) = Query(latitude, longitude).let {
+        it.query()
+        this(it, context)
+    }
+
     @Serializable
     open class Query(
         override var latitude: Float,

diff --git a/lib/src/main/kotlin/com/openmeteo/api/Forecast.kt b/lib/src/main/kotlin/com/openmeteo/api/Forecast.kt
@@ -4,6 +4,7 @@ import com.openmeteo.api.common.CellSelection
 import com.openmeteo.api.common.CurrentWeather
 import com.openmeteo.api.common.Options
 import com.openmeteo.api.common.http.Endpoint
+import com.openmeteo.api.common.query.City
 import com.openmeteo.api.common.time.Date
 import com.openmeteo.api.common.time.Timezone
 import com.openmeteo.api.common.units.PrecipitationUnit
@@ -23,6 +24,22 @@ object Forecast : Endpoint(
     operator fun invoke(query: Query, context: URL = this.context) =
         query<Response, Query>(query, context)
 
+    operator fun invoke(
+        city: City,
+        context: URL = this.context,
+        query: Query.() -> Unit,
+    ) = this(city.latitude, city.longitude, context, query)
+
+    operator fun invoke(
+        latitude: Float,
+        longitude: Float,
+        context: URL = this.context,
+        query: Query.() -> Unit,
+    ) = Query(latitude, longitude).let {
+        it.query()
+        this(it, context)
+    }
+
     @Serializable
     open class Query(
         override var latitude: Float,

diff --git a/lib/src/main/kotlin/com/openmeteo/api/GeocodingGet.kt b/lib/src/main/kotlin/com/openmeteo/api/GeocodingGet.kt
@@ -15,6 +15,15 @@ object GeocodingGet : Endpoint(
     operator fun invoke(query: Query, context: URL = this.context) =
         query<Response, Query>(query, context)
 
+    operator fun invoke(
+        id: Int,
+        context: URL = this.context,
+        query: Query.() -> Unit,
+    ) = Query(id).let {
+        it.query()
+        this(it, context)
+    }
+
     @Serializable
     open class Query(
         var id: Int,

diff --git a/lib/src/main/kotlin/com/openmeteo/api/GeocodingSearch.kt b/lib/src/main/kotlin/com/openmeteo/api/GeocodingSearch.kt
@@ -14,6 +14,15 @@ object GeocodingSearch : Endpoint(
     operator fun invoke(query: Query, context: URL = this.context) =
         query<Response, Query>(query, context)
 
+    operator fun invoke(
+        name: String,
+        context: URL = this.context,
+        query: Query.() -> Unit,
+    ) = Query(name).let {
+        it.query()
+        this(it, context)
+    }
+
     @Serializable
     open class Query(
         var name: String,

diff --git a/lib/src/main/kotlin/com/openmeteo/api/Historical.kt b/lib/src/main/kotlin/com/openmeteo/api/Historical.kt
@@ -4,6 +4,7 @@ import com.openmeteo.api.common.CellSelection
 import com.openmeteo.api.common.CurrentWeather
 import com.openmeteo.api.common.Options
 import com.openmeteo.api.common.http.Endpoint
+import com.openmeteo.api.common.query.City
 import com.openmeteo.api.common.time.Date
 import com.openmeteo.api.common.time.Timezone
 import com.openmeteo.api.common.units.PrecipitationUnit
@@ -23,6 +24,22 @@ object Historical : Endpoint(
     operator fun invoke(query: Query, context: URL = this.context) =
         query<Response, Query>(query, context)
 
+    operator fun invoke(
+        city: City,
+        context: URL = this.context,
+        query: Query.() -> Unit,
+    ) = this(city.latitude, city.longitude, context, query)
+
+    operator fun invoke(
+        latitude: Float,
+        longitude: Float,
+        context: URL = this.context,
+        query: Query.() -> Unit,
+    ) = Query(latitude, longitude).let {
+        it.query()
+        this(it, context)
+    }
+
     @Serializable
     open class Query(
         override var latitude: Float,

diff --git a/lib/src/main/kotlin/com/openmeteo/api/Marine.kt b/lib/src/main/kotlin/com/openmeteo/api/Marine.kt
@@ -3,6 +3,7 @@ package com.openmeteo.api
 import com.openmeteo.api.common.CellSelection
 import com.openmeteo.api.common.Options
 import com.openmeteo.api.common.http.Endpoint
+import com.openmeteo.api.common.query.City
 import com.openmeteo.api.common.time.Date
 import com.openmeteo.api.common.time.Timezone
 import com.openmeteo.api.common.units.LengthUnit
@@ -20,6 +21,22 @@ object Marine : Endpoint(
     operator fun invoke(query: Query, context: URL = this.context) =
         query<Response, Query>(query, context)
 
+    operator fun invoke(
+        city: City,
+        context: URL = this.context,
+        query: Query.() -> Unit,
+    ) = this(city.latitude, city.longitude, context, query)
+
+    operator fun invoke(
+        latitude: Float,
+        longitude: Float,
+        context: URL = this.context,
+        query: Query.() -> Unit,
+    ) = Query(latitude, longitude).let {
+        it.query()
+        this(it, context)
+    }
+
     @Serializable
     open class Query(
         override var latitude: Float,