add total count in OSMDocument

ev-map/evmap-osm@5d7b07b
ev-map · Sep 23, 2023 · ea35455 · ea35455
1 parent bfed74e
commit ea35455
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/app/src/main/java/net/vonforst/evmap/api/openstreetmap/OpenStreetMapAdapters.kt b/app/src/main/java/net/vonforst/evmap/api/openstreetmap/OpenStreetMapAdapters.kt
@@ -1,9 +1,7 @@
 package net.vonforst.evmap.api.openstreetmap
 
 import com.squareup.moshi.FromJson
-import com.squareup.moshi.JsonAdapter
 import com.squareup.moshi.JsonReader
-import com.squareup.moshi.JsonWriter
 import com.squareup.moshi.Moshi
 import com.squareup.moshi.ToJson
 import com.squareup.moshi.rawType
@@ -38,15 +36,18 @@ internal class OSMConverterFactory(val moshi: Moshi) : Converter.Factory() {
 
         val instantAdapter = moshi.adapter(Instant::class.java)
         val osmChargingStationAdapter = moshi.adapter(OSMChargingStation::class.java)
+        val longAdapter = moshi.adapter(Long::class.java)
         return Converter<ResponseBody, OSMDocument> { body ->
             val reader = JsonReader.of(body.source())
             reader.beginObject()
 
             var timestamp: Instant? = null
             var doc: Sequence<OSMChargingStation>? = null
+            var count: Long? = null
             while (reader.hasNext()) {
                 when (reader.nextName()) {
                     "timestamp" -> timestamp = instantAdapter.fromJson(reader)!!
+                    "count" -> count = longAdapter.fromJson(reader)!!
                     "elements" -> {
                         doc = sequence {
                             reader.beginArray()
@@ -60,7 +61,7 @@ internal class OSMConverterFactory(val moshi: Moshi) : Converter.Factory() {
                     }
                 }
             }
-            OSMDocument(timestamp!!, doc!!)
+            OSMDocument(timestamp!!, count!!, doc!!)
         }
     }
 }
diff --git a/app/src/main/java/net/vonforst/evmap/api/openstreetmap/OpenStreetMapModel.kt b/app/src/main/java/net/vonforst/evmap/api/openstreetmap/OpenStreetMapModel.kt
@@ -62,6 +62,7 @@ private val SOCKET_TYPES = immutableListOf(
 
 data class OSMDocument(
     val timestamp: Instant,
+    val count: Long,
     val elements: Sequence<OSMChargingStation>
 )