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

Fixed a crash when native code was accessing the LatLngBounds class (#655)

Browse Source
This commit is contained in:
Artak Kalantarian
2023-01-04 14:56:20 -08:00
committed by GitHub
parent f2c1b4ab4b
commit 558c1c0ccd
7 changed files with 114 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -41,8 +41,8 @@ object Utils {
*/
fun getRandomLocation(bounds: LatLngBounds): Location {
val random = Random()
val randomLat = bounds.latSouth + (bounds.latNorth - bounds.latSouth) * random.nextDouble()
val randomLon = bounds.lonWest + (bounds.lonEast - bounds.lonWest) * random.nextDouble()
val randomLat = bounds.latitudeSouth + (bounds.latitudeNorth - bounds.latitudeSouth) * random.nextDouble()
val randomLon = bounds.longitudeWest + (bounds.longitudeEast - bounds.longitudeWest) * random.nextDouble()
val location = Location("random-loc")
location.longitude = randomLon
location.latitude = randomLat

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

@@ -25,7 +25,6 @@ import com.mapbox.mapboxsdk.style.layers.PropertyFactory
import com.mapbox.mapboxsdk.style.layers.SymbolLayer
import com.mapbox.mapboxsdk.style.sources.GeoJsonSource
import com.mapbox.mapboxsdk.testapp.R
import com.mapbox.mapboxsdk.testapp.activity.style.AnimatedSymbolLayerActivity.Car
import com.mapbox.turf.TurfMeasurement
import java.util.*
@@ -296,8 +295,8 @@ class AnimatedSymbolLayerActivity : AppCompatActivity() {
get() {
val bounds = mapboxMap!!.projection.visibleRegion.latLngBounds
val generator = Random()
val randomLat = bounds.latSouth + generator.nextDouble() * bounds.latNorth - bounds.latSouth
val randomLon = bounds.lonWest + generator.nextDouble() * bounds.lonEast - bounds.lonWest
val randomLat = bounds.latitudeSouth + generator.nextDouble() * bounds.latitudeNorth - bounds.latitudeSouth
val randomLon = bounds.longitudeWest + generator.nextDouble() * bounds.longitudeEast - bounds.longitudeWest
return LatLng(randomLat, randomLon)
}

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

@@ -130,8 +130,8 @@ class CollectionUpdateOnStyleChange : AppCompatActivity(), OnMapReadyCallback, S
private fun getLatLngInBounds(bounds: LatLngBounds): LatLng {
val generator = Random()
val randomLat = bounds.latSouth + generator.nextDouble() * (bounds.latNorth - bounds.latSouth)
val randomLon = bounds.lonWest + generator.nextDouble() * (bounds.lonEast - bounds.lonWest)
val randomLat = bounds.latitudeSouth + generator.nextDouble() * (bounds.latitudeNorth - bounds.latitudeSouth)
val randomLon = bounds.longitudeWest + generator.nextDouble() * (bounds.longitudeEast - bounds.longitudeWest)
return LatLng(randomLat, randomLon)
}
}

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

@@ -16,7 +16,6 @@ import com.mapbox.mapboxsdk.style.layers.*
import com.mapbox.mapboxsdk.style.sources.CustomGeometrySource
import com.mapbox.mapboxsdk.style.sources.GeometryTileProvider
import com.mapbox.mapboxsdk.testapp.R
import com.mapbox.mapboxsdk.testapp.activity.style.GridSourceActivity.GridProvider
import java.util.*
/**
@@ -59,24 +58,24 @@ class GridSourceActivity : AppCompatActivity(), OnMapReadyCallback {
20.0
}
var gridLines: MutableList<Any?> = ArrayList<Any?>()
var y = Math.ceil(bounds.latNorth / gridSpacing) * gridSpacing
while (y >= Math.floor(bounds.latSouth / gridSpacing) * gridSpacing) {
var y = Math.ceil(bounds.latitudeNorth / gridSpacing) * gridSpacing
while (y >= Math.floor(bounds.latitudeSouth / gridSpacing) * gridSpacing) {
gridLines.add(
Arrays.asList(
Point.fromLngLat(bounds.lonWest, y),
Point.fromLngLat(bounds.lonEast, y)
Point.fromLngLat(bounds.longitudeWest, y),
Point.fromLngLat(bounds.longitudeEast, y)
)
)
y -= gridSpacing
}
features.add(Feature.fromGeometry(MultiLineString.fromLngLats(gridLines as MutableList<MutableList<Point>>)))
gridLines = ArrayList<Any?>()
var x = Math.floor(bounds.lonWest / gridSpacing) * gridSpacing
while (x <= Math.ceil(bounds.lonEast / gridSpacing) * gridSpacing) {
var x = Math.floor(bounds.longitudeWest / gridSpacing) * gridSpacing
while (x <= Math.ceil(bounds.longitudeEast / gridSpacing) * gridSpacing) {
gridLines.add(
Arrays.asList(
Point.fromLngLat(x, bounds.latSouth),
Point.fromLngLat(x, bounds.latNorth)
Point.fromLngLat(x, bounds.latitudeSouth),
Point.fromLngLat(x, bounds.latitudeNorth)
)
)
x += gridSpacing
@@ -110,32 +109,32 @@ class GridSourceActivity : AppCompatActivity(), OnMapReadyCallback {
override fun onStart() {
super.onStart()
mapView!!.onStart()
mapView.onStart()
}
public override fun onResume() {
super.onResume()
mapView!!.onResume()
mapView.onResume()
}
public override fun onPause() {
super.onPause()
mapView!!.onPause()
mapView.onPause()
}
override fun onStop() {
super.onStop()
mapView!!.onStop()
mapView.onStop()
}
override fun onDestroy() {
super.onDestroy()
mapView!!.onDestroy()
mapView.onDestroy()
}
override fun onSaveInstanceState(outState: Bundle) {
super.onSaveInstanceState(outState)
mapView!!.onSaveInstanceState(outState)
mapView.onSaveInstanceState(outState)
}
companion object {