@maplibre/maplibre-react-native 10.0.0-beta.1 → 10.0.0-beta.10

package/android/src/main/java/org/maplibre/reactnative/modules/MLRNModule.java

@@ -11,9 +11,7 @@ import com.facebook.react.common.MapBuilder;
 import com.facebook.react.module.annotations.ReactModule;
 import org.maplibre.android.MapLibre;
 import org.maplibre.android.WellKnownTileServer;
-import org.maplibre.android.style.layers.Property;
 import org.maplibre.reactnative.components.camera.constants.CameraMode;
-import org.maplibre.reactnative.components.styles.MLRNStyleValue;
 import org.maplibre.reactnative.components.styles.sources.MLRNSource;
 import org.maplibre.reactnative.events.constants.EventTypes;
 import org.maplibre.reactnative.http.CustomHeadersInterceptor;
@@ -99,127 +97,6 @@ public class MLRNModule extends ReactContextBaseJavaModule {
         Map<String, String> styleSourceConsts = new HashMap<>();
         styleSourceConsts.put("DefaultSourceID", MLRNSource.DEFAULT_ID);
 
-        // interpolation modes
-        Map<String, Integer> interpolationModes = new HashMap<>();
-        interpolationModes.put("Exponential", MLRNStyleValue.InterpolationModeExponential);
-        interpolationModes.put("Categorical", MLRNStyleValue.InterpolationModeCategorical);
-        interpolationModes.put("Interval", MLRNStyleValue.InterpolationModeInterval);
-        interpolationModes.put("Identity", MLRNStyleValue.InterpolationModeIdentity);
-
-        // line layer constants
-        Map<String, String> lineJoin = new HashMap<>();
-        lineJoin.put("Bevel", Property.LINE_JOIN_BEVEL);
-        lineJoin.put("Round", Property.LINE_JOIN_ROUND);
-        lineJoin.put("Miter", Property.LINE_JOIN_MITER);
-
-        Map<String, String> lineCap = new HashMap<>();
-        lineCap.put("Butt", Property.LINE_CAP_BUTT);
-        lineCap.put("Round", Property.LINE_CAP_ROUND);
-        lineCap.put("Square", Property.LINE_CAP_SQUARE);
-
-        Map<String, String> lineTranslateAnchor = new HashMap<>();
-        lineTranslateAnchor.put("Map", Property.LINE_TRANSLATE_ANCHOR_MAP);
-        lineTranslateAnchor.put("Viewport", Property.LINE_TRANSLATE_ANCHOR_VIEWPORT);
-
-        // circle layer constants
-        Map<String, String> circlePitchScale = new HashMap<>();
-        circlePitchScale.put("Map", Property.CIRCLE_PITCH_SCALE_MAP);
-        circlePitchScale.put("Viewport", Property.CIRCLE_PITCH_SCALE_VIEWPORT);
-
-        Map<String, String> circleTranslateAnchor = new HashMap<>();
-        circleTranslateAnchor.put("Map", Property.CIRCLE_TRANSLATE_ANCHOR_MAP);
-        circleTranslateAnchor.put("Viewport", Property.CIRCLE_TRANSLATE_ANCHOR_VIEWPORT);
-
-        Map<String, String> circlePitchAlignment = new HashMap<>();
-        circlePitchAlignment.put("Map", Property.CIRCLE_PITCH_ALIGNMENT_MAP);
-        circlePitchAlignment.put("Viewport", Property.CIRCLE_PITCH_ALIGNMENT_VIEWPORT);
-
-        // fill extrusion layer constants
-        Map<String, String> fillExtrusionTranslateAnchor = new HashMap<>();
-        fillExtrusionTranslateAnchor.put("Map", Property.FILL_EXTRUSION_TRANSLATE_ANCHOR_MAP);
-        fillExtrusionTranslateAnchor.put("Viewport", Property.FILL_EXTRUSION_TRANSLATE_ANCHOR_VIEWPORT);
-
-        // fill layer constants
-        Map<String, String> fillTranslateAnchor = new HashMap<>();
-        fillTranslateAnchor.put("Map", Property.FILL_TRANSLATE_ANCHOR_MAP);
-        fillTranslateAnchor.put("Viewport", Property.FILL_TRANSLATE_ANCHOR_VIEWPORT);
-
-        // symbol layer constants
-        Map<String, String> iconRotationAlignment = new HashMap<>();
-        iconRotationAlignment.put("Auto", Property.ICON_ROTATION_ALIGNMENT_AUTO);
-        iconRotationAlignment.put("Map", Property.ICON_ROTATION_ALIGNMENT_MAP);
-        iconRotationAlignment.put("Viewport", Property.ICON_ROTATION_ALIGNMENT_VIEWPORT);
-
-        Map<String, String> iconTextFit = new HashMap<>();
-        iconTextFit.put("None", Property.ICON_TEXT_FIT_NONE);
-        iconTextFit.put("Width", Property.ICON_TEXT_FIT_WIDTH);
-        iconTextFit.put("Height", Property.ICON_TEXT_FIT_HEIGHT);
-        iconTextFit.put("Both", Property.ICON_TEXT_FIT_BOTH);
-
-        Map<String, String> iconAnchor = new HashMap<>();
-        iconAnchor.put("Center", Property.ICON_ANCHOR_CENTER);
-        iconAnchor.put("Left", Property.ICON_ANCHOR_LEFT);
-        iconAnchor.put("Right", Property.ICON_ANCHOR_RIGHT);
-        iconAnchor.put("Top", Property.ICON_ANCHOR_TOP);
-        iconAnchor.put("Bottom", Property.ICON_ANCHOR_BOTTOM);
-        iconAnchor.put("TopLeft", Property.ICON_ANCHOR_TOP_LEFT);
-        iconAnchor.put("TopRight", Property.ICON_ANCHOR_TOP_RIGHT);
-        iconAnchor.put("BottomLeft", Property.ICON_ANCHOR_BOTTOM_LEFT);
-        iconAnchor.put("BottomRight", Property.ICON_ANCHOR_BOTTOM_RIGHT);
-
-        Map<String, String> iconPitchAlignment = new HashMap<>();
-        iconPitchAlignment.put("Auto", Property.ICON_PITCH_ALIGNMENT_AUTO);
-        iconPitchAlignment.put("Map", Property.ICON_PITCH_ALIGNMENT_MAP);
-        iconPitchAlignment.put("Viewport", Property.ICON_PITCH_ALIGNMENT_VIEWPORT);
-
-        Map<String, String> iconTranslateAnchor = new HashMap<>();
-        iconTranslateAnchor.put("Map", Property.ICON_TRANSLATE_ANCHOR_MAP);
-        iconTranslateAnchor.put("Viewport", Property.ICON_TRANSLATE_ANCHOR_VIEWPORT);
-
-        Map<String, String> symbolPlacement = new HashMap<>();
-        symbolPlacement.put("Line", Property.SYMBOL_PLACEMENT_LINE);
-        symbolPlacement.put("Point", Property.SYMBOL_PLACEMENT_POINT);
-
-        Map<String, String> textAnchor = new HashMap<>();
-        textAnchor.put("Center", Property.TEXT_ANCHOR_CENTER);
-        textAnchor.put("Left", Property.TEXT_ANCHOR_LEFT);
-        textAnchor.put("Right", Property.TEXT_ANCHOR_RIGHT);
-        textAnchor.put("Top", Property.TEXT_ANCHOR_TOP);
-        textAnchor.put("Bottom", Property.TEXT_ANCHOR_BOTTOM);
-        textAnchor.put("TopLeft", Property.TEXT_ANCHOR_TOP_LEFT);
-        textAnchor.put("TopRight", Property.TEXT_ANCHOR_TOP_RIGHT);
-        textAnchor.put("BottomLeft", Property.TEXT_ANCHOR_BOTTOM_LEFT);
-        textAnchor.put("BottomRight", Property.TEXT_ANCHOR_BOTTOM_RIGHT);
-
-        Map<String, String> textJustify = new HashMap<>();
-        textJustify.put("Center", Property.TEXT_JUSTIFY_CENTER);
-        textJustify.put("Left", Property.TEXT_JUSTIFY_LEFT);
-        textJustify.put("Right", Property.TEXT_JUSTIFY_RIGHT);
-
-        Map<String, String> textPitchAlignment = new HashMap<>();
-        textPitchAlignment.put("Auto", Property.TEXT_PITCH_ALIGNMENT_AUTO);
-        textPitchAlignment.put("Map", Property.TEXT_PITCH_ALIGNMENT_MAP);
-        textPitchAlignment.put("Viewport", Property.TEXT_PITCH_ALIGNMENT_VIEWPORT);
-
-        Map<String, String> textRotationAlignment = new HashMap<>();
-        textRotationAlignment.put("Auto", Property.TEXT_ROTATION_ALIGNMENT_AUTO);
-        textRotationAlignment.put("Map", Property.TEXT_ROTATION_ALIGNMENT_MAP);
-        textRotationAlignment.put("Viewport", Property.TEXT_ROTATION_ALIGNMENT_VIEWPORT);
-
-        Map<String, String> textTransform = new HashMap<>();
-        textTransform.put("None", Property.TEXT_TRANSFORM_NONE);
-        textTransform.put("Lowercase", Property.TEXT_TRANSFORM_LOWERCASE);
-        textTransform.put("Uppercase", Property.TEXT_TRANSFORM_UPPERCASE);
-
-        Map<String, String> textTranslateAnchor = new HashMap<>();
-        textTranslateAnchor.put("Map", Property.TEXT_TRANSLATE_ANCHOR_MAP);
-        textTranslateAnchor.put("Viewport", Property.TEXT_TRANSLATE_ANCHOR_VIEWPORT);
-
-        // light constants
-        Map<String, String> lightAnchor = new HashMap<>();
-        lightAnchor.put("Map", Property.ANCHOR_MAP);
-        lightAnchor.put("Viewport", Property.ANCHOR_VIEWPORT);
-
         // offline region download states
         Map<String, Integer> offlinePackDownloadStates = new HashMap<>();
         offlinePackDownloadStates.put("Inactive", MLRNOfflineModule.INACTIVE_REGION_DOWNLOAD_STATE);
@@ -242,28 +119,6 @@ public class MLRNModule extends ReactContextBaseJavaModule {
                 .put("UserLocationVerticalAlignment", userLocationVerticalAlignment)
                 .put("CameraModes", cameraModes)
                 .put("StyleSource", styleSourceConsts)
-                .put("InterpolationMode", interpolationModes)
-                .put("LineJoin", lineJoin)
-                .put("LineCap", lineCap)
-                .put("LineTranslateAnchor", lineTranslateAnchor)
-                .put("CirclePitchScale", circlePitchScale)
-                .put("CircleTranslateAnchor", circleTranslateAnchor)
-                .put("CirclePitchAlignment", circlePitchAlignment)
-                .put("FillExtrusionTranslateAnchor", fillExtrusionTranslateAnchor)
-                .put("FillTranslateAnchor", fillTranslateAnchor)
-                .put("IconRotationAlignment", iconRotationAlignment)
-                .put("IconTextFit", iconTextFit)
-                .put("IconTranslateAnchor", iconTranslateAnchor)
-                .put("SymbolPlacement", symbolPlacement)
-                .put("IconAnchor", iconAnchor)
-                .put("TextAnchor", textAnchor)
-                .put("TextJustify", textJustify)
-                .put("IconPitchAlignment", iconPitchAlignment)
-                .put("TextPitchAlignment", textPitchAlignment)
-                .put("TextRotationAlignment", textRotationAlignment)
-                .put("TextTransform", textTransform)
-                .put("TextTranslateAnchor", textTranslateAnchor)
-                .put("LightAnchor", lightAnchor)
                 .put("OfflinePackDownloadState", offlinePackDownloadStates)
                 .put("OfflineCallbackName", offlineModuleCallbackNames)
                 .put("LocationCallbackName", locationModuleCallbackNames)

package/android/src/main/java/org/maplibre/reactnative/utils/GeoJSONUtils.java

@@ -10,9 +10,11 @@ import org.maplibre.geojson.Feature;
 import org.maplibre.geojson.FeatureCollection;
 import org.maplibre.geojson.Geometry;
 import org.maplibre.geojson.GeometryCollection;
+import org.maplibre.geojson.MultiLineString;
 import org.maplibre.geojson.LineString;
 import org.maplibre.geojson.MultiPoint;
 import org.maplibre.geojson.Point;
+import org.maplibre.geojson.MultiPolygon;
 import org.maplibre.geojson.Polygon;
 import org.maplibre.android.geometry.LatLng;
 import org.maplibre.android.geometry.LatLngBounds;
@@ -48,6 +50,12 @@ public class GeoJSONUtils {
                 return fromLineString((LineString) geometry);
             case "Polygon":
                 return fromPolygon((Polygon) geometry);
+            case "MultiPoint":
+                return fromMultiPoint((MultiPoint) geometry);
+            case "MultiLineString":
+                return fromMultiLineString((MultiLineString) geometry);
+            case "MultiPolygon":
+                return fromMultiPolygon((MultiPolygon) geometry);
             default:
                 return null;
         }
@@ -74,6 +82,27 @@ public class GeoJSONUtils {
         return map;
     }
 
+    public static WritableMap fromMultiPoint(MultiPoint multiPoint) {
+        WritableMap map = Arguments.createMap();
+        map.putString("type", "MultiPoint");
+        map.putArray("coordinates", getCoordinates(multiPoint));
+        return map;
+    }
+
+    public static WritableMap fromMultiLineString(MultiLineString multiLineString) {
+        WritableMap map = Arguments.createMap();
+        map.putString("type", "MultiLineString");
+        map.putArray("coordinates", getCoordinates(multiLineString));
+        return map;
+    }
+
+    public static WritableMap fromMultiPolygon(MultiPolygon multiPolygon) {
+        WritableMap map = Arguments.createMap();
+        map.putString("type", "MultiPolygon");
+        map.putArray("coordinates", getCoordinates(multiPolygon));
+        return map;
+    }
+
     public static WritableArray getCoordinates(Point point) {
         return Arguments.fromArray(pointToDoubleArray(point));
     }
@@ -110,6 +139,57 @@ public class GeoJSONUtils {
         return array;
     }
 
+    public static WritableArray getCoordinates(MultiPoint multiPoint) {
+        WritableArray array = Arguments.createArray();
+
+        List<Point> points = multiPoint.coordinates();
+        for (Point point : points) {
+            array.pushArray(Arguments.fromArray(pointToDoubleArray(point)));
+        }
+
+        return array;
+    }
+
+    public static WritableArray getCoordinates(MultiLineString multiLineString) {
+        WritableArray array = Arguments.createArray();
+
+        List<List<Point>> lines = multiLineString.coordinates();
+        for (List<Point> line : lines) {
+            WritableArray lineArray = Arguments.createArray();
+
+            for (Point point : line) {
+                lineArray.pushArray(Arguments.fromArray(pointToDoubleArray(point)));
+            }
+
+            array.pushArray(lineArray);
+        }
+
+        return array;
+    }
+
+    public static WritableArray getCoordinates(MultiPolygon multiPolygon) {
+        WritableArray array = Arguments.createArray();
+
+        List<List<List<Point>>> polygons = multiPolygon.coordinates();
+        for (List<List<Point>> polygon : polygons) {
+            WritableArray polygonArray = Arguments.createArray();
+
+            for (List<Point> ring : polygon) {
+                WritableArray ringArray = Arguments.createArray();
+
+                for (Point point : ring) {
+                    ringArray.pushArray(Arguments.fromArray(pointToDoubleArray(point)));
+                }
+
+                polygonArray.pushArray(ringArray);
+            }
+
+            array.pushArray(polygonArray);
+        }
+
+        return array;
+    }
+
     public static WritableMap toPointFeature(LatLng latLng, WritableMap properties) {
         WritableMap map = new WritableNativeMap();
         map.putString("type", "Feature");

package/ios/MLRN/MLRNBackgroundLayer.h

@@ -1,5 +1,4 @@
 #import "MLRNLayer.h"
-@import MapLibre;
 
 @interface MLRNBackgroundLayer : MLRNLayer
 

package/ios/MLRN/MLRNFillExtrusionLayer.h

@@ -1,5 +1,4 @@
 #import "MLRNVectorLayer.h"
-@import MapLibre;
 
 @interface MLRNFillExtrusionLayer : MLRNVectorLayer
 

package/ios/MLRN/MLRNFillLayer.h

@@ -1,5 +1,4 @@
 #import "MLRNVectorLayer.h"
-@import MapLibre;
 
 @interface MLRNFillLayer : MLRNVectorLayer
 

package/ios/MLRN/MLRNFillLayer.m

@@ -1,5 +1,6 @@
 #import "MLRNFillLayer.h"
 #import "MLRNStyle.h"
+
 #import <React/RCTLog.h>
 
 @implementation MLRNFillLayer

package/ios/MLRN/MLRNLineLayer.h

@@ -1,5 +1,4 @@
 #import "MLRNVectorLayer.h"
-@import MapLibre;
 
 @interface MLRNLineLayer : MLRNVectorLayer
 

package/ios/MLRN/MLRNModule.m

@@ -71,120 +71,6 @@ RCT_EXPORT_MODULE();
     NSMutableDictionary *styleSourceConsts = [[NSMutableDictionary alloc] init];
     [styleSourceConsts setObject:DEFAULT_SOURCE_ID forKey:@"DefaultSourceID"];
 
-    // line layer constants
-    NSMutableDictionary *lineJoin = [[NSMutableDictionary alloc] init];
-    [lineJoin setObject:@(MLNLineJoinBevel) forKey:@"Bevel"];
-    [lineJoin setObject:@(MLNLineJoinRound) forKey:@"Round"];
-    [lineJoin setObject:@(MLNLineJoinMiter) forKey:@"Miter"];
-
-    NSMutableDictionary *lineCap = [[NSMutableDictionary alloc] init];
-    [lineCap setObject:@(MLNLineCapButt) forKey:@"Butt"];
-    [lineCap setObject:@(MLNLineCapRound) forKey:@"Round"];
-    [lineCap setObject:@(MLNLineCapSquare) forKey:@"Square"];
-
-    NSMutableDictionary *lineTranslateAnchor = [[NSMutableDictionary alloc] init];
-    [lineTranslateAnchor setObject:@(MLNLineTranslationAnchorMap) forKey:@"Map"];
-    [lineTranslateAnchor setObject:@(MLNLineTranslationAnchorViewport) forKey:@"Viewport"];
-
-    // circle layer constants
-    NSMutableDictionary *circlePitchScale = [[NSMutableDictionary alloc] init];
-    [circlePitchScale setObject:@(MLNCircleScaleAlignmentMap) forKey:@"Map"];
-    [circlePitchScale setObject:@(MLNCircleScaleAlignmentViewport) forKey:@"Viewport"];
-
-    NSMutableDictionary *circlePitchAlignment = [[NSMutableDictionary alloc] init];
-    [circlePitchAlignment setObject:@(MLNCirclePitchAlignmentMap) forKey:@"Map"];
-    [circlePitchAlignment setObject:@(MLNCirclePitchAlignmentViewport) forKey:@"Viewport"];
-
-    NSMutableDictionary *circleTranslateAnchor = [[NSMutableDictionary alloc] init];
-    [circleTranslateAnchor setObject:@(MLNCircleTranslationAnchorMap) forKey:@"Map"];
-    [circleTranslateAnchor setObject:@(MLNCircleTranslationAnchorViewport) forKey:@"Viewport"];
-
-    // fill extrusion layer constants
-    NSMutableDictionary *fillExtrusionTranslateAnchor = [[NSMutableDictionary alloc] init];
-    [fillExtrusionTranslateAnchor setObject:@(MLNFillExtrusionTranslationAnchorMap) forKey:@"Map"];
-    [fillExtrusionTranslateAnchor setObject:@(MLNFillExtrusionTranslationAnchorViewport) forKey:@"Viewport"];
-
-    // fill layer constants
-    NSMutableDictionary *fillTranslateAnchor = [[NSMutableDictionary alloc] init];
-    [fillTranslateAnchor setObject:@(MLNFillTranslationAnchorMap) forKey:@"Map"];
-    [fillTranslateAnchor setObject:@(MLNFillTranslationAnchorViewport) forKey:@"Viewport"];
-
-    // symbol layer constants
-    NSMutableDictionary *iconRotationAlignment = [[NSMutableDictionary alloc] init];
-    [iconRotationAlignment setObject:@(MLNIconRotationAlignmentAuto) forKey:@"Auto"];
-    [iconRotationAlignment setObject:@(MLNIconRotationAlignmentMap) forKey:@"Map"];
-    [iconRotationAlignment setObject:@(MLNIconRotationAlignmentViewport) forKey:@"Viewport"];
-
-    NSMutableDictionary *iconTextFit = [[NSMutableDictionary alloc] init];
-    [iconTextFit setObject:@(MLNIconTextFitNone) forKey:@"None"];
-    [iconTextFit setObject:@(MLNIconTextFitWidth) forKey:@"Width"];
-    [iconTextFit setObject:@(MLNIconTextFitHeight) forKey:@"Height"];
-    [iconTextFit setObject:@(MLNIconTextFitBoth) forKey:@"Both"];
-
-    NSMutableDictionary *iconAnchor = [[NSMutableDictionary alloc] init];
-    [iconAnchor setObject:@(MLNIconAnchorCenter) forKey:@"Center"];
-    [iconAnchor setObject:@(MLNIconAnchorTop) forKey:@"Top"];
-    [iconAnchor setObject:@(MLNIconAnchorBottom) forKey:@"Bottom"];
-    [iconAnchor setObject:@(MLNIconAnchorLeft) forKey:@"Left"];
-    [iconAnchor setObject:@(MLNIconAnchorRight) forKey:@"Right"];
-    [iconAnchor setObject:@(MLNIconAnchorTopLeft) forKey:@"TopLeft"];
-    [iconAnchor setObject:@(MLNIconAnchorTopRight) forKey:@"TopRight"];
-    [iconAnchor setObject:@(MLNIconAnchorBottomLeft) forKey:@"BottomLeft"];
-    [iconAnchor setObject:@(MLNIconAnchorBottomRight) forKey:@"BottomRight"];
-
-    NSMutableDictionary *iconTranslateAnchor = [[NSMutableDictionary alloc] init];
-    [iconTranslateAnchor setObject:@(MLNIconTranslationAnchorMap) forKey:@"Map"];
-    [iconTranslateAnchor setObject:@(MLNIconTranslationAnchorViewport) forKey:@"Viewport"];
-
-    NSMutableDictionary *iconPitchAlignment = [[NSMutableDictionary alloc] init];
-    [iconPitchAlignment setObject:@(MLNIconPitchAlignmentAuto) forKey:@"Auto"];
-    [iconPitchAlignment setObject:@(MLNIconPitchAlignmentMap) forKey:@"Map"];
-    [iconPitchAlignment setObject:@(MLNIconPitchAlignmentViewport) forKey:@"Viewport"];
-
-    NSMutableDictionary *symbolPlacement = [[NSMutableDictionary alloc] init];
-    [symbolPlacement setObject:@(MLNSymbolPlacementLine) forKey:@"Line"];
-    [symbolPlacement setObject:@(MLNSymbolPlacementPoint) forKey:@"Point"];
-
-    NSMutableDictionary *textAnchor = [[NSMutableDictionary alloc] init];
-    [textAnchor setObject:@(MLNTextAnchorCenter) forKey:@"Center"];
-    [textAnchor setObject:@(MLNTextAnchorLeft) forKey:@"Left"];
-    [textAnchor setObject:@(MLNTextAnchorRight) forKey:@"Right"];
-    [textAnchor setObject:@(MLNTextAnchorTop) forKey:@"Top"];
-    [textAnchor setObject:@(MLNTextAnchorBottom) forKey:@"Bottom"];
-    [textAnchor setObject:@(MLNTextAnchorTopLeft) forKey:@"TopLeft"];
-    [textAnchor setObject:@(MLNTextAnchorTopRight) forKey:@"TopRight"];
-    [textAnchor setObject:@(MLNTextAnchorBottomLeft) forKey:@"BottomLeft"];
-    [textAnchor setObject:@(MLNTextAnchorBottomRight) forKey:@"BottomRight"];
-
-    NSMutableDictionary *textJustify = [[NSMutableDictionary alloc] init];
-    [textJustify setObject:@(MLNTextJustificationCenter) forKey:@"Center"];
-    [textJustify setObject:@(MLNTextJustificationLeft) forKey:@"Left"];
-    [textJustify setObject:@(MLNTextJustificationRight) forKey:@"Right"];
-
-    NSMutableDictionary *textPitchAlignment = [[NSMutableDictionary alloc] init];
-    [textPitchAlignment setObject:@(MLNTextPitchAlignmentAuto) forKey:@"Auto"];
-    [textPitchAlignment setObject:@(MLNTextPitchAlignmentMap) forKey:@"Map"];
-    [textPitchAlignment setObject:@(MLNTextPitchAlignmentViewport) forKey:@"Viewport"];
-
-    NSMutableDictionary *textRotationAlignment = [[NSMutableDictionary alloc] init];
-    [textRotationAlignment setObject:@(MLNTextRotationAlignmentAuto) forKey:@"Auto"];
-    [textRotationAlignment setObject:@(MLNTextRotationAlignmentMap) forKey:@"Map"];
-    [textRotationAlignment setObject:@(MLNTextRotationAlignmentViewport) forKey:@"Viewport"];
-
-    NSMutableDictionary *textTransform = [[NSMutableDictionary alloc] init];
-    [textTransform setObject:@(MLNTextTransformNone) forKey:@"None"];
-    [textTransform setObject:@(MLNTextTransformLowercase) forKey:@"Lowercase"];
-    [textTransform setObject:@(MLNTextTransformUppercase) forKey:@"Uppercase"];
-
-    NSMutableDictionary *textTranslateAnchor = [[NSMutableDictionary alloc] init];
-    [textTranslateAnchor setObject:@(MLNTextTranslationAnchorMap) forKey:@"Map"];
-    [textTranslateAnchor setObject:@(MLNTextTranslationAnchorViewport) forKey:@"Viewport"];
-
-    // light constants
-    NSMutableDictionary *lightAnchor = [[NSMutableDictionary alloc] init];
-    [lightAnchor setObject:@(MLNLightAnchorMap) forKey:@"Map"];
-    [lightAnchor setObject:@(MLNLightAnchorViewport) forKey:@"Viewport"];
-
     // offline module callback names
     NSMutableDictionary *offlineModuleCallbackNames = [[NSMutableDictionary alloc] init];
     [offlineModuleCallbackNames setObject:RCT_MAPBOX_OFFLINE_CALLBACK_ERROR forKey:@"Error"];
@@ -202,27 +88,6 @@ RCT_EXPORT_MODULE();
          @"UserLocationVerticalAlignment": userLocationVerticalAlignment,
          @"CameraModes": cameraModes,
          @"StyleSource": styleSourceConsts,
-         @"LineJoin": lineJoin,
-         @"LineCap": lineCap,
-         @"LineTranslateAnchor": lineTranslateAnchor,
-         @"CirclePitchScale": circlePitchScale,
-         @"CircleTranslateAnchor": circleTranslateAnchor,
-         @"CirclePitchAlignment": circlePitchAlignment,
-         @"FillExtrusionTranslateAnchor": fillExtrusionTranslateAnchor,
-         @"FillTranslateAnchor": fillTranslateAnchor,
-         @"IconRotationAlignment": iconRotationAlignment,
-         @"IconTextFit": iconTextFit,
-         @"IconTranslateAnchor": iconTranslateAnchor,
-         @"IconAnchor": iconAnchor,
-         @"IconPitchAlignment": iconPitchAlignment,
-         @"SymbolPlacement": symbolPlacement,
-         @"TextAnchor": textAnchor,
-         @"TextJustify": textJustify,
-         @"TextPitchAlignment": textPitchAlignment,
-         @"TextRotationAlignment": textRotationAlignment,
-         @"TextTransform": textTransform,
-         @"TextTranslateAnchor": textTranslateAnchor,
-         @"LightAnchor": lightAnchor,
          @"OfflineCallbackName": offlineModuleCallbackNames,
          @"OfflinePackDownloadState": offlinePackDownloadState,
          @"LocationCallbackName": locationModuleEvents

package/ios/MLRN/MLRNRasterLayer.h

@@ -1,5 +1,4 @@
 #import "MLRNLayer.h"
-@import MapLibre;
 
 @interface MLRNRasterLayer : MLRNLayer
 

package/ios/MLRN/MLRNShapeSource.h

@@ -31,15 +31,4 @@
 
 - (double)getClusterExpansionZoom:(nonnull NSString *)featureJSON;
 
-// Deprecated. Will be removed in 9+ ver.
-- (nonnull NSArray<id <MLNFeature>> *)getClusterLeavesById:(nonnull NSNumber *)clusterId
-                                                number:(NSUInteger)number    
-                                                offset:(NSUInteger)offset;
-
-// Deprecated. Will be removed in 9+ ver.                                                
-- (nonnull NSArray<id <MLNFeature>> *)getClusterChildrenById:(nonnull NSNumber *)clusterId;     
-                                          
-// Deprecated. Will be removed in 9+ ver.
-- (double)getClusterExpansionZoomById:(nonnull NSNumber *)clusterId;
-
 @end

package/ios/MLRN/MLRNShapeSource.m

@@ -145,42 +145,4 @@ static UIImage * _placeHolderImage;
     return [shapeSource childrenOfCluster:cluster];
 }
 
-
-// Deprecated. Will be removed in 9+ ver.
-- (double)getClusterExpansionZoomById:(nonnull NSNumber *)clusterId
-{
-    MLNShapeSource *shapeSource = (MLNShapeSource *)self.source;
-    NSArray<id<MLNFeature>> *features = [shapeSource featuresMatchingPredicate: [NSPredicate predicateWithFormat:@"%K = %i", @"cluster_id", clusterId.intValue]];
-    if (features.count == 0) {
-        return -1;
-    }
-    return [shapeSource zoomLevelForExpandingCluster:(MLNPointFeatureCluster *)features[0]];
-}
-
-// Deprecated. Will be removed in 9+ ver.
-- (nonnull NSArray<id <MLNFeature>> *)getClusterLeavesById:(nonnull NSNumber *)clusterId
-    number:(NSUInteger)number
-    offset:(NSUInteger)offset
-{
-    MLNShapeSource *shapeSource = (MLNShapeSource *)self.source;
-    
-    NSPredicate* predicate = [NSPredicate predicateWithFormat:@"cluster_id == %@", clusterId];
-    NSArray<id<MLNFeature>> *features = [shapeSource featuresMatchingPredicate:predicate];
-    
-    MLNPointFeatureCluster * cluster = (MLNPointFeatureCluster *)features[0];
-    return [shapeSource leavesOfCluster:cluster offset:offset limit:number];
-}
-
-// Deprecated. Will be removed in 9+ ver.
-- (nonnull NSArray<id <MLNFeature>> *)getClusterChildrenById:(nonnull NSNumber *)clusterId
-{
-    MLNShapeSource *shapeSource = (MLNShapeSource *)self.source;
-    
-    NSPredicate* predicate = [NSPredicate predicateWithFormat:@"cluster_id == %@", clusterId];
-    NSArray<id<MLNFeature>> *features = [shapeSource featuresMatchingPredicate:predicate];
-    
-    MLNPointFeatureCluster * cluster = (MLNPointFeatureCluster *)features[0];
-    return [shapeSource childrenOfCluster:cluster];
-}
-
 @end

package/ios/MLRN/MLRNShapeSourceManager.m

@@ -128,72 +128,4 @@ RCT_EXPORT_METHOD(getClusterChildren:(nonnull NSNumber*)reactTag
     }];
 }
 
-// Deprecated. Will be removed in 9+ ver.
-RCT_EXPORT_METHOD(getClusterExpansionZoomById:(nonnull NSNumber*)reactTag
-                                clusterId:(nonnull NSNumber*)clusterId
-                                 resolver:(RCTPromiseResolveBlock)resolve
-                                 rejecter:(RCTPromiseRejectBlock)reject)
-{
-    [self.bridge.uiManager addUIBlock:^(__unused RCTUIManager *manager, NSDictionary<NSNumber*, UIView*> *viewRegistry) {
-        MLRNShapeSource* shapeSource = (MLRNShapeSource *)viewRegistry[reactTag];
-
-        if (![shapeSource isKindOfClass:[MLRNShapeSource class]]) {
-            RCTLogError(@"Invalid react tag, could not find MLRNMapView");
-            return;
-        }
-
-        double zoom = [shapeSource getClusterExpansionZoomById:clusterId];
-        if (zoom == -1) {
-          reject(@"zoom_error", [NSString stringWithFormat:@"Could not get zoom for cluster id %@", clusterId], nil);
-          return;
-        }
-        resolve(@{@"data":@(zoom)});
-    }];
-}
-
-// Deprecated. Will be removed in 9+ ver.
-RCT_EXPORT_METHOD(getClusterLeavesById:(nonnull NSNumber*)reactTag
-                  clusterId:(nonnull NSNumber *)clusterId
-                  number:(NSUInteger) number
-                  offset:(NSUInteger) offset
-                  resolver:(RCTPromiseResolveBlock)resolve
-                  rejecter:(RCTPromiseRejectBlock)reject)
-{
-    [self.bridge.uiManager addUIBlock:^(__unused RCTUIManager *manager, NSDictionary<NSNumber*, UIView*> *viewRegistry) {
-        MLRNShapeSource* shapeSource = (MLRNShapeSource *)viewRegistry[reactTag];
-
-        NSArray<id<MLNFeature>> *shapes = [shapeSource getClusterLeavesById:clusterId number:number offset:offset];
-
-        NSMutableArray<NSDictionary*> *features = [[NSMutableArray alloc] initWithCapacity:shapes.count];
-        for (int i = 0; i < shapes.count; i++) {
-            [features addObject:shapes[i].geoJSONDictionary];
-        }
-
-        resolve(@{
-                  @"data": @{ @"type": @"FeatureCollection", @"features": features }
-                  });
-    }];
-}
-// Deprecated. Will be removed in 9+ ver.
-RCT_EXPORT_METHOD(getClusterChildrenById:(nonnull NSNumber*)reactTag
-                  clusterId:(nonnull NSNumber *)clusterId                  
-                  resolver:(RCTPromiseResolveBlock)resolve
-                  rejecter:(RCTPromiseRejectBlock)reject)
-{
-    [self.bridge.uiManager addUIBlock:^(__unused RCTUIManager *manager, NSDictionary<NSNumber*, UIView*> *viewRegistry) {
-        MLRNShapeSource* shapeSource = (MLRNShapeSource *)viewRegistry[reactTag];
-
-        NSArray<id<MLNFeature>> *shapes = [shapeSource getClusterChildrenById: clusterId];
-
-        NSMutableArray<NSDictionary*> *features = [[NSMutableArray alloc] initWithCapacity:shapes.count];
-        for (int i = 0; i < shapes.count; i++) {
-            [features addObject:shapes[i].geoJSONDictionary];
-        }
-
-        resolve(@{
-                  @"data": @{ @"type": @"FeatureCollection", @"features": features }
-                  });
-    }];
-}
-
 @end

package/ios/MLRN/MLRNSymbolLayer.h

@@ -1,11 +1,5 @@
-#import <React/RCTComponent.h>
 #import "MLRNVectorLayer.h"
 
-@interface MLRNSymbolLayer : MLRNVectorLayer<RCTInvalidating>
-
-@property (nonatomic, strong) NSMutableArray<id<RCTComponent>> *reactSubviews;
-
-@property (nonatomic, assign) BOOL snapshot;
-@property (nonatomic, copy) NSString *sourceLayerID;
+@interface MLRNSymbolLayer : MLRNVectorLayer
 
 @end