@maplibre/maplibre-react-native 10.0.0-alpha.4 → 10.0.0-alpha.5

package/CHANGELOG.md

@@ -5,6 +5,11 @@ Please add unreleased changes in the following style:
 PR Title ([#123](link to my pr))
 ```
 
+## 10.0.0-alpha.5
+Fix: [remove AbortController test mock](https://github.com/maplibre/maplibre-react-native/pull/403)
+Fix: [ExpoPlugin after Class renaming](thttps://github.com/maplibre/maplibre-react-native/pull/405)
+Fix: [android example crashing](https://github.com/maplibre/maplibre-react-native/pull/372) on launch
+
 ## 10.0.0-alpha.4
 Update maplibre-native to use [new metal renderer on iOS](https://github.com/maplibre/maplibre-native/releases/tag/ios-v6.4.0)
 
@@ -20,6 +25,7 @@ Fix: Duplicated Signature issue with Xcode 15 ([#238](https://github.com/maplibr
 Update download-style-spec.sh ([#163](https://github.com/maplibre/maplibre-react-native/pull/163))
 Update react-maplibre ([#34](https://github.com/maplibre/maplibre-react-native/issues/34))
 chore: update support libraries ([#121](https://github.com/maplibre/maplibre-react-native/pull/121)).
+fix: correct types in MapView ([#268])(https://github.com/maplibre/maplibre-react-native/pull/268))
 
 ## 10.0.0-alpha.1
 

package/docs/MapView.md

@@ -108,14 +108,14 @@ const visibleBounds = await this._map.getVisibleBounds();
 ```
 
 
-#### queryRenderedFeaturesAtPoint(coordinate[, filter][, layerIDs])
+#### queryRenderedFeaturesAtPoint(point[, filter][, layerIDs])
 
 Returns an array of rendered map features that intersect with a given point.
 
 ##### arguments
 | Name | Type | Required | Description  |
 | ---- | :--: | :------: | :----------: |
-| `coordinate` | `GeoJSON.Position` | `Yes` | A point expressed in the map view’s coordinate system. |
+| `point` | `tuple` | `Yes` | A point expressed in the map view’s coordinate system. |
 | `filter` | `FilterExpression` | `No` | A set of strings that correspond to the names of layers defined in the current style. Only the features contained in these layers are included in the returned array. |
 | `layerIDs` | `Array` | `No` | A array of layer id's to filter the features by |
 

package/docs/docs.json

@@ -2136,7 +2136,7 @@
       },
       {
         "name": "getVisibleBounds",
-        "docblock": "The coordinate bounds(ne, sw) visible in the users’s viewport.\n\n@example\nconst visibleBounds = await this._map.getVisibleBounds();\n\n@return {Array}",
+        "docblock": "The coordinate bounds(ne, sw) visible in the users’s viewport.\n\n@example\nconst visibleBounds = await this._map.getVisibleBounds();\n\n@return {VisibleBounds}",
         "modifiers": [
           "async"
         ],
@@ -2147,10 +2147,19 @@
             "name": "Promise",
             "elements": [
               {
-                "name": "Bounds"
+                "name": "tuple",
+                "raw": "[northEast: GeoJSON.Position, southWest: GeoJSON.Position]",
+                "elements": [
+                  {
+                    "name": "unknown"
+                  },
+                  {
+                    "name": "unknown"
+                  }
+                ]
               }
             ],
-            "raw": "Promise<Bounds>"
+            "raw": "Promise<VisibleBounds>"
           }
         },
         "description": "The coordinate bounds(ne, sw) visible in the users’s viewport.",
@@ -2160,16 +2169,16 @@
       },
       {
         "name": "queryRenderedFeaturesAtPoint",
-        "docblock": "Returns an array of rendered map features that intersect with a given point.\n\n@example\nthis._map.queryRenderedFeaturesAtPoint([30, 40], ['==', 'type', 'Point'], ['id1', 'id2'])\n\n@param  {Array<Number>} coordinate - A point expressed in the map view’s coordinate system.\n@param  {Array=} filter - A set of strings that correspond to the names of layers defined in the current style. Only the features contained in these layers are included in the returned array.\n@param  {Array=} layerIDs - A array of layer id's to filter the features by\n@return {GeoJSON.FeatureCollection}",
+        "docblock": "Returns an array of rendered map features that intersect with a given point.\n\n@example\nthis._map.queryRenderedFeaturesAtPoint([30, 40], ['==', 'type', 'Point'], ['id1', 'id2'])\n\n@typedef {number} ScreenPointX\n@typedef {number} ScreenPointY\n@param  {[ScreenPointX, ScreenPointY]} point - A point expressed in the map view’s coordinate system.\n@param  {Array=} filter - A set of strings that correspond to the names of layers defined in the current style. Only the features contained in these layers are included in the returned array.\n@param  {Array=} layerIDs - A array of layer id's to filter the features by\n@return {GeoJSON.FeatureCollection}",
         "modifiers": [
           "async"
         ],
         "params": [
           {
-            "name": "coordinate",
+            "name": "point",
             "description": "A point expressed in the map view’s coordinate system.",
             "type": {
-              "name": "GeoJSON.Position"
+              "name": "tuple"
             },
             "optional": false
           },

package/ios/install.md

@@ -8,7 +8,7 @@ Add the following to your `ios/Podfile`:
 ```ruby
   post_install do |installer|
     ... other post install hooks
-    $RNMBGL.post_install(installer)
+    $RCTMLN.post_install(installer)
   end
 ```
 
@@ -31,7 +31,6 @@ environments. The map either does not render at all or appears garbled when pann
 It is best to test on a real device if at all possible at this time
 until this is fixed upstream. iOS devs can open the workspace in Xcode and run from there.
 
-
 ## Installing a specific version
 
 The current default MapLibre version is `6.4.0`.
@@ -39,7 +38,7 @@ If you want to install a different version, you can override as follows in
 your `Podfile`:
 
 ```ruby
-$RNMBGL_Use_SPM = {
+$RCTMLN_Use_SPM = {
   url: "https://github.com/maplibre/maplibre-gl-native-distribution",
   requirement: {
     kind: "upToNextMajorVersion",

package/javascript/components/MapView.tsx

@@ -42,14 +42,11 @@ export interface RegionPayload {
   heading: number;
   animated: boolean;
   isUserInteraction: boolean;
-  visibleBounds: GeoJSON.Position[];
+  visibleBounds: VisibleBounds;
   pitch: number;
 }
 
-interface Bounds {
-  ne: GeoJSON.Position;
-  sw: GeoJSON.Position;
-}
+type VisibleBounds = [northEast: GeoJSON.Position, southWest: GeoJSON.Position];
 
 interface MapViewProps extends BaseProps {
   /**
@@ -274,7 +271,7 @@ export interface MapViewState {
   isReady: boolean;
   width: number;
   height: number;
-  region: RegionPayload | null;
+  region: GeoJSON.Feature<GeoJSON.Point, RegionPayload> | null;
   isUserInteraction: boolean;
 }
 
@@ -444,10 +441,10 @@ class MapView extends NativeBridgeComponent(
    * @example
    * const visibleBounds = await this._map.getVisibleBounds();
    *
-   * @return {Array}
+   * @return {VisibleBounds}
    */
-  async getVisibleBounds(): Promise<Bounds> {
-    const res: {visibleBounds: Bounds} = await this._runNativeCommand(
+  async getVisibleBounds(): Promise<VisibleBounds> {
+    const res: {visibleBounds: VisibleBounds} = await this._runNativeCommand(
       'getVisibleBounds',
       this._nativeRef,
     );
@@ -460,25 +457,29 @@ class MapView extends NativeBridgeComponent(
    * @example
    * this._map.queryRenderedFeaturesAtPoint([30, 40], ['==', 'type', 'Point'], ['id1', 'id2'])
    *
-   * @param  {Array<Number>} coordinate - A point expressed in the map view’s coordinate system.
+   * @typedef {number} ScreenPointX
+   * @typedef {number} ScreenPointY
+   * @param  {[ScreenPointX, ScreenPointY]} point - A point expressed in the map view’s coordinate system.
    * @param  {Array=} filter - A set of strings that correspond to the names of layers defined in the current style. Only the features contained in these layers are included in the returned array.
    * @param  {Array=} layerIDs - A array of layer id's to filter the features by
    * @return {GeoJSON.FeatureCollection}
    */
   async queryRenderedFeaturesAtPoint(
-    coordinate: GeoJSON.Position,
+    point: [screenPointX: number, screenPointY: number],
     filter?: FilterExpression,
     layerIDs = [],
   ): Promise<GeoJSON.FeatureCollection> {
-    if (!coordinate || coordinate.length < 2) {
-      throw new Error('Must pass in valid coordinate[lng, lat]');
+    if (!point || point.length < 2) {
+      throw new Error(
+        "Must pass in valid point in the map view's cooridnate system[x, y]",
+      );
     }
 
     const res: {data: string | GeoJSON.FeatureCollection} =
       await this._runNativeCommand(
         'queryRenderedFeaturesAtPoint',
         this._nativeRef,
-        [coordinate, getFilter(filter), layerIDs],
+        [point, getFilter(filter), layerIDs],
       );
 
     if (isAndroid()) {

package/maplibre-react-native.podspec

@@ -2,9 +2,9 @@ require 'json'
 
 package = JSON.parse(File.read(File.join(__dir__, 'package.json')))
 
-$RNMBGL = Object.new
+$RCTMLN = Object.new
 
-def $RNMBGL._add_spm_to_target(project, target, url, requirement, product_name)
+def $RCTMLN._add_spm_to_target(project, target, url, requirement, product_name)
   pkg_class = Xcodeproj::Project::Object::XCRemoteSwiftPackageReference
   ref_class = Xcodeproj::Project::Object::XCSwiftPackageProductDependency
   pkg = project.root_object.package_references.find { |p| p.class == pkg_class && p.repositoryURL == url }
@@ -23,7 +23,7 @@ def $RNMBGL._add_spm_to_target(project, target, url, requirement, product_name)
   end
 end
 
-def $RNMBGL.post_install(installer)
+def $RCTMLN.post_install(installer)
   spm_spec = {
     url: "https://github.com/maplibre/maplibre-gl-native-distribution",
     requirement: {
@@ -33,8 +33,8 @@ def $RNMBGL.post_install(installer)
     product_name: "MapLibre"
   }
 
-  if $RNMBGL_SPM_Spec.is_a?(Hash)
-    spm_spec = $RNMBGL_SPM_Spec
+  if $RCTMLN_SPM_Spec.is_a?(Hash)
+    spm_spec = $RCTMLN_SPM_Spec
   end
   project = installer.pods_project
   self._add_spm_to_target(

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@maplibre/maplibre-react-native",
   "description": "A MapLibre GL Native plugin for creating maps in React Native",
-  "version": "10.0.0-alpha.4",
+  "version": "10.0.0-alpha.5",
   "publishConfig": {
     "access": "public"
   },

package/plugin/build/withMapLibre.js

@@ -81,7 +81,7 @@ function addMapLibreInstallerBlock(src, blockName) {
     return (0, generateCode_1.mergeContents)({
         tag: `@maplibre/maplibre-react-native-${blockName}_installer`,
         src,
-        newSrc: `    $RNMBGL.${blockName}_install(installer)`,
+        newSrc: `    $RCTMLN.${blockName}_install(installer)`,
         anchor: new RegExp(`${blockName}_install do \\|installer\\|`),
         offset: 1,
         comment: '#',
@@ -110,7 +110,7 @@ exports.setExcludedArchitectures = setExcludedArchitectures;
 const withoutSignatures = config => {
     const shellScript = `if [ "$XCODE_VERSION_MAJOR" = "1500" ]; then
     echo "Remove signature files (Xcode 15 workaround)";
-    rm -rf "$CONFIGURATION_BUILD_DIR/Mapbox.xcframework-ios.signature";
+    rm -rf "$CONFIGURATION_BUILD_DIR/MapLibre.xcframework-ios.signature";
   fi`;
     return (0, config_plugins_1.withXcodeProject)(config, async (config) => {
         const xcodeProject = config.modResults;

package/setup-jest.js

@@ -106,9 +106,3 @@ NativeModules.MLNLocationModule = {
   stop: jest.fn(),
   pause: jest.fn(),
 };
-
-// Mock for global AbortController
-global.AbortController = class {
-  signal = 'test-signal';
-  abort = jest.fn();
-};