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

package/README.md

@@ -15,66 +15,65 @@ supported both Mapbox and MapLibre for some time, but as the MapLibre and Mapbox
 diverged, it has become necessary to separate the projects into specific wrappers by underlying renderer.
 
 <p align="center">
-    <img src="/docs/assets/indoor-building-map-android.png"
+    <img src="/docs/assets/device-android.png"
          alt="Indoor Building Map Android"
-         height="300"
+         height="320"
           />
-    <img src="/docs/assets/indoor-building-map-ios.png"
+    <img src="/docs/assets/device-ios.png"
          alt="Indoor Building Map iOS"
-         height="300"
+         height="320"
           />
 </p>
 
 ## Documentation
 
-- [Getting Started](/docs/GettingStarted.md)
+- [Getting Started](/docs/guides/setup/GettingStarted.md)
 - Installation
   - React Native  
-    - [Android](/android/install.md)
-    - [iOS](/ios/install.md)
-  - [Expo](/plugin/install.md)
+    - [Android](/docs/guides/setup/Android.md)
+    - [iOS](/docs/guides/setup/iOS.md)
+  - [Expo](/docs/guides/setup/Expo.md)
 
 ### Components
 
-- [MapView](/docs/MapView.md)
-- [Light](/docs/Light.md)
-- [StyleSheet](/docs/StyleSheet.md)
-- [PointAnnotation](/docs/PointAnnotation.md)
-- [MarkerView](/docs/MarkerView.md)
-- [Callout](/docs/Callout.md)
-- [Camera](docs/Camera.md)
-- [UserLocation](docs/UserLocation.md)
-- [Images](docs/Images.md)
+- [MapView](/docs/components/MapView.md)
+- [Light](/docs/components/Light.md)
+- [PointAnnotation](/docs/components/PointAnnotation.md)
+- [MarkerView](/docs/components/MarkerView.md)
+- [Callout](/docs/components/Callout.md)
+- [Camera](docs/components/Camera.md)
+- [UserLocation](docs/components/UserLocation.md)
+- [Images](docs/components/Images.md)
 
 ### Sources
 
-- [VectorSource](/docs/VectorSource.md)
-- [ShapeSource](/docs/ShapeSource.md)
-- [RasterSource](/docs/RasterSource.md)
+- [VectorSource](/docs/components/VectorSource.md)
+- [ShapeSource](/docs/components/ShapeSource.md)
+- [RasterSource](/docs/components/RasterSource.md)
 
 ### Layers
 
-- [BackgroundLayer](/docs/BackgroundLayer.md)
-- [CircleLayer](/docs/CircleLayer.md)
-- [FillExtrusionLayer](/docs/FillExtrusionLayer.md)
-- [FillLayer](/docs/FillLayer.md)
-- [LineLayer](/docs/LineLayer.md)
-- [RasterLayer](/docs/RasterLayer.md)
-- [SymbolLayer](/docs/SymbolLayer.md)
-- [HeatmapLayer](/docs/HeatmapLayer.md)
+- [BackgroundLayer](/docs/components/BackgroundLayer.md)
+- [CircleLayer](/docs/components/CircleLayer.md)
+- [FillExtrusionLayer](/docs/components/FillExtrusionLayer.md)
+- [FillLayer](/docs/components/FillLayer.md)
+- [LineLayer](/docs/components/LineLayer.md)
+- [RasterLayer](/docs/components/RasterLayer.md)
+- [SymbolLayer](/docs/components/SymbolLayer.md)
+- [HeatmapLayer](/docs/components/HeatmapLayer.md)
 
-### Offline
+### Modules
 
-- [OfflineManager](/docs/OfflineManager.md)
-- [SnapshotManager](/docs/snapshotManager.md)
+- [OfflineManager](/docs/modules/offlineManager.md)
+- [SnapshotManager](/docs/modules/snapshotManager.md)
 
 ### Misc
 
-- [MapLibreGL](/docs/MapLibreGL.md)
-- [CustomHttpHeaders](/docs/CustomHttpHeaders.md)
-- [Logger](/docs/Logger.md)
+- [MapLibreGL](/docs/guides/MapLibreGL.md)
+- [Custom HTTP Headers](/docs/guides/CustomHTTPHeaders.md)
+- [Logger](/docs/guides/Logger.md)
 
-## Contributing / local development
+## Contributing & Development
 
 Read the [CONTRIBUTING.md](CONTRIBUTING.md) guide in order to get familiar with how we do things around here and
 set up your local development environment.

package/android/build.gradle

@@ -1,69 +1,116 @@
-apply plugin: 'com.android.library'
+buildscript {
+  // Buildscript is evaluated before everything else so we can't use getExtOrDefault
+  def kotlin_version = rootProject.ext.has("kotlinVersion") ? rootProject.ext.get("kotlinVersion") : project.properties["MapLibreReactNative_kotlinVersion"]
+
+  repositories {
+    google()
+    mavenCentral()
+  }
+
+  dependencies {
+    classpath "com.android.tools.build:gradle:7.2.1"
+    // noinspection DifferentKotlinGradleVersion
+    classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
+  }
+}
 
-def safeExtGet(prop, fallback) {
-    rootProject.ext.has(prop) ? rootProject.ext.get(prop) : fallback
+def reactNativeArchitectures() {
+  def value = rootProject.getProperties().get("reactNativeArchitectures")
+  return value ? value.split(",") : ["armeabi-v7a", "x86", "x86_64", "arm64-v8a"]
 }
 
 def isNewArchitectureEnabled() {
-    return project.hasProperty("newArchEnabled") && project.newArchEnabled == "true"
+  return rootProject.hasProperty("newArchEnabled") && rootProject.getProperty("newArchEnabled") == "true"
 }
 
-buildscript {
-    ext {
-        buildToolsVersion = "33.0.0"
-        minSdkVersion = 16
-        compileSdkVersion = 34
-        targetSdkVersion = 33
-        supportLibVersion = "28.0.0"
-    }
+apply plugin: "com.android.library"
+apply plugin: "kotlin-android"
 
-    repositories {
-        google()
-        mavenCentral()
-    }
+// TODO: Currently breaks new arch support, but works without
+// if (isNewArchitectureEnabled()) {
+//   apply plugin: "com.facebook.react"
+// }
+
+def getExtOrDefault(name) {
+  return rootProject.ext.has(name) ? rootProject.ext.get(name) : project.properties["MapLibreReactNative_" + name]
+}
+
+def getExtOrIntegerDefault(name) {
+  return rootProject.ext.has(name) ? rootProject.ext.get(name) : (project.properties["MapLibreReactNative_" + name]).toInteger()
+}
+
+def supportsNamespace() {
+  def parsed = com.android.Version.ANDROID_GRADLE_PLUGIN_VERSION.tokenize('.')
+  def major = parsed[0].toInteger()
+  def minor = parsed[1].toInteger()
+
+  // Namespace support was added in 7.3.0
+  return (major == 7 && minor >= 3) || major >= 8
 }
 
 android {
-    compileSdkVersion safeExtGet("compileSdkVersion", 33)
-    buildToolsVersion safeExtGet("buildToolsVersion", '33.0.1')
-
-    defaultConfig {
-        minSdkVersion safeExtGet('minSdkVersion', 16)
-        targetSdkVersion safeExtGet('targetSdkVersion', 26)
-        versionCode 1
-        versionName "1.0"
-        buildConfigField("boolean", "IS_NEW_ARCHITECTURE_ENABLED", isNewArchitectureEnabled().toString())
-    }
+  if (supportsNamespace()) {
+    namespace "org.maplibre.reactnative"
 
-    compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
+    sourceSets {
+      main {
+        manifest.srcFile "src/main/AndroidManifestNew.xml"
+      }
     }
+  }
+
+  compileSdkVersion getExtOrIntegerDefault("compileSdkVersion")
+
+  defaultConfig {
+    minSdkVersion getExtOrIntegerDefault("minSdkVersion")
+    targetSdkVersion getExtOrIntegerDefault("targetSdkVersion")
 
-    buildTypes {
-        release {
-            minifyEnabled false
-        }
+    buildConfigField "boolean", "IS_NEW_ARCHITECTURE_ENABLED", isNewArchitectureEnabled().toString()
+  }
+
+  buildTypes {
+    release {
+      minifyEnabled false
     }
+  }
+
+  lintOptions {
+    disable "GradleCompatible"
+  }
+
+  compileOptions {
+    sourceCompatibility JavaVersion.VERSION_1_8
+    targetCompatibility JavaVersion.VERSION_1_8
+  }
 }
 
+repositories {
+  mavenCentral()
+  google()
+}
+
+def kotlin_version = getExtOrDefault("kotlinVersion")
+
 dependencies {
-    // The version of react-native is set by the React Native Gradle Plugin
-    implementation("com.facebook.react:react-android")
-
-    // MapLibre SDK
-    implementation "org.maplibre.gl:android-sdk:11.5.0"
-    implementation "org.maplibre.gl:android-sdk-turf:6.0.1"
-
-    // Dependencies
-    implementation "androidx.vectordrawable:vectordrawable:1.1.0"
-    implementation "androidx.annotation:annotation:1.7.0"
-    implementation "androidx.appcompat:appcompat:1.6.1"
-    implementation "com.squareup.okhttp3:okhttp:${safeExtGet('okhttpVersion', '4.9.0')}"
-    implementation "com.squareup.okhttp3:okhttp-urlconnection:${safeExtGet('okhttpVersion', '4.9.0')}"
-
-    // MapLibre plugins
-    implementation ("org.maplibre.gl:android-plugin-localization-v9:3.0.1")
-    implementation ("org.maplibre.gl:android-plugin-annotation-v9:3.0.1")
-    implementation ("org.maplibre.gl:android-plugin-markerview-v9:3.0.1")
+  // For < 0.71, this will be from the local maven repo
+  // For > 0.71, this will be replaced by `com.facebook.react:react-android:$version` by react gradle plugin
+  //noinspection GradleDynamicVersion
+  implementation "com.facebook.react:react-native:+"
+  implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
+
+  // MapLibre SDK
+  implementation "org.maplibre.gl:android-sdk:11.5.0"
+  implementation "org.maplibre.gl:android-sdk-turf:6.0.1"
+
+  // Dependencies
+  implementation "androidx.vectordrawable:vectordrawable:1.1.0"
+  implementation "androidx.annotation:annotation:1.7.0"
+  implementation "androidx.appcompat:appcompat:1.6.1"
+  implementation "com.squareup.okhttp3:okhttp:${getExtOrDefault('okhttpVersion')}"
+  implementation "com.squareup.okhttp3:okhttp-urlconnection:${getExtOrDefault('okhttpVersion')}"
+
+  // MapLibre plugins
+  implementation ("org.maplibre.gl:android-plugin-localization-v9:3.0.1")
+  implementation ("org.maplibre.gl:android-plugin-annotation-v9:3.0.1")
+  implementation ("org.maplibre.gl:android-plugin-markerview-v9:3.0.1")
 }

package/android/gradle.properties

@@ -0,0 +1,7 @@
+MapLibreReactNative_kotlinVersion=1.7.0
+MapLibreReactNative_minSdkVersion=21
+MapLibreReactNative_targetSdkVersion=31
+MapLibreReactNative_compileSdkVersion=31
+MapLibreReactNative_ndkversion=21.4.7075529
+
+MapLibreReactNative_okhttpVersion=4.9.0

package/android/src/main/AndroidManifest.xml

@@ -1,4 +1,6 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="org.maplibre.reactnative">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="org.maplibre.reactnative">
+
     <uses-permission android:name="android.permission.INTERNET" />
-    <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION"/>
+    <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
 </manifest>

package/android/src/main/AndroidManifestNew.xml

@@ -0,0 +1,5 @@
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <uses-permission android:name="android.permission.INTERNET" />
+    <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
+</manifest>

package/android/src/main/java/org/maplibre/reactnative/MLRNPackage.java

@@ -52,11 +52,6 @@ public class MLRNPackage implements ReactPackage {
         return modules;
     }
 
-    @Deprecated
-    public List<Class<? extends JavaScriptModule>> createJSModules() {
-        return Collections.emptyList();
-    }
-
     @Override
     public List<ViewManager> createViewManagers(ReactApplicationContext reactApplicationContext) {
         List<ViewManager> managers = new ArrayList<>();

package/android/src/main/java/org/maplibre/reactnative/components/styles/MLRNStyle.java

@@ -35,10 +35,7 @@ public class MLRNStyle {
 
         while (it.hasNextKey()) {
             String key = it.nextKey();
-
-            if (!key.equals("__MAPBOX_STYLESHEET__")) {
-                keys.add(key);
-            }
+            keys.add(key);
         }
 
         return keys;

package/android/src/main/java/org/maplibre/reactnative/components/styles/MLRNStyleFactory.java

@@ -9,7 +9,6 @@ import org.maplibre.android.style.layers.FillExtrusionLayer;
 import org.maplibre.android.style.layers.FillLayer;
 import org.maplibre.android.style.layers.LineLayer;
 import org.maplibre.android.style.layers.PropertyFactory;
-import org.maplibre.android.style.layers.PropertyValue;
 import org.maplibre.android.style.layers.RasterLayer;
 import org.maplibre.android.style.layers.SymbolLayer;
 import org.maplibre.android.style.layers.HeatmapLayer;
@@ -28,7 +27,7 @@ public class MLRNStyleFactory {
     public static void setFillLayerStyle(final FillLayer layer, MLRNStyle style) {
       List<String> styleKeys = style.getAllStyleKeys();
 
-      if (styleKeys.size() == 0) {
+      if (styleKeys.isEmpty()) {
         return;
       }
 
@@ -89,7 +88,7 @@ public class MLRNStyleFactory {
     public static void setLineLayerStyle(final LineLayer layer, MLRNStyle style) {
       List<String> styleKeys = style.getAllStyleKeys();
 
-      if (styleKeys.size() == 0) {
+      if (styleKeys.isEmpty()) {
         return;
       }
 
@@ -186,7 +185,7 @@ public class MLRNStyleFactory {
     public static void setSymbolLayerStyle(final SymbolLayer layer, MLRNStyle style) {
       List<String> styleKeys = style.getAllStyleKeys();
 
-      if (styleKeys.size() == 0) {
+      if (styleKeys.isEmpty()) {
         return;
       }
 
@@ -409,7 +408,7 @@ public class MLRNStyleFactory {
     public static void setCircleLayerStyle(final CircleLayer layer, MLRNStyle style) {
       List<String> styleKeys = style.getAllStyleKeys();
 
-      if (styleKeys.size() == 0) {
+      if (styleKeys.isEmpty()) {
         return;
       }
 
@@ -486,7 +485,7 @@ public class MLRNStyleFactory {
     public static void setHeatmapLayerStyle(final HeatmapLayer layer, MLRNStyle style) {
       List<String> styleKeys = style.getAllStyleKeys();
 
-      if (styleKeys.size() == 0) {
+      if (styleKeys.isEmpty()) {
         return;
       }
 
@@ -527,7 +526,7 @@ public class MLRNStyleFactory {
     public static void setFillExtrusionLayerStyle(final FillExtrusionLayer layer, MLRNStyle style) {
       List<String> styleKeys = style.getAllStyleKeys();
 
-      if (styleKeys.size() == 0) {
+      if (styleKeys.isEmpty()) {
         return;
       }
 
@@ -591,7 +590,7 @@ public class MLRNStyleFactory {
     public static void setRasterLayerStyle(final RasterLayer layer, MLRNStyle style) {
       List<String> styleKeys = style.getAllStyleKeys();
 
-      if (styleKeys.size() == 0) {
+      if (styleKeys.isEmpty()) {
         return;
       }
 
@@ -650,7 +649,7 @@ public class MLRNStyleFactory {
     public static void setHillshadeLayerStyle(final HillshadeLayer layer, MLRNStyle style) {
       List<String> styleKeys = style.getAllStyleKeys();
 
-      if (styleKeys.size() == 0) {
+      if (styleKeys.isEmpty()) {
         return;
       }
 
@@ -697,7 +696,7 @@ public class MLRNStyleFactory {
     public static void setBackgroundLayerStyle(final BackgroundLayer layer, MLRNStyle style) {
       List<String> styleKeys = style.getAllStyleKeys();
 
-      if (styleKeys.size() == 0) {
+      if (styleKeys.isEmpty()) {
         return;
       }
 
@@ -737,7 +736,7 @@ public class MLRNStyleFactory {
     public static void setLightLayerStyle(final Light layer, MLRNStyle style) {
       List<String> styleKeys = style.getAllStyleKeys();
 
-      if (styleKeys.size() == 0) {
+      if (styleKeys.isEmpty()) {
         return;
       }
 

package/android/src/main/java/org/maplibre/reactnative/components/styles/sources/MLRNShapeSource.java

@@ -243,70 +243,4 @@ public class MLRNShapeSource extends MLRNSource<GeoJsonSource> {
         AndroidCallbackEvent event = new AndroidCallbackEvent(this, callbackID, payload);
         mManager.handleEvent(event);
     }
-
-    // Deprecated. Will be removed in 9+ ver. 
-    public void getClusterExpansionZoomById(String callbackID, int clusterId) {
-        if (mSource == null) {
-            WritableMap payload = new WritableNativeMap();
-            payload.putString("error", "source is not yet loaded");
-            AndroidCallbackEvent event = new AndroidCallbackEvent(this, callbackID, payload);
-            mManager.handleEvent(event);
-            return;
-        }
-        List<Feature> features = mSource.querySourceFeatures(Expression.eq(Expression.id(), clusterId));
-        int zoom = -1;
-        if (features.size() > 0) {
-            zoom = mSource.getClusterExpansionZoom(features.get(0));
-        }
-
-        if (zoom == -1) {
-            WritableMap payload = new WritableNativeMap();
-            payload.putString("error", "Could not get zoom for cluster id " + clusterId);
-            AndroidCallbackEvent event = new AndroidCallbackEvent(this, callbackID, payload);
-            mManager.handleEvent(event);
-            return;
-        }
-
-        WritableMap payload = new WritableNativeMap();
-        payload.putInt("data", zoom);
-
-        AndroidCallbackEvent event = new AndroidCallbackEvent(this, callbackID, payload);
-        mManager.handleEvent(event);
-    }
-
-    // Deprecated. Will be removed in 9+ ver.
-    public void getClusterLeavesById(String callbackID, int clusterId, int number, int offset) {
-        if (mSource == null) {
-            WritableMap payload = new WritableNativeMap();
-            payload.putString("error", "source is not yet loaded");
-            AndroidCallbackEvent event = new AndroidCallbackEvent(this, callbackID, payload);
-            mManager.handleEvent(event);
-            return;
-        }
-        Feature clusterFeature = mSource.querySourceFeatures(Expression.eq(Expression.get("cluster_id"), clusterId)).get(0);
-        FeatureCollection leaves = mSource.getClusterLeaves(clusterFeature, number, offset);
-        WritableMap payload = new WritableNativeMap();
-        payload.putString("data", leaves.toJson());
-
-        AndroidCallbackEvent event = new AndroidCallbackEvent(this, callbackID, payload);
-        mManager.handleEvent(event);
-    }
-
-    // Deprecated. Will be removed in 9+ ver.
-    public void getClusterChildrenById(String callbackID, int clusterId) {
-        if (mSource == null) {
-            WritableMap payload = new WritableNativeMap();
-            payload.putString("error", "source is not yet loaded");
-            AndroidCallbackEvent event = new AndroidCallbackEvent(this, callbackID, payload);
-            mManager.handleEvent(event);
-            return;
-        }
-        Feature clusterFeature = mSource.querySourceFeatures(Expression.eq(Expression.get("cluster_id"), clusterId)).get(0);
-        FeatureCollection leaves = mSource.getClusterChildren(clusterFeature);
-        WritableMap payload = new WritableNativeMap();
-        payload.putString("data", leaves.toJson());
-
-        AndroidCallbackEvent event = new AndroidCallbackEvent(this, callbackID, payload);
-        mManager.handleEvent(event);
-    }
 }

package/android/src/main/java/org/maplibre/reactnative/components/styles/sources/MLRNShapeSourceManager.java

@@ -179,11 +179,6 @@ public class MLRNShapeSourceManager extends AbstractEventEmitter<MLRNShapeSource
     public static final int METHOD_GET_CLUSTER_LEAVES = 105;
     public static final int METHOD_GET_CLUSTER_CHILDREN = 106;
 
-    // Deprecated. Will be removed in 9+ ver.
-    public static final int METHOD_GET_CLUSTER_EXPANSION_ZOOM_BY_ID = 107;
-    public static final int METHOD_GET_CLUSTER_LEAVES_BY_ID = 108;
-    public static final int METHOD_GET_CLUSTER_CHILDREN_BY_ID = 109;
-
     @Nullable
     @Override
     public Map<String, Integer> getCommandsMap() {
@@ -192,12 +187,6 @@ public class MLRNShapeSourceManager extends AbstractEventEmitter<MLRNShapeSource
                 .put("getClusterExpansionZoom", METHOD_GET_CLUSTER_EXPANSION_ZOOM)
                 .put("getClusterLeaves", METHOD_GET_CLUSTER_LEAVES)
                 .put("getClusterChildren", METHOD_GET_CLUSTER_CHILDREN)
-
-                // Deprecated. Will be removed in 9+ ver.
-                .put("getClusterExpansionZoomById", METHOD_GET_CLUSTER_EXPANSION_ZOOM_BY_ID)
-                .put("getClusterLeavesById", METHOD_GET_CLUSTER_LEAVES_BY_ID)
-                .put("getClusterChildrenById", METHOD_GET_CLUSTER_CHILDREN_BY_ID)
-               
                 .build();
     }
 
@@ -227,23 +216,6 @@ public class MLRNShapeSourceManager extends AbstractEventEmitter<MLRNShapeSource
                         args.getString(1)                        
                 );
                 break;
-            case METHOD_GET_CLUSTER_EXPANSION_ZOOM_BY_ID:
-                source.getClusterExpansionZoomById(args.getString(0), args.getInt(1));
-                break;
-            case METHOD_GET_CLUSTER_LEAVES_BY_ID:
-                source.getClusterLeavesById(
-                        args.getString(0),
-                        args.getInt(1),
-                        args.getInt(2),
-                        args.getInt((3))
-                );
-                break;
-            case METHOD_GET_CLUSTER_CHILDREN_BY_ID:
-                source.getClusterChildrenById(
-                        args.getString(0),
-                        args.getInt(1)                        
-                );
-                break;
         }
     }
 }