Skip to content

Use puckBearingEnabled prop in Android #3742

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
RmStorm wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Use puckBearingEnabled prop in Android #3742

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
91d2e35
Use puckBearingEnabled prop in Android
RmStorm Jan 17, 2025
52ff3f4
Give androidRenderMode precedence when determing rendering
RmStorm Jan 27, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
65 changes: 26 additions & 39 deletions android/src/main/java/com/rnmapbox/rnmbx/components/location/RNMBXNativeUserLocation.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ import com.mapbox.maps.MapboxMap
import com.mapbox.maps.Style
import com.mapbox.maps.plugin.LocationPuck2D
import com.mapbox.maps.plugin.locationcomponent.LocationComponentConstants
import com.mapbox.maps.plugin.locationcomponent.createDefault2DPuck
import com.mapbox.maps.plugin.locationcomponent.location
import com.mapbox.maps.plugin.locationcomponent.R as LR
import com.rnmapbox.rnmbx.R
Expand Down Expand Up @@ -125,26 +126,33 @@ class RNMBXNativeUserLocation(context: Context) : AbstractMapFeature(context), O
private fun _apply(mapView: MapView) {
val location2 = mapView.location2;

if (visible) {
if (images.isEmpty()) {
location2.locationPuck =
makeDefaultLocationPuck2D(mContext, androidRenderMode ?: RenderMode.NORMAL)
} else {
location2.locationPuck = LocationPuck2D(
topImage = images[PuckImagePart.TOP],
bearingImage = images[PuckImagePart.BEARING],
shadowImage = images[PuckImagePart.SHADOW],
scaleExpression = scale?.toJson()
)
val withBearing = puckBearingEnabled ?: when (androidRenderMode ?: RenderMode.NORMAL) {
RenderMode.GPS -> true
RenderMode.COMPASS -> true
RenderMode.NORMAL -> false
}

// Always start with the default puck
location2.locationPuck = createDefault2DPuck(withBearing = withBearing)

// If custom images are provided, overwrite the corresponding fields
if (images.isNotEmpty()) {
(location2.locationPuck as? LocationPuck2D)?.apply {
topImage = images[PuckImagePart.TOP] ?: topImage
bearingImage = images[PuckImagePart.BEARING] ?: bearingImage
shadowImage = images[PuckImagePart.SHADOW] ?: shadowImage
scaleExpression = scale?.toJson() ?: scaleExpression
}
} else {
val empty =
AppCompatResourcesV11.getDrawableImageHolder(mContext, R.drawable.empty)
location2.locationPuck = LocationPuck2D(
topImage = empty,
bearingImage = empty,
}

// If visibility is false, overwrite the images with empty placeholders
if (!visible) {
val empty = AppCompatResourcesV11.getDrawableImageHolder(mContext, R.drawable.empty)
(location2.locationPuck as? LocationPuck2D)?.apply {
topImage = empty
bearingImage = empty
shadowImage = empty
)
}
}

this.puckBearing?.let {
Expand Down Expand Up @@ -278,24 +286,3 @@ class RNMBXNativeUserLocation(context: Context) : AbstractMapFeature(context), O
const val LOG_TAG = "RNMBXNativeUserLocation"
}
}

fun makeDefaultLocationPuck2D(context: Context, renderMode: RenderMode): LocationPuck2D {
return LocationPuck2D(
topImage = AppCompatResourcesV11.getDrawableImageHolder(
context,
LR.drawable.mapbox_user_icon
),
bearingImage = AppCompatResourcesV11.getDrawableImageHolder(
context,
when (renderMode) {
RenderMode.GPS -> LR.drawable.mapbox_user_bearing_icon
RenderMode.COMPASS -> LR.drawable.mapbox_user_puck_icon
RenderMode.NORMAL -> LR.drawable.mapbox_user_stroke_icon
}
),
shadowImage = AppCompatResourcesV11.getDrawableImageHolder(
context,
LR.drawable.mapbox_user_icon_shadow
)
);
}
Loading