@heycar/heycars-map 0.9.27-google5 → 0.9.27-google7

package/dist/components/AmapMarker/AmapMarker.js

@@ -4,6 +4,7 @@ import { useMapOverlay } from "../../hooks/useOverlay.js";
 import { defineSetup } from "../../types/helper.js";
 import { watchNoneImmediatePostEffectForMapProperty, watchPostEffectForAMapEvent } from "../../utils/compare.js";
 import { referenceCount } from "../../utils/referenceCount.js";
+import { useAmapFixBugOverlayDrag } from "../AmapPolygon/AmapPolygon.js";
 import { shallowRef, onMounted, onUnmounted, watchPostEffect } from "vue";
 const AmapMarker = defineSetup(function AmapMarker2(props, { emit }) {
   const { registerOverlay } = props;
@@ -21,6 +22,7 @@ const AmapMarker = defineSetup(function AmapMarker2(props, { emit }) {
     (_b = markerRef.value) == null ? void 0 : _b.destroy();
     markerRef.value = void 0;
   });
+  useAmapFixBugOverlayDrag(markerRef);
   watchPostEffect((onCleanup) => {
     var _a;
     const map = mapRef == null ? void 0 : mapRef.value;

package/dist/components/AmapPolygon/AmapPolygon.d.ts

@@ -1,3 +1,4 @@
+import { type ShallowRef } from "vue-demi";
 import type { AMapEvent } from "../../types/mapHelper";
 export interface AmapPolygonProps extends AMap.PolygonOptions {
     onTouchStart?: (e: AMapEvent<AMap.Polygon>) => void;
@@ -5,3 +6,4 @@ export interface AmapPolygonProps extends AMap.PolygonOptions {
     onTouchEnd?: (e: AMapEvent<AMap.Polygon>) => void;
 }
 export declare const AmapPolygon: import("vue-demi").DefineComponent<import("vue/types/v3-component-props").ComponentObjectPropsOptions<AmapPolygonProps>, import("../../types/helper").Empty, import("../../types/helper").Empty, import("../../types/helper").Empty, import("../../types/helper").Empty, import("../../types/helper").Empty, import("../../types/helper").Empty, import("../../types/helper").EmitByProps<AmapPolygonProps, Required<AmapPolygonProps>>, "touchStart" | "touchMove" | "touchEnd", AmapPolygonProps>;
+export declare const useAmapFixBugOverlayDrag: (overlayRef?: ShallowRef<AMap.Polygon | AMap.Marker | undefined>) => void;

package/dist/components/AmapPolygon/AmapPolygon.js

@@ -19,7 +19,7 @@ const AmapPolygon = defineSetup(function AmapPolygon2(props) {
     (_b = polygonRef.value) == null ? void 0 : _b.destroy();
     polygonRef.value = void 0;
   });
-  useAmapFixBugPolygonDrag(polygonRef);
+  useAmapFixBugOverlayDrag(polygonRef);
   watchPostEffect((onCleanup) => {
     var _a;
     const map = mapRef == null ? void 0 : mapRef.value;
@@ -48,7 +48,7 @@ const AmapPolygon = defineSetup(function AmapPolygon2(props) {
   );
   return () => null;
 });
-const useAmapFixBugPolygonDrag = (polygonRef) => {
+const useAmapFixBugOverlayDrag = (overlayRef) => {
   let dragStatus = "UNSTARTED";
   const onTouchStart = () => {
     dragStatus = "WAITING_DRAG_START";
@@ -70,21 +70,22 @@ const useAmapFixBugPolygonDrag = (polygonRef) => {
     amap == null ? void 0 : amap.emit("dragend", { type: "dragend", target: amap, lnglat, pixel, originEvent });
   };
   watchPostEffectForAMapEvent(
-    polygonRef,
+    overlayRef,
     {},
     onTouchStart,
     ["onTouchStart"]
   );
   watchPostEffectForAMapEvent(
-    polygonRef,
+    overlayRef,
     {},
     onTouchMove,
     ["onTouchMove"]
   );
-  watchPostEffectForAMapEvent(polygonRef, {}, onTouchEnd, [
+  watchPostEffectForAMapEvent(overlayRef, {}, onTouchEnd, [
     "onTouchEnd"
   ]);
 };
 export {
-  AmapPolygon
+  AmapPolygon,
+  useAmapFixBugOverlayDrag
 };

package/dist/components/AmapPolygon/index.js

@@ -1,4 +1,5 @@
-import { AmapPolygon } from "./AmapPolygon.js";
+import { AmapPolygon, useAmapFixBugOverlayDrag } from "./AmapPolygon.js";
 export {
-  AmapPolygon
+  AmapPolygon,
+  useAmapFixBugOverlayDrag
 };

package/dist/hooks/useMapLoader.js

@@ -1,5 +1,6 @@
 import "../chunks/index.fbc1adc8.js";
 import { watchPostEffectForDeepOption } from "../utils/compare.js";
+import { createRunOnce } from "../utils/helper.js";
 import { shallowRef, computed } from "vue";
 var commonjsGlobal = typeof globalThis !== "undefined" ? globalThis : typeof window !== "undefined" ? window : typeof global !== "undefined" ? global : typeof self !== "undefined" ? self : {};
 var distExports = {};
@@ -604,6 +605,7 @@ const useAmapLoader = (props) => {
   );
   return { statusRef, readyPromise };
 };
+const createGmapLoaderOnce = createRunOnce((opts) => new Loader(opts));
 const useGmapLoader = (props) => {
   const { onChange } = props;
   let resolveLoader;
@@ -624,7 +626,7 @@ const useGmapLoader = (props) => {
     () => optionsRef.value,
     (options) => {
       const language = navigator.language;
-      const loader = new Loader({ ...options, language });
+      const loader = createGmapLoaderOnce({ ...options, language });
       const setStatusAndExecuteCallback = (status) => {
         statusRef.value = status;
         if (status === "SUCCESS")

package/dist/utils/log.js

@@ -1,6 +1,6 @@
 const availableLogKeys = /* @__PURE__ */ new Set();
 const pkgName = "@heycar/heycars-map";
-const pkgVersion = "0.9.27-google5";
+const pkgVersion = "0.9.27-google7";
 const isEnableLog = (name) => {
   const searchParam = new URLSearchParams(location.search);
   return searchParam.has(`log-${name}`);

package/dist/utils/transform.js

@@ -90,13 +90,16 @@ function amapPlaceName2DisplayNameInChina(name, options) {
   if (neighborhood)
     return neighborhood;
   let result = name;
-  for (const item of [province, city, district, township]) {
-    const replacedName = result.replace(item, "");
-    if (replacedName.length < 20)
-      return replacedName;
-    result = replacedName;
+  for (const item of [province, city, district]) {
+    const replacedName2 = result.replace(item, "");
+    if (!replacedName2.trim())
+      return result;
+    result = replacedName2;
   }
-  return result;
+  if (result.length < 20)
+    return result;
+  const replacedName = result.replace(township, "");
+  return replacedName.trim() ? replacedName : result;
 }
 const NOT_ONLY_NUMBERS_REGEX = /[^\d\s-]/;
 function amapPlaceName2DisplayNameOutChina(name, options) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@heycar/heycars-map",
-  "version": "0.9.27-google5",
+  "version": "0.9.27-google7",
   "type": "module",
   "bin": {
     "checkVersion": "./bin/checkVersion.js"