Allow env values in setLocation command

maestro-client/src/main/java/maestro/Maestro.kt

@@ -545,10 +545,10 @@ class Maestro(private val driver: Driver) : AutoCloseable {
  }
  }
 
- fun setLocation(latitude: Double, longitude: Double) {
+ fun setLocation(latitude: String, longitude: String) {
  LOGGER.info("Setting location: ($latitude, $longitude)")
 
- driver.setLocation(latitude, longitude)
+ driver.setLocation(latitude.toDouble(), longitude.toDouble())
  }
 
  fun eraseText(charactersToErase: Int) {

maestro-orchestra-models/src/main/java/maestro/orchestra/Commands.kt

@@ -667,8 +667,8 @@ data class RunFlowCommand(
 }
 
 data class SetLocationCommand(
- val latitude: Double,
- val longitude: Double,
+ val latitude: String,
+ val longitude: String,
  val label: String? = null
 ) : Command {
 
@@ -677,7 +677,10 @@ data class SetLocationCommand(
  }
 
  override fun evaluateScripts(jsEngine: JsEngine): SetLocationCommand {
- return this
+ return copy(
+ latitude = latitude.evaluateScripts(jsEngine),
+ longitude = longitude.evaluateScripts(jsEngine),
+ )
  }
 }
 
@@ -808,17 +811,23 @@ data class TravelCommand(
 ) : Command {
 
  data class GeoPoint(
- val latitude: Double,
- val longitude: Double,
+ val latitude: String,
+ val longitude: String,
  ) {
 
  fun getDistanceInMeters(another: GeoPoint): Double {
  val earthRadius = 6371 // in kilometers
- val dLat = Math.toRadians(another.latitude - latitude)
- val dLon = Math.toRadians(another.longitude - longitude)
+ val oLat = Math.toRadians(latitude.toDouble())
+ val oLon = Math.toRadians(longitude.toDouble())
+
+ val aLat = Math.toRadians(another.latitude.toDouble())
+ val aLon = Math.toRadians(another.longitude.toDouble())
+
+ val dLat = Math.toRadians(aLat - oLat)
+ val dLon = Math.toRadians(aLon - oLon)
 
  val a = Math.sin(dLat / 2) * Math.sin(dLat / 2) +
- Math.cos(Math.toRadians(latitude)) * Math.cos(Math.toRadians(another.latitude)) *
+ Math.cos(Math.toRadians(oLat)) * Math.cos(Math.toRadians(aLat)) *
  Math.sin(dLon / 2) * Math.sin(dLon / 2)
 
  val c = 2 * Math.atan2(Math.sqrt(a), Math.sqrt(1 - a))
@@ -834,7 +843,9 @@ data class TravelCommand(
  }
 
  override fun evaluateScripts(jsEngine: JsEngine): Command {
- return this
+ return copy(
+ points = points.map { it.copy(latitude = it.latitude.evaluateScripts(jsEngine), longitude = it.longitude.evaluateScripts(jsEngine)) }
+ )
  }
 
 }

maestro-orchestra/src/main/java/maestro/orchestra/geo/Traveller.kt

@@ -43,14 +43,20 @@ object Traveller {
 
  val timeToSleep = timeToTravelInMilliseconds / steps
 
- val latitudeStep = (end.latitude - start.latitude) / steps
- val longitudeStep = (end.longitude - start.longitude) / steps
+ val sLat = start.latitude.toDouble()
+ val sLon = start.longitude.toDouble()
+
+ val eLat = end.latitude.toDouble()
+ val eLon = end.longitude.toDouble()
+
+ val latitudeStep = (eLat - sLat) / steps
+ val longitudeStep = (eLon - sLon) / steps
 
  for (i in 1..steps) {
- val latitude = start.latitude + (latitudeStep * i)
- val longitude = start.longitude + (longitudeStep * i)
+ val latitude = sLat + (latitudeStep * i)
+ val longitude = sLon + (longitudeStep * i)
 
- maestro.setLocation(latitude, longitude)
+ maestro.setLocation(latitude.toString(), longitude.toString())
  Thread.sleep(timeToSleep)
  }
  }

maestro-orchestra/src/main/java/maestro/orchestra/yaml/YamlFluentCommand.kt

@@ -300,8 +300,8 @@ data class YamlFluentCommand(
  val longitude = spitPoint[1].toDoubleOrNull() ?: throw SyntaxError("Invalid travel point longitude: $point")
 
  TravelCommand.GeoPoint(
- latitude = latitude,
- longitude = longitude,
+ latitude = latitude.toString(),
+ longitude = longitude.toString(),
  )
  },
  speedMPS = command.speed,

maestro-orchestra/src/main/java/maestro/orchestra/yaml/YamlSetLocation.kt

@@ -3,7 +3,7 @@ package maestro.orchestra.yaml
 import com.fasterxml.jackson.annotation.JsonCreator
 
 data class YamlSetLocation @JsonCreator constructor(
- val latitude: Double,
- val longitude: Double,
+ val latitude: String,
+ val longitude: String,
  val label: String? = null,
 )

maestro-orchestra/src/test/java/maestro/orchestra/MaestroCommandTest.kt

@@ -33,7 +33,7 @@ internal class MaestroCommandTest {
  @Test
  fun `description (with a label)`() {
  // given
- val maestroCommand = MaestroCommand(SetLocationCommand(12.5266, 78.2150, "Set Location to Test Laboratory"))
+ val maestroCommand = MaestroCommand(SetLocationCommand("12.5266", "78.2150", "Set Location to Test Laboratory"))
 
  // when
  val description = maestroCommand.description()
@@ -42,4 +42,17 @@ internal class MaestroCommandTest {
  assertThat(description)
  .isEqualTo("Set Location to Test Laboratory")
  }
+
+ @Test
+ fun `description (negative coordinates)`() {
+ // given
+ val maestroCommand = MaestroCommand(SetLocationCommand("-12.5266", "-78.2150", "Set Location with negative coordinates"))
+
+ // when
+ val description = maestroCommand.description()
+
+ // then
+ assertThat(description)
+ .isEqualTo("Set Location with negative coordinates")
+ }
 }

maestro-orchestra/src/test/java/maestro/orchestra/yaml/YamlCommandReaderTest.kt

@@ -481,8 +481,8 @@ internal class YamlCommandReaderTest {
  centerElement = false
  ),
  SetLocationCommand(
- latitude = 12.5266,
- longitude = 78.2150,
+ latitude = "12.5266",
+ longitude = "78.2150",
  label = "Set Location to Test Laboratory"
  ),
  StartRecordingCommand(
@@ -502,10 +502,10 @@ internal class YamlCommandReaderTest {
  ),
  TravelCommand(
  points = listOf(
- TravelCommand.GeoPoint(0.0,0.0),
- TravelCommand.GeoPoint(0.1,0.0),
- TravelCommand.GeoPoint(0.1,0.1),
- TravelCommand.GeoPoint(0.0,0.1),
+ TravelCommand.GeoPoint("0.0","0.0"),
+ TravelCommand.GeoPoint("0.1","0.0"),
+ TravelCommand.GeoPoint("0.1","0.1"),
+ TravelCommand.GeoPoint("0.0","0.1"),
  ),
  speedMPS = 2000.0,
  label = "Run around the north pole"
@@ -646,4 +646,11 @@ internal class YamlCommandReaderTest {
 
  private fun commands(vararg commands: Command): List<MaestroCommand> =
  commands.map(::MaestroCommand).toList()
+
+ @Test
+ fun setLocationSyntaxError(
+ @YamlFile("026_setLocation_syntaxError.yaml") e: SyntaxError,
+ ) {
+ assertThat(e.message).contains("Cannot deserialize value of type")
+ }
 }

maestro-orchestra/src/test/resources/YamlCommandReaderTest/026_setLocation_syntaxError.yaml

@@ -0,0 +1,5 @@
+appId: com.example.app
+---
+setLocation:
+ latitude: 12.5266
+ longitude: 78.2150