Fix

Author: janicduplessis

android/rctmgl/src/main/java/com/mapbox/rctmgl/components/styles/sources/RCTMGLShapeSource.java

@@ -172,16 +172,28 @@ public void querySourceFeatures(String callbackID,
         mManager.handleEvent(event);
     }
 
-    public void getClusterExpansionZoom(String callbackID, String clusterId) {
+    public void getClusterExpansionZoom(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.get("id"), clusterId));
-        int zoom = mSource.getClusterExpansionZoom(features.get(0));
+        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);
 

android/rctmgl/src/main/java/com/mapbox/rctmgl/components/styles/sources/RCTMGLShapeSourceManager.java

@@ -169,7 +169,7 @@ public void receiveCommand(RCTMGLShapeSource source, int commandID, @Nullable Re
                         );
                 break;
             case METHOD_GET_CLUSTER_EXPANSION_ZOOM:
-                source.getClusterExpansionZoom(args.getString(0), args.getString(1));
+                source.getClusterExpansionZoom(args.getString(0), args.getInt(1));
                 break;
         }
     }

docs/ShapeSource.md

@@ -38,12 +38,12 @@ shapeSource.features()
 
 #### getClusterExpansionZoom(clusterId)
 
-Returns the zoom needed to expand the cluster. If the request fails -1 will be<br/>returned.
+Returns the zoom needed to expand the cluster.
 
 ##### arguments
 | Name | Type | Required | Description  |
 | ---- | :--: | :------: | :----------: |
-| `clusterId` | `string` | `Yes` | The id of the cluster to expand. |
+| `clusterId` | `number` | `Yes` | The id of the cluster to expand. |
 
 
 

docs/docs.json

@@ -3575,7 +3575,7 @@
       },
       {
         "name": "getClusterExpansionZoom",
-        "docblock": "Returns the zoom needed to expand the cluster. If the request fails -1 will be\nreturned.\n\n@example\nconst zoom = await shapeSource.getClusterExpansionZoom(clusterId);\n\n@param  {string} clusterId - The id of the cluster to expand.\n@return {number}",
+        "docblock": "Returns the zoom needed to expand the cluster.\n\n@example\nconst zoom = await shapeSource.getClusterExpansionZoom(clusterId);\n\n@param  {number} clusterId - The id of the cluster to expand.\n@return {number}",
         "modifiers": [
           "async"
         ],
@@ -3584,7 +3584,7 @@
             "name": "clusterId",
             "description": "The id of the cluster to expand.",
             "type": {
-              "name": "string"
+              "name": "number"
             },
             "optional": false
           }
@@ -3595,7 +3595,7 @@
             "name": "number"
           }
         },
-        "description": "Returns the zoom needed to expand the cluster. If the request fails -1 will be\nreturned.",
+        "description": "Returns the zoom needed to expand the cluster.",
         "examples": [
           "\nconst zoom = await shapeSource.getClusterExpansionZoom(clusterId);\n\n"
         ]

ios/RCTMGL/RCTMGLShapeSource.h

@@ -31,6 +31,6 @@
 
 - (nonnull NSArray<id <MGLFeature>> *)featuresMatchingPredicate:(nullable NSPredicate *)predicate;
 
-- (double)getClusterExpansionZoom:(NSString *)clusterId;
+- (double)getClusterExpansionZoom:(nonnull NSNumber *)clusterId;
 
 @end

ios/RCTMGL/RCTMGLShapeSource.m

@@ -104,10 +104,14 @@ - (nullable MGLSource*)makeSource
     return [shapeSource featuresMatchingPredicate:predicate];
 }
 
-- (double)getClusterExpansionZoom:(NSString *)clusterId
+- (double)getClusterExpansionZoom:(nonnull NSNumber *)clusterId
 {
     MGLShapeSource *shapeSource = (MGLShapeSource *)self.source;
-    NSArray<id<MGLFeature>> *features = [shapeSource featuresMatchingPredicate: [NSPredicate predicateWithFormat:@"id = %@", clusterId]];
+    NSArray<id<MGLFeature>> *features = [shapeSource featuresMatchingPredicate: [NSPredicate predicateWithFormat:@"id == %i", clusterId.intValue]];
+
+    if (features.count == 0) {
+        return -1;
+    }
     return [shapeSource zoomLevelForExpandingCluster:(MGLPointFeatureCluster *)features[0]];
 }
 

ios/RCTMGL/RCTMGLShapeSourceManager.m

@@ -67,7 +67,7 @@ - (UIView*)view
 }
 
 RCT_EXPORT_METHOD(getClusterExpansionZoom:(nonnull NSNumber*)reactTag
-                                clusterId:(NSString *)clusterId
+                                clusterId:(nonnull NSNumber*)clusterId
                                  resolver:(RCTPromiseResolveBlock)resolve
                                  rejecter:(RCTPromiseRejectBlock)reject)
 {
@@ -80,6 +80,10 @@ - (UIView*)view
         }
 
         double zoom = [shapeSource getClusterExpansionZoom:clusterId];
+        if (zoom == -1) {
+          reject(@"zoom_error", [NSString stringWithFormat:@"Could not get zoom for cluster id %@", clusterId], nil);
+          return;
+        }
         resolve(@{@"data":@(zoom)});
     }];
 }

javascript/components/ShapeSource.js

@@ -148,13 +148,12 @@ class ShapeSource extends NativeBridgeComponent(AbstractSource) {
   }
 
   /**
-   * Returns the zoom needed to expand the cluster. If the request fails -1 will be
-   * returned.
+   * Returns the zoom needed to expand the cluster.
    *
    * @example
    * const zoom = await shapeSource.getClusterExpansionZoom(clusterId);
    *
-   * @param  {string} clusterId - The id of the cluster to expand.
+   * @param  {number} clusterId - The id of the cluster to expand.
    * @return {number}
    */
   async getClusterExpansionZoom(clusterId) {