Skip to content

Commit c7396e7

Browse files
DzmitryFomchynDzmitryFomchyn
authored
Dependencies bump; New functionality; Search SDK release (#317)
* Search Native bump; SearchResultMetadata.cuisines * Improve main activity * Add functionality to select language and worldview * Offline multiple languages search example * Fix offline integration test * Simplify SAR example, remove proximity usage * Bump SDK version; Update changelog * TilesetParameters type for the offline search * Fix changelog
1 parent 788f24a commit c7396e7

File tree

26 files changed

+737
-315
lines changed

26 files changed

+737
-315
lines changed

‎CHANGELOG.md

+21-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,24 @@
11
# Changelog for the Mapbox Search SDK for Android
22

3+
## 2.9.0-beta.1
4+
5+
### New features
6+
- Added new property `SearchResultMetadata.cuisines` which returns a list of cuisines served if metadata belongs to a food-serving POI.
7+
- Added new function `OfflineSearchEngine.selectTileset(TilesetParameters)` which allows to select tileset with specified parameters, including language and worldview.
8+
9+
### Bug fixes
10+
- Search along route functionality in offline has been improved.
11+
12+
### Experimental API breaking changes
13+
- `OfflineSearchEngine.createTilesetDescriptor(String, String, IsoLanguageCode, IsoCountryCode)` has been replaced with `OfflineSearchEngine.createTilesetDescriptor(TilesetParameters)`.
14+
- `OfflineSearchEngine.createPlacesTilesetDescriptor(String, String, IsoLanguageCode, IsoCountryCode)` has been replaced with `OfflineSearchEngine.createPlacesTilesetDescriptor(TilesetParameters)`.
15+
16+
### Mapbox dependencies
17+
- Search Native SDK `2.9.0-beta.1`
18+
- Common SDK `24.11.0-beta.1`
19+
20+
21+
322
## 2.8.0
423

524
### New features
@@ -12,8 +31,8 @@
1231
- Now `OfflineSearchAlongRouteOptions` doesn't accept `proximity` as a parameter, search will be performed along the whole route.
1332

1433
### Mapbox dependencies
15-
- Search Native SDK `2.8.0-rc.2`
16-
- Common SDK `24.10.0-rc.1`
34+
- Search Native SDK `2.8.0`
35+
- Common SDK `24.10.0`
1736

1837

1938

‎MapboxSearch/base/src/main/java/com/mapbox/search/base/core/CoreFactoryFunctions.kt

+2
Original file line numberDiff line numberDiff line change
@@ -116,6 +116,7 @@ fun createCoreResultMetadata(
116116
facilities: List<CoreFacility>? = null,
117117
timezone: String? = null,
118118
lastUpdated: String? = null,
119+
cuisines: List<String>? = null,
119120
): CoreResultMetadata = CoreResultMetadata(
120121
reviewCount = reviewCount,
121122
phone = phone,
@@ -159,6 +160,7 @@ fun createCoreResultMetadata(
159160
facilities = facilities,
160161
timezone = timezone,
161162
lastUpdated = lastUpdated,
163+
cuisines = cuisines,
162164
)
163165

164166
fun createCoreOpenHours(

‎MapboxSearch/gradle.properties

+1-1
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ android.enableJetifier=false
2121
kotlin.code.style=official
2222

2323
# SDK version attributes
24-
VERSION_NAME=2.8.0
24+
VERSION_NAME=2.9.0-beta.1
2525

2626
# Artifact attributes
2727
mapboxArtifactUserOrg=mapbox

‎MapboxSearch/gradle/versions.gradle

+3-3
Original file line numberDiff line numberDiff line change
@@ -41,13 +41,13 @@ ext {
4141

4242
pitest_version = '1.6.7'
4343

44-
mapbox_maps_version = '11.10.0-rc.1'
44+
mapbox_maps_version = '11.10.0'
4545
mapbox_turf_version = '6.15.0'
4646

47-
common_sdk_version = '24.10.0'
47+
common_sdk_version = '24.11.0-beta.1'
4848
mapbox_base_version = '0.8.0'
4949

50-
search_native_version = '2.8.0'
50+
search_native_version = '2.9.0-beta.1'
5151

5252
detekt_version = '1.19.0'
5353

‎MapboxSearch/offline/api/api-metalava.txt

+20-6
Original file line numberDiff line numberDiff line change
@@ -139,12 +139,12 @@ package com.mapbox.search.offline {
139139
method public default static final com.mapbox.common.TilesetDescriptor createPlacesTilesetDescriptor(String dataset = "mbx-gen2", String version = "");
140140
method public default static final com.mapbox.common.TilesetDescriptor createPlacesTilesetDescriptor(String dataset = "mbx-gen2");
141141
method public default static final com.mapbox.common.TilesetDescriptor createPlacesTilesetDescriptor();
142-
method @com.mapbox.annotation.MapboxExperimental public default static com.mapbox.common.TilesetDescriptor createPlacesTilesetDescriptor(String dataset = "mbx-gen2", String version = "", com.mapbox.search.common.IsoLanguageCode language, com.mapbox.search.common.IsoCountryCode worldview);
142+
method @com.mapbox.annotation.MapboxExperimental public default static com.mapbox.common.TilesetDescriptor createPlacesTilesetDescriptor(com.mapbox.search.offline.TilesetParameters tilesetParameters);
143143
method public default static com.mapbox.common.TilesetDescriptor createTilesetDescriptor(String dataset = "mbx-gen2", String version = "", String? language = null);
144144
method public default static final com.mapbox.common.TilesetDescriptor createTilesetDescriptor(String dataset = "mbx-gen2", String version = "");
145145
method public default static final com.mapbox.common.TilesetDescriptor createTilesetDescriptor(String dataset = "mbx-gen2");
146146
method public default static final com.mapbox.common.TilesetDescriptor createTilesetDescriptor();
147-
method @com.mapbox.annotation.MapboxExperimental public default static com.mapbox.common.TilesetDescriptor createTilesetDescriptor(String dataset = "mbx-gen2", String version = "", com.mapbox.search.common.IsoLanguageCode language, com.mapbox.search.common.IsoCountryCode worldview);
147+
method @com.mapbox.annotation.MapboxExperimental public default static com.mapbox.common.TilesetDescriptor createTilesetDescriptor(com.mapbox.search.offline.TilesetParameters tilesetParameters);
148148
method public com.mapbox.search.offline.OfflineSearchEngineSettings getSettings();
149149
method public void removeEngineReadyCallback(com.mapbox.search.offline.OfflineSearchEngine.EngineReadyCallback callback);
150150
method public void removeOnIndexChangeListener(com.mapbox.search.offline.OfflineSearchEngine.OnIndexChangeListener listener);
@@ -161,6 +161,7 @@ package com.mapbox.search.offline {
161161
method @com.mapbox.annotation.MapboxExperimental public com.mapbox.search.common.AsyncOperationTask searchAlongRoute(String query, com.mapbox.search.offline.OfflineSearchAlongRouteOptions options, java.util.concurrent.Executor executor, com.mapbox.search.offline.OfflineSearchCallback callback);
162162
method @com.mapbox.annotation.MapboxExperimental public default com.mapbox.search.common.AsyncOperationTask searchAlongRoute(String query, com.mapbox.search.offline.OfflineSearchAlongRouteOptions options, com.mapbox.search.offline.OfflineSearchCallback callback);
163163
method public void selectTileset(String? dataset, String? version);
164+
method @com.mapbox.annotation.MapboxExperimental public void selectTileset(com.mapbox.search.offline.TilesetParameters tilesetParameters);
164165
property public abstract com.mapbox.search.offline.OfflineSearchEngineSettings settings;
165166
field public static final com.mapbox.search.offline.OfflineSearchEngine.Companion Companion;
166167
}
@@ -171,12 +172,12 @@ package com.mapbox.search.offline {
171172
method public com.mapbox.common.TilesetDescriptor createPlacesTilesetDescriptor(String dataset = "mbx-gen2", String version = "");
172173
method public com.mapbox.common.TilesetDescriptor createPlacesTilesetDescriptor(String dataset = "mbx-gen2");
173174
method public com.mapbox.common.TilesetDescriptor createPlacesTilesetDescriptor();
174-
method @com.mapbox.annotation.MapboxExperimental public com.mapbox.common.TilesetDescriptor createPlacesTilesetDescriptor(String dataset = "mbx-gen2", String version = "", com.mapbox.search.common.IsoLanguageCode language, com.mapbox.search.common.IsoCountryCode worldview);
175+
method @com.mapbox.annotation.MapboxExperimental public com.mapbox.common.TilesetDescriptor createPlacesTilesetDescriptor(com.mapbox.search.offline.TilesetParameters tilesetParameters);
175176
method public com.mapbox.common.TilesetDescriptor createTilesetDescriptor(String dataset = "mbx-gen2", String version = "", String? language = null);
176177
method public com.mapbox.common.TilesetDescriptor createTilesetDescriptor(String dataset = "mbx-gen2", String version = "");
177178
method public com.mapbox.common.TilesetDescriptor createTilesetDescriptor(String dataset = "mbx-gen2");
178179
method public com.mapbox.common.TilesetDescriptor createTilesetDescriptor();
179-
method @com.mapbox.annotation.MapboxExperimental public com.mapbox.common.TilesetDescriptor createTilesetDescriptor(String dataset = "mbx-gen2", String version = "", com.mapbox.search.common.IsoLanguageCode language, com.mapbox.search.common.IsoCountryCode worldview);
180+
method @com.mapbox.annotation.MapboxExperimental public com.mapbox.common.TilesetDescriptor createTilesetDescriptor(com.mapbox.search.offline.TilesetParameters tilesetParameters);
180181
}
181182

182183
public static interface OfflineSearchEngine.EngineReadyCallback {
@@ -199,8 +200,6 @@ package com.mapbox.search.offline {
199200
property public final com.mapbox.common.location.LocationProvider? locationProvider;
200201
property public final com.mapbox.common.TileStore tileStore;
201202
property public final java.net.URI tilesBaseUri;
202-
field public static final String DEFAULT_DATASET = "mbx-gen2";
203-
field public static final String DEFAULT_VERSION = "";
204203
}
205204

206205
public static final class OfflineSearchEngineSettings.Builder {
@@ -318,5 +317,20 @@ package com.mapbox.search.offline {
318317
property public final com.mapbox.search.offline.OfflineSearchResultType DEFAULT;
319318
}
320319

320+
@com.mapbox.annotation.MapboxExperimental public final class TilesetParameters {
321+
}
322+
323+
public static final class TilesetParameters.Builder {
324+
ctor public TilesetParameters.Builder(String dataset = "mbx-gen2", String version = "");
325+
ctor public TilesetParameters.Builder(String dataset = "mbx-gen2");
326+
method public com.mapbox.search.offline.TilesetParameters build();
327+
method public String getDataset();
328+
method public String getVersion();
329+
method public com.mapbox.search.offline.TilesetParameters.Builder language(com.mapbox.search.common.IsoLanguageCode language);
330+
method public com.mapbox.search.offline.TilesetParameters.Builder worldview(com.mapbox.search.common.IsoLanguageCode language, com.mapbox.search.common.IsoCountryCode worldview);
331+
property public final String dataset;
332+
property public final String version;
333+
}
334+
321335
}
322336

‎MapboxSearch/offline/api/offline.api

+25-8
Original file line numberDiff line numberDiff line change
@@ -192,14 +192,14 @@ public abstract interface class com/mapbox/search/offline/OfflineSearchEngine {
192192
public abstract fun addOnIndexChangeListener (Ljava/util/concurrent/Executor;Lcom/mapbox/search/offline/OfflineSearchEngine$OnIndexChangeListener;)V
193193
public static fun create (Lcom/mapbox/search/offline/OfflineSearchEngineSettings;)Lcom/mapbox/search/offline/OfflineSearchEngine;
194194
public static fun createPlacesTilesetDescriptor ()Lcom/mapbox/common/TilesetDescriptor;
195+
public static fun createPlacesTilesetDescriptor (Lcom/mapbox/search/offline/TilesetParameters;)Lcom/mapbox/common/TilesetDescriptor;
195196
public static fun createPlacesTilesetDescriptor (Ljava/lang/String;)Lcom/mapbox/common/TilesetDescriptor;
196197
public static fun createPlacesTilesetDescriptor (Ljava/lang/String;Ljava/lang/String;)Lcom/mapbox/common/TilesetDescriptor;
197-
public static fun createPlacesTilesetDescriptor (Ljava/lang/String;Ljava/lang/String;Lcom/mapbox/search/common/IsoLanguageCode;Lcom/mapbox/search/common/IsoCountryCode;)Lcom/mapbox/common/TilesetDescriptor;
198198
public static fun createPlacesTilesetDescriptor (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Lcom/mapbox/common/TilesetDescriptor;
199199
public static fun createTilesetDescriptor ()Lcom/mapbox/common/TilesetDescriptor;
200+
public static fun createTilesetDescriptor (Lcom/mapbox/search/offline/TilesetParameters;)Lcom/mapbox/common/TilesetDescriptor;
200201
public static fun createTilesetDescriptor (Ljava/lang/String;)Lcom/mapbox/common/TilesetDescriptor;
201202
public static fun createTilesetDescriptor (Ljava/lang/String;Ljava/lang/String;)Lcom/mapbox/common/TilesetDescriptor;
202-
public static fun createTilesetDescriptor (Ljava/lang/String;Ljava/lang/String;Lcom/mapbox/search/common/IsoLanguageCode;Lcom/mapbox/search/common/IsoCountryCode;)Lcom/mapbox/common/TilesetDescriptor;
203203
public static fun createTilesetDescriptor (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Lcom/mapbox/common/TilesetDescriptor;
204204
public abstract fun getSettings ()Lcom/mapbox/search/offline/OfflineSearchEngineSettings;
205205
public abstract fun removeEngineReadyCallback (Lcom/mapbox/search/offline/OfflineSearchEngine$EngineReadyCallback;)V
@@ -216,24 +216,23 @@ public abstract interface class com/mapbox/search/offline/OfflineSearchEngine {
216216
public abstract fun searchAlongRoute (Ljava/lang/String;Lcom/mapbox/geojson/Point;Ljava/util/List;Ljava/util/concurrent/Executor;Lcom/mapbox/search/offline/OfflineSearchCallback;)Lcom/mapbox/search/common/AsyncOperationTask;
217217
public abstract fun searchAlongRoute (Ljava/lang/String;Lcom/mapbox/search/offline/OfflineSearchAlongRouteOptions;Lcom/mapbox/search/offline/OfflineSearchCallback;)Lcom/mapbox/search/common/AsyncOperationTask;
218218
public abstract fun searchAlongRoute (Ljava/lang/String;Lcom/mapbox/search/offline/OfflineSearchAlongRouteOptions;Ljava/util/concurrent/Executor;Lcom/mapbox/search/offline/OfflineSearchCallback;)Lcom/mapbox/search/common/AsyncOperationTask;
219+
public abstract fun selectTileset (Lcom/mapbox/search/offline/TilesetParameters;)V
219220
public abstract fun selectTileset (Ljava/lang/String;Ljava/lang/String;)V
220221
}
221222

222223
public final class com/mapbox/search/offline/OfflineSearchEngine$Companion {
223224
public final fun create (Lcom/mapbox/search/offline/OfflineSearchEngineSettings;)Lcom/mapbox/search/offline/OfflineSearchEngine;
224225
public final fun createPlacesTilesetDescriptor ()Lcom/mapbox/common/TilesetDescriptor;
226+
public final fun createPlacesTilesetDescriptor (Lcom/mapbox/search/offline/TilesetParameters;)Lcom/mapbox/common/TilesetDescriptor;
225227
public final fun createPlacesTilesetDescriptor (Ljava/lang/String;)Lcom/mapbox/common/TilesetDescriptor;
226228
public final fun createPlacesTilesetDescriptor (Ljava/lang/String;Ljava/lang/String;)Lcom/mapbox/common/TilesetDescriptor;
227-
public final fun createPlacesTilesetDescriptor (Ljava/lang/String;Ljava/lang/String;Lcom/mapbox/search/common/IsoLanguageCode;Lcom/mapbox/search/common/IsoCountryCode;)Lcom/mapbox/common/TilesetDescriptor;
228229
public final fun createPlacesTilesetDescriptor (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Lcom/mapbox/common/TilesetDescriptor;
229-
public static synthetic fun createPlacesTilesetDescriptor$default (Lcom/mapbox/search/offline/OfflineSearchEngine$Companion;Ljava/lang/String;Ljava/lang/String;Lcom/mapbox/search/common/IsoLanguageCode;Lcom/mapbox/search/common/IsoCountryCode;ILjava/lang/Object;)Lcom/mapbox/common/TilesetDescriptor;
230230
public static synthetic fun createPlacesTilesetDescriptor$default (Lcom/mapbox/search/offline/OfflineSearchEngine$Companion;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;ILjava/lang/Object;)Lcom/mapbox/common/TilesetDescriptor;
231231
public final fun createTilesetDescriptor ()Lcom/mapbox/common/TilesetDescriptor;
232+
public final fun createTilesetDescriptor (Lcom/mapbox/search/offline/TilesetParameters;)Lcom/mapbox/common/TilesetDescriptor;
232233
public final fun createTilesetDescriptor (Ljava/lang/String;)Lcom/mapbox/common/TilesetDescriptor;
233234
public final fun createTilesetDescriptor (Ljava/lang/String;Ljava/lang/String;)Lcom/mapbox/common/TilesetDescriptor;
234-
public final fun createTilesetDescriptor (Ljava/lang/String;Ljava/lang/String;Lcom/mapbox/search/common/IsoLanguageCode;Lcom/mapbox/search/common/IsoCountryCode;)Lcom/mapbox/common/TilesetDescriptor;
235235
public final fun createTilesetDescriptor (Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;)Lcom/mapbox/common/TilesetDescriptor;
236-
public static synthetic fun createTilesetDescriptor$default (Lcom/mapbox/search/offline/OfflineSearchEngine$Companion;Ljava/lang/String;Ljava/lang/String;Lcom/mapbox/search/common/IsoLanguageCode;Lcom/mapbox/search/common/IsoCountryCode;ILjava/lang/Object;)Lcom/mapbox/common/TilesetDescriptor;
237236
public static synthetic fun createTilesetDescriptor$default (Lcom/mapbox/search/offline/OfflineSearchEngine$Companion;Ljava/lang/String;Ljava/lang/String;Ljava/lang/String;ILjava/lang/Object;)Lcom/mapbox/common/TilesetDescriptor;
238237
}
239238

@@ -258,8 +257,6 @@ public abstract interface class com/mapbox/search/offline/OfflineSearchEngine$On
258257
}
259258

260259
public final class com/mapbox/search/offline/OfflineSearchEngineSettings {
261-
public static final field DEFAULT_DATASET Ljava/lang/String;
262-
public static final field DEFAULT_VERSION Ljava/lang/String;
263260
public fun <init> ()V
264261
public fun <init> (Lcom/mapbox/common/TileStore;)V
265262
public fun <init> (Lcom/mapbox/common/TileStore;Ljava/net/URI;)V
@@ -401,3 +398,23 @@ public final class com/mapbox/search/offline/OfflineSearchResultType$Companion {
401398
public final fun getDEFAULT ()Lcom/mapbox/search/offline/OfflineSearchResultType;
402399
}
403400

401+
public final class com/mapbox/search/offline/TilesetParameters {
402+
public static final synthetic field DEFAULT_DATASET Ljava/lang/String;
403+
public static final synthetic field DEFAULT_VERSION Ljava/lang/String;
404+
public fun equals (Ljava/lang/Object;)Z
405+
public fun hashCode ()I
406+
public fun toString ()Ljava/lang/String;
407+
}
408+
409+
public final class com/mapbox/search/offline/TilesetParameters$Builder {
410+
public fun <init> ()V
411+
public fun <init> (Ljava/lang/String;)V
412+
public fun <init> (Ljava/lang/String;Ljava/lang/String;)V
413+
public synthetic fun <init> (Ljava/lang/String;Ljava/lang/String;ILkotlin/jvm/internal/DefaultConstructorMarker;)V
414+
public final fun build ()Lcom/mapbox/search/offline/TilesetParameters;
415+
public final fun getDataset ()Ljava/lang/String;
416+
public final fun getVersion ()Ljava/lang/String;
417+
public final fun language (Lcom/mapbox/search/common/IsoLanguageCode;)Lcom/mapbox/search/offline/TilesetParameters$Builder;
418+
public final fun worldview (Lcom/mapbox/search/common/IsoLanguageCode;Lcom/mapbox/search/common/IsoCountryCode;)Lcom/mapbox/search/offline/TilesetParameters$Builder;
419+
}
420+

0 commit comments

Comments
 (0)