Skip to content

Commit c2d4850

Browse files
sarahsporcktyrauber
sarahsporck
authored and
tyrauber
committed
feat: update maplibre native version
1 parent 27ec4c6 commit c2d4850

File tree

3 files changed

+27
-32
lines changed

3 files changed

+27
-32
lines changed

‎android/rctmgl/build.gradle

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ dependencies {
3333
implementation("com.facebook.react:react-android")
3434

3535
// MapLibre SDK
36-
implementation "org.maplibre.gl:android-sdk:9.6.0"
36+
implementation "org.maplibre.gl:android-sdk:10.2.0"
3737
implementation "org.maplibre.gl:android-sdk-turf:5.9.0"
3838

3939
// Dependencies
@@ -45,9 +45,9 @@ dependencies {
4545

4646

4747
// MapLibre plugins
48-
implementation ("org.maplibre.gl:android-plugin-localization-v9:1.0.0")
49-
implementation ("org.maplibre.gl:android-plugin-annotation-v9:1.0.0")
50-
implementation ("org.maplibre.gl:android-plugin-markerview-v9:1.0.0")
48+
implementation ("org.maplibre.gl:android-plugin-localization-v9:2.0.1")
49+
implementation ("org.maplibre.gl:android-plugin-annotation-v9:2.0.1")
50+
implementation ("org.maplibre.gl:android-plugin-markerview-v9:2.0.1")
5151
}
5252

5353
allprojects {

‎android/rctmgl/src/main/java/com/mapbox/rctmgl/location/LocationManager.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
import com.mapbox.android.core.location.LocationEnginePriority;
1414
*/
1515

16-
import com.mapbox.mapboxsdk.location.engine.LocationEngineProvider;
16+
import com.mapbox.mapboxsdk.location.engine.LocationEngineDefault;
1717
import com.mapbox.mapboxsdk.location.engine.LocationEngineRequest;
1818
import com.mapbox.mapboxsdk.location.engine.LocationEngineResult;
1919
import com.mapbox.mapboxsdk.location.permissions.PermissionsManager;
@@ -63,7 +63,7 @@ private LocationManager(Context context) {
6363

6464
}
6565
private void buildEngineRequest() {
66-
locationEngine = LocationEngineProvider.getBestLocationEngine(this.context.getApplicationContext());
66+
locationEngine = LocationEngineDefault.INSTANCE.getDefaultLocationEngine(this.context.getApplicationContext());
6767
locationEngineRequest = new LocationEngineRequest.Builder(DEFAULT_INTERVAL_MILLIS)
6868
.setFastestInterval(DEFAULT_FASTEST_INTERVAL_MILLIS)
6969
.setPriority(LocationEngineRequest.PRIORITY_HIGH_ACCURACY)

‎android/rctmgl/src/main/java/com/mapbox/rctmgl/modules/RCTMGLOfflineModule.java

Lines changed: 21 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,11 @@
11
package com.mapbox.rctmgl.modules;
22

3+
import android.content.Context;
34
import android.os.Handler;
45
import android.os.Looper;
56
import android.util.Log;
67

7-
import com.facebook.react.bridge.Arguments;
8-
import com.facebook.react.bridge.Promise;
9-
import com.facebook.react.bridge.ReactApplicationContext;
10-
import com.facebook.react.bridge.ReactContextBaseJavaModule;
11-
import com.facebook.react.bridge.ReactMethod;
12-
import com.facebook.react.bridge.ReadableMap;
13-
import com.facebook.react.bridge.WritableArray;
14-
import com.facebook.react.bridge.WritableMap;
15-
import com.facebook.react.bridge.WritableNativeMap;
8+
import com.facebook.react.bridge.*;
169
import com.facebook.react.module.annotations.ReactModule;
1710
import com.facebook.react.modules.core.RCTNativeAppEventEmitter;
1811
import com.mapbox.geojson.FeatureCollection;
@@ -58,12 +51,14 @@ public class RCTMGLOfflineModule extends ReactContextBaseJavaModule {
5851
public static final Double DEFAULT_MIN_ZOOM_LEVEL = 10.0;
5952
public static final Double DEFAULT_MAX_ZOOM_LEVEL = 20.0;
6053

61-
private ReactApplicationContext mReactContext;
54+
private final Context mContext;
55+
private final ReactContext mReactContext;
6256
private Double mProgressEventThrottle = 300.0;
6357

6458
public RCTMGLOfflineModule(ReactApplicationContext reactApplicationContext) {
6559
super(reactApplicationContext);
6660
mReactContext = reactApplicationContext;
61+
mContext = reactApplicationContext.getApplicationContext();
6762
}
6863

6964
@Override
@@ -84,7 +79,7 @@ public void removeListeners(Integer count) {
8479
@ReactMethod
8580
public void createPack(ReadableMap options, final Promise promise) {
8681
final String name = ConvertUtils.getString("name", options, "");
87-
final OfflineManager offlineManager = OfflineManager.getInstance(mReactContext);
82+
final OfflineManager offlineManager = OfflineManager.Companion.getInstance(mContext);
8883
LatLngBounds latLngBounds = getBoundsFromOptions(options);
8984

9085
OfflineRegionDefinition definition = makeDefinition(latLngBounds, options);
@@ -110,7 +105,7 @@ public void onError(String error) {
110105
public void getPacks(final Promise promise) {
111106
activateFileSource();
112107

113-
final OfflineManager offlineManager = OfflineManager.getInstance(mReactContext);
108+
final OfflineManager offlineManager = OfflineManager.Companion.getInstance(mContext);
114109

115110
offlineManager.listOfflineRegions(new OfflineManager.ListOfflineRegionsCallback() {
116111
@Override
@@ -134,7 +129,7 @@ public void onError(String error) {
134129
@ReactMethod
135130
public void invalidateAmbientCache(final Promise promise) {
136131
activateFileSource();
137-
final OfflineManager offlineManager = OfflineManager.getInstance(mReactContext);
132+
final OfflineManager offlineManager = OfflineManager.Companion.getInstance(mContext);
138133
offlineManager.invalidateAmbientCache(new OfflineManager.FileSourceCallback() {
139134
@Override
140135
public void onSuccess() {
@@ -152,7 +147,7 @@ public void onError(String error) {
152147
public void clearAmbientCache(final Promise promise) {
153148
activateFileSource();
154149

155-
final OfflineManager offlineManager = OfflineManager.getInstance(mReactContext);
150+
final OfflineManager offlineManager = OfflineManager.Companion.getInstance(mContext);
156151

157152
offlineManager.clearAmbientCache(new OfflineManager.FileSourceCallback() {
158153
@Override
@@ -171,7 +166,7 @@ public void onError(String error) {
171166
public void setMaximumAmbientCacheSize(int size, final Promise promise) {
172167
activateFileSource();
173168

174-
final OfflineManager offlineManager = OfflineManager.getInstance(mReactContext);
169+
final OfflineManager offlineManager = OfflineManager.Companion.getInstance(mContext);
175170

176171
offlineManager.setMaximumAmbientCacheSize(size, new OfflineManager.FileSourceCallback() {
177172
@Override
@@ -190,7 +185,7 @@ public void onError(String error) {
190185
@ReactMethod
191186
public void resetDatabase(final Promise promise) {
192187
activateFileSource();
193-
final OfflineManager offlineManager = OfflineManager.getInstance(mReactContext);
188+
final OfflineManager offlineManager = OfflineManager.Companion.getInstance(mContext);
194189
offlineManager.resetDatabase(new OfflineManager.FileSourceCallback() {
195190
@Override
196191
public void onSuccess() {
@@ -208,7 +203,7 @@ public void onError(String error) {
208203
public void getPackStatus(final String name, final Promise promise) {
209204
activateFileSource();
210205

211-
final OfflineManager offlineManager = OfflineManager.getInstance(mReactContext);
206+
final OfflineManager offlineManager = OfflineManager.Companion.getInstance(mContext);
212207

213208
offlineManager.listOfflineRegions(new OfflineManager.ListOfflineRegionsCallback() {
214209
@Override
@@ -245,7 +240,7 @@ public void onError(String error) {
245240
public void setPackObserver(final String name, final Promise promise) {
246241
activateFileSource();
247242

248-
final OfflineManager offlineManager = OfflineManager.getInstance(mReactContext);
243+
final OfflineManager offlineManager = OfflineManager.Companion.getInstance(mContext);
249244

250245
offlineManager.listOfflineRegions(new OfflineManager.ListOfflineRegionsCallback() {
251246
@Override
@@ -271,7 +266,7 @@ public void onError(String error) {
271266
public void invalidatePack(final String name, final Promise promise) {
272267
activateFileSource();
273268

274-
final OfflineManager offlineManager = OfflineManager.getInstance(mReactContext);
269+
final OfflineManager offlineManager = OfflineManager.Companion.getInstance(mContext);
275270

276271
offlineManager.listOfflineRegions(new OfflineManager.ListOfflineRegionsCallback() {
277272
@Override
@@ -308,7 +303,7 @@ public void onError(String error) {
308303
public void deletePack(final String name, final Promise promise) {
309304
activateFileSource();
310305

311-
final OfflineManager offlineManager = OfflineManager.getInstance(mReactContext);
306+
final OfflineManager offlineManager = OfflineManager.Companion.getInstance(mContext);
312307

313308
offlineManager.listOfflineRegions(new OfflineManager.ListOfflineRegionsCallback() {
314309
@Override
@@ -348,7 +343,7 @@ public void onError(String error) {
348343
public void pausePackDownload(final String name, final Promise promise) {
349344
activateFileSource();
350345

351-
final OfflineManager offlineManager = OfflineManager.getInstance(mReactContext);
346+
final OfflineManager offlineManager = OfflineManager.Companion.getInstance(mContext);
352347

353348
offlineManager.listOfflineRegions(new OfflineManager.ListOfflineRegionsCallback() {
354349
@Override
@@ -380,7 +375,7 @@ public void onError(String error) {
380375
public void resumePackDownload(final String name, final Promise promise) {
381376
activateFileSource();
382377

383-
final OfflineManager offlineManager = OfflineManager.getInstance(mReactContext);
378+
final OfflineManager offlineManager = OfflineManager.Companion.getInstance(mContext);
384379

385380
offlineManager.listOfflineRegions(new OfflineManager.ListOfflineRegionsCallback() {
386381
@Override
@@ -407,7 +402,7 @@ public void onError(String error) {
407402
public void mergeOfflineRegions(final String path, final Promise promise) {
408403
activateFileSource();
409404

410-
final OfflineManager offlineManager = OfflineManager.getInstance(mReactContext);
405+
final OfflineManager offlineManager = OfflineManager.Companion.getInstance(mContext);
411406

412407
offlineManager.mergeOfflineRegions(path, new OfflineManager.MergeOfflineRegionsCallback() {
413408
@Override
@@ -424,7 +419,7 @@ public void onError(String error) {
424419

425420
@ReactMethod
426421
public void setTileCountLimit(int tileCountLimit) {
427-
OfflineManager offlineManager = OfflineManager.getInstance(mReactContext);
422+
OfflineManager offlineManager = OfflineManager.Companion.getInstance(mContext);
428423
offlineManager.setOfflineMapboxTileCountLimit(tileCountLimit);
429424
}
430425

@@ -439,7 +434,7 @@ private OfflineRegionDefinition makeDefinition(LatLngBounds latLngBounds, Readab
439434
latLngBounds,
440435
ConvertUtils.getDouble("minZoom", options, DEFAULT_MIN_ZOOM_LEVEL),
441436
ConvertUtils.getDouble("maxZoom", options, DEFAULT_MAX_ZOOM_LEVEL),
442-
mReactContext.getResources().getDisplayMetrics().density);
437+
mContext.getResources().getDisplayMetrics().density);
443438
}
444439

445440
private byte[] getMetadataBytes(String metadata) {
@@ -591,7 +586,7 @@ private OfflineRegion getRegionByName(String name, OfflineRegion[] offlineRegion
591586
}
592587

593588
private void activateFileSource() {
594-
FileSource fileSource = FileSource.getInstance(mReactContext);
589+
FileSource fileSource = FileSource.getInstance(mContext);
595590
fileSource.activate();
596591
}
597592
}

0 commit comments

Comments
 (0)