From 98d5f3a7bea58cb6d6729c03a39d760969cc33ca Mon Sep 17 00:00:00 2001 From: geeksville Date: Thu, 11 Jun 2020 21:25:45 -0700 Subject: [PATCH] remove deprecated lat/long float encodings --- app/src/main/java/com/geeksville/mesh/NodeInfo.kt | 4 ++-- app/src/main/java/com/geeksville/mesh/service/MeshService.kt | 3 --- app/src/main/proto | 2 +- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/app/src/main/java/com/geeksville/mesh/NodeInfo.kt b/app/src/main/java/com/geeksville/mesh/NodeInfo.kt index 0a3ce55d..675a8238 100644 --- a/app/src/main/java/com/geeksville/mesh/NodeInfo.kt +++ b/app/src/main/java/com/geeksville/mesh/NodeInfo.kt @@ -42,8 +42,8 @@ data class Position( */ constructor(p: MeshProtos.Position, defaultTime: Int = currentTime()) : this( // We prefer the int version of lat/lon but if not available use the depreciated legacy version - if (p.latitudeI == 0) p.latitudeD else degD(p.latitudeI), - if (p.longitudeI == 0) p.longitudeD else degD(p.longitudeI), + degD(p.latitudeI), + degD(p.longitudeI), p.altitude, if (p.time != 0) p.time else defaultTime ) diff --git a/app/src/main/java/com/geeksville/mesh/service/MeshService.kt b/app/src/main/java/com/geeksville/mesh/service/MeshService.kt index 276b5778..a044b94c 100644 --- a/app/src/main/java/com/geeksville/mesh/service/MeshService.kt +++ b/app/src/main/java/com/geeksville/mesh/service/MeshService.kt @@ -1327,9 +1327,6 @@ class MeshService : Service(), Logging { debug("Sending our position to=$destNum lat=$lat, lon=$lon, alt=$alt") val position = MeshProtos.Position.newBuilder().also { - it.latitudeD = lat // Only old radios will use this variant, others will just ignore it - it.longitudeD = lon - it.longitudeI = Position.degI(lon) it.latitudeI = Position.degI(lat) diff --git a/app/src/main/proto b/app/src/main/proto index 3ba76bbe..b6b1cca5 160000 --- a/app/src/main/proto +++ b/app/src/main/proto @@ -1 +1 @@ -Subproject commit 3ba76bbe4c98ee9c9e422d8dc10844cc9fb5272a +Subproject commit b6b1cca5ada3bc22c6b84761846e889315160db3