Skip to content

Task/mt 7306 add http headers to each function of our text data source interface #97

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

Merged
kaytran2992 merged 1 commit into from
Feb 12, 2025
Merged

Task/mt 7306 add http headers to each function of our text data source interface #97

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion gradle/libs.versions.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ googleMapUtils = "3.4.0"
googleMapPlayService = "19.0.0"

#What3words Library
what3wordsWrapper = "4.0.2"
what3wordsWrapper = "4.0.3-SNAPSHOT"
what3wordsDesignLibrary = "2.0.4-SNAPSHOT"

#Maven Publish
Expand Down
3 changes: 3 additions & 0 deletions lib-compose/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ android {

defaultConfig {
minSdk = libs.versions.minSdk.get().toInt()
buildConfigField("String", "LIBRARY_VERSION", "\"${findProperty("LIBRARY_VERSION")}\"")

testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
consumerProguardFiles("consumer-rules.pro")
Expand All @@ -44,7 +45,9 @@ android {
}
buildFeatures {
compose = true
buildConfig = true
}

kotlinOptions {
jvmTarget = libs.versions.jvmTarget.get()
}
Expand Down
52 changes: 38 additions & 14 deletions lib-compose/src/main/java/com/what3words/components/compose/maps/W3WMapManager.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ import com.mapbox.geojson.Point
import com.mapbox.maps.CameraState
import com.mapbox.maps.EdgeInsets
import com.mapbox.maps.extension.compose.animation.viewport.MapViewportState
import com.what3words.androidwrapper.datasource.text.W3WApiTextDataSource
import com.what3words.components.compose.maps.W3WMapDefaults.LOCATION_DEFAULT
import com.what3words.components.compose.maps.W3WMapDefaults.MARKER_COLOR_DEFAULT
import com.what3words.components.compose.maps.extensions.addMarker
Expand Down Expand Up @@ -45,6 +46,7 @@ import com.what3words.core.types.geometry.W3WCoordinates
import com.what3words.core.types.geometry.W3WGridSection
import com.what3words.core.types.geometry.W3WRectangle
import com.what3words.core.types.language.W3WRFC5646Language
import com.what3words.map.components.compose.BuildConfig
import kotlinx.collections.immutable.persistentListOf
import kotlinx.collections.immutable.toImmutableList
import kotlinx.coroutines.CoroutineDispatcher
Expand Down Expand Up @@ -237,7 +239,7 @@ class W3WMapManager(
private suspend fun calculateGridPolylines(gridBound: W3WRectangle): W3WGridLines? =
withContext(dispatcher) {
gridBound.let { safeBox ->
when (val grid = textDataSource.gridSection(safeBox)) {
when (val grid = convertGridSection(safeBox)) {
is W3WResult.Failure -> {
null
}
Expand Down Expand Up @@ -490,7 +492,7 @@ class W3WMapManager(
suspend fun setSelectedAt(
words: String
) = withContext(dispatcher) {
when (val result = textDataSource.convertToCoordinates(words)) {
when (val result = convertToCoordinates(words)) {
is W3WResult.Failure -> {
throw result.error
}
Expand All @@ -510,10 +512,7 @@ class W3WMapManager(
suspend fun setSelectedAt(
coordinates: W3WCoordinates
) = withContext(dispatcher) {
when (val result = textDataSource.convertTo3wa(
W3WCoordinates(lat = coordinates.lat, lng = coordinates.lng),
language
)) {
when (val result = convertTo3wa(coordinates)) {
is W3WResult.Failure -> {
throw result.error
}
Expand Down Expand Up @@ -1064,7 +1063,7 @@ class W3WMapManager(
listName = listName,
input = words,
markerColor = markerColor,
convertFunction = { textDataSource.convertToCoordinates(words) },
convertFunction = { convertToCoordinates(words) },
zoomOption = zoomOption,
zoomLevel = zoomLevel
)
Expand Down Expand Up @@ -1103,7 +1102,7 @@ class W3WMapManager(
listName = listName,
input = coordinates,
markerColor = markerColor,
convertFunction = { textDataSource.convertTo3wa(coordinates, language) },
convertFunction = { convertTo3wa(coordinates) },
zoomOption = zoomOption,
zoomLevel = zoomLevel
)
Expand Down Expand Up @@ -1145,7 +1144,7 @@ class W3WMapManager(
markerColor = markerColor,
convertFunction = {
if (address.center == null) {
textDataSource.convertToCoordinates(address.words)
convertToCoordinates(address.words)
} else {
W3WResult.Success(address)
}
Expand Down Expand Up @@ -1192,7 +1191,7 @@ class W3WMapManager(
markerColor = markerColor,
convertFunction = {
if (suggestion.w3wAddress.center == null) {
textDataSource.convertToCoordinates(suggestion.w3wAddress.words)
convertToCoordinates(suggestion.w3wAddress.words)
} else {
W3WResult.Success(suggestion.w3wAddress)
}
Expand Down Expand Up @@ -1298,7 +1297,7 @@ class W3WMapManager(
inputs = listWords,
markerColor = markerColor,
convertFunction = {
textDataSource.convertToCoordinates(it)
convertToCoordinates(it)
},
zoomOption = zoomOption,
)
Expand Down Expand Up @@ -1338,7 +1337,7 @@ class W3WMapManager(
inputs = listCoordinates,
markerColor = markerColor,
convertFunction = {
textDataSource.convertTo3wa(it, language)
convertTo3wa(it)
},
zoomOption = zoomOption,
)
Expand Down Expand Up @@ -1381,7 +1380,7 @@ class W3WMapManager(
markerColor = markerColor,
convertFunction = {
if (it.w3wAddress.center == null) {
textDataSource.convertToCoordinates(it.w3wAddress.words)
convertToCoordinates(it.w3wAddress.words)
} else {
W3WResult.Success(it.w3wAddress)
}
Expand Down Expand Up @@ -1427,7 +1426,7 @@ class W3WMapManager(
markerColor = markerColor,
convertFunction = {
if (it.center == null) {
textDataSource.convertToCoordinates(it.words)
convertToCoordinates(it.words)
} else {
W3WResult.Success(it)
}
Expand Down Expand Up @@ -1643,8 +1642,33 @@ class W3WMapManager(
this.textDataSource = textDataSource
}

private suspend fun convertToCoordinates(
words: String,
): W3WResult<W3WAddress> = withContext(dispatcher) {
val apiTextDataSource = textDataSource as? W3WApiTextDataSource
apiTextDataSource?.convertToCoordinates(words, HEADER_MAP_COMPONENT)
?: textDataSource.convertToCoordinates(words)
}

private suspend fun convertTo3wa(
coordinates: W3WCoordinates
): W3WResult<W3WAddress> = withContext(dispatcher) {
val apiTextDataSource = textDataSource as? W3WApiTextDataSource
apiTextDataSource?.convertTo3wa(coordinates, language, HEADER_MAP_COMPONENT)
?: textDataSource.convertTo3wa(coordinates, language)
}

private suspend fun convertGridSection(
boundingBox: W3WRectangle
): W3WResult<W3WGridSection> = withContext(dispatcher) {
val apiTextDataSource = textDataSource as? W3WApiTextDataSource
apiTextDataSource?.gridSection(boundingBox, HEADER_MAP_COMPONENT)
?: textDataSource.gridSection(boundingBox)
}

companion object {
const val LIST_DEFAULT_ID = "LIST_DEFAULT_ID"
private val HEADER_MAP_COMPONENT = mapOf("X-W3W-AS-Component" to ("what3words-Map-Android/" + BuildConfig.LIBRARY_VERSION))

/**
* The default saver implementation for [W3WMapManager].
Expand Down