@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.
- package/.eslintrc.js +3 -1
- package/.yarn/sdks/eslint/bin/eslint.js +8 -1
- package/.yarn/sdks/eslint/lib/api.js +8 -1
- package/.yarn/sdks/eslint/lib/unsupported-api.js +8 -1
- package/.yarn/sdks/prettier/bin/prettier.cjs +8 -1
- package/.yarn/sdks/prettier/index.cjs +8 -1
- package/.yarn/sdks/typescript/bin/tsc +8 -1
- package/.yarn/sdks/typescript/bin/tsserver +8 -1
- package/.yarn/sdks/typescript/lib/tsc.js +8 -1
- package/.yarn/sdks/typescript/lib/tsserver.js +20 -6
- package/.yarn/sdks/typescript/lib/tsserverlibrary.js +20 -6
- package/.yarn/sdks/typescript/lib/typescript.js +8 -1
- package/CHANGELOG.md +7 -0
- package/CONTRIBUTING.md +10 -9
- package/android/build.gradle +1 -1
- package/android/rctmln/build.gradle +5 -5
- package/android/rctmln/src/main/java/com/maplibre/rctmln/components/annotation/MarkerView.java +2 -2
- package/android/rctmln/src/main/java/com/maplibre/rctmln/components/annotation/MarkerViewManager.java +6 -6
- package/android/rctmln/src/main/java/com/maplibre/rctmln/components/annotation/RCTMLNMarkerView.java +5 -5
- package/android/rctmln/src/main/java/com/maplibre/rctmln/components/annotation/RCTMLNPointAnnotation.java +9 -8
- package/android/rctmln/src/main/java/com/maplibre/rctmln/components/camera/CameraStop.java +14 -12
- package/android/rctmln/src/main/java/com/maplibre/rctmln/components/camera/CameraUpdateItem.java +10 -10
- package/android/rctmln/src/main/java/com/maplibre/rctmln/components/camera/CameraUpdateQueue.java +1 -1
- package/android/rctmln/src/main/java/com/maplibre/rctmln/components/camera/RCTMLNCamera.java +26 -26
- package/android/rctmln/src/main/java/com/maplibre/rctmln/components/camera/RCTMLNCameraManager.java +1 -1
- package/android/rctmln/src/main/java/com/maplibre/rctmln/components/images/RCTMLNImages.java +12 -12
- package/android/rctmln/src/main/java/com/maplibre/rctmln/components/location/LocationComponentManager.java +9 -9
- package/android/rctmln/src/main/java/com/maplibre/rctmln/components/location/RCTMLNNativeUserLocation.java +7 -7
- package/android/rctmln/src/main/java/com/maplibre/rctmln/components/location/RCTMLNNativeUserLocationManager.java +1 -1
- package/android/rctmln/src/main/java/com/maplibre/rctmln/components/mapview/LayerSourceInfo.java +9 -9
- package/android/rctmln/src/main/java/com/maplibre/rctmln/components/mapview/RCTMLNAndroidTextureMapView.java +2 -2
- package/android/rctmln/src/main/java/com/maplibre/rctmln/components/mapview/RCTMLNAndroidTextureMapViewManager.java +2 -2
- package/android/rctmln/src/main/java/com/maplibre/rctmln/components/mapview/RCTMLNMapView.java +43 -43
- package/android/rctmln/src/main/java/com/maplibre/rctmln/components/mapview/RCTMLNMapViewManager.java +6 -6
- package/android/rctmln/src/main/java/com/maplibre/rctmln/components/styles/RCTMLNStyle.java +3 -3
- package/android/rctmln/src/main/java/com/maplibre/rctmln/components/styles/RCTMLNStyleFactory.java +14 -14
- package/android/rctmln/src/main/java/com/maplibre/rctmln/components/styles/RCTMLNStyleFunctionParser.java +2 -2
- package/android/rctmln/src/main/java/com/maplibre/rctmln/components/styles/RCTMLNStyleValue.java +2 -2
- package/android/rctmln/src/main/java/com/maplibre/rctmln/components/styles/layers/RCTLayer.java +8 -8
- package/android/rctmln/src/main/java/com/maplibre/rctmln/components/styles/layers/RCTMLNBackgroundLayer.java +1 -1
- package/android/rctmln/src/main/java/com/maplibre/rctmln/components/styles/layers/RCTMLNCircleLayer.java +2 -2
- package/android/rctmln/src/main/java/com/maplibre/rctmln/components/styles/layers/RCTMLNFillExtrusionLayer.java +2 -2
- package/android/rctmln/src/main/java/com/maplibre/rctmln/components/styles/layers/RCTMLNFillLayer.java +2 -2
- package/android/rctmln/src/main/java/com/maplibre/rctmln/components/styles/layers/RCTMLNHeatmapLayer.java +2 -2
- package/android/rctmln/src/main/java/com/maplibre/rctmln/components/styles/layers/RCTMLNLineLayer.java +2 -2
- package/android/rctmln/src/main/java/com/maplibre/rctmln/components/styles/layers/RCTMLNRasterLayer.java +1 -1
- package/android/rctmln/src/main/java/com/maplibre/rctmln/components/styles/layers/RCTMLNSymbolLayer.java +2 -2
- package/android/rctmln/src/main/java/com/maplibre/rctmln/components/styles/light/RCTMLNLight.java +6 -6
- package/android/rctmln/src/main/java/com/maplibre/rctmln/components/styles/sources/RCTMLNImageSource.java +3 -3
- package/android/rctmln/src/main/java/com/maplibre/rctmln/components/styles/sources/RCTMLNImageSourceManager.java +1 -1
- package/android/rctmln/src/main/java/com/maplibre/rctmln/components/styles/sources/RCTMLNRasterSource.java +3 -3
- package/android/rctmln/src/main/java/com/maplibre/rctmln/components/styles/sources/RCTMLNShapeSource.java +9 -9
- package/android/rctmln/src/main/java/com/maplibre/rctmln/components/styles/sources/RCTMLNShapeSourceManager.java +1 -1
- package/android/rctmln/src/main/java/com/maplibre/rctmln/components/styles/sources/RCTMLNTileSource.java +2 -2
- package/android/rctmln/src/main/java/com/maplibre/rctmln/components/styles/sources/RCTMLNVectorSource.java +4 -4
- package/android/rctmln/src/main/java/com/maplibre/rctmln/components/styles/sources/RCTSource.java +7 -7
- package/android/rctmln/src/main/java/com/maplibre/rctmln/events/FeatureClickEvent.java +2 -2
- package/android/rctmln/src/main/java/com/maplibre/rctmln/events/MapClickEvent.java +1 -1
- package/android/rctmln/src/main/java/com/maplibre/rctmln/events/PointAnnotationClickEvent.java +2 -2
- package/android/rctmln/src/main/java/com/maplibre/rctmln/events/PointAnnotationDragEvent.java +2 -2
- package/android/rctmln/src/main/java/com/maplibre/rctmln/location/LocationManager.java +6 -6
- package/android/rctmln/src/main/java/com/maplibre/rctmln/location/UserLocation.java +1 -1
- package/android/rctmln/src/main/java/com/maplibre/rctmln/location/UserTrackingMode.java +3 -3
- package/android/rctmln/src/main/java/com/maplibre/rctmln/modules/RCTMLNLocationModule.java +2 -2
- package/android/rctmln/src/main/java/com/maplibre/rctmln/modules/RCTMLNLogging.java +2 -2
- package/android/rctmln/src/main/java/com/maplibre/rctmln/modules/RCTMLNModule.java +8 -8
- package/android/rctmln/src/main/java/com/maplibre/rctmln/modules/RCTMLNOfflineModule.java +11 -11
- package/android/rctmln/src/main/java/com/maplibre/rctmln/modules/RCTMLNSnapshotModule.java +7 -7
- package/android/rctmln/src/main/java/com/maplibre/rctmln/utils/ClusterPropertyEntry.java +1 -1
- package/android/rctmln/src/main/java/com/maplibre/rctmln/utils/DownloadMapImageTask.java +5 -5
- package/android/rctmln/src/main/java/com/maplibre/rctmln/utils/ExpressionParser.java +2 -2
- package/android/rctmln/src/main/java/com/maplibre/rctmln/utils/GeoJSONUtils.java +13 -13
- package/android/rctmln/src/main/java/com/maplibre/rctmln/utils/GeoViewport.java +3 -3
- package/android/rctmln/src/main/java/com/maplibre/rctmln/utils/SimpleEventCallback.java +2 -2
- package/android/rctmln/src/main/java/com/maplibre/rctmln/utils/SphericalMercator.java +1 -1
- package/docs/Camera.md +3 -3
- package/docs/MapView.md +9 -33
- package/docs/UserLocation.md +10 -2
- package/docs/docs.json +16 -31
- package/javascript/Maplibre.ts +5 -1
- package/javascript/components/BackgroundLayer.tsx +27 -20
- package/javascript/components/Callout.tsx +40 -40
- package/javascript/components/Camera.tsx +421 -478
- package/javascript/components/CircleLayer.tsx +29 -22
- package/javascript/components/FillExtrusionLayer.tsx +23 -23
- package/javascript/components/FillLayer.tsx +22 -19
- package/javascript/components/HeatmapLayer.tsx +21 -19
- package/javascript/components/ImageSource.tsx +25 -32
- package/javascript/components/Images.tsx +36 -35
- package/javascript/components/Light.tsx +20 -47
- package/javascript/components/LineLayer.tsx +23 -20
- package/javascript/components/MapView.tsx +604 -554
- package/javascript/components/MarkerView.tsx +23 -38
- package/javascript/components/NativeUserLocation.tsx +3 -5
- package/javascript/components/PointAnnotation.tsx +111 -87
- package/javascript/components/RasterLayer.tsx +21 -18
- package/javascript/components/RasterSource.tsx +39 -42
- package/javascript/components/ShapeSource.tsx +287 -239
- package/javascript/components/Style.tsx +1 -1
- package/javascript/components/SymbolLayer.tsx +34 -28
- package/javascript/components/UserLocation.tsx +164 -151
- package/javascript/components/VectorSource.tsx +128 -117
- package/javascript/components/annotations/Annotation.tsx +105 -79
- package/javascript/{components/AbstractLayer.tsx → hooks/useAbstractLayer.ts} +54 -37
- package/javascript/hooks/useAbstractSource.ts +34 -0
- package/javascript/hooks/useNativeBridge.ts +125 -0
- package/javascript/hooks/useNativeRef.ts +13 -0
- package/javascript/hooks/useOnce.ts +12 -0
- package/javascript/utils/Logger.ts +3 -3
- package/package.json +2 -1
- package/scripts/templates/RCTMLNStyleFactory.java.ejs +14 -14
- package/javascript/components/AbstractSource.tsx +0 -27
- 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
|
|
15
|
-
import
|
|
16
|
-
import
|
|
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
|
|
23
|
-
import
|
|
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
|
-
|
|
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
|
|
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
|
|
24
|
+
private MapLibreMap mMap;
|
|
25
25
|
|
|
26
|
-
public RCTMLNStyle(@NonNull Context context, @NonNull ReadableMap reactStyle, @NonNull
|
|
26
|
+
public RCTMLNStyle(@NonNull Context context, @NonNull ReadableMap reactStyle, @NonNull MapLibreMap map) {
|
|
27
27
|
mContext = context;
|
|
28
28
|
mReactStyle = reactStyle;
|
|
29
29
|
mMap = map;
|
package/android/rctmln/src/main/java/com/maplibre/rctmln/components/styles/RCTMLNStyleFactory.java
CHANGED
|
@@ -3,20 +3,20 @@
|
|
|
3
3
|
|
|
4
4
|
package com.maplibre.rctmln.components.styles;
|
|
5
5
|
|
|
6
|
-
import
|
|
7
|
-
import
|
|
8
|
-
import
|
|
9
|
-
import
|
|
10
|
-
import
|
|
11
|
-
import
|
|
12
|
-
import
|
|
13
|
-
import
|
|
14
|
-
import
|
|
15
|
-
import
|
|
16
|
-
import
|
|
17
|
-
import
|
|
18
|
-
import
|
|
19
|
-
import
|
|
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
|
|
13
|
-
import
|
|
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;
|
package/android/rctmln/src/main/java/com/maplibre/rctmln/components/styles/RCTMLNStyleValue.java
CHANGED
|
@@ -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
|
|
12
|
-
import
|
|
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;
|
package/android/rctmln/src/main/java/com/maplibre/rctmln/components/styles/layers/RCTLayer.java
CHANGED
|
@@ -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
|
|
9
|
-
import
|
|
10
|
-
import
|
|
11
|
-
import
|
|
12
|
-
import
|
|
13
|
-
import
|
|
14
|
-
import
|
|
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
|
|
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
|
|
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
|
|
6
|
-
import
|
|
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
|
|
6
|
-
import
|
|
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
|
|
6
|
-
import
|
|
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
|
|
6
|
-
import
|
|
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
|
|
6
|
-
import
|
|
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
|
|
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
|
|
6
|
-
import
|
|
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;
|
package/android/rctmln/src/main/java/com/maplibre/rctmln/components/styles/light/RCTMLNLight.java
CHANGED
|
@@ -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
|
|
7
|
-
import
|
|
8
|
-
import
|
|
9
|
-
import
|
|
10
|
-
import
|
|
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
|
|
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
|
|
9
|
-
import
|
|
10
|
-
import
|
|
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
|
|
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
|
|
6
|
-
import
|
|
5
|
+
import org.maplibre.geojson.Feature;
|
|
6
|
+
import org.maplibre.android.style.sources.RasterSource;
|
|
7
7
|
|
|
8
|
-
import static
|
|
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
|
|
14
|
-
import
|
|
15
|
-
import
|
|
16
|
-
import
|
|
17
|
-
import
|
|
18
|
-
import
|
|
19
|
-
import
|
|
20
|
-
import
|
|
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
|
-
|
|
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
|
|
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
|
|
6
|
-
import
|
|
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
|
|
10
|
-
import
|
|
11
|
-
import
|
|
12
|
-
import
|
|
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
|
|
package/android/rctmln/src/main/java/com/maplibre/rctmln/components/styles/sources/RCTSource.java
CHANGED
|
@@ -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
|
|
12
|
-
import
|
|
13
|
-
import
|
|
14
|
-
import
|
|
15
|
-
import
|
|
16
|
-
import
|
|
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
|
|
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
|
|
10
|
-
import
|
|
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
|
|
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;
|
package/android/rctmln/src/main/java/com/maplibre/rctmln/events/PointAnnotationClickEvent.java
CHANGED
|
@@ -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
|
|
10
|
-
import
|
|
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;
|
package/android/rctmln/src/main/java/com/maplibre/rctmln/events/PointAnnotationDragEvent.java
CHANGED
|
@@ -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
|
|
10
|
-
import
|
|
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
|
|
9
|
-
import
|
|
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
|
|
17
|
-
import
|
|
18
|
-
import
|
|
19
|
-
import
|
|
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;
|
|
@@ -1,11 +1,11 @@
|
|
|
1
1
|
package com.maplibre.rctmln.location;
|
|
2
2
|
|
|
3
3
|
/*
|
|
4
|
-
import
|
|
4
|
+
import org.maplibre.android.plugins.locationlayer.modes.RenderMode;
|
|
5
5
|
*/
|
|
6
6
|
|
|
7
|
-
import
|
|
8
|
-
import
|
|
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
|
|
14
|
-
import
|
|
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
|
|
11
|
-
import
|
|
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
|
|
13
|
-
import
|
|
14
|
-
import
|
|
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
|
|
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
|
-
|
|
284
|
+
MapLibre.getInstance(getReactApplicationContext());
|
|
285
285
|
} else {
|
|
286
|
-
|
|
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 =
|
|
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
|
-
|
|
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
|
|
12
|
-
// import
|
|
13
|
-
import
|
|
14
|
-
import
|
|
15
|
-
import
|
|
16
|
-
import
|
|
17
|
-
import
|
|
18
|
-
import
|
|
19
|
-
import
|
|
20
|
-
import
|
|
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
|
|
26
|
+
import org.maplibre.android.maps.Style;
|
|
27
27
|
|
|
28
28
|
import org.json.JSONException;
|
|
29
29
|
import org.json.JSONObject;
|