diff options
| -rw-r--r-- | android-app/app/src/main/kotlin/org/terst/nav/MainActivity.kt | 4 | ||||
| -rw-r--r-- | android-app/app/src/main/kotlin/org/terst/nav/ui/map/ParticleWindView.kt | 16 |
2 files changed, 10 insertions, 10 deletions
diff --git a/android-app/app/src/main/kotlin/org/terst/nav/MainActivity.kt b/android-app/app/src/main/kotlin/org/terst/nav/MainActivity.kt index d417355..b1f1919 100644 --- a/android-app/app/src/main/kotlin/org/terst/nav/MainActivity.kt +++ b/android-app/app/src/main/kotlin/org/terst/nav/MainActivity.kt @@ -297,8 +297,8 @@ class MainActivity : AppCompatActivity(), SafetyFragment.SafetyListener { maplibreMap.addOnCameraIdleListener { val bounds = maplibreMap.projection.visibleRegion.latLngBounds viewModel.loadWindGrid( - bounds.latSouth, bounds.latNorth, - bounds.lonWest, bounds.lonEast + bounds.southWest.latitude, bounds.northEast.latitude, + bounds.southWest.longitude, bounds.northEast.longitude ) } } diff --git a/android-app/app/src/main/kotlin/org/terst/nav/ui/map/ParticleWindView.kt b/android-app/app/src/main/kotlin/org/terst/nav/ui/map/ParticleWindView.kt index ae708af..a5a0b8b 100644 --- a/android-app/app/src/main/kotlin/org/terst/nav/ui/map/ParticleWindView.kt +++ b/android-app/app/src/main/kotlin/org/terst/nav/ui/map/ParticleWindView.kt @@ -74,10 +74,10 @@ class ParticleWindView @JvmOverloads constructor( lastFrameNs = now val bounds = m.projection.visibleRegion.latLngBounds - val latSouth = bounds.latSouth.toFloat() - val latNorth = bounds.latNorth.toFloat() - val lonWest = bounds.lonWest.toFloat() - val lonEast = bounds.lonEast.toFloat() + val latSouth = bounds.southWest.latitude.toFloat() + val latNorth = bounds.northEast.latitude.toFloat() + val lonWest = bounds.southWest.longitude.toFloat() + val lonEast = bounds.northEast.longitude.toFloat() val latRange = latNorth - latSouth val lonRange = lonEast - lonWest @@ -138,10 +138,10 @@ class ParticleWindView @JvmOverloads constructor( private fun scatter(m: MapLibreMap) { val bounds = m.projection.visibleRegion.latLngBounds - val latSouth = bounds.latSouth.toFloat() - val lonWest = bounds.lonWest.toFloat() - val latRange = (bounds.latNorth - latSouth).toFloat() - val lonRange = (bounds.northEast.longitude - lonWest).toFloat() + val latSouth = bounds.southWest.latitude.toFloat() + val lonWest = bounds.southWest.longitude.toFloat() + val latRange = (bounds.northEast.latitude - bounds.southWest.latitude).toFloat() + val lonRange = (bounds.northEast.longitude - bounds.southWest.longitude).toFloat() for (i in 0 until N) { particleLat[i] = latSouth + Random.nextFloat() * latRange particleLon[i] = lonWest + Random.nextFloat() * lonRange |