新增api

Author: Mrliwang

harmony/maps.har

@@ -65,6 +65,19 @@ static jsi::Value __hostFunction_AIRMapManagerTurboModule_getAddressFromCoordina
     return static_cast<ArkTSTurboModule &>(turboModule).callAsync(rt, "getAddressFromCoordinates", args, count);
 }
 
+static jsi::Value __hostFunction_AIRMapManagerTurboModule_pointForCoordinate(jsi::Runtime &rt,
+                                                                                    react::TurboModule &turboModule,
+                                                                                    const jsi::Value *args,
+                                                                                    size_t count) {
+    return static_cast<ArkTSTurboModule &>(turboModule).call(rt, "pointForCoordinate", args, count);
+}
+
+static jsi::Value __hostFunction_AIRMapManagerTurboModule_coordinateForPoint(jsi::Runtime &rt,
+                                                                             react::TurboModule &turboModule,
+                                                                             const jsi::Value *args, size_t count) {
+    return static_cast<ArkTSTurboModule &>(turboModule).call(rt, "coordinateForPoint", args, count);
+}
+
 AIRMapManagerTurboModule::AIRMapManagerTurboModule(const ArkTSTurboModule::Context ctx, const std::string name)
     : ArkTSTurboModule(ctx, name) {
     methodMap_["getCamera"] = MethodMetadata{0, __hostFunction_AIRMapManagerTurboModule_getCamera};
@@ -77,4 +90,6 @@ AIRMapManagerTurboModule::AIRMapManagerTurboModule(const ArkTSTurboModule::Conte
     methodMap_["getAddressFromCoordinates"] = MethodMetadata{1, __hostFunction_AIRMapManagerTurboModule_getAddressFromCoordinates};
 
     methodMap_["takeSnapshot"] = MethodMetadata{1, __hostFunction_AIRMapManagerTurboModule_takeSnapshot};
+    methodMap_["pointForCoordinate"] = MethodMetadata{1, __hostFunction_AIRMapManagerTurboModule_pointForCoordinate};
+    methodMap_["coordinateForPoint"] = MethodMetadata{1, __hostFunction_AIRMapManagerTurboModule_coordinateForPoint};
 }

harmony/maps/src/main/cpp/AIRMapManagerTurboModule.cpp

@@ -57,7 +57,7 @@ export class AIRMapManager extends TurboModule {
    * @return Promise Promise with the bounding box ({ northEast: <LatLng>, southWest: <LatLng> })
    */
   public getMapBoundaries(){
-    //todo 暂无对应api实现
+    return MapsTurboManager.getInstance().getMapBoundaries();
   }
 
   /**
@@ -83,7 +83,7 @@ export class AIRMapManager extends TurboModule {
    * @return Promise Promise with the point ({ x: Number, y: Number })
    */
   public pointForCoordinate(coordinate: LatLng){
-    //todo 暂无对应api实现
+    return MapsTurboManager.getInstance().pointForCoordinate(coordinate);
   }
 
   /**
@@ -96,7 +96,7 @@ export class AIRMapManager extends TurboModule {
    * @return Promise Promise with the coordinate ({ latitude: Number, longitude: Number })
    */
   public coordinateForPoint(point: Point){
-    //todo 暂无对应api实现
+    return MapsTurboManager.getInstance().coordinateForPoint(point);
   }
 
   /**
@@ -107,7 +107,7 @@ export class AIRMapManager extends TurboModule {
    * @return Promise Promise with { <identifier>: { point: Point, frame: Frame } }
    */
   public getMarkersFrames(onlyVisible: Boolean){
-    //todo 暂无对应api实现
+    //todo 华为地图不支持
   }
 
   public animateToRegion(region: Region, duration: number) {
@@ -131,7 +131,7 @@ export class AIRMapManager extends TurboModule {
    * @param animated
    */
   public fitToElements(edgePadding: EdgePadding, animated: boolean) {
-    //todo 暂无对应api实现
+    //todo 华为地图不支持 地图加载kml数据后的操作
   }
 
   /**
@@ -142,7 +142,7 @@ export class AIRMapManager extends TurboModule {
    * @param animated
    */
   public fitToSuppliedMarkers(markers: string[], edgePadding: EdgePadding, animated: boolean) {
-    //todo 暂无对应api实现
+    //todo 华为地图不支持
   }
 
   /**
@@ -167,6 +167,6 @@ export class AIRMapManager extends TurboModule {
   }
 
   public setIndoorActiveLevelIndex(activeLevelIndex: number) {
-    //todo 暂无对应api实现
+    //todo 华为地图不支持
   }
 }

harmony/maps/src/main/ets/AIRMaps/AIRMapManager.ts

@@ -73,11 +73,12 @@ export struct AIRMapMarker {
             this.marker.setInfoWindowVisible(false);
           }
         } else if (command === 'redrawCallout') {
-          //todo 华为地图不支持
+          //todo 华为地图不支持 当infoWindow为自定义view的时候，调用此方法更新infoWindow里的内容
         } else if (command === 'animateMarkerToCoordinate') {
           //todo 华为地图不支持
         } else if (command === 'redraw') {
-          //todo 华为地图不支持
+          this.marker?.remove();
+          MapsManager.getInstance().addMarker(this, false);
         }
       }));
 

harmony/maps/src/main/ets/AIRMaps/AIRMapMarker.ets

@@ -58,6 +58,6 @@ export class AIRMapMarkerManager extends TurboModule {
    * Causes a redraw of the marker. Useful when there are updates to the marker and tracksViewChanges comes with a cost that is too high.
    */
   public redraw(){
-    //todo 华为地图不支持
+    MapsTurboManager.getInstance().redraw();
   }
 }

harmony/maps/src/main/ets/AIRMaps/AIRMapMarkerManager.ts

@@ -21,7 +21,7 @@
  */
 
 import { TAG } from './sharedTypes'
-const RELEASE = true;
+const RELEASE = false;
 
 export function LWLog(...args: any[]) {
   if (RELEASE) {

harmony/maps/src/main/ets/LWLog.ts

@@ -1,6 +1,4 @@
-/**
- * MIT License
- *
+/*
  * Copyright (C) 2024 Huawei Device Co., Ltd.
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy

harmony/maps/src/main/ets/Logger.ets

@@ -24,7 +24,9 @@ import { map, mapCommon, site, staticMap } from '@kit.MapKit';
 import { LWError, LWLog } from './LWLog';
 import {
   Address,
-  Camera, ColorMap, DEFAULT_ZOOM, EdgePadding, ImageURISource, LatLng, Region,
+  Camera, ColorMap, DEFAULT_ZOOM, EdgePadding, ImageURISource, LatLng,
+  Point,
+  Region,
   SnapshotOptions,
   TAG } from './sharedTypes';
 import { image } from '@kit.ImageKit';
@@ -34,6 +36,7 @@ import fs from '@ohos.file.fs';
 import { RNOHContext } from 'rnoh/ts';
 
 export class MapsTurboManager{
+
   private constructor() {
   }
 
@@ -174,6 +177,40 @@ export class MapsTurboManager{
     this.mapController?.setLatLngBounds({northeast: northEast, southwest: southWest})
   }
 
+  getMapBoundaries() {
+    try {
+      let bounds = this.mapController?.getProjection().getVisibleRegion();
+      let north = bounds.bounds.northeast;
+      let south = bounds.bounds.southwest;
+      return {
+        northEast: north,
+        southWest: south,
+      };
+    } catch (e) {
+      LWError('getMapBoundaries exception=' + JSON.stringify(e));
+    }
+    return {};
+  }
+
+  pointForCoordinate(coordinate: LatLng) {
+    try {
+      let mapPoint: mapCommon.MapPoint = this.mapController?.getProjection().toScreenLocation({latitude: coordinate.latitude, longitude: coordinate.longitude});
+      return {x: mapPoint?.positionX, y: mapPoint?.positionY};
+    } catch (e) {
+      LWError('pointForCoordinate exception=' + JSON.stringify(e));
+    }
+    return {};
+  }
+
+  coordinateForPoint(point: Point) {
+    try {
+      return this.mapController?.getProjection().fromScreenLocation({positionX: point.x, positionY: point.y});
+    } catch (e) {
+      LWError('coordinateForPoint exception=' + JSON.stringify(e));
+    }
+    return {};
+  }
+
   public getAddressFromCoordinates(coordinate: LatLng): Promise<Address> {
     return new Promise((resolve, reject) => {
       let params: site.ReverseGeocodeParams = {
@@ -285,4 +322,8 @@ export class MapsTurboManager{
   public hideCallout(){
 
   }
+
+  public redraw() {
+
+  }
 }

harmony/maps/src/main/ets/MapsTurboManager.ts

@@ -5,7 +5,7 @@
   "main": "lib/index.js",
   "author": "Leland Richardson <leland.m.richardson@gmail.com>",
   "homepage": "https://github.com/react-native-maps/react-native-maps#readme",
-  "version": "1.10.3-0.0.2",
+  "version": "1.10.3-0.0.3",
   "license": "MIT",
   "scripts": {
     "lint": "eslint . --max-warnings 0",