Skip to content

Commit c97123d

Browse files
committed
Revert scaling puck pulsing radius on Android
1 parent 52598be commit c97123d

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

android/src/main/kotlin/com/mapbox/maps/mapbox_maps/LocationComponentController.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import com.mapbox.maps.plugin.locationcomponent.location2
99

1010
class LocationComponentController(private val mapView: MapView) :
1111
FLTSettings.LocationComponentSettingsInterface {
12-
override fun getSettings(): FLTSettings.LocationComponentSettings = mapView.location2.toFLT(mapView.context)
12+
override fun getSettings(): FLTSettings.LocationComponentSettings = mapView.location2.toFLT()
1313

1414
override fun updateSettings(settings: FLTSettings.LocationComponentSettings) {
1515
mapView.location2.apply {

android/src/main/kotlin/com/mapbox/maps/mapbox_maps/mapping/LocationComponentMappings.kt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ fun LocationComponentSettingsInterface2.applyFromFLT(settings: FLTSettings.Locat
1818
settings.enabled?.let { enabled = it }
1919
settings.pulsingEnabled?.let { pulsingEnabled = it }
2020
settings.pulsingColor?.let { pulsingColor = it.toInt() }
21-
settings.pulsingMaxRadius?.let { pulsingMaxRadius = it.toDevicePixels(context) }
21+
settings.pulsingMaxRadius?.let { pulsingMaxRadius = it.toFloat() }
2222
settings.showAccuracyRing?.let { showAccuracyRing = it }
2323
settings.accuracyRingColor?.let { accuracyRingColor = it.toInt() }
2424
settings.accuracyRingBorderColor?.let { accuracyRingBorderColor = it.toInt() }
@@ -54,11 +54,11 @@ fun LocationComponentSettingsInterface2.applyFromFLT(settings: FLTSettings.Locat
5454
}
5555
}
5656

57-
fun LocationComponentSettingsInterface2.toFLT(context: Context) = FLTSettings.LocationComponentSettings.Builder().let { settings ->
57+
fun LocationComponentSettingsInterface2.toFLT() = FLTSettings.LocationComponentSettings.Builder().let { settings ->
5858
settings.setEnabled(enabled)
5959
settings.setPulsingEnabled(pulsingEnabled)
6060
settings.setPulsingColor(pulsingColor.toUInt().toLong())
61-
settings.setPulsingMaxRadius(pulsingMaxRadius.toLogicalPixels(context))
61+
settings.setPulsingMaxRadius(pulsingMaxRadius.toDouble())
6262
settings.setShowAccuracyRing(showAccuracyRing)
6363
settings.setAccuracyRingColor(accuracyRingColor.toUInt().toLong())
6464
settings.setAccuracyRingBorderColor(accuracyRingBorderColor.toUInt().toLong())
@@ -104,4 +104,4 @@ fun LocationComponentSettingsInterface2.toFLT(context: Context) = FLTSettings.Lo
104104
settings.build()
105105
}
106106

107-
// End of generated file.
107+
// End of generated file.

0 commit comments

Comments
 (0)