Android-builders-club/OsmAnd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Increase location accuracy threshold and remove 15 sec check for my location

Browse source
This commit is contained in:
Chumva 2019-02-04 13:47:17 +02:00
parent cc676a39ac
commit 84ac49e09b
2 changed files with 2 additions and 53 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
OsmAnd-telegram/src/net/osmand/telegram/helpers/ShareLocationHelper.kt
View file

@ -13,9 +13,7 @@ import org.json.JSONObject
private const val USER_SET_LIVE_PERIOD_DELAY_MS = 5000 // 5 sec private const val USER_SET_LIVE_PERIOD_DELAY_MS = 5000 // 5 sec
private const val MY_LOCATION_UPDATE_MS = 15000 // 15 sec private const val UPDATE_LOCATION_ACCURACY = 150 // 150 meters
private const val UPDATE_LOCATION_ACCURACY = 30 // 30 meters
class ShareLocationHelper(private val app: TelegramApplication) { class ShareLocationHelper(private val app: TelegramApplication) {
@ -32,8 +30,6 @@ class ShareLocationHelper(private val app: TelegramApplication) {
var lastLocationUpdateTime: Long = 0 var lastLocationUpdateTime: Long = 0
var lastMyLocationUpdateTime: Long = 0
var lastLocation: Location? = null var lastLocation: Location? = null
set(value) { set(value) {
if (lastTimeInMillis == 0L) { if (lastTimeInMillis == 0L) {
@ -227,10 +223,7 @@ class ShareLocationHelper(private val app: TelegramApplication) {
prepareMapAndTextMessage(shareInfo, message, isBot, sharingMode) prepareMapAndTextMessage(shareInfo, message, isBot, sharingMode)
} }
} }
if (System.currentTimeMillis() - lastMyLocationUpdateTime > MY_LOCATION_UPDATE_MS) { app.locationMessages.addMyLocationMessage(location)
app.locationMessages.addMyLocationMessage(location)
lastMyLocationUpdateTime = System.currentTimeMillis()
}
if (bufferedMessagesFull) { if (bufferedMessagesFull) {
checkNetworkType() checkNetworkType()
} }

44
OsmAnd-telegram/src/net/osmand/telegram/helpers/TelegramUiHelper.kt
View file

@ -226,32 +226,6 @@ object TelegramUiHelper {
} }
} }
private fun gpxToGpxChatItem(
helper: TelegramHelper,
gpx: GPXFile
): GpxChatItem? {
val user = helper.getUser(gpx.userId) ?: return null
val chat = helper.getChat(gpx.chatId) ?: return null
return GpxChatItem().apply {
chatId = chat.id
chatTitle = chat.title
gpxFile = gpx
name = TelegramUiHelper.getUserName(user)
if (helper.isGroup(chat)) {
photoPath = helper.getUserPhotoPath(user)
groupPhotoPath = chat.photo?.small?.local?.path
} else {
photoPath = user.profilePhoto?.small?.local?.path
}
grayscalePhotoPath = helper.getUserGreyPhotoPath(user)
placeholderId = R.drawable.img_user_picture
userId = user.id
privateChat = helper.isPrivateChat(chat) || helper.isSecretChat(chat)
chatWithBot = helper.isBot(userId)
lastUpdated = (gpx.modifiedTime / 1000).toInt()
}
}
fun userLocationsToChatItem(helper: TelegramHelper, userLocation: LocationMessages.UserLocations): LocationMessagesChatItem? { fun userLocationsToChatItem(helper: TelegramHelper, userLocation: LocationMessages.UserLocations): LocationMessagesChatItem? {
val user = helper.getUser(userLocation.userId) val user = helper.getUser(userLocation.userId)
val chat = helper.getChat(userLocation.chatId) val chat = helper.getChat(userLocation.chatId)
@ -328,24 +302,6 @@ object TelegramUiHelper {
override fun getVisibleName() = chatTitle override fun getVisibleName() = chatTitle
} }
class GpxChatItem : ListItem() {
var gpxFile: GPXFile? = null
internal set
var groupPhotoPath: String? = null
internal set
var privateChat: Boolean = false
internal set
var chatWithBot: Boolean = false
internal set
override fun canBeOpenedOnMap() = latLon != null
override fun getMapPointId() = "${chatId}_$userId"
override fun getVisibleName() = chatTitle
}
class LocationMessagesChatItem : ListItem() { class LocationMessagesChatItem : ListItem() {
var userLocations: LocationMessages.UserLocations? = null var userLocations: LocationMessages.UserLocations? = null