expo-gaode-map-navigation 2.0.11 → 2.0.12

package/ios/map/overlays/MarkerViewModule.swift

@@ -41,12 +41,12 @@ public class MarkerViewModule: Module {
                 view.iconHeight = height
             }
             
-            Prop("customViewWidth") { (view: MarkerView, width: Double) in
-                view.customViewWidth = width
+            Prop("contentWidth") { (view: MarkerView, width: Double) in
+                view.setContentWidth(width)
             }
             
-            Prop("customViewHeight") { (view: MarkerView, height: Double) in
-                view.customViewHeight = height
+            Prop("contentHeight") { (view: MarkerView, height: Double) in
+                view.setContentHeight(height)
             }
             
             Prop("centerOffset") { (view: MarkerView, offset: [String: Double]) in

package/ios/map/utils/ClusterNative.h

@@ -55,6 +55,14 @@ NS_ASSUME_NONNULL_BEGIN
 + (NSDictionary * _Nullable)calculatePathBoundsWithLatitudes:(NSArray<NSNumber *> *)latitudes
                                                 longitudes:(NSArray<NSNumber *> *)longitudes NS_SWIFT_NAME(calculatePathBounds(latitudes:longitudes:));
 
++ (double)calculateFitZoomWithLatitudes:(NSArray<NSNumber *> *)latitudes
+                             longitudes:(NSArray<NSNumber *> *)longitudes
+                        viewportWidthPx:(double)viewportWidthPx
+                       viewportHeightPx:(double)viewportHeightPx
+                               paddingPx:(double)paddingPx
+                                 minZoom:(int)minZoom
+                                 maxZoom:(int)maxZoom NS_SWIFT_NAME(calculateFitZoom(latitudes:longitudes:viewportWidthPx:viewportHeightPx:paddingPx:minZoom:maxZoom:));
+
 + (NSString *)encodeGeoHashWithLat:(double)lat
                                lon:(double)lon
                          precision:(int)precision NS_SWIFT_NAME(encodeGeoHash(lat:lon:precision:));

package/ios/map/utils/ClusterNative.mm

@@ -242,6 +242,33 @@
     };
 }
 
++ (double)calculateFitZoomWithLatitudes:(NSArray<NSNumber *> *)latitudes
+                              longitudes:(NSArray<NSNumber *> *)longitudes
+                         viewportWidthPx:(double)viewportWidthPx
+                        viewportHeightPx:(double)viewportHeightPx
+                                paddingPx:(double)paddingPx
+                                  minZoom:(int)minZoom
+                                  maxZoom:(int)maxZoom {
+    if (latitudes.count == 0 || latitudes.count != longitudes.count) {
+        return (double)minZoom;
+    }
+
+    std::vector<gaodemap::GeoPoint> points;
+    points.reserve(latitudes.count);
+    for (NSUInteger i = 0; i < latitudes.count; i++) {
+        points.push_back({[latitudes[i] doubleValue], [longitudes[i] doubleValue]});
+    }
+
+    return gaodemap::calculateFitZoomForPoints(
+        points,
+        viewportWidthPx,
+        viewportHeightPx,
+        paddingPx,
+        minZoom,
+        maxZoom
+    );
+}
+
 + (NSString *)encodeGeoHashWithLat:(double)lat
                                lon:(double)lon
                          precision:(int)precision {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "expo-gaode-map-navigation",
-  "version": "2.0.11",
+  "version": "2.0.12",
   "description": "React Native AMap (Gaode Map) navigation module for Expo: route planning and turn-by-turn navigation, includes full map features.",
   "author": "TomWq <582752848@qq.com> (https://github.com/TomWq)",
   "repository": {
@@ -17,6 +17,7 @@
     "lint": "expo-module lint",
     "test": "expo-module test",
     "prepare": "expo-module prepare && yarn build:plugin",
+    "postinstall": "node scripts/check-expo-modules.js",
     "prepublishOnly": "echo 'Skipping proofread check' && exit 0",
     "expo-module": "expo-module",
     "android": "expo run:android",
@@ -25,9 +26,9 @@
   "devDependencies": {
     "@expo/vector-icons": "^15.0.3",
     "@types/react": "~19.1.0",
-    "expo": "^54.0.31",
-    "expo-module-scripts": "^5.0.8",
-    "react-native": "0.81.5",
+    "expo": "^55.0.8",
+    "expo-module-scripts": "^55.0.2",
+    "react-native": "0.83.2",
     "typescript": "^5.9.3"
   },
   "peerDependencies": {
@@ -51,6 +52,7 @@
     "ios",
     "widget-template",
     "shared",
+    "scripts",
     "app.plugin.js",
     "expo-module.config.json",
     "plugin/build"

package/scripts/check-expo-modules.js

@@ -0,0 +1,68 @@
+#!/usr/bin/env node
+
+const fs = require('node:fs');
+const path = require('node:path');
+
+function resolveProjectRoot() {
+  return process.env.INIT_CWD || process.env.npm_config_local_prefix || process.cwd();
+}
+
+function hasPackage(pkgName, projectRoot) {
+  try {
+    require.resolve(`${pkgName}/package.json`, { paths: [projectRoot] });
+    return true;
+  } catch {
+    return false;
+  }
+}
+
+function printWarning(lines) {
+  const prefix = '[expo-gaode-map-navigation]';
+  console.warn(`${prefix} WARNING: Expo Modules infrastructure was not detected in this React Native project.`);
+  for (const line of lines) {
+    console.warn(`${prefix} ${line}`);
+  }
+}
+
+function main() {
+  const projectRoot = resolveProjectRoot();
+
+  // Skip non-React Native consumers.
+  if (!hasPackage('react-native', projectRoot)) {
+    return;
+  }
+
+  const hasExpo = hasPackage('expo', projectRoot);
+  const hasExpoModulesCore = hasPackage('expo-modules-core', projectRoot);
+  const podfilePath = path.join(projectRoot, 'ios', 'Podfile');
+  const hasPodfile = fs.existsSync(podfilePath);
+  const hasUseExpoModules = hasPodfile
+    ? /\buse_expo_modules!\b/m.test(fs.readFileSync(podfilePath, 'utf8'))
+    : true;
+
+  if (hasExpo && hasExpoModulesCore && hasUseExpoModules) {
+    return;
+  }
+
+  const details = [];
+  if (!hasExpo) {
+    details.push('Missing dependency: expo');
+  }
+  if (!hasExpoModulesCore) {
+    details.push('Missing dependency: expo-modules-core');
+  }
+  if (!hasUseExpoModules) {
+    details.push('iOS Podfile does not contain use_expo_modules!');
+  }
+
+  printWarning([
+    ...details,
+    'This package requires Expo Modules infrastructure even in bare React Native apps.',
+    'Suggested fix:',
+    '  npx install-expo-modules@latest',
+    hasPodfile ? '  (then) cd ios && pod install' : null,
+    'Docs: https://docs.expo.dev/bare/installing-expo-modules/',
+  ].filter(Boolean));
+}
+
+main();

package/shared/cpp/GeometryEngine.cpp

@@ -3,6 +3,7 @@
 #include <cmath>
 #include <map>
 #include <algorithm>
+#include <limits>
 
 namespace gaodemap {
 
@@ -19,6 +20,54 @@ static inline double geo_toDegrees(double radians) {
     return radians * kRadiansToDegrees;
 }
 
+static inline double clampMercatorLatitude(double lat) {
+    static constexpr double kMaxMercatorLatitude = 85.05112878;
+    if (lat > kMaxMercatorLatitude) return kMaxMercatorLatitude;
+    if (lat < -kMaxMercatorLatitude) return -kMaxMercatorLatitude;
+    return lat;
+}
+
+static inline double mercatorX01(double lon) {
+    double wrapped = std::fmod(lon + 180.0, 360.0);
+    if (wrapped < 0.0) {
+        wrapped += 360.0;
+    }
+    return wrapped / 360.0;
+}
+
+static inline double mercatorY01(double lat) {
+    const double clampedLat = clampMercatorLatitude(lat);
+    const double latRad = geo_toRadians(clampedLat);
+    const double y = (1.0 - std::asinh(std::tan(latRad)) / kPi) * 0.5;
+    if (y < 0.0) return 0.0;
+    if (y > 1.0) return 1.0;
+    return y;
+}
+
+static double wrappedSpan01(std::vector<double> xs) {
+    if (xs.size() <= 1) {
+        return 0.0;
+    }
+
+    std::sort(xs.begin(), xs.end());
+    double maxGap = 0.0;
+
+    for (size_t i = 0; i + 1 < xs.size(); ++i) {
+        const double gap = xs[i + 1] - xs[i];
+        if (gap > maxGap) {
+            maxGap = gap;
+        }
+    }
+
+    const double endGap = xs.front() + 1.0 - xs.back();
+    if (endGap > maxGap) {
+        maxGap = endGap;
+    }
+
+    const double span = 1.0 - maxGap;
+    return span < 0.0 ? 0.0 : span;
+}
+
 double calculateDistance(double lat1, double lon1, double lat2, double lon2) {
     const double radLat1 = geo_toRadians(lat1);
     const double radLat2 = geo_toRadians(lat2);
@@ -512,6 +561,69 @@ GeoPoint pixelToLatLng(double x, double y, int zoom) {
     return {lat, lon};
 }
 
+double calculateFitZoomForPoints(
+    const std::vector<GeoPoint>& points,
+    double viewportWidthPx,
+    double viewportHeightPx,
+    double paddingPx,
+    int minZoom,
+    int maxZoom
+) {
+    if (minZoom > maxZoom) {
+        std::swap(minZoom, maxZoom);
+    }
+    if (points.empty()) {
+        return static_cast<double>(minZoom);
+    }
+    if (points.size() == 1) {
+        return static_cast<double>(maxZoom);
+    }
+
+    const double safeViewportWidth = viewportWidthPx > 1.0 ? viewportWidthPx : 390.0;
+    const double safeViewportHeight = viewportHeightPx > 1.0 ? viewportHeightPx : 844.0;
+    const double safePadding = std::max(0.0, paddingPx);
+    const double availableWidth = std::max(1.0, safeViewportWidth - safePadding * 2.0);
+    const double availableHeight = std::max(1.0, safeViewportHeight - safePadding * 2.0);
+
+    std::vector<double> projectedXs;
+    projectedXs.reserve(points.size());
+
+    double minY = std::numeric_limits<double>::max();
+    double maxY = -std::numeric_limits<double>::max();
+
+    for (const auto& p : points) {
+        projectedXs.push_back(mercatorX01(p.lon));
+        const double y = mercatorY01(p.lat);
+        if (y < minY) minY = y;
+        if (y > maxY) maxY = y;
+    }
+
+    const double spanX = wrappedSpan01(projectedXs);
+    const double spanY = std::max(0.0, maxY - minY);
+    static constexpr double kTileSize = 256.0;
+    static constexpr double kSpanEpsilon = 1e-12;
+
+    const double zoomX = spanX <= kSpanEpsilon
+        ? static_cast<double>(maxZoom)
+        : std::log2(availableWidth / (kTileSize * spanX));
+    const double zoomY = spanY <= kSpanEpsilon
+        ? static_cast<double>(maxZoom)
+        : std::log2(availableHeight / (kTileSize * spanY));
+
+    double fitZoom = std::min(zoomX, zoomY);
+    if (!std::isfinite(fitZoom)) {
+        fitZoom = static_cast<double>(minZoom);
+    }
+
+    if (fitZoom < static_cast<double>(minZoom)) {
+        fitZoom = static_cast<double>(minZoom);
+    } else if (fitZoom > static_cast<double>(maxZoom)) {
+        fitZoom = static_cast<double>(maxZoom);
+    }
+
+    return fitZoom;
+}
+
 // --- 批量地理围栏与热力图 ---
 
 int findPointInPolygons(double pointLat, double pointLon, const std::vector<std::vector<GeoPoint>>& polygons) {

package/shared/cpp/GeometryEngine.hpp

@@ -125,6 +125,27 @@ PixelResult latLngToPixel(double lat, double lon, int zoom);
  */
 GeoPoint pixelToLatLng(double x, double y, int zoom);
 
+/**
+ * 根据一组坐标点和视口尺寸计算“可同时看到所有点”的推荐缩放级别。
+ * 使用 Web Mercator 投影，在跨经线场景下会自动取更小经度跨度。
+ *
+ * @param points 坐标点集合，至少 1 个
+ * @param viewportWidthPx 视口宽度（像素）
+ * @param viewportHeightPx 视口高度（像素）
+ * @param paddingPx 四周预留的内边距（像素）
+ * @param minZoom 最小缩放级别
+ * @param maxZoom 最大缩放级别
+ * @return 推荐 zoom（已在 [minZoom, maxZoom] 范围内）
+ */
+double calculateFitZoomForPoints(
+    const std::vector<GeoPoint>& points,
+    double viewportWidthPx,
+    double viewportHeightPx,
+    double paddingPx,
+    int minZoom,
+    int maxZoom
+);
+
 // --- 批量地理围栏与热力图 ---
 
 /**