gdmap-utils 1.1.2 → 1.1.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gdmap-utils",
-  "version": "1.1.2",
+  "version": "1.1.3",
   "description": "高德地图工具库",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

package/src/layers/baseMarkerLayer/MarkerLayer.ts

@@ -179,7 +179,7 @@ class MarkerLayer {
   */
   refreshOverlayLabel(
     marker: InstanceType<typeof AMap.Marker>,
-    labelOpts?: {
+    labelOpts: {
       content: string;
       direction: string;
       offset: [number, number] | Array<number>;
@@ -189,16 +189,10 @@ class MarkerLayer {
       // 如果没有找到对应的marker
       return MapUtils.error('marker is not found');
     }
-    if (labelOpts) {
-      marker.setLabel(labelOpts);
-    } else {
-      let labelOpts = marker.getLabel();
 
-      marker.setLabel({
-        ...labelOpts,
-        content: '',
-      });
-    }
+    marker.setLabel({
+      ...labelOpts,
+    });
   }
 }
 

package/src/layers/baseMarkerLayer/index.ts

@@ -249,49 +249,41 @@ class BaseMarkerLayer<
     }
     const OvlLayer = BaseMarkerLayer.layerClassMap.get(this.layerType);
 
-    if (
-      this.rawLayerIns instanceof MarkerLayer ||
-      this.rawLayerIns instanceof LabelMarkerLayer
-    ) {
-      const marker = this.rawLayerIns.findLayerOverlay(overlayId);
-      // 函数可以动态计算label,
-      const ovlOpts = OvlLayer!.convertOverlayDataToOvlOpts(
-        this.overlayList[ovlDataIndex],
-        ovlDataIndex,
-        this.getIconUrl,
-        this.getOverlayOpts,
-        MapUtils
-      );
-
-      const iconImageUrl = this.getIconUrl(this.overlayList[ovlDataIndex]);
+    const marker = this.rawLayerIns.findLayerOverlay(overlayId);
+    // 函数可以动态计算label,
+    const ovlOpts = OvlLayer!.convertOverlayDataToOvlOpts(
+      this.overlayList[ovlDataIndex],
+      ovlDataIndex,
+      this.getIconUrl,
+      this.getOverlayOpts,
+      MapUtils
+    );
 
-      if (this.rawLayerIns instanceof MarkerLayer) {
-        let icon = ovlOpts.icon! as AMap.Icon | string;
+    const iconImageUrl = this.getIconUrl(this.overlayList[ovlDataIndex]);
 
-        if (typeof icon === 'string') {
-          icon = iconImageUrl;
-        } else {
-          (icon as AMap.Icon).setImage(iconImageUrl);
-        }
+    if (this.rawLayerIns instanceof MarkerLayer) {
+      let icon = ovlOpts.icon! as AMap.Icon | string;
 
-        (this.rawLayerIns as MarkerLayerIns).refreshOverlayIcon(
-          (marker as AMap.Marker)!,
-          icon
-        );
+      if (typeof icon === 'string') {
+        icon = iconImageUrl;
       } else {
-        let icon = ovlOpts.icon! as AMap.LabelMarkerIconOptions;
+        (icon as AMap.Icon).setImage(iconImageUrl);
+      }
 
-        icon.image = iconImageUrl;
+      (this.rawLayerIns as MarkerLayerIns).refreshOverlayIcon(
+        (marker as AMap.Marker)!,
+        icon
+      );
+    } else {
+      let icon = ovlOpts.icon! as AMap.LabelMarkerIconOptions;
 
-        this.rawLayerIns.refreshOverlayIcon(
-          (marker as AMap.LabelMarker)!,
-          icon
-        );
-      }
+      icon.image = iconImageUrl;
+
+      this.rawLayerIns.refreshOverlayIcon((marker as AMap.LabelMarker)!, icon);
     }
   }
 
-  refreshOverlayLabel(overlayId: string | number, labelShow: boolean) {
+  refreshOverlayLabel(overlayId: string | number) {
     const ovlDataIndex = this.overlayList.findIndex(
       ovl => ovl.id === overlayId
     );
@@ -302,49 +294,32 @@ class BaseMarkerLayer<
     }
     const OvlLayer = BaseMarkerLayer.layerClassMap.get(this.layerType);
 
-    if (
-      this.rawLayerIns instanceof MarkerLayer ||
-      this.rawLayerIns instanceof LabelMarkerLayer
-    ) {
-      // marker拿到手
-      const marker = this.rawLayerIns.findLayerOverlay(overlayId)!;
-
-      const ovDataItem = this.overlayList.find(item => item.id === overlayId);
-      // 属性值转变为boolean
-      ovDataItem!.labelShowed = labelShow;
-
-      // 函数可以动态计算label,
-      const ovlOpts = OvlLayer!.convertOverlayDataToOvlOpts(
-        this.overlayList[ovlDataIndex],
-        ovlDataIndex,
-        this.getIconUrl,
-        this.getOverlayOpts,
-        MapUtils
-      );
+    // marker拿到手
+    const marker = this.rawLayerIns.findLayerOverlay(overlayId)!;
 
-      if (this.rawLayerIns instanceof MarkerLayer) {
-        if (labelShow) {
-          this.rawLayerIns.refreshOverlayLabel(
-            marker as AMap.Marker,
-            (ovlOpts as AMap.MarkerOptions).label! as {
-              content: string;
-              direction: string;
-              offset: [number, number] | Array<number>;
-            }
-          );
-        } else {
-          this.rawLayerIns.refreshOverlayLabel(marker as AMap.Marker);
-        }
-      } else {
-        if (labelShow) {
-          this.rawLayerIns.refreshOverlayLabel(
-            marker as AMap.LabelMarker,
-            ovlOpts.text as AMap.LabelMarkerTextOptions
-          );
-        } else {
-          this.rawLayerIns.refreshOverlayLabel(marker as AMap.LabelMarker);
+    // 函数可以动态计算label,
+    const ovlOpts = OvlLayer!.convertOverlayDataToOvlOpts(
+      this.overlayList[ovlDataIndex],
+      ovlDataIndex,
+      this.getIconUrl,
+      this.getOverlayOpts,
+      MapUtils
+    );
+
+    if (this.rawLayerIns instanceof MarkerLayer) {
+      this.rawLayerIns.refreshOverlayLabel(
+        marker as AMap.Marker,
+        (ovlOpts as AMap.MarkerOptions).label as {
+          content: string;
+          direction: string;
+          offset: [number, number] | Array<number>;
         }
-      }
+      );
+    } else {
+      this.rawLayerIns.refreshOverlayLabel(
+        marker as AMap.LabelMarker,
+        ovlOpts.text as AMap.LabelMarkerTextOptions
+      );
     }
   }