@maplibre/maplibre-react-native 10.0.0-alpha.6 → 10.0.0-alpha.8

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (113) hide show
  1. package/.eslintrc.js +3 -1
  2. package/.yarn/sdks/eslint/bin/eslint.js +8 -1
  3. package/.yarn/sdks/eslint/lib/api.js +8 -1
  4. package/.yarn/sdks/eslint/lib/unsupported-api.js +8 -1
  5. package/.yarn/sdks/prettier/bin/prettier.cjs +8 -1
  6. package/.yarn/sdks/prettier/index.cjs +8 -1
  7. package/.yarn/sdks/typescript/bin/tsc +8 -1
  8. package/.yarn/sdks/typescript/bin/tsserver +8 -1
  9. package/.yarn/sdks/typescript/lib/tsc.js +8 -1
  10. package/.yarn/sdks/typescript/lib/tsserver.js +20 -6
  11. package/.yarn/sdks/typescript/lib/tsserverlibrary.js +20 -6
  12. package/.yarn/sdks/typescript/lib/typescript.js +8 -1
  13. package/CHANGELOG.md +7 -0
  14. package/CONTRIBUTING.md +10 -9
  15. package/android/build.gradle +1 -1
  16. package/android/rctmln/build.gradle +5 -5
  17. package/android/rctmln/src/main/java/com/maplibre/rctmln/components/annotation/MarkerView.java +2 -2
  18. package/android/rctmln/src/main/java/com/maplibre/rctmln/components/annotation/MarkerViewManager.java +6 -6
  19. package/android/rctmln/src/main/java/com/maplibre/rctmln/components/annotation/RCTMLNMarkerView.java +5 -5
  20. package/android/rctmln/src/main/java/com/maplibre/rctmln/components/annotation/RCTMLNPointAnnotation.java +9 -8
  21. package/android/rctmln/src/main/java/com/maplibre/rctmln/components/camera/CameraStop.java +14 -12
  22. package/android/rctmln/src/main/java/com/maplibre/rctmln/components/camera/CameraUpdateItem.java +10 -10
  23. package/android/rctmln/src/main/java/com/maplibre/rctmln/components/camera/CameraUpdateQueue.java +1 -1
  24. package/android/rctmln/src/main/java/com/maplibre/rctmln/components/camera/RCTMLNCamera.java +26 -26
  25. package/android/rctmln/src/main/java/com/maplibre/rctmln/components/camera/RCTMLNCameraManager.java +1 -1
  26. package/android/rctmln/src/main/java/com/maplibre/rctmln/components/images/RCTMLNImages.java +12 -12
  27. package/android/rctmln/src/main/java/com/maplibre/rctmln/components/location/LocationComponentManager.java +9 -9
  28. package/android/rctmln/src/main/java/com/maplibre/rctmln/components/location/RCTMLNNativeUserLocation.java +7 -7
  29. package/android/rctmln/src/main/java/com/maplibre/rctmln/components/location/RCTMLNNativeUserLocationManager.java +1 -1
  30. package/android/rctmln/src/main/java/com/maplibre/rctmln/components/mapview/LayerSourceInfo.java +9 -9
  31. package/android/rctmln/src/main/java/com/maplibre/rctmln/components/mapview/RCTMLNAndroidTextureMapView.java +2 -2
  32. package/android/rctmln/src/main/java/com/maplibre/rctmln/components/mapview/RCTMLNAndroidTextureMapViewManager.java +2 -2
  33. package/android/rctmln/src/main/java/com/maplibre/rctmln/components/mapview/RCTMLNMapView.java +43 -43
  34. package/android/rctmln/src/main/java/com/maplibre/rctmln/components/mapview/RCTMLNMapViewManager.java +6 -6
  35. package/android/rctmln/src/main/java/com/maplibre/rctmln/components/styles/RCTMLNStyle.java +3 -3
  36. package/android/rctmln/src/main/java/com/maplibre/rctmln/components/styles/RCTMLNStyleFactory.java +14 -14
  37. package/android/rctmln/src/main/java/com/maplibre/rctmln/components/styles/RCTMLNStyleFunctionParser.java +2 -2
  38. package/android/rctmln/src/main/java/com/maplibre/rctmln/components/styles/RCTMLNStyleValue.java +2 -2
  39. package/android/rctmln/src/main/java/com/maplibre/rctmln/components/styles/layers/RCTLayer.java +8 -8
  40. package/android/rctmln/src/main/java/com/maplibre/rctmln/components/styles/layers/RCTMLNBackgroundLayer.java +1 -1
  41. package/android/rctmln/src/main/java/com/maplibre/rctmln/components/styles/layers/RCTMLNCircleLayer.java +2 -2
  42. package/android/rctmln/src/main/java/com/maplibre/rctmln/components/styles/layers/RCTMLNFillExtrusionLayer.java +2 -2
  43. package/android/rctmln/src/main/java/com/maplibre/rctmln/components/styles/layers/RCTMLNFillLayer.java +2 -2
  44. package/android/rctmln/src/main/java/com/maplibre/rctmln/components/styles/layers/RCTMLNHeatmapLayer.java +2 -2
  45. package/android/rctmln/src/main/java/com/maplibre/rctmln/components/styles/layers/RCTMLNLineLayer.java +2 -2
  46. package/android/rctmln/src/main/java/com/maplibre/rctmln/components/styles/layers/RCTMLNRasterLayer.java +1 -1
  47. package/android/rctmln/src/main/java/com/maplibre/rctmln/components/styles/layers/RCTMLNSymbolLayer.java +2 -2
  48. package/android/rctmln/src/main/java/com/maplibre/rctmln/components/styles/light/RCTMLNLight.java +6 -6
  49. package/android/rctmln/src/main/java/com/maplibre/rctmln/components/styles/sources/RCTMLNImageSource.java +3 -3
  50. package/android/rctmln/src/main/java/com/maplibre/rctmln/components/styles/sources/RCTMLNImageSourceManager.java +1 -1
  51. package/android/rctmln/src/main/java/com/maplibre/rctmln/components/styles/sources/RCTMLNRasterSource.java +3 -3
  52. package/android/rctmln/src/main/java/com/maplibre/rctmln/components/styles/sources/RCTMLNShapeSource.java +9 -9
  53. package/android/rctmln/src/main/java/com/maplibre/rctmln/components/styles/sources/RCTMLNShapeSourceManager.java +1 -1
  54. package/android/rctmln/src/main/java/com/maplibre/rctmln/components/styles/sources/RCTMLNTileSource.java +2 -2
  55. package/android/rctmln/src/main/java/com/maplibre/rctmln/components/styles/sources/RCTMLNVectorSource.java +4 -4
  56. package/android/rctmln/src/main/java/com/maplibre/rctmln/components/styles/sources/RCTSource.java +7 -7
  57. package/android/rctmln/src/main/java/com/maplibre/rctmln/events/FeatureClickEvent.java +2 -2
  58. package/android/rctmln/src/main/java/com/maplibre/rctmln/events/MapClickEvent.java +1 -1
  59. package/android/rctmln/src/main/java/com/maplibre/rctmln/events/PointAnnotationClickEvent.java +2 -2
  60. package/android/rctmln/src/main/java/com/maplibre/rctmln/events/PointAnnotationDragEvent.java +2 -2
  61. package/android/rctmln/src/main/java/com/maplibre/rctmln/location/LocationManager.java +6 -6
  62. package/android/rctmln/src/main/java/com/maplibre/rctmln/location/UserLocation.java +1 -1
  63. package/android/rctmln/src/main/java/com/maplibre/rctmln/location/UserTrackingMode.java +3 -3
  64. package/android/rctmln/src/main/java/com/maplibre/rctmln/modules/RCTMLNLocationModule.java +2 -2
  65. package/android/rctmln/src/main/java/com/maplibre/rctmln/modules/RCTMLNLogging.java +2 -2
  66. package/android/rctmln/src/main/java/com/maplibre/rctmln/modules/RCTMLNModule.java +8 -8
  67. package/android/rctmln/src/main/java/com/maplibre/rctmln/modules/RCTMLNOfflineModule.java +11 -11
  68. package/android/rctmln/src/main/java/com/maplibre/rctmln/modules/RCTMLNSnapshotModule.java +7 -7
  69. package/android/rctmln/src/main/java/com/maplibre/rctmln/utils/ClusterPropertyEntry.java +1 -1
  70. package/android/rctmln/src/main/java/com/maplibre/rctmln/utils/DownloadMapImageTask.java +5 -5
  71. package/android/rctmln/src/main/java/com/maplibre/rctmln/utils/ExpressionParser.java +2 -2
  72. package/android/rctmln/src/main/java/com/maplibre/rctmln/utils/GeoJSONUtils.java +13 -13
  73. package/android/rctmln/src/main/java/com/maplibre/rctmln/utils/GeoViewport.java +3 -3
  74. package/android/rctmln/src/main/java/com/maplibre/rctmln/utils/SimpleEventCallback.java +2 -2
  75. package/android/rctmln/src/main/java/com/maplibre/rctmln/utils/SphericalMercator.java +1 -1
  76. package/docs/Camera.md +3 -3
  77. package/docs/MapView.md +9 -33
  78. package/docs/UserLocation.md +10 -2
  79. package/docs/docs.json +16 -31
  80. package/javascript/Maplibre.ts +5 -1
  81. package/javascript/components/BackgroundLayer.tsx +27 -20
  82. package/javascript/components/Callout.tsx +40 -40
  83. package/javascript/components/Camera.tsx +421 -478
  84. package/javascript/components/CircleLayer.tsx +29 -22
  85. package/javascript/components/FillExtrusionLayer.tsx +23 -23
  86. package/javascript/components/FillLayer.tsx +22 -19
  87. package/javascript/components/HeatmapLayer.tsx +21 -19
  88. package/javascript/components/ImageSource.tsx +25 -32
  89. package/javascript/components/Images.tsx +36 -35
  90. package/javascript/components/Light.tsx +20 -47
  91. package/javascript/components/LineLayer.tsx +23 -20
  92. package/javascript/components/MapView.tsx +604 -554
  93. package/javascript/components/MarkerView.tsx +23 -38
  94. package/javascript/components/NativeUserLocation.tsx +3 -5
  95. package/javascript/components/PointAnnotation.tsx +111 -87
  96. package/javascript/components/RasterLayer.tsx +21 -18
  97. package/javascript/components/RasterSource.tsx +39 -42
  98. package/javascript/components/ShapeSource.tsx +287 -239
  99. package/javascript/components/Style.tsx +1 -1
  100. package/javascript/components/SymbolLayer.tsx +34 -28
  101. package/javascript/components/UserLocation.tsx +164 -151
  102. package/javascript/components/VectorSource.tsx +128 -117
  103. package/javascript/components/annotations/Annotation.tsx +105 -79
  104. package/javascript/{components/AbstractLayer.tsx → hooks/useAbstractLayer.ts} +54 -37
  105. package/javascript/hooks/useAbstractSource.ts +34 -0
  106. package/javascript/hooks/useNativeBridge.ts +125 -0
  107. package/javascript/hooks/useNativeRef.ts +13 -0
  108. package/javascript/hooks/useOnce.ts +12 -0
  109. package/javascript/utils/Logger.ts +3 -3
  110. package/package.json +2 -1
  111. package/scripts/templates/RCTMLNStyleFactory.java.ejs +14 -14
  112. package/javascript/components/AbstractSource.tsx +0 -27
  113. package/javascript/components/NativeBridgeComponent.tsx +0 -117
@@ -11,16 +11,16 @@ import com.facebook.react.common.MapBuilder;
11
11
  import com.facebook.react.uimanager.LayoutShadowNode;
12
12
  import com.facebook.react.uimanager.ThemedReactContext;
13
13
  import com.facebook.react.uimanager.annotations.ReactProp;
14
- import com.mapbox.mapboxsdk.geometry.LatLngBounds;
15
- import com.mapbox.mapboxsdk.log.Logger;
16
- import com.mapbox.mapboxsdk.maps.MapboxMap;
14
+ import org.maplibre.android.geometry.LatLngBounds;
15
+ import org.maplibre.android.log.Logger;
16
+ import org.maplibre.android.maps.MapLibreMap;
17
17
  import com.maplibre.rctmln.components.AbstractEventEmitter;
18
18
  import com.maplibre.rctmln.events.constants.EventKeys;
19
19
  import com.maplibre.rctmln.utils.ConvertUtils;
20
20
  import com.maplibre.rctmln.utils.ExpressionParser;
21
21
  import com.maplibre.rctmln.utils.GeoJSONUtils;
22
- import com.mapbox.geojson.FeatureCollection;
23
- import com.mapbox.geojson.Point;
22
+ import org.maplibre.geojson.FeatureCollection;
23
+ import org.maplibre.geojson.Point;
24
24
 
25
25
  import java.util.ArrayList;
26
26
  import java.util.HashMap;
@@ -247,7 +247,7 @@ public class RCTMLNMapViewManager extends AbstractEventEmitter<RCTMLNMapView> {
247
247
  @Override
248
248
  public void receiveCommand(RCTMLNMapView mapView, int commandID, @Nullable ReadableArray args) {
249
249
  // allows method calls to work with componentDidMount
250
- MapboxMap mapboxMap = mapView.getMapboxMap();
250
+ MapLibreMap mapboxMap = mapView.getMapboxMap();
251
251
  if (mapboxMap == null) {
252
252
  mapView.enqueuePreRenderMapMethod(commandID, args);
253
253
  return;
@@ -5,7 +5,7 @@ import androidx.annotation.NonNull;
5
5
 
6
6
  import com.facebook.react.bridge.ReadableMap;
7
7
  import com.facebook.react.bridge.ReadableMapKeySetIterator;
8
- import com.mapbox.mapboxsdk.maps.MapboxMap;
8
+ import org.maplibre.android.maps.MapLibreMap;
9
9
  import com.maplibre.rctmln.utils.DownloadMapImageTask;
10
10
  import com.maplibre.rctmln.utils.ImageEntry;
11
11
 
@@ -21,9 +21,9 @@ import java.util.Map;
21
21
  public class RCTMLNStyle {
22
22
  private Context mContext;
23
23
  private ReadableMap mReactStyle;
24
- private MapboxMap mMap;
24
+ private MapLibreMap mMap;
25
25
 
26
- public RCTMLNStyle(@NonNull Context context, @NonNull ReadableMap reactStyle, @NonNull MapboxMap map) {
26
+ public RCTMLNStyle(@NonNull Context context, @NonNull ReadableMap reactStyle, @NonNull MapLibreMap map) {
27
27
  mContext = context;
28
28
  mReactStyle = reactStyle;
29
29
  mMap = map;
@@ -3,20 +3,20 @@
3
3
 
4
4
  package com.maplibre.rctmln.components.styles;
5
5
 
6
- import com.mapbox.mapboxsdk.style.layers.BackgroundLayer;
7
- import com.mapbox.mapboxsdk.style.layers.CircleLayer;
8
- import com.mapbox.mapboxsdk.style.layers.FillExtrusionLayer;
9
- import com.mapbox.mapboxsdk.style.layers.FillLayer;
10
- import com.mapbox.mapboxsdk.style.layers.LineLayer;
11
- import com.mapbox.mapboxsdk.style.layers.PropertyFactory;
12
- import com.mapbox.mapboxsdk.style.layers.PropertyValue;
13
- import com.mapbox.mapboxsdk.style.layers.RasterLayer;
14
- import com.mapbox.mapboxsdk.style.layers.SymbolLayer;
15
- import com.mapbox.mapboxsdk.style.layers.HeatmapLayer;
16
- import com.mapbox.mapboxsdk.style.layers.HillshadeLayer;
17
- import com.mapbox.mapboxsdk.style.layers.TransitionOptions;
18
- import com.mapbox.mapboxsdk.style.light.Light;
19
- import com.mapbox.mapboxsdk.style.light.Position;
6
+ import org.maplibre.android.style.layers.BackgroundLayer;
7
+ import org.maplibre.android.style.layers.CircleLayer;
8
+ import org.maplibre.android.style.layers.FillExtrusionLayer;
9
+ import org.maplibre.android.style.layers.FillLayer;
10
+ import org.maplibre.android.style.layers.LineLayer;
11
+ import org.maplibre.android.style.layers.PropertyFactory;
12
+ import org.maplibre.android.style.layers.PropertyValue;
13
+ import org.maplibre.android.style.layers.RasterLayer;
14
+ import org.maplibre.android.style.layers.SymbolLayer;
15
+ import org.maplibre.android.style.layers.HeatmapLayer;
16
+ import org.maplibre.android.style.layers.HillshadeLayer;
17
+ import org.maplibre.android.style.layers.TransitionOptions;
18
+ import org.maplibre.android.style.light.Light;
19
+ import org.maplibre.android.style.light.Position;
20
20
  import com.maplibre.rctmln.utils.DownloadMapImageTask;
21
21
 
22
22
  import java.util.List;
@@ -9,8 +9,8 @@ import com.facebook.react.bridge.ReadableMap;
9
9
  import com.facebook.react.bridge.ReadableMapKeySetIterator;
10
10
  import com.facebook.react.bridge.ReadableNativeArray;
11
11
  import com.facebook.react.bridge.ReadableType;
12
- import com.mapbox.mapboxsdk.style.expressions.Expression.Stop;
13
- import com.mapbox.mapboxsdk.style.layers.PropertyValue;
12
+ import org.maplibre.android.style.expressions.Expression.Stop;
13
+ import org.maplibre.android.style.layers.PropertyValue;
14
14
 
15
15
  import java.text.NumberFormat;
16
16
  import java.text.ParseException;
@@ -8,8 +8,8 @@ import com.facebook.react.bridge.ReadableMap;
8
8
  import com.facebook.react.bridge.ReadableType;
9
9
  import com.facebook.react.bridge.WritableNativeMap;
10
10
  import com.google.gson.JsonArray;
11
- import com.mapbox.mapboxsdk.style.expressions.Expression;
12
- import com.mapbox.mapboxsdk.style.layers.TransitionOptions;
11
+ import org.maplibre.android.style.expressions.Expression;
12
+ import org.maplibre.android.style.layers.TransitionOptions;
13
13
  import com.maplibre.rctmln.utils.ConvertUtils;
14
14
  import com.maplibre.rctmln.utils.ExpressionParser;
15
15
  import com.maplibre.rctmln.utils.ImageEntry;
@@ -5,13 +5,13 @@ import android.content.Context;
5
5
  import com.facebook.react.bridge.ReadableArray;
6
6
  import com.facebook.react.bridge.ReadableMap;
7
7
  import com.facebook.common.logging.FLog;
8
- import com.mapbox.mapboxsdk.location.LocationComponentConstants;
9
- import com.mapbox.mapboxsdk.maps.MapboxMap;
10
- import com.mapbox.mapboxsdk.maps.Style;
11
- import com.mapbox.mapboxsdk.style.expressions.Expression;
12
- import com.mapbox.mapboxsdk.style.layers.Layer;
13
- import com.mapbox.mapboxsdk.style.layers.Property;
14
- import com.mapbox.mapboxsdk.style.layers.PropertyFactory;
8
+ import org.maplibre.android.location.LocationComponentConstants;
9
+ import org.maplibre.android.maps.MapLibreMap;
10
+ import org.maplibre.android.maps.Style;
11
+ import org.maplibre.android.style.expressions.Expression;
12
+ import org.maplibre.android.style.layers.Layer;
13
+ import org.maplibre.android.style.layers.Property;
14
+ import org.maplibre.android.style.layers.PropertyFactory;
15
15
  import com.maplibre.rctmln.components.AbstractMapFeature;
16
16
  import com.maplibre.rctmln.components.mapview.RCTMLNMapView;
17
17
  import com.maplibre.rctmln.utils.ExpressionParser;
@@ -39,7 +39,7 @@ public abstract class RCTLayer<T extends Layer> extends AbstractMapFeature {
39
39
  protected ReadableMap mReactStyle;
40
40
  protected Expression mFilter;
41
41
 
42
- protected MapboxMap mMap;
42
+ protected MapLibreMap mMap;
43
43
  protected T mLayer;
44
44
 
45
45
  protected Context mContext;
@@ -2,7 +2,7 @@ package com.maplibre.rctmln.components.styles.layers;
2
2
 
3
3
  import android.content.Context;
4
4
 
5
- import com.mapbox.mapboxsdk.style.layers.BackgroundLayer;
5
+ import org.maplibre.android.style.layers.BackgroundLayer;
6
6
  import com.maplibre.rctmln.components.styles.RCTMLNStyle;
7
7
  import com.maplibre.rctmln.components.styles.RCTMLNStyleFactory;
8
8
 
@@ -2,8 +2,8 @@ package com.maplibre.rctmln.components.styles.layers;
2
2
 
3
3
  import android.content.Context;
4
4
 
5
- import com.mapbox.mapboxsdk.style.expressions.Expression;
6
- import com.mapbox.mapboxsdk.style.layers.CircleLayer;
5
+ import org.maplibre.android.style.expressions.Expression;
6
+ import org.maplibre.android.style.layers.CircleLayer;
7
7
  import com.maplibre.rctmln.components.mapview.RCTMLNMapView;
8
8
  import com.maplibre.rctmln.components.styles.RCTMLNStyle;
9
9
  import com.maplibre.rctmln.components.styles.RCTMLNStyleFactory;
@@ -2,8 +2,8 @@ package com.maplibre.rctmln.components.styles.layers;
2
2
 
3
3
  import android.content.Context;
4
4
 
5
- import com.mapbox.mapboxsdk.style.expressions.Expression;
6
- import com.mapbox.mapboxsdk.style.layers.FillExtrusionLayer;
5
+ import org.maplibre.android.style.expressions.Expression;
6
+ import org.maplibre.android.style.layers.FillExtrusionLayer;
7
7
  import com.maplibre.rctmln.components.mapview.RCTMLNMapView;
8
8
  import com.maplibre.rctmln.components.styles.RCTMLNStyle;
9
9
  import com.maplibre.rctmln.components.styles.RCTMLNStyleFactory;
@@ -2,8 +2,8 @@ package com.maplibre.rctmln.components.styles.layers;
2
2
 
3
3
  import android.content.Context;
4
4
 
5
- import com.mapbox.mapboxsdk.style.expressions.Expression;
6
- import com.mapbox.mapboxsdk.style.layers.FillLayer;
5
+ import org.maplibre.android.style.expressions.Expression;
6
+ import org.maplibre.android.style.layers.FillLayer;
7
7
  import com.maplibre.rctmln.components.mapview.RCTMLNMapView;
8
8
  import com.maplibre.rctmln.components.styles.RCTMLNStyle;
9
9
  import com.maplibre.rctmln.components.styles.RCTMLNStyleFactory;
@@ -2,8 +2,8 @@ package com.maplibre.rctmln.components.styles.layers;
2
2
 
3
3
  import android.content.Context;
4
4
 
5
- import com.mapbox.mapboxsdk.style.expressions.Expression;
6
- import com.mapbox.mapboxsdk.style.layers.HeatmapLayer;
5
+ import org.maplibre.android.style.expressions.Expression;
6
+ import org.maplibre.android.style.layers.HeatmapLayer;
7
7
  import com.maplibre.rctmln.components.mapview.RCTMLNMapView;
8
8
  import com.maplibre.rctmln.components.styles.RCTMLNStyle;
9
9
  import com.maplibre.rctmln.components.styles.RCTMLNStyleFactory;
@@ -2,8 +2,8 @@ package com.maplibre.rctmln.components.styles.layers;
2
2
 
3
3
  import android.content.Context;
4
4
 
5
- import com.mapbox.mapboxsdk.style.expressions.Expression;
6
- import com.mapbox.mapboxsdk.style.layers.LineLayer;
5
+ import org.maplibre.android.style.expressions.Expression;
6
+ import org.maplibre.android.style.layers.LineLayer;
7
7
  import com.maplibre.rctmln.components.mapview.RCTMLNMapView;
8
8
  import com.maplibre.rctmln.components.styles.RCTMLNStyle;
9
9
  import com.maplibre.rctmln.components.styles.RCTMLNStyleFactory;
@@ -2,7 +2,7 @@ package com.maplibre.rctmln.components.styles.layers;
2
2
 
3
3
  import android.content.Context;
4
4
 
5
- import com.mapbox.mapboxsdk.style.layers.RasterLayer;
5
+ import org.maplibre.android.style.layers.RasterLayer;
6
6
  import com.maplibre.rctmln.components.styles.RCTMLNStyle;
7
7
  import com.maplibre.rctmln.components.styles.RCTMLNStyleFactory;
8
8
 
@@ -2,8 +2,8 @@ package com.maplibre.rctmln.components.styles.layers;
2
2
 
3
3
  import android.content.Context;
4
4
 
5
- import com.mapbox.mapboxsdk.style.expressions.Expression;
6
- import com.mapbox.mapboxsdk.style.layers.SymbolLayer;
5
+ import org.maplibre.android.style.expressions.Expression;
6
+ import org.maplibre.android.style.layers.SymbolLayer;
7
7
  import com.maplibre.rctmln.components.mapview.RCTMLNMapView;
8
8
  import com.maplibre.rctmln.components.styles.RCTMLNStyle;
9
9
  import com.maplibre.rctmln.components.styles.RCTMLNStyleFactory;
@@ -3,11 +3,11 @@ package com.maplibre.rctmln.components.styles.light;
3
3
  import android.content.Context;
4
4
 
5
5
  import com.facebook.react.bridge.ReadableMap;
6
- import com.mapbox.mapboxsdk.maps.MapboxMap;
7
- import com.mapbox.mapboxsdk.maps.Style;
8
- import com.mapbox.mapboxsdk.style.layers.TransitionOptions;
9
- import com.mapbox.mapboxsdk.style.light.Light;
10
- import com.mapbox.mapboxsdk.style.light.Position;
6
+ import org.maplibre.android.maps.MapLibreMap;
7
+ import org.maplibre.android.maps.Style;
8
+ import org.maplibre.android.style.layers.TransitionOptions;
9
+ import org.maplibre.android.style.light.Light;
10
+ import org.maplibre.android.style.light.Position;
11
11
  import com.maplibre.rctmln.components.AbstractMapFeature;
12
12
  import com.maplibre.rctmln.components.mapview.RCTMLNMapView;
13
13
  import com.maplibre.rctmln.components.styles.RCTMLNStyle;
@@ -21,7 +21,7 @@ import java.util.Map;
21
21
  */
22
22
 
23
23
  public class RCTMLNLight extends AbstractMapFeature {
24
- private MapboxMap mMap;
24
+ private MapLibreMap mMap;
25
25
  private ReadableMap mReactStyle;
26
26
 
27
27
  public RCTMLNLight(Context context) {
@@ -5,9 +5,9 @@ import android.util.Log;
5
5
 
6
6
  import com.facebook.drawee.backends.pipeline.Fresco;
7
7
  import com.facebook.react.views.imagehelper.ResourceDrawableIdHelper;
8
- import com.mapbox.geojson.Feature;
9
- import com.mapbox.mapboxsdk.geometry.LatLngQuad;
10
- import com.mapbox.mapboxsdk.style.sources.ImageSource;
8
+ import org.maplibre.geojson.Feature;
9
+ import org.maplibre.android.geometry.LatLngQuad;
10
+ import org.maplibre.android.style.sources.ImageSource;
11
11
 
12
12
  import java.net.MalformedURLException;
13
13
  import java.net.URL;
@@ -8,7 +8,7 @@ import com.facebook.react.uimanager.ThemedReactContext;
8
8
  import com.facebook.react.uimanager.ViewGroupManager;
9
9
  import com.facebook.react.uimanager.annotations.ReactProp;
10
10
  import com.facebook.react.views.imagehelper.ImageSource;
11
- import com.mapbox.mapboxsdk.geometry.LatLngQuad;
11
+ import org.maplibre.android.geometry.LatLngQuad;
12
12
  import com.maplibre.rctmln.utils.ConvertUtils;
13
13
  import com.maplibre.rctmln.utils.GeoJSONUtils;
14
14
 
@@ -2,10 +2,10 @@ package com.maplibre.rctmln.components.styles.sources;
2
2
 
3
3
  import android.content.Context;
4
4
 
5
- import com.mapbox.geojson.Feature;
6
- import com.mapbox.mapboxsdk.style.sources.RasterSource;
5
+ import org.maplibre.geojson.Feature;
6
+ import org.maplibre.android.style.sources.RasterSource;
7
7
 
8
- import static com.mapbox.mapboxsdk.style.sources.RasterSource.DEFAULT_TILE_SIZE;
8
+ import static org.maplibre.android.style.sources.RasterSource.DEFAULT_TILE_SIZE;
9
9
 
10
10
  /**
11
11
  * Created by nickitaliano on 9/25/17.
@@ -10,14 +10,14 @@ import androidx.core.content.res.ResourcesCompat;
10
10
 
11
11
  import com.facebook.react.bridge.WritableMap;
12
12
  import com.facebook.react.bridge.WritableNativeMap;
13
- import com.mapbox.geojson.Feature;
14
- import com.mapbox.geojson.FeatureCollection;
15
- import com.mapbox.mapboxsdk.maps.MapboxMap;
16
- import com.mapbox.mapboxsdk.maps.Style;
17
- import com.mapbox.mapboxsdk.style.expressions.Expression;
18
- import com.mapbox.mapboxsdk.style.sources.GeoJsonOptions;
19
- import com.mapbox.mapboxsdk.style.sources.GeoJsonSource;
20
- import com.mapbox.mapboxsdk.utils.BitmapUtils;
13
+ import org.maplibre.geojson.Feature;
14
+ import org.maplibre.geojson.FeatureCollection;
15
+ import org.maplibre.android.maps.MapLibreMap;
16
+ import org.maplibre.android.maps.Style;
17
+ import org.maplibre.android.style.expressions.Expression;
18
+ import org.maplibre.android.style.sources.GeoJsonOptions;
19
+ import org.maplibre.android.style.sources.GeoJsonSource;
20
+ import org.maplibre.android.utils.BitmapUtils;
21
21
  import com.maplibre.rctmln.R;
22
22
  import com.maplibre.rctmln.components.mapview.RCTMLNMapView;
23
23
  import com.maplibre.rctmln.events.AndroidCallbackEvent;
@@ -67,7 +67,7 @@ public class RCTMLNShapeSource extends RCTSource<GeoJsonSource> {
67
67
  mapView.getMapboxMap().getStyle(new Style.OnStyleLoaded() {
68
68
  @Override
69
69
  public void onStyleLoaded(@NonNull Style style) {
70
- MapboxMap map = mapView.getMapboxMap();
70
+ MapLibreMap map = mapView.getMapboxMap();
71
71
  RCTMLNShapeSource.super.addToMap(mapView);
72
72
  }
73
73
  });
@@ -18,7 +18,7 @@ import com.facebook.react.common.MapBuilder;
18
18
  import com.facebook.react.uimanager.ThemedReactContext;
19
19
  import com.facebook.react.uimanager.ViewGroupManager;
20
20
  import com.facebook.react.uimanager.annotations.ReactProp;
21
- import com.mapbox.mapboxsdk.style.expressions.Expression;
21
+ import org.maplibre.android.style.expressions.Expression;
22
22
  import com.maplibre.rctmln.components.AbstractEventEmitter;
23
23
  import com.maplibre.rctmln.components.annotation.RCTMLNCallout;
24
24
  import com.maplibre.rctmln.components.mapview.RCTMLNMapView;
@@ -2,8 +2,8 @@ package com.maplibre.rctmln.components.styles.sources;
2
2
 
3
3
  import android.content.Context;
4
4
 
5
- import com.mapbox.mapboxsdk.style.sources.Source;
6
- import com.mapbox.mapboxsdk.style.sources.TileSet;
5
+ import org.maplibre.android.style.sources.Source;
6
+ import org.maplibre.android.style.sources.TileSet;
7
7
 
8
8
  import java.util.Collection;
9
9
 
@@ -6,10 +6,10 @@ import androidx.annotation.Size;
6
6
 
7
7
  import com.facebook.react.bridge.WritableMap;
8
8
  import com.facebook.react.bridge.WritableNativeMap;
9
- import com.mapbox.geojson.Feature;
10
- import com.mapbox.geojson.FeatureCollection;
11
- import com.mapbox.mapboxsdk.style.expressions.Expression;
12
- import com.mapbox.mapboxsdk.style.sources.VectorSource;
9
+ import org.maplibre.geojson.Feature;
10
+ import org.maplibre.geojson.FeatureCollection;
11
+ import org.maplibre.android.style.expressions.Expression;
12
+ import org.maplibre.android.style.sources.VectorSource;
13
13
  import com.maplibre.rctmln.events.AndroidCallbackEvent;
14
14
  import com.maplibre.rctmln.events.FeatureClickEvent;
15
15
 
@@ -8,12 +8,12 @@ import android.view.View;
8
8
 
9
9
  import com.facebook.react.bridge.ReadableMap;
10
10
  import com.facebook.react.common.MapBuilder;
11
- import com.mapbox.geojson.Feature;
12
- import com.mapbox.mapboxsdk.geometry.LatLng;
13
- import com.mapbox.mapboxsdk.log.Logger;
14
- import com.mapbox.mapboxsdk.maps.MapboxMap;
15
- import com.mapbox.mapboxsdk.maps.Style;
16
- import com.mapbox.mapboxsdk.style.sources.Source;
11
+ import org.maplibre.geojson.Feature;
12
+ import org.maplibre.android.geometry.LatLng;
13
+ import org.maplibre.android.log.Logger;
14
+ import org.maplibre.android.maps.MapLibreMap;
15
+ import org.maplibre.android.maps.Style;
16
+ import org.maplibre.android.style.sources.Source;
17
17
  import com.maplibre.rctmln.components.AbstractMapFeature;
18
18
  import com.maplibre.rctmln.components.mapview.RCTMLNMapView;
19
19
  import com.maplibre.rctmln.components.styles.layers.RCTLayer;
@@ -35,7 +35,7 @@ public abstract class RCTSource<T extends Source> extends AbstractMapFeature {
35
35
  public static final double DEFAULT_HITBOX_HEIGHT = 44.0;
36
36
 
37
37
  protected RCTMLNMapView mMapView;
38
- protected MapboxMap mMap;
38
+ protected MapLibreMap mMap;
39
39
 
40
40
  protected String mID;
41
41
  protected T mSource;
@@ -6,8 +6,8 @@ import android.view.View;
6
6
  import com.facebook.react.bridge.Arguments;
7
7
  import com.facebook.react.bridge.WritableArray;
8
8
  import com.facebook.react.bridge.WritableMap;
9
- import com.mapbox.geojson.Feature;
10
- import com.mapbox.mapboxsdk.geometry.LatLng;
9
+ import org.maplibre.geojson.Feature;
10
+ import org.maplibre.android.geometry.LatLng;
11
11
  import com.maplibre.rctmln.components.styles.sources.RCTSource;
12
12
  import com.maplibre.rctmln.events.constants.EventKeys;
13
13
  import com.maplibre.rctmln.events.constants.EventTypes;
@@ -6,7 +6,7 @@ import android.view.View;
6
6
 
7
7
  import com.facebook.react.bridge.WritableMap;
8
8
  import com.facebook.react.bridge.WritableNativeMap;
9
- import com.mapbox.mapboxsdk.geometry.LatLng;
9
+ import org.maplibre.android.geometry.LatLng;
10
10
 
11
11
  import com.maplibre.rctmln.events.constants.EventKeys;
12
12
  import com.maplibre.rctmln.events.constants.EventTypes;
@@ -6,8 +6,8 @@ import android.view.View;
6
6
 
7
7
  import com.facebook.react.bridge.WritableMap;
8
8
  import com.facebook.react.bridge.WritableNativeMap;
9
- import com.mapbox.mapboxsdk.plugins.markerview.MarkerView;
10
- import com.mapbox.mapboxsdk.geometry.LatLng;
9
+ import org.maplibre.android.plugins.markerview.MarkerView;
10
+ import org.maplibre.android.geometry.LatLng;
11
11
  import com.maplibre.rctmln.components.annotation.RCTMLNPointAnnotation;
12
12
  import com.maplibre.rctmln.events.constants.EventKeys;
13
13
  import com.maplibre.rctmln.events.constants.EventTypes;
@@ -6,8 +6,8 @@ import android.view.View;
6
6
 
7
7
  import com.facebook.react.bridge.WritableMap;
8
8
  import com.facebook.react.bridge.WritableNativeMap;
9
- import com.mapbox.mapboxsdk.plugins.markerview.MarkerView;
10
- import com.mapbox.mapboxsdk.geometry.LatLng;
9
+ import org.maplibre.android.plugins.markerview.MarkerView;
10
+ import org.maplibre.android.geometry.LatLng;
11
11
  import com.maplibre.rctmln.components.annotation.RCTMLNPointAnnotation;
12
12
  import com.maplibre.rctmln.events.constants.EventKeys;
13
13
  import com.maplibre.rctmln.events.constants.EventTypes;
@@ -5,18 +5,18 @@ import android.location.Location;
5
5
  import android.os.Looper;
6
6
  import android.util.Log;
7
7
 
8
- import com.mapbox.mapboxsdk.location.engine.LocationEngine;
9
- import com.mapbox.mapboxsdk.location.engine.LocationEngineCallback;
8
+ import org.maplibre.android.location.engine.LocationEngine;
9
+ import org.maplibre.android.location.engine.LocationEngineCallback;
10
10
 
11
11
  /*
12
12
  import com.mapbox.android.core.location.LocationEngineListener;
13
13
  import com.mapbox.android.core.location.LocationEnginePriority;
14
14
  */
15
15
 
16
- import com.mapbox.mapboxsdk.location.engine.LocationEngineDefault;
17
- import com.mapbox.mapboxsdk.location.engine.LocationEngineRequest;
18
- import com.mapbox.mapboxsdk.location.engine.LocationEngineResult;
19
- import com.mapbox.mapboxsdk.location.permissions.PermissionsManager;
16
+ import org.maplibre.android.location.engine.LocationEngineDefault;
17
+ import org.maplibre.android.location.engine.LocationEngineRequest;
18
+ import org.maplibre.android.location.engine.LocationEngineResult;
19
+ import org.maplibre.android.location.permissions.PermissionsManager;
20
20
 
21
21
  import java.lang.ref.WeakReference;
22
22
  import java.util.ArrayList;
@@ -2,7 +2,7 @@ package com.maplibre.rctmln.location;
2
2
 
3
3
  import android.location.Location;
4
4
 
5
- import com.mapbox.mapboxsdk.geometry.LatLng;
5
+ import org.maplibre.android.geometry.LatLng;
6
6
 
7
7
  /**
8
8
  * Created by nickitaliano on 12/13/17.
@@ -1,11 +1,11 @@
1
1
  package com.maplibre.rctmln.location;
2
2
 
3
3
  /*
4
- import com.mapbox.mapboxsdk.plugins.locationlayer.modes.RenderMode;
4
+ import org.maplibre.android.plugins.locationlayer.modes.RenderMode;
5
5
  */
6
6
 
7
- import com.mapbox.mapboxsdk.location.modes.CameraMode;
8
- import com.mapbox.mapboxsdk.location.modes.RenderMode;
7
+ import org.maplibre.android.location.modes.CameraMode;
8
+ import org.maplibre.android.location.modes.RenderMode;
9
9
 
10
10
  /**
11
11
  * Created by nickitaliano on 12/13/17.
@@ -10,8 +10,8 @@ import com.facebook.react.bridge.ReactContextBaseJavaModule;
10
10
  import com.facebook.react.bridge.ReactMethod;
11
11
  import com.facebook.react.module.annotations.ReactModule;
12
12
  import com.facebook.react.modules.core.RCTNativeAppEventEmitter;
13
- import com.mapbox.mapboxsdk.location.engine.LocationEngineCallback;
14
- import com.mapbox.mapboxsdk.location.engine.LocationEngineResult;
13
+ import org.maplibre.android.location.engine.LocationEngineCallback;
14
+ import org.maplibre.android.location.engine.LocationEngineResult;
15
15
  import com.maplibre.rctmln.events.EventEmitter;
16
16
  import com.maplibre.rctmln.events.LocationEvent;
17
17
  import com.maplibre.rctmln.location.LocationManager;
@@ -7,8 +7,8 @@ import com.facebook.react.bridge.ReactMethod;
7
7
  import com.facebook.react.bridge.WritableMap;
8
8
  import com.facebook.react.module.annotations.ReactModule;
9
9
  import com.facebook.react.modules.core.DeviceEventManagerModule;
10
- import com.mapbox.mapboxsdk.log.Logger;
11
- import com.mapbox.mapboxsdk.log.LoggerDefinition;
10
+ import org.maplibre.android.log.Logger;
11
+ import org.maplibre.android.log.LoggerDefinition;
12
12
  import android.util.Log;
13
13
 
14
14
  @ReactModule(name = RCTMLNLogging.REACT_CLASS)
@@ -9,9 +9,9 @@ import com.facebook.react.bridge.ReactContextBaseJavaModule;
9
9
  import com.facebook.react.bridge.ReactMethod;
10
10
  import com.facebook.react.common.MapBuilder;
11
11
  import com.facebook.react.module.annotations.ReactModule;
12
- import com.mapbox.mapboxsdk.Mapbox;
13
- import com.mapbox.mapboxsdk.WellKnownTileServer;
14
- import com.mapbox.mapboxsdk.style.layers.Property;
12
+ import org.maplibre.android.MapLibre;
13
+ import org.maplibre.android.WellKnownTileServer;
14
+ import org.maplibre.android.style.layers.Property;
15
15
  import com.maplibre.rctmln.components.camera.constants.CameraMode;
16
16
  import com.maplibre.rctmln.components.styles.RCTMLNStyleValue;
17
17
  import com.maplibre.rctmln.components.styles.sources.RCTSource;
@@ -23,7 +23,7 @@ import com.maplibre.rctmln.location.UserTrackingMode;
23
23
  import okhttp3.Dispatcher;
24
24
  import okhttp3.OkHttpClient;
25
25
 
26
- import com.mapbox.mapboxsdk.module.http.HttpRequestUtil;
26
+ import org.maplibre.android.module.http.HttpRequestUtil;
27
27
 
28
28
  import java.util.HashMap;
29
29
  import java.util.Map;
@@ -281,9 +281,9 @@ public class RCTMLNModule extends ReactContextBaseJavaModule {
281
281
  @Override
282
282
  public void run() {
283
283
  if (accessToken == null) {
284
- Mapbox.getInstance(getReactApplicationContext());
284
+ MapLibre.getInstance(getReactApplicationContext());
285
285
  } else {
286
- Mapbox.getInstance(getReactApplicationContext(), accessToken, WellKnownTileServer.Mapbox);
286
+ MapLibre.getInstance(getReactApplicationContext(), accessToken, WellKnownTileServer.Mapbox);
287
287
  }
288
288
  }
289
289
  });
@@ -320,7 +320,7 @@ public class RCTMLNModule extends ReactContextBaseJavaModule {
320
320
  // TODO: How to handle this? Underlying API has changed significantly on Android
321
321
  @ReactMethod
322
322
  public void getAccessToken(Promise promise) {
323
- String token = Mapbox.getApiKey();
323
+ String token = MapLibre.getApiKey();
324
324
  if(token == null) {
325
325
  promise.reject("missing_access_token", "No access token has been set");
326
326
  } else {
@@ -333,7 +333,7 @@ public class RCTMLNModule extends ReactContextBaseJavaModule {
333
333
  mReactContext.runOnUiQueueThread(new Runnable() {
334
334
  @Override
335
335
  public void run() {
336
- Mapbox.setConnected(connected);
336
+ MapLibre.setConnected(connected);
337
337
  }
338
338
  });
339
339
  }
@@ -8,22 +8,22 @@ import android.util.Log;
8
8
  import com.facebook.react.bridge.*;
9
9
  import com.facebook.react.module.annotations.ReactModule;
10
10
  import com.facebook.react.modules.core.RCTNativeAppEventEmitter;
11
- import com.mapbox.geojson.FeatureCollection;
12
- // import com.mapbox.mapboxsdk.constants.Style;
13
- import com.mapbox.mapboxsdk.geometry.LatLngBounds;
14
- import com.mapbox.mapboxsdk.offline.OfflineManager;
15
- import com.mapbox.mapboxsdk.offline.OfflineRegion;
16
- import com.mapbox.mapboxsdk.offline.OfflineRegionDefinition;
17
- import com.mapbox.mapboxsdk.offline.OfflineRegionError;
18
- import com.mapbox.mapboxsdk.offline.OfflineRegionStatus;
19
- import com.mapbox.mapboxsdk.offline.OfflineTilePyramidRegionDefinition;
20
- import com.mapbox.mapboxsdk.storage.FileSource;
11
+ import org.maplibre.geojson.FeatureCollection;
12
+ // import org.maplibre.android.constants.Style;
13
+ import org.maplibre.android.geometry.LatLngBounds;
14
+ import org.maplibre.android.offline.OfflineManager;
15
+ import org.maplibre.android.offline.OfflineRegion;
16
+ import org.maplibre.android.offline.OfflineRegionDefinition;
17
+ import org.maplibre.android.offline.OfflineRegionError;
18
+ import org.maplibre.android.offline.OfflineRegionStatus;
19
+ import org.maplibre.android.offline.OfflineTilePyramidRegionDefinition;
20
+ import org.maplibre.android.storage.FileSource;
21
21
  import com.maplibre.rctmln.events.IEvent;
22
22
  import com.maplibre.rctmln.events.OfflineEvent;
23
23
  import com.maplibre.rctmln.events.constants.EventTypes;
24
24
  import com.maplibre.rctmln.utils.ConvertUtils;
25
25
  import com.maplibre.rctmln.utils.GeoJSONUtils;
26
- import com.mapbox.mapboxsdk.maps.Style;
26
+ import org.maplibre.android.maps.Style;
27
27
 
28
28
  import org.json.JSONException;
29
29
  import org.json.JSONObject;