Android Auto: initial implementation

app/src/main/java/net/vonforst/evmap/api/Utils.kt

@@ -37,28 +37,4 @@ suspend fun Call.await(): Response {
             }
         }
     }
-}
-
-const val earthRadiusKm: Double = 6372.8
-
-/**
- * Calculates the distance between two points on Earth in meters.
- * Latitude and longitude should be given in degrees.
- */
-fun distanceBetween(
-    startLatitude: Double, startLongitude: Double,
-    endLatitude: Double, endLongitude: Double
-): Double {
-    // see https://rosettacode.org/wiki/Haversine_formula#Java
-    val dLat = Math.toRadians(endLatitude - startLatitude);
-    val dLon = Math.toRadians(endLongitude - startLongitude);
-    val originLat = Math.toRadians(startLatitude);
-    val destinationLat = Math.toRadians(endLatitude);
-
-    val a = Math.pow(Math.sin(dLat / 2), 2.toDouble()) + Math.pow(
-        Math.sin(dLon / 2),
-        2.toDouble()
-    ) * Math.cos(originLat) * Math.cos(destinationLat);
-    val c = 2 * Math.asin(Math.sqrt(a));
-    return earthRadiusKm * c * 1000;
 }

app/src/main/java/net/vonforst/evmap/api/availability/NewMotionAvailabilityDetector.kt

@@ -1,9 +1,9 @@
 package net.vonforst.evmap.api.availability
 
 import com.squareup.moshi.JsonClass
-import net.vonforst.evmap.api.distanceBetween
 import net.vonforst.evmap.api.goingelectric.ChargeLocation
 import net.vonforst.evmap.api.goingelectric.Chargepoint
+import net.vonforst.evmap.utils.distanceBetween
 import okhttp3.OkHttpClient
 import retrofit2.Retrofit
 import retrofit2.converter.moshi.MoshiConverterFactory

app/src/main/java/net/vonforst/evmap/api/goingelectric/GoingElectricApi.kt

@@ -16,7 +16,7 @@ import retrofit2.http.Query
 interface GoingElectricApi {
     @GET("chargepoints/")
     suspend fun getChargepoints(
-        @Query("sw_lat") swlat: Double, @Query("sw_lng") sw_lng: Double,
+        @Query("sw_lat") sw_lat: Double, @Query("sw_lng") sw_lng: Double,
         @Query("ne_lat") ne_lat: Double, @Query("ne_lng") ne_lng: Double,
         @Query("zoom") zoom: Float,
         @Query("clustering") clustering: Boolean = false,
@@ -34,6 +34,27 @@ interface GoingElectricApi {
         @Query("exclude_faults") excludeFaults: Boolean = false
     ): Response<ChargepointList>
 
+    @GET("chargepoints/")
+    suspend fun getChargepointsRadius(
+        @Query("lat") lat: Double, @Query("lng") lng: Double,
+        @Query("radius") radius: Int,
+        @Query("zoom") zoom: Float,
+        @Query("orderby") orderby: String = "distance",
+        @Query("clustering") clustering: Boolean = false,
+        @Query("cluster_distance") clusterDistance: Int? = null,
+        @Query("freecharging") freecharging: Boolean = false,
+        @Query("freeparking") freeparking: Boolean = false,
+        @Query("min_power") minPower: Int = 0,
+        @Query("plugs") plugs: String? = null,
+        @Query("chargecards") chargecards: String? = null,
+        @Query("networks") networks: String? = null,
+        @Query("categories") categories: String? = null,
+        @Query("startkey") startkey: Int? = null,
+        @Query("open_twentyfourseven") open247: Boolean = false,
+        @Query("barrierfree") barrierfree: Boolean = false,
+        @Query("exclude_faults") excludeFaults: Boolean = false
+    ): Response<ChargepointList>
+
     @GET("chargepoints/")
     fun getChargepointDetail(@Query("ge_id") id: Long): Call<ChargepointList>
 

app/src/main/java/net/vonforst/evmap/ui/MarkerUtils.kt

@@ -12,7 +12,7 @@ import kotlin.math.max
 
 fun getMarkerTint(
     charger: ChargeLocation,
-    connectors: Set<String>?
+    connectors: Set<String>? = null
 ): Int = when {
     charger.maxPower(connectors) >= 100 -> R.color.charger_100kw
     charger.maxPower(connectors) >= 43 -> R.color.charger_43kw

app/src/main/java/net/vonforst/evmap/utils/LocationUtils.kt

@@ -0,0 +1,34 @@
+package net.vonforst.evmap.utils
+
+import android.location.Location
+import kotlin.math.*
+
+/**
+ * Adds a certain distance in meters to a location. Approximate calculation.
+ */
+fun Location.plusMeters(dx: Double, dy: Double): Pair<Double, Double> {
+    val lat = this.latitude + (180 / Math.PI) * (dx / 6378137.0)
+    val lon = this.longitude + (180 / Math.PI) * (dy / 6378137.0) / cos(Math.toRadians(lat))
+    return Pair(lat, lon)
+}
+
+const val earthRadiusM = 6378137.0
+
+/**
+ * Calculates the distance between two points on Earth in meters.
+ * Latitude and longitude should be given in degrees.
+ */
+fun distanceBetween(
+    startLatitude: Double, startLongitude: Double,
+    endLatitude: Double, endLongitude: Double
+): Double {
+    // see https://rosettacode.org/wiki/Haversine_formula#Java
+    val dLat = Math.toRadians(endLatitude - startLatitude)
+    val dLon = Math.toRadians(endLongitude - startLongitude)
+    val originLat = Math.toRadians(startLatitude)
+    val destinationLat = Math.toRadians(endLatitude)
+
+    val a = sin(dLat / 2).pow(2.0) + sin(dLon / 2).pow(2.0) * cos(originLat) * cos(destinationLat)
+    val c = 2 * asin(sqrt(a))
+    return earthRadiusM * c
+}

app/src/main/java/net/vonforst/evmap/viewmodel/FavoritesViewModel.kt

@@ -10,10 +10,10 @@ import net.vonforst.evmap.adapter.Equatable
 import net.vonforst.evmap.api.availability.ChargeLocationStatus
 import net.vonforst.evmap.api.availability.ChargepointStatus
 import net.vonforst.evmap.api.availability.getAvailability
-import net.vonforst.evmap.api.distanceBetween
 import net.vonforst.evmap.api.goingelectric.ChargeLocation
 import net.vonforst.evmap.api.goingelectric.GoingElectricApi
 import net.vonforst.evmap.storage.AppDatabase
+import net.vonforst.evmap.utils.distanceBetween
 
 class FavoritesViewModel(application: Application, geApiKey: String) :
     AndroidViewModel(application) {

app/src/main/java/net/vonforst/evmap/viewmodel/MapViewModel.kt

@@ -9,10 +9,10 @@ import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.launch
 import net.vonforst.evmap.api.availability.ChargeLocationStatus
 import net.vonforst.evmap.api.availability.getAvailability
-import net.vonforst.evmap.api.distanceBetween
 import net.vonforst.evmap.api.goingelectric.*
 import net.vonforst.evmap.storage.*
 import net.vonforst.evmap.ui.cluster
+import net.vonforst.evmap.utils.distanceBetween
 import retrofit2.Call
 import retrofit2.Callback
 import retrofit2.Response