Switch to server-generated icons

teambtcmap · Nov 1, 2022 · e446af1 · e446af1
1 parent 28cedbc
commit e446af1
Show file tree

Hide file tree

Showing 8 changed files with 21 additions and 497 deletions.
diff --git a/app/src/main/kotlin/area/AreaFragment.kt b/app/src/main/kotlin/area/AreaFragment.kt
@@ -150,7 +150,7 @@ class AreaFragment : Fragment() {
 
                     AreaAdapter.Item.Element(
                         id = it.id,
-                        iconId = it.icon_id,
+                        iconId = it.icon_id ?: "question_mark",
                         name = tags["name"]?.jsonPrimitive?.content
                             ?: getString(R.string.unnamed_place),
                         status = status,

diff --git a/app/src/main/kotlin/db/Db.kt b/app/src/main/kotlin/db/Db.kt
@@ -14,7 +14,7 @@ fun database(context: Context): Database {
     val driver = AndroidSqliteDriver(
         schema = Database.Schema,
         context = context,
-        name = "btcmap-v24.db",
+        name = "btcmap-v25.db",
         factory = RequerySQLiteOpenHelperFactory(),
     )
 
@@ -48,6 +48,12 @@ private fun elementAdapter(): Element.Adapter {
 
             override fun encode(value: JsonObject) = value.toString()
         },
+        tagsAdapter = object : ColumnAdapter<JsonObject, String> {
+            override fun decode(databaseValue: String): JsonObject =
+                Json.decodeFromString(databaseValue)
+
+            override fun encode(value: JsonObject) = value.toString()
+        },
     )
 }
 

diff --git a/app/src/main/kotlin/element/ElementFragment.kt b/app/src/main/kotlin/element/ElementFragment.kt
@@ -99,7 +99,9 @@ class ElementFragment : Fragment() {
                 val markersRepo = MapMarkersRepo(requireContext(), confRepo)
                 val marker = Marker(binding.map)
                 marker.position = GeoPoint(element.lat, element.lon)
-                marker.icon = markersRepo.getMarker(element.icon_id)
+                marker.icon = markersRepo.getMarker(
+                    element.tags["icon:android"]?.jsonPrimitive?.content ?: "question_mark"
+                )
                 binding.map.overlays.add(marker)
             }
         }

diff --git a/app/src/main/kotlin/elements/ElementsRepo.kt b/app/src/main/kotlin/elements/ElementsRepo.kt
@@ -4,7 +4,6 @@ import android.content.Context
 import app.cash.sqldelight.coroutines.*
 import db.*
 import http.await
-import icons.iconId
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.GlobalScope
 import kotlinx.coroutines.flow.first
@@ -190,8 +189,8 @@ class ElementsRepo(
                                 id = it.id,
                                 lat = latLon.first,
                                 lon = latLon.second,
-                                icon_id = it.osm_json["tags"]?.jsonObject?.iconId() ?: "",
                                 osm_json = it.osm_json,
+                                tags = it.tags,
                                 created_at = it.created_at,
                                 updated_at = it.updated_at,
                                 deleted_at = it.deleted_at,
@@ -242,8 +241,8 @@ class ElementsRepo(
                         id = it.id,
                         lat = latLon.first,
                         lon = latLon.second,
-                        icon_id = it.osm_json["tags"]?.jsonObject?.iconId() ?: "",
                         osm_json = it.osm_json,
+                        tags = it.tags,
                         created_at = it.created_at,
                         updated_at = it.updated_at,
                         deleted_at = it.deleted_at,
@@ -286,6 +285,7 @@ class ElementsRepo(
     private data class ElementJson(
         val id: String,
         val osm_json: JsonObject,
+        val tags: JsonObject,
         val created_at: String,
         val updated_at: String,
         val deleted_at: String,