-
Notifications
You must be signed in to change notification settings - Fork 22
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
feat: adds support for SearchByText and tests (#253)
* chore: update gradle to 8.4, kotlin to 1.9.22, places SDK to 3.4.0 * Adds awaitSearchByText extension function * Adds testing for searchByTextRequest * Adds awaitSearchByText extension function * Adds testing for searchByTextRequest * Adds copyright notices --------- Co-authored-by: dkhawk <dkhawk@google.com>
- Loading branch information
Showing
8 changed files
with
219 additions
and
2 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
16 changes: 16 additions & 0 deletions
16
...src/main/java/com/google/android/libraries/places/ktx/api/model/AutocompletePrediction.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
56 changes: 56 additions & 0 deletions
56
...-ktx/src/main/java/com/google/android/libraries/places/ktx/api/net/SearchByTextRequest.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,56 @@ | ||
| // Copyright 2024 Google LLC | ||
| // | ||
| // Licensed under the Apache License, Version 2.0 (the "License"); | ||
| // you may not use this file except in compliance with the License. | ||
| // You may obtain a copy of the License at | ||
| // | ||
| // http://www.apache.org/licenses/LICENSE-2.0 | ||
| // | ||
| // Unless required by applicable law or agreed to in writing, software | ||
| // distributed under the License is distributed on an "AS IS" BASIS, | ||
| // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| // See the License for the specific language governing permissions and | ||
| // limitations under the License. | ||
|
|
||
| package com.google.android.libraries.places.ktx.api.net | ||
|
|
||
| import com.google.android.libraries.places.api.model.Place | ||
| import com.google.android.libraries.places.api.net.SearchByTextRequest | ||
|
|
||
| public enum class PriceLevel(public val value: Int) { | ||
| FREE(0), // Note: not for use in the API call. | ||
| INEXPENSIVE(1), | ||
| MODERATE(2), | ||
| EXPENSIVE(3), | ||
| VERY_EXPENSIVE(4) | ||
| } | ||
|
|
||
| /** | ||
| * Builds a new [SearchByTextRequest]. | ||
| * | ||
| * @param textQuery the query string to search | ||
| * @param placeFields the fields of the place to be requested | ||
| * @param actions the actions to apply to the [SearchByTextRequest.Builder] | ||
| * @return the constructed [SearchByTextRequest] | ||
| */ | ||
| public fun searchByTextRequest( | ||
| textQuery: String, | ||
| placeFields: List<Place.Field>, | ||
| actions: SearchByTextRequest.Builder.() -> Unit = {}, | ||
| ): SearchByTextRequest { | ||
| return SearchByTextRequest.builder(textQuery, placeFields) | ||
| .apply(actions) | ||
| .build() | ||
| } | ||
|
|
||
| public fun SearchByTextRequest.Builder.setPriceLevels( | ||
| priceLevels: Collection<PriceLevel> | ||
| ): SearchByTextRequest.Builder { | ||
| return this.setPriceLevels(priceLevels.map { it.value }) | ||
| } | ||
|
|
||
| public fun SearchByTextRequest.Builder.setPriceLevels( | ||
| vararg priceLevels: PriceLevel | ||
| ): SearchByTextRequest.Builder { | ||
| return this.setPriceLevels(priceLevels.map { it.value }) | ||
| } |
71 changes: 71 additions & 0 deletions
71
.../src/test/java/com/google/android/libraries/places/ktx/api/net/SearchByTextRequestTest.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,71 @@ | ||
| /* | ||
| * Copyright 2024 Google LLC | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
|
|
||
| package com.google.android.libraries.places.ktx.api.net | ||
|
|
||
| import com.google.android.gms.maps.model.LatLng | ||
| import com.google.android.gms.tasks.CancellationTokenSource | ||
| import com.google.android.libraries.places.api.model.CircularBounds | ||
| import com.google.android.libraries.places.api.model.Place | ||
| import com.google.android.libraries.places.api.net.SearchByTextRequest | ||
| import com.google.common.truth.Truth.assertThat | ||
| import org.junit.Test | ||
|
|
||
| internal class SearchByTextRequestTest { | ||
| @Test | ||
| fun testBuilderNoActions() { | ||
| val request = searchByTextRequest( | ||
| textQuery = "test query", | ||
| placeFields = listOf(Place.Field.NAME) | ||
| ) | ||
|
|
||
| assertThat(request.textQuery).isEqualTo("test query") | ||
| assertThat(request.placeFields).containsExactly(Place.Field.NAME) | ||
| } | ||
|
|
||
| @Test | ||
| fun testBuilderWithActions() { | ||
| val cancellationToken = CancellationTokenSource().token | ||
| val ashland = LatLng(42.193893370553916, -122.7088890892941) | ||
| val radiusInMeters = 1500.0 | ||
|
|
||
| val request = searchByTextRequest( | ||
| textQuery = "test query", | ||
| placeFields = listOf(Place.Field.NAME, Place.Field.ADDRESS), | ||
| ) { | ||
| setCancellationToken(cancellationToken) | ||
| includedType = "national_park" | ||
| isOpenNow = true | ||
| minRating = 4.0 | ||
| setPriceLevels(PriceLevel.MODERATE, PriceLevel.EXPENSIVE) | ||
| rankPreference = SearchByTextRequest.RankPreference.RELEVANCE | ||
| regionCode = "US" | ||
|
|
||
| locationBias = CircularBounds.newInstance(ashland, radiusInMeters) | ||
| } | ||
|
|
||
| assertThat(request.locationBias) | ||
| .isEqualTo(CircularBounds.newInstance(ashland, radiusInMeters)) | ||
| assertThat(request.isOpenNow).isTrue() | ||
| assertThat(request.minRating).isEqualTo(4.0) | ||
| assertThat(request.priceLevels) | ||
| .containsExactly(PriceLevel.MODERATE.value, PriceLevel.EXPENSIVE.value) | ||
| assertThat(request.rankPreference).isEqualTo(SearchByTextRequest.RankPreference.RELEVANCE) | ||
| assertThat(request.regionCode).isEqualTo("US") | ||
| assertThat(request.includedType).isEqualTo("national_park") | ||
| assertThat(request.textQuery).isEqualTo("test query") | ||
| } | ||
| } |
16 changes: 16 additions & 0 deletions
16
...src/test/java/com/google/android/libraries/places/ktx/model/AutocompletePredictionTest.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters