mirror/EVMap
1
0
Fork 0
mirror of https://github.com/ev-map/EVMap.git synced 2025-12-23 23:27:46 -05:00
Code Issues Packages Projects Releases Wiki Activity

fix #390

Browse Source
This commit is contained in:
johan12345
2025-09-21 22:23:21 +02:00
parent 4ed046df7a
commit 2c35df6360
2 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
app/src/main/java/net/vonforst/evmap/storage/ChargeLocationsDao.kt
View File

@@ -69,8 +69,11 @@ abstract class ChargeLocationsDao {
@Query("DELETE FROM chargelocation WHERE NOT EXISTS (SELECT 1 FROM favorite WHERE favorite.chargerId = chargelocation.id)")
abstract suspend fun deleteAllIfNotFavorite()
@Query("DELETE FROM chargelocation WHERE dataSource == :dataSource AND id NOT IN (:chargerIds)")
abstract suspend fun deleteIdNotIn(dataSource: String, chargerIds: List<Long>)
@Query("SELECT id FROM chargelocation WHERE dataSource == :dataSource")
abstract suspend fun getAllIds(dataSource: String): List<Long>
@Query("DELETE FROM chargelocation WHERE dataSource == :dataSource AND id IN (:chargerIds)")
abstract suspend fun deleteById(dataSource: String, chargerIds: List<Long>)
@Query("SELECT * FROM chargelocation WHERE dataSource == :dataSource AND id == :id AND isDetailed == 1 AND timeRetrieved > :after")
abstract suspend fun getChargeLocationById(
@@ -706,7 +709,7 @@ class ChargeLocationsRepository(
val result = api.fullDownload()
try {
var insertJob: Job? = null
val chargerIds = mutableListOf<Long>()
val idsToDelete = chargeLocationsDao.getAllIds(api.id).toMutableSet()
result.chargers.chunked(1024).forEach {
insertJob?.join()
insertJob = withContext(Dispatchers.IO) {
@@ -714,11 +717,11 @@ class ChargeLocationsRepository(
chargeLocationsDao.insert(*it.toTypedArray())
}
}
chargerIds.addAll(it.map { it.id })
idsToDelete.removeAll(it.map { it.id })
fullDownloadProgress.value = result.progress
}
// delete chargers that have been removed
chargeLocationsDao.deleteIdNotIn(api.id, chargerIds)
chargeLocationsDao.deleteById(api.id, idsToDelete.toList())
val region = Mbr(
-180.0,

6
app/src/main/java/net/vonforst/evmap/storage/UpdateFullDownloadWorker.kt
View File

@@ -23,7 +23,7 @@ class UpdateFullDownloadWorker(appContext: Context, workerParams: WorkerParamete
var insertJob: Job? = null
val result = api.fullDownload()
val chargerIds = mutableListOf<Long>()
val idsToDelete = chargeLocations.getAllIds(api.id).toMutableSet()
result.chargers.chunked(1024).forEach {
insertJob?.join()
insertJob = withContext(Dispatchers.IO) {
@@ -31,11 +31,11 @@ class UpdateFullDownloadWorker(appContext: Context, workerParams: WorkerParamete
chargeLocations.insert(*it.toTypedArray())
}
}
chargerIds.addAll(it.map { it.id })
idsToDelete.removeAll(it.map { it.id })
}
// delete chargers that have been removed
chargeLocations.deleteIdNotIn(api.id, chargerIds)
chargeLocations.deleteById(api.id, idsToDelete.toList())
when (api) {
is OpenStreetMapApiWrapper -> {