feat：geojson中polygon属性补充，用户位置按钮配置 (#20)

Author: willian-feng

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

@@ -108,9 +108,9 @@ export struct AIRMap {
            LWLog('AIRMap.aboutToAppear----->权限申请通过')
             // 启用我的位置图层
             this.mapController?.setMyLocationEnabled(true);
-            // 启用我的位置按钮
-            this.mapController?.setMyLocationControlsEnabled(true);
-            //首次设置我的位置
+            // 我的位置按钮
+            this.mapController?.setMyLocationControlsEnabled(this.descriptor.rawProps.showsMyLocationButton);
+            // 首次设置我的位置
             geoLocationManager.getCurrentLocation().then((result) => {
             console.log('current location: ' + JSON.stringify(result));
               // 设置用户的位置
@@ -223,6 +223,7 @@ export struct AIRMap {
       minZoom: this.descriptor.rawProps.minZoomLevel,
       rotateGesturesEnabled: this.descriptor.rawProps.rotateEnabled,
       scaleControlsEnabled: this.descriptor.rawProps.showsScale,
+      alwaysShowScaleEnabled: this.descriptor.rawProps.showsScale,
       scrollGesturesEnabled: this.descriptor.rawProps.scrollEnabled,
       tiltGesturesEnabled: true,
       zoomGesturesEnabled: this.descriptor.rawProps.zoomEnabled,

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

@@ -35,6 +35,7 @@ export struct AIRMapMarker {
   @BuilderParam buildCustomComponent: (componentBuilderContext: ComponentBuilderContext) => void
   @State descriptor: AIRMapMarkerDescriptor = {} as AIRMapMarkerDescriptor
   protected cleanUpCallbacks: (() => void)[] = []
+  private marker?: map.Marker;
 
   aboutToAppear() {
     LWLog('AIRMapMarker.aboutToAppear 初始化 AIRMapMarker...')
@@ -46,7 +47,7 @@ export struct AIRMapMarker {
         this.marker?.setPosition({latitude: this.descriptor.rawProps.coordinate.latitude, longitude: this.descriptor.rawProps.coordinate.longitude})
         this.marker?.setRotation(this.descriptor.rawProps.rotation);
         this.marker?.setZIndex(this.descriptor.rawProps.zIndex);
-        this.marker?.setAlpha(this.descriptor.rawProps.opacity?this.descriptor.rawProps.opacity:1.0);
+        this.marker?.setAlpha(this.descriptor.rawProps.opacity ?? 1.0);
         this.marker?.setMarkerAnchor(MapsManager.getInstance().getPointX(this.descriptor.rawProps.anchor, 0.5), MapsManager.getInstance().getPointX(this.descriptor.rawProps.anchor, 1));
         this.marker?.setClickable(this.descriptor.rawProps.tappable===undefined?true:this.descriptor.rawProps.tappable);
         this.marker?.setDraggable(this.descriptor.rawProps.draggable===undefined?true:this.descriptor.rawProps.draggable);
@@ -62,13 +63,9 @@ export struct AIRMapMarker {
       (command, args: [ESObject, ESObject, ESObject]) => {
        LWLog('AIRMapMarker.aboutToAppear----------command=' + command, JSON.stringify(args))
         if (command === 'showCallout') {
-          if (this.marker) {
-            this.marker.setInfoWindowVisible(true);
-          }
+          this.marker?.setInfoWindowVisible(true);
         } else if (command === 'hideCallout') {
-          if (this.marker) {
-            this.marker.setInfoWindowVisible(false);
-          }
+          this.marker?.setInfoWindowVisible(false);
         } else if (command === 'redrawCallout') {
           //todo 华为地图不支持 当infoWindow为自定义view的时候，调用此方法更新infoWindow里的内容
         } else if (command === 'animateMarkerToCoordinate') {
@@ -99,12 +96,6 @@ export struct AIRMapMarker {
     });
   }
 
-  private marker?: map.Marker;
-
-  public setMarker(marker: map.Marker){
-    this.marker = marker;
-  }
-
   aboutToDisappear() {
     this.cleanUpCallbacks.forEach(cb => cb());
     this.marker?.remove();

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

@@ -46,7 +46,7 @@ export struct Geojson {
 
     if (MapsManager.getInstance().isInitMapController()) {
       MapsManager.getInstance().addGeojson(this.descriptor);
-    }else {
+    } else {
       setTimeout(()=>{
         MapsManager.getInstance().addGeojson(this.descriptor);
       }, 500)

harmony/maps/src/main/ets/MapsManager.ets

@@ -113,7 +113,6 @@ export class MapsManager{
     };
     return this.mapController.addMarker(markerOptions).then(marker => {
       LWLog('MapsManager.addMarker----------marker=' + marker.getId())
-      _this.setMarker(marker);
 
       this.mapController?.on("markerClick", (marker)=>{
         _this.ctx.rnInstance.emitComponentEvent(_this.descriptor.tag, AIR_MAP_MARKER_TYPE, { type: "onPress" });

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

@@ -34,7 +34,7 @@ class MapsTurboModulesFactory extends TurboModulesFactory {
     console.log(TAG, '初始化 MapsTurboModulesFactory.createTurboModule=' + name)
     if (name === REACT_CLASS_AIRMAP_MANAGER) {
       return new AIRMapManager(this.ctx);
-    }else if(name === REACT_CLASS_AIRMAP_MARKER_MANAGER){
+    } else if (name === REACT_CLASS_AIRMAP_MARKER_MANAGER){
       return new AIRMapMarkerManager(this.ctx);
     }
     return null;

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

@@ -215,10 +215,8 @@ export class MapsTurboManager{
     return new Promise((resolve, reject) => {
       let params: site.ReverseGeocodeParams = {
         location: {
-          longitude: 10.252502,
-          latitude: 43.8739168
-          // longitude: coordinate.longitude,
-          // latitude: coordinate.latitude
+          longitude: coordinate.longitude,
+          latitude: coordinate.latitude
         },
         language: "zh",
         radius: 10

src/Geojson.tsx

@@ -261,6 +261,11 @@ const Geojson = (props: GeojsonProps) => {
             strokeColor={lineStrokeColor}
             fillColor={polygonFillColor}
             strokeWidth={lineStrokeWidth}
+            lineCap={lineCap}
+            lineJoin={lineJoin}
+            lineDashPhase={lineDashPhase}
+            lineDashPattern={lineDashPattern}
+            miterLimit={miterLimit}
             tappable={tappable}
             onPress={() => onPress && onPress(overlay)}
             zIndex={zIndex}