expo-gaode-map-search 1.3.3 → 1.3.5

package/ios/ExpoGaodeMapSearchModule.swift

@@ -43,6 +43,9 @@ public class ExpoGaodeMapSearchModule: Module {
       request.types = types
       request.page = pageNum
       request.offset = pageSize
+      // SDK 9.4.0+ 使用 showFieldsType 控制返回字段
+      // AMapPOISearchShowFieldsTypeAll (返回所有扩展信息)
+      request.showFieldsType = AMapPOISearchShowFieldsType.all
       
       self.searchDelegate.currentPromise = promise
       self.searchAPI.aMapPOIKeywordsSearch(request)
@@ -81,6 +84,7 @@ public class ExpoGaodeMapSearchModule: Module {
       request.types = types
       request.page = pageNum
       request.offset = pageSize
+      request.showFieldsType = AMapPOISearchShowFieldsType.all
       
       self.searchDelegate.currentPromise = promise
       self.searchAPI.aMapPOIAroundSearch(request)
@@ -170,6 +174,7 @@ public class ExpoGaodeMapSearchModule: Module {
       let pageSize = options["pageSize"] as? Int ?? 20
       let pageNum = options["pageNum"] as? Int ?? 1
       
+      // 转换路线点
       var points: [AMapGeoPoint] = []
       for point in polygon {
         if let lat = point["latitude"] as? Double,
@@ -187,6 +192,7 @@ public class ExpoGaodeMapSearchModule: Module {
       request.types = types
       request.page = pageNum
       request.offset = pageSize
+      request.showFieldsType = AMapPOISearchShowFieldsType.all
       
       self.searchDelegate.currentPromise = promise
       self.searchAPI.aMapPOIPolygonSearch(request)
@@ -214,10 +220,61 @@ public class ExpoGaodeMapSearchModule: Module {
       self.searchDelegate.currentPromise = promise
       self.searchAPI.aMapInputTipsSearch(request)
     }
+
+    /**
+     * 逆地理编码（坐标转地址）
+     */
+    AsyncFunction("reGeocode") { (options: [String: Any], promise: Promise) in
+      self.initSearchAPI()
+      
+      guard let location = options["location"] as? [String: Any],
+            let latitude = location["latitude"] as? Double,
+            let longitude = location["longitude"] as? Double else {
+        promise.reject("SEARCH_ERROR", "location is required")
+        return
+      }
+      
+      let radius = options["radius"] as? Int ?? 1000
+      let requireExtension = options["requireExtension"] as? Bool ?? true
+      
+      let request = AMapReGeocodeSearchRequest()
+      request.location = AMapGeoPoint.location(withLatitude: CGFloat(latitude), longitude: CGFloat(longitude))
+      request.radius = limitReGeocodeRadius(radius)
+      request.requireExtension = requireExtension
+      
+      self.searchDelegate.currentPromise = promise
+      self.searchAPI.aMapReGoecodeSearch(request)
+    }
+
+    /**
+     * POI ID 搜索（详情查询）
+     */
+    AsyncFunction("getPoiDetail") { (id: String, promise: Promise) in
+      self.initSearchAPI()
+      
+      if id.isEmpty {
+        promise.reject("SEARCH_ERROR", "id is required")
+        return
+      }
+      
+      let request = AMapPOIIDSearchRequest()
+      request.uid = id
+      
+      self.searchDelegate.currentPromise = promise
+      self.searchAPI.aMapPOIIDSearch(request)
+    }
   }
+
   
   // MARK: - Private Methods
   
+  private func limitReGeocodeRadius(_ radius: Int) -> Int {
+     // AMapReGeocodeSearchRequest radius property is NSInteger
+     // The documentation doesn't specify a strict limit but usually it's around 0-3000m for regeocode.
+     // We just cast it safely.
+     return radius
+  }
+
   /**
    * 初始化搜索 API（延迟初始化）
    */
@@ -230,7 +287,7 @@ public class ExpoGaodeMapSearchModule: Module {
       searchAPI = AMapSearchAPI()
       searchAPI.delegate = searchDelegate
       
-      let apiKey = AMapServices.shared().apiKey
+        _ = AMapServices.shared().apiKey
     }
   }
   
@@ -266,7 +323,7 @@ class SearchDelegate: NSObject, AMapSearchDelegate {
     guard let promise = currentPromise else { return }
     
     if let response = response {
-      promise.resolve(convertPOISearchResponse(response))
+      promise.resolve(convertPOISearchResponse(response, request: request))
     } else {
       promise.reject("SEARCH_ERROR", "Search failed")
     }
@@ -304,6 +361,21 @@ class SearchDelegate: NSObject, AMapSearchDelegate {
     currentPromise = nil
   }
   
+  /**
+   * 逆地理编码回调
+   */
+  func onReGeocodeSearchDone(_ request: AMapReGeocodeSearchRequest!, response: AMapReGeocodeSearchResponse!) {
+    guard let promise = currentPromise else { return }
+    
+    if let response = response {
+      promise.resolve(convertReGeocodeResponse(response))
+    } else {
+      promise.reject("SEARCH_ERROR", "ReGeocode failed")
+    }
+    
+    currentPromise = nil
+  }
+  
   /**
    * 搜索失败回调
    */
@@ -320,8 +392,41 @@ class SearchDelegate: NSObject, AMapSearchDelegate {
   /**
    * 转换 POI 搜索结果
    */
-  private func convertPOISearchResponse(_ response: AMapPOISearchResponse) -> [String: Any] {
+  private func convertPOISearchResponse(_ response: AMapPOISearchResponse, request: AMapPOISearchBaseRequest!) -> Any {
+    // 检查是否是 ID 搜索（只有 1 个结果且不是列表）
+    // 但 AMapPOISearchResponse 总是返回列表
+    // 我们约定如果是 ID 搜索，我们在 JS 层处理，这里依然返回列表格式，或者如果是单个 POI，我们取第一个
+    
+    // 注意：ID 搜索返回的也是 AMapPOISearchResponse
+    
     let pois = response.pois?.map { poi -> [String: Any] in
+      return convertPOI(poi)
+    } ?? []
+    
+    // 如果是 ID 搜索，通常 pois 只有一个
+    // 为了保持 searchPOI 接口返回结构一致，我们总是返回列表结构
+    // 但对于 getPoiDetail，我们需要单个对象。
+    // 由于 native 无法区分当前是 searchPOI 还是 getPoiDetail 调用的回调（除非用不同 delegate 方法，但 SDK 都是 onPOISearchDone）
+    // 我们可以根据 request 类型判断？SDK 回调中 request 参数是基类 AMapPOISearchBaseRequest
+    
+    if request is AMapPOIIDSearchRequest {
+        if let first = pois.first {
+            return first
+        } else {
+            return [:] // 没找到
+        }
+    }
+    
+    return [
+      "pois": pois,
+      "total": response.count,
+      "pageNum": response.pois?.first?.uid != nil ? 1 : 0,
+      "pageSize": response.pois?.count ?? 0,
+      "pageCount": (response.count + 19) / 20
+    ]
+  }
+
+  private func convertPOI(_ poi: AMapPOI) -> [String: Any] {
       var result: [String: Any] = [
         "id": poi.uid ?? "",
         "name": poi.name ?? "",
@@ -335,20 +440,79 @@ class SearchDelegate: NSObject, AMapSearchDelegate {
         "tel": poi.tel ?? "",
         "distance": poi.distance,
         "cityName": poi.city ?? "",
+        "cityCode": poi.citycode ?? "",
         "provinceName": poi.province ?? "",
         "adName": poi.district ?? "",
-        "adCode": poi.adcode ?? ""
+        "adCode": poi.adcode ?? "",
+        "businessArea": poi.businessArea ?? "",
+        "parkingType": poi.parkingType ?? "",
+        "website": poi.website ?? "",
+        "email": poi.email ?? "",
+        "postcode": poi.postcode ?? ""
+      ]
+      
+      // 图片信息
+      if let images = poi.images {
+          result["photos"] = images.map { image in
+              return [
+                  "title": image.title ?? "",
+                  "url": image.url ?? ""
+              ]
+          }
+      }
+      
+      // 室内信息
+      if let indoor = poi.indoorData {
+          result["indoor"] = [
+              "floor": indoor.floor,
+              "floorName": indoor.floorName ?? "",
+              "poiId": indoor.pid ?? "",
+              "hasIndoorMap": poi.hasIndoorMap
+          ]
+      }
+      
+      // 深度信息 (Business)
+      // 只有当有扩展信息或特定业务字段时才返回
+      var business: [String: Any] = [
+          "tel": poi.tel ?? "",
+          "parkingType": poi.parkingType ?? "",
+          "businessArea": poi.businessArea ?? ""
       ]
+      
+      // 合并 extensionInfo
+      if let ext = poi.extensionInfo {
+          business["rating"] = String(format: "%.1f", ext.rating)
+          business["cost"] = String(format: "%.1f", ext.cost)
+          business["opentime"] = ext.openTime ?? ""
+      }
+      
+      // 合并 businessData (SDK 9.4.0 新增)
+      if let biz = poi.businessData {
+          business["alias"] = biz.alias ?? ""
+          business["tag"] = biz.tag ?? ""
+          
+          // 如果 extensionInfo 没有这些字段，优先使用 businessData
+          if business["rating"] == nil || (business["rating"] as? String) == "0.0" {
+             business["rating"] = biz.rating ?? ""
+          }
+          if business["cost"] == nil || (business["cost"] as? String) == "0.0" {
+             business["cost"] = biz.cost ?? ""
+          }
+          if business["opentime"] == nil || (business["opentime"] as? String) == "" {
+              business["opentime"] = biz.opentimeWeek ?? ""
+          }
+          
+          business["opentimeToday"] = biz.opentimeToday ?? ""
+          
+          // 如果外层没有 tel/parkingType/businessArea，尝试从 businessData 获取
+          if (business["tel"] as? String) == "" { business["tel"] = biz.tel ?? "" }
+          if (business["parkingType"] as? String) == "" { business["parkingType"] = biz.parkingType ?? "" }
+          if (business["businessArea"] as? String) == "" { business["businessArea"] = biz.businessArea ?? "" }
+      }
+      
+      result["business"] = business
+      
       return result
-    } ?? []
-    
-    return [
-      "pois": pois,
-      "total": response.count,
-      "pageNum": response.pois?.first?.uid != nil ? 1 : 0,
-      "pageSize": response.pois?.count ?? 0,
-      "pageCount": (response.count + 19) / 20
-    ]
   }
 
   /**
@@ -378,12 +542,126 @@ class SearchDelegate: NSObject, AMapSearchDelegate {
     return ["tips": tips]
   }
 
+  /**
+   * 转换逆地理编码结果
+   */
+  private func convertReGeocodeResponse(_ response: AMapReGeocodeSearchResponse) -> [String: Any] {
+    guard let regeocode = response.regeocode else {
+      return [:]
+    }
+    
+    var result: [String: Any] = [
+      "formattedAddress": regeocode.formattedAddress ?? ""
+    ]
+    
+    if let addressComponent = regeocode.addressComponent {
+      let streetNumber = addressComponent.streetNumber
+      let streetNumberDict: [String: Any] = [
+        "street": streetNumber?.street ?? "",
+        "number": streetNumber?.number ?? "",
+        "direction": streetNumber?.direction ?? "",
+        "distance": streetNumber?.distance ?? 0
+      ]
+      
+      let businessAreas = addressComponent.businessAreas?.map { area -> [String: Any] in
+        return [
+            "name": area.name ?? "",
+            "location": [
+                "latitude": area.location?.latitude ?? 0,
+                "longitude": area.location?.longitude ?? 0
+            ]
+        ]
+      } ?? []
+      
+      result["addressComponent"] = [
+        "province": addressComponent.province ?? "",
+        "city": addressComponent.city ?? "",
+        "district": addressComponent.district ?? "",
+        "township": addressComponent.township ?? "",
+        "neighborhood": addressComponent.neighborhood ?? "",
+        "building": addressComponent.building ?? "",
+        "cityCode": addressComponent.citycode ?? "",
+        "adCode": addressComponent.adcode ?? "",
+        "streetNumber": streetNumberDict,
+        "businessAreas": businessAreas
+      ]
+    }
+    
+    if let pois = regeocode.pois {
+      result["pois"] = pois.map { poi -> [String: Any] in
+        return [
+          "id": poi.uid ?? "",
+          "name": poi.name ?? "",
+          "typeCode": poi.typecode ?? "",
+          "typeDes": poi.type ?? "",
+          "tel": poi.tel ?? "",
+          "distance": poi.distance,
+          "direction": poi.direction ?? "",
+          "address": poi.address ?? "",
+          "location": [
+            "latitude": poi.location?.latitude ?? 0,
+            "longitude": poi.location?.longitude ?? 0
+          ]
+        ]
+      }
+    }
+    
+    if let aois = regeocode.aois {
+      result["aois"] = aois.map { aoi -> [String: Any] in
+        return [
+          "id": aoi.uid ?? "",
+          "name": aoi.name ?? "",
+          "adCode": aoi.adcode ?? "",
+          "location": [
+            "latitude": aoi.location?.latitude ?? 0,
+            "longitude": aoi.location?.longitude ?? 0
+          ],
+          "area": aoi.area
+        ]
+      }
+    }
+    
+    if let roads = regeocode.roads {
+        result["roads"] = roads.map { road -> [String: Any] in
+            return [
+                "id": road.uid ?? "",
+                "name": road.name ?? "",
+                "distance": road.distance,
+                "direction": road.direction ?? "",
+                "location": [
+                    "latitude": road.location?.latitude ?? 0,
+                    "longitude": road.location?.longitude ?? 0
+                ]
+            ]
+        }
+    }
+    
+    if let roadinters = regeocode.roadinters {
+        result["roadCrosses"] = roadinters.map { cross -> [String: Any] in
+            return [
+                "distance": cross.distance,
+                "direction": cross.direction ?? "",
+                "location": [
+                    "latitude": cross.location?.latitude ?? 0,
+                    "longitude": cross.location?.longitude ?? 0
+                ],
+                "firstId": cross.firstId ?? "",
+                "firstName": cross.firstName ?? "",
+                "secondId": cross.secondId ?? "",
+                "secondName": cross.secondName ?? ""
+            ]
+        }
+    }
+    
+    return result
+  }
+
   /**
    * 转换沿途 POI 搜索结果
    */
   private func convertRoutePOISearchResponse(_ response: AMapRoutePOISearchResponse) -> [String: Any] {
     let pois = response.pois?.map { poi -> [String: Any] in
-      var result: [String: Any] = [
+        let result: [String: Any] = [
         "id": poi.uid ?? "",
         "name": poi.name ?? "",
         "address": "",

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "expo-gaode-map-search",
-  "version": "1.3.3",
-  "description": "高德地图搜索功能模块 - POI搜索、关键词搜索、周边搜索，需先安装expo-gaode-map",
+  "version": "1.3.5",
+  "description": "高德地图搜索功能模块 - POI搜索、关键词搜索、周边搜索，需先安装expo-gaode-map或者expo-gaode-map-navigation",
   "main": "build/index.js",
   "types": "build/index.d.ts",
   "scripts": {
@@ -10,9 +10,8 @@
     "lint": "expo-module lint",
     "test": "expo-module test",
     "prepare": "expo-module prepare",
-    "prepublishOnly": "expo-module prepublishOnly",
-    "expo-module": "expo-module",
-    "postinstall": "node -e \"try{require.resolve('expo-gaode-map');process.exit(0)}catch(e1){try{require.resolve('expo-gaode-map-navigation');process.exit(0)}catch(e2){console.error('[expo-gaode-map-search] 需要安装基础地图组件：expo-gaode-map 或 expo-gaode-map-navigation 中的任意一个。\\npm i expo-gaode-map 或 npm i expo-gaode-map-navigation');process.exit(1)}}\""
+    "prepublishOnly": "echo 'Skipping proofread check' && exit 0",
+    "expo-module": "expo-module"
   },
   "keywords": [
     "react-native",
@@ -45,8 +44,8 @@
   },
   "devDependencies": {
     "@types/react": "~19.1.0",
-    "expo": "^54.0.18",
-    "expo-module-scripts": "^5.0.7",
+    "expo": "^54.0.31",
+    "expo-module-scripts": "^5.0.8",
     "react-native": "0.81.5",
     "typescript": "^5.9.3"
   },
@@ -56,6 +55,6 @@
     "react-native": "*"
   },
   "dependencies": {
-    "expo-gaode-map": "^2.2.15"
+    "expo-gaode-map": "^2.2.23"
   }
 }

package/src/ExpoGaodeMapSearch.types.ts

@@ -12,6 +12,8 @@ export enum SearchType {
   POLYGON = 'polygon',
   /** 输入提示 */
   INPUT_TIPS = 'inputTips',
+  /** 逆地理编码 */
+  RE_GEOCODE = 'reGeocode',
 }
 
 /**
@@ -52,6 +54,168 @@ export interface POI {
   adName?: string;
   /** 区域编码 */
   adCode?: string;
+  /** 
+   * 深度信息 (Android SDK V9.4.0+ 新增)
+   * 包含评分、营业时间、人均消费等扩展信息
+   */
+  business?: {
+    opentime?: string;
+    opentimeToday?: string;
+    rating?: string;
+    cost?: string;
+    parkingType?: string;
+    tag?: string;
+    tel?: string;
+    alias?: string;
+    businessArea?: string;
+  };
+  /**
+   * 图片信息
+   */
+  photos?: Array<{
+    title?: string;
+    url?: string;
+  }>;
+  /** 室内地图信息 */
+  indoor?: {
+    /** 楼层 */
+    floor?: string;
+    /** 楼层名称 */
+    floorName?: string;
+    /** POI ID */
+    poiId?: string;
+    /** 是否有室内地图 */
+    hasIndoorMap?: boolean;
+  };
+}
+
+/**
+ * 商圈信息
+ */
+export interface BusinessArea {
+  /** 名称 */
+  name: string;
+  /** 中心坐标 */
+  location: Coordinates;
+}
+
+/**
+ * 地址组成要素
+ */
+export interface AddressComponent {
+  /** 省名称 */
+  province: string;
+  /** 市名称 */
+  city: string;
+  /** 区名称 */
+  district: string;
+  /** 乡镇名称 */
+  township: string;
+  /** 社区名称 */
+  neighborhood: string;
+  /** 建筑名称 */
+  building: string;
+  /** 城市编码 */
+  cityCode: string;
+  /** 区域编码 */
+  adCode: string;
+  /** 门牌信息 */
+  streetNumber: {
+    /** 街道名称 */
+    street: string;
+    /** 门牌号 */
+    number: string;
+    /** 坐标点 */
+    location?: Coordinates;
+    /** 方向 */
+    direction: string;
+    /** 距离 */
+    distance: number;
+  };
+  /** 商圈列表 */
+  businessAreas?: BusinessArea[];
+}
+
+/**
+ * 道路信息
+ */
+export interface Road {
+  /** 道路ID */
+  id: string;
+  /** 道路名称 */
+  name: string;
+  /** 距离 */
+  distance: number;
+  /** 方向 */
+  direction: string;
+  /** 坐标点 */
+  location: Coordinates;
+}
+
+/**
+ * 道路交叉口信息
+ */
+export interface RoadCross {
+  /** 距离 */
+  distance: number;
+  /** 方向 */
+  direction: string;
+  /** 交叉口坐标 */
+  location: Coordinates;
+  /** 第一条道路ID */
+  firstId: string;
+  /** 第一条道路名称 */
+  firstName: string;
+  /** 第二条道路ID */
+  secondId: string;
+  /** 第二条道路名称 */
+  secondName: string;
+}
+
+/**
+ * 兴趣区域信息
+ */
+export interface AOI {
+  /** AOI ID */
+  id: string;
+  /** AOI 名称 */
+  name: string;
+  /** 区域编码 */
+  adCode: string;
+  /** 中心点坐标 */
+  location: Coordinates;
+  /** 面积 */
+  area: number;
+}
+
+/**
+ * 逆地理编码选项
+ */
+export interface ReGeocodeOptions {
+  /** 经纬度坐标 */
+  location: Coordinates;
+  /** 搜索半径，默认 1000 米 */
+  radius?: number;
+  /** 是否返回扩展信息，默认 true */
+  requireExtension?: boolean;
+}
+
+/**
+ * 逆地理编码结果
+ */
+export interface ReGeocodeResult {
+  /** 格式化地址 */
+  formattedAddress: string;
+  /** 地址组成要素 */
+  addressComponent: AddressComponent;
+  /** 兴趣点列表 */
+  pois: POI[];
+  /** 道路列表 */
+  roads: Road[];
+  /** 道路交叉口列表 */
+  roadCrosses: RoadCross[];
+  /** 兴趣区域列表 */
+  aois: AOI[];
 }
 
 /**