From 1bc23f775e1b179700891d346a269559c0fcf522 Mon Sep 17 00:00:00 2001 From: "Loren M. Lang" Date: Wed, 5 Jan 2022 03:35:30 -0800 Subject: [PATCH] Refactored code for formatting DMS coordinate strings for easier testability --- src/AprsPacket.scala | 7 +++++++ src/MapMenuHelper.scala | 3 +-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/src/AprsPacket.scala b/src/AprsPacket.scala index 16d42b1..9254178 100644 --- a/src/AprsPacket.scala +++ b/src/AprsPacket.scala @@ -71,12 +71,19 @@ object AprsPacket { "" } + val DirectionsLatitude = "NS"; + val DirectionsLongitude = "WE"; def formatDMS(coordinate : Float, nesw : String) = { val dms = Location.convert(coordinate, Location.FORMAT_SECONDS).split(":") val nesw_idx = (coordinate < 0).compare(false) "%2s° %2s' %s\" %s".format(dms(0), dms(1), dms(2), nesw(nesw_idx)) } + def formatCoordinates(latitude : Float, longitude : Float) = { + (AprsPacket.formatDMS(latitude, DirectionsLatitude), + AprsPacket.formatDMS(longitude, DirectionsLongitude)) + } + def parseQrg(comment : String) : String = { comment match { case QRG_RE(qrg) => qrg diff --git a/src/MapMenuHelper.scala b/src/MapMenuHelper.scala index cdb89f7..9c90f0a 100644 --- a/src/MapMenuHelper.scala +++ b/src/MapMenuHelper.scala @@ -174,8 +174,7 @@ trait MapMenuHelper extends UIHelper with OnClickListener { def updateCoordinateInfo(lat : Float, lon : Float): Unit = { resultIntent.putExtra("lat", lat).putExtra("lon", lon) - val lat_s = AprsPacket.formatDMS(lat, "NS") - val lon_s = AprsPacket.formatDMS(lon, "WE") + val (lat_s, lon_s) = AprsPacket.formatCoordinates(lat, lon) infoText.setText(lat_s + "\n" + lon_s) accept.setEnabled(true); }