tei/MapLibreParticleLab
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[android] Improve Kotlinification of LatLng (#742)

Browse Source
This commit is contained in:
fynngodau
2023-01-27 20:06:29 +01:00
committed by GitHub
parent 44dd205403
commit 6d07ff85b4
4 changed files with 46 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files

100
platform/android/MapboxGLAndroidSDK/src/main/java/com/mapbox/mapboxsdk/geometry/LatLng.kt
View File

@@ -9,6 +9,7 @@ import com.mapbox.geojson.Point
import com.mapbox.mapboxsdk.constants.GeometryConstants
import com.mapbox.turf.TurfConstants
import com.mapbox.turf.TurfMeasurement
import kotlin.math.abs
/**
* A geographical location which contains a single latitude, longitude pair, with
@@ -25,49 +26,58 @@ import com.mapbox.turf.TurfMeasurement
*
*/
class LatLng : Parcelable {
/**
* Get the latitude, in degrees.
*
* The latitude, in degrees.
*
* This value is in the range of [-90, 90], see [GeometryConstants.MIN_LATITUDE] and
* [GeometryConstants.MAX_LATITUDE]
*
*
* @return the latitude value in degrees
* @see GeometryConstants.MIN_LATITUDE
*
* @see GeometryConstants.MAX_LATITUDE
*/
@Keep
var latitude = 0.0
private set
set(
@FloatRange(from = GeometryConstants.MIN_LATITUDE, to = GeometryConstants.MAX_LATITUDE) latitude) {
require(!latitude.isNaN()) { "latitude must not be NaN" }
require(abs(latitude) <= GeometryConstants.MAX_LATITUDE) { "latitude must be between -90 and 90" }
field = latitude
}
/**
* Get the longitude, in degrees.
*
* The longitude, in degrees.
*
* This value is in the range of [-180, 180], see [GeometryConstants.MIN_LONGITUDE] and
* [GeometryConstants.MAX_LONGITUDE]
*
*
* @return the longitude value in degrees
* @see GeometryConstants.MIN_LONGITUDE
*
* @see GeometryConstants.MAX_LONGITUDE
*/
@Keep
var longitude = 0.0
private set
/**
* Set the longitude, in degrees.
*
*
* This value is in the range of [-180, 180], see [GeometryConstants.MIN_LONGITUDE] and
* [GeometryConstants.MAX_LONGITUDE]
*
*
* @param longitude the longitude value in degrees
* @see GeometryConstants.MIN_LONGITUDE
*
* @see GeometryConstants.MAX_LONGITUDE
*/
set(@FloatRange(from = GeometryConstants.MIN_LONGITUDE, to = GeometryConstants.MAX_LONGITUDE) longitude) {
require(!longitude.isNaN()) { "longitude must not be NaN" }
require(!longitude.isInfinite()) { "longitude must not be infinite" }
field = longitude
}
/**
* Get the altitude, in meters.
*
* @return the altitude value in meters
*/
/**
* Set the altitude, in meters.
*
* @var altitude the altitude in meters
* The altitude, in meters.
*/
var altitude = 0.0
@@ -87,8 +97,8 @@ class LatLng : Parcelable {
*/
@Keep
constructor(latitude: Double, longitude: Double) {
setLatitude(latitude)
setLongitude(longitude)
this.latitude = latitude
this.longitude = longitude
}
/**
@@ -99,8 +109,8 @@ class LatLng : Parcelable {
* @param altitude Altitude in meters
*/
constructor(latitude: Double, longitude: Double, altitude: Double) {
setLatitude(latitude)
setLongitude(longitude)
this.latitude = latitude
this.longitude = longitude
this.altitude = altitude
}
@@ -128,51 +138,11 @@ class LatLng : Parcelable {
* @param in the parcel containing the latitude, longitude, altitude values
*/
constructor(`in`: Parcel) {
setLatitude(`in`.readDouble())
setLongitude(`in`.readDouble())
latitude = (`in`.readDouble())
longitude = (`in`.readDouble())
altitude = `in`.readDouble()
}
/**
* Set the latitude, in degrees.
*
*
* This value is in the range of [-90, 90], see [GeometryConstants.MIN_LATITUDE] and
* [GeometryConstants.MAX_LATITUDE]
*
*
* @param latitude the latitude value in degrees
* @see GeometryConstants.MIN_LATITUDE
*
* @see GeometryConstants.MAX_LATITUDE
*/
fun setLatitude(
@FloatRange(from = GeometryConstants.MIN_LATITUDE, to = GeometryConstants.MAX_LATITUDE) latitude: Double
) {
require(!latitude.isNaN()) { "latitude must not be NaN" }
require(Math.abs(latitude) <= GeometryConstants.MAX_LATITUDE) { "latitude must be between -90 and 90" }
this.latitude = latitude
}
/**
* Set the longitude, in degrees.
*
*
* This value is in the range of [-180, 180], see [GeometryConstants.MIN_LONGITUDE] and
* [GeometryConstants.MAX_LONGITUDE]
*
*
* @param longitude the longitude value in degrees
* @see GeometryConstants.MIN_LONGITUDE
*
* @see GeometryConstants.MAX_LONGITUDE
*/
fun setLongitude(@FloatRange(from = GeometryConstants.MIN_LONGITUDE, to = GeometryConstants.MAX_LONGITUDE) longitude: Double) {
require(!longitude.isNaN()) { "longitude must not be NaN" }
require(!longitude.isInfinite()) { "longitude must not be infinite" }
this.longitude = longitude
}
/**
* Return a new LatLng object with a wrapped Longitude. This allows original data object
* to remain unchanged.

14
platform/android/MapboxGLAndroidSDK/src/test/java/com/mapbox/mapboxsdk/geometry/LatLngTest.kt
View File

@@ -59,14 +59,14 @@ class LatLngTest {
@Test
fun testLatitudeSetter() {
val latLng = LatLng(1.2, 3.4)
latLng.setLatitude(3.0)
latLng.latitude = 3.0
Assert.assertEquals("latitude should match", 3.0, latLng.latitude, DELTA)
}
@Test
fun testLongitudeSetter() {
val latLng = LatLng(1.2, 3.4)
latLng.setLongitude(3.0)
latLng.longitude = 3.0
Assert.assertEquals("longitude should match", 3.0, latLng.longitude, DELTA)
}
@@ -112,35 +112,35 @@ class LatLngTest {
fun testLatitudeSetterChecksNaN() {
exception.expect(IllegalArgumentException::class.java)
exception.expectMessage("latitude must not be NaN")
LatLng().setLatitude(Double.NaN)
LatLng().latitude = Double.NaN
}
@Test
fun testLongitudeSetterChecksNaN() {
exception.expect(IllegalArgumentException::class.java)
exception.expectMessage("longitude must not be NaN")
LatLng().setLongitude(Double.NaN)
LatLng().longitude = Double.NaN
}
@Test
fun testLatitudeSetterChecksGreaterThan90() {
exception.expect(IllegalArgumentException::class.java)
exception.expectMessage("latitude must be between -90 and 90")
LatLng().setLatitude(95.0)
LatLng().latitude = 95.0
}
@Test
fun testLatitudeSetterChecksLessThanThanNegative90() {
exception.expect(IllegalArgumentException::class.java)
exception.expectMessage("latitude must be between -90 and 90")
LatLng().setLatitude(-95.0)
LatLng().latitude = -95.0
}
@Test
fun testLongitudeSetterChecksInfinity() {
exception.expect(IllegalArgumentException::class.java)
exception.expectMessage("longitude must not be infinite")
LatLng().setLongitude(Double.NEGATIVE_INFINITY)
LatLng().longitude = Double.NEGATIVE_INFINITY
}
@Test

4
platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/camera/CameraAnimatorActivity.kt
View File

@@ -235,8 +235,8 @@ class CameraAnimatorActivity : AppCompatActivity(), OnMapReadyCallback {
private class LatLngEvaluator : TypeEvaluator<LatLng> {
private val latLng = LatLng()
override fun evaluate(fraction: Float, startValue: LatLng, endValue: LatLng): LatLng {
latLng.setLongitude((startValue.latitude + (endValue.latitude - startValue.latitude) * fraction))
latLng.setLongitude((startValue.longitude + (endValue.longitude - startValue.longitude) * fraction))
latLng.latitude = startValue.latitude + (endValue.latitude - startValue.latitude) * fraction
latLng.longitude = startValue.longitude + (endValue.longitude - startValue.longitude) * fraction
return latLng
}
}

4
platform/android/MapboxGLAndroidSDKTestApp/src/main/java/com/mapbox/mapboxsdk/testapp/activity/style/AnimatedSymbolLayerActivity.kt
View File

@@ -347,8 +347,8 @@ class AnimatedSymbolLayerActivity : AppCompatActivity() {
private class LatLngEvaluator : TypeEvaluator<LatLng> {
private val latLng = LatLng()
override fun evaluate(fraction: Float, startValue: LatLng, endValue: LatLng): LatLng {
latLng.setLatitude(startValue.latitude + (endValue.latitude - startValue.latitude) * fraction)
latLng.setLongitude(startValue.longitude + (endValue.longitude - startValue.longitude) * fraction)
latLng.latitude = startValue.latitude + (endValue.latitude - startValue.latitude) * fraction
latLng.longitude = startValue.longitude + (endValue.longitude - startValue.longitude) * fraction
return latLng
}
}