@heycar/heycars-map 0.8.3 → 0.8.5

package/dist/index.cjs

@@ -9,7 +9,7 @@ Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 const Vue = require("vue");
 const style = "";
 const name = "@heycar/heycars-map";
-const version = "0.8.3";
+const version = "0.8.5";
 const type = "module";
 const scripts = {
   dev: "vite -c vite.config.dev.ts",
@@ -857,7 +857,6 @@ const useMapOverlay = (props) => {
       registerOverlay == null ? void 0 : registerOverlay.remove(overlay);
   });
 };
-const isLatLngLiteral = (obj) => obj != null && typeof obj === "object" && Number.isFinite(obj.lat) && Number.isFinite(obj.lng);
 var HAS_WEAK_MAP_SUPPORT = typeof WeakMap === "function";
 var keys = Object.keys;
 function sameValueZeroEqual(a, b) {
@@ -1098,6 +1097,23 @@ createComparator(function() {
 });
 createComparator(createCircularEqualCreator());
 createComparator(createCircularEqualCreator(sameValueZeroEqual));
+const isPlace = (place) => {
+  return place.lng !== void 0 && place.lat !== void 0;
+};
+const sleep = (milliSeconds) => new Promise((resolve) => setTimeout(resolve, milliSeconds));
+const assertPoint = (point) => {
+  if (Array.isArray(point) && point.length === 2 && typeof point[0] === "number" && typeof point[1] === "number")
+    return;
+  throw new Error(`Assertion Error: expect type [number, number], actual is ${point}`);
+};
+const assertAngle = (angle) => {
+  if (typeof angle === "number" || typeof angle === "undefined")
+    return;
+  throw new Error(`Assertion Error: expect type number | undefined, actual is ${angle}`);
+};
+const isLatLngLiteral = (value) => {
+  return value != null && typeof value === "object" && Number.isFinite(value.lat) && Number.isFinite(value.lng);
+};
 const vec2lnglat = ([lng, lat]) => ({
   lng: Number(lng),
   lat: Number(lat)
@@ -1214,8 +1230,8 @@ const wxGetLocationSuccessResponse2GeolocationPosition = (res) => {
   return { timestamp, coords };
 };
 const deepCompareEqualsForMaps = createComparator((deepEqual) => (a, b) => {
-  if (isLatLngLiteral(a) || isLatLngLiteral(b)) {
-    return new google.maps.LatLng(a).equals(new google.maps.LatLng(b));
+  if (isLatLngLiteral(a) && isLatLngLiteral(b)) {
+    return isPlaceEqual(a, b);
   }
   return deepEqual(a, b);
 });
@@ -3557,20 +3573,6 @@ const watchVisibilityState = () => {
   document.addEventListener("visibilitychange", handleVisibilityChange);
   return { visibilityStateRef, unwatchVisibilityState };
 };
-const isPlace = (place) => {
-  return place.lng !== void 0 && place.lat !== void 0;
-};
-const sleep = (milliSeconds) => new Promise((resolve) => setTimeout(resolve, milliSeconds));
-const assertPoint = (point) => {
-  if (Array.isArray(point) && point.length === 2 && typeof point[0] === "number" && typeof point[1] === "number")
-    return;
-  throw new Error(`Assertion Error: expect type [number, number], actual is ${point}`);
-};
-const assertAngle = (angle) => {
-  if (typeof angle === "number" || typeof angle === "undefined")
-    return;
-  throw new Error(`Assertion Error: expect type number | undefined, actual is ${angle}`);
-};
 const WX_GET_LOCATION_INTERVAL_STILL = 10 * 1e3;
 const WX_GET_LOCATION_INTERVAL_SLOW = 3 * 1e3;
 const WX_GET_LOCATION_INTERVAL_FAST = 1 * 1e3;
@@ -5758,53 +5760,6 @@ const useMapRecomendPlace = (props) => {
   const { supplier } = useMapSupplier();
   return supplier === "gmap" ? useGmapRecomendPlace(props) : useAmapRecomendPlace(props);
 };
-const GOOGLE_MAP_ZOOM_CHANGE_DEBOUNCE_TIMEOUT = 50;
-const DEFAULT_ZOOM$1 = 13;
-const useAmapZoom = (props) => {
-  var _a, _b, _c;
-  const { onChange, mapRef, defaultValue } = props;
-  const zoomRef = Vue.ref((_c = (_b = (_a = mapRef.value) == null ? void 0 : _a.getZoom()) != null ? _b : defaultValue) != null ? _c : DEFAULT_ZOOM$1);
-  const setZoom = (v) => {
-    var _a2;
-    zoomRef.value = v;
-    (_a2 = mapRef.value) == null ? void 0 : _a2.setZoom(v, true);
-  };
-  const handleZoomEnd = (_, { target }) => {
-    const zoom = target.getZoom();
-    zoomRef.value = zoom;
-    onChange == null ? void 0 : onChange(zoom);
-  };
-  watchPostEffectForAMapEvent(mapRef, {}, handleZoomEnd, [
-    "onZoomEnd"
-  ]);
-  return { zoomRef, setZoom };
-};
-const useGmapZoom = (props) => {
-  var _a, _b, _c;
-  const { onChange, mapRef, defaultValue } = props;
-  const zoomRef = Vue.ref((_c = (_b = (_a = mapRef.value) == null ? void 0 : _a.getZoom()) != null ? _b : defaultValue) != null ? _c : DEFAULT_ZOOM$1);
-  const setZoom = (v) => {
-    var _a2;
-    zoomRef.value = v;
-    (_a2 = mapRef.value) == null ? void 0 : _a2.setZoom(v);
-  };
-  const handleZoomChange = debounce(
-    (_, { target }) => {
-      const zoom = target.getZoom();
-      zoomRef.value = zoom;
-      onChange == null ? void 0 : onChange(zoom);
-    },
-    GOOGLE_MAP_ZOOM_CHANGE_DEBOUNCE_TIMEOUT
-  );
-  watchPostEffectForGMapEvent(mapRef, {}, handleZoomChange, [
-    "onZoom_changed"
-  ]);
-  return { zoomRef, setZoom };
-};
-const useMapZoom = (props) => {
-  const { supplier } = useMapSupplier();
-  return supplier === "gmap" ? useGmapZoom(props) : useAmapZoom(props);
-};
 const AmapPolygon = defineSetup(function AmapPolygon2(props) {
   const polygonRef = Vue.shallowRef();
   const mapRef = useAmap();
@@ -6067,51 +6022,220 @@ const ConditionalFittablePassengerCircle = defineSetup(function ConditionalFitta
     })]);
   };
 });
+const GOOGLE_MAP_ZOOM_CHANGE_DEBOUNCE_TIMEOUT = 50;
+const DEFAULT_ZOOM$1 = 13;
+const useAmapZoom = (props) => {
+  var _a, _b, _c;
+  const { onChange, mapRef, defaultValue } = props;
+  const zoomRef = Vue.ref((_c = (_b = (_a = mapRef.value) == null ? void 0 : _a.getZoom()) != null ? _b : defaultValue) != null ? _c : DEFAULT_ZOOM$1);
+  const setZoom = (v) => {
+    var _a2;
+    zoomRef.value = v;
+    (_a2 = mapRef.value) == null ? void 0 : _a2.setZoom(v, true);
+  };
+  const handleZoomEnd = (_, { target }) => {
+    const zoom = target.getZoom();
+    zoomRef.value = zoom;
+    onChange == null ? void 0 : onChange(zoom);
+  };
+  Vue.watch(
+    () => mapRef.value,
+    (map) => {
+      if (!map)
+        return;
+      zoomRef.value = map.getZoom();
+    }
+  );
+  watchPostEffectForAMapEvent(mapRef, {}, handleZoomEnd, [
+    "onZoomEnd"
+  ]);
+  return { zoomRef, setZoom };
+};
+const useGmapZoom = (props) => {
+  var _a, _b, _c;
+  const { onChange, mapRef, defaultValue } = props;
+  const zoomRef = Vue.ref((_c = (_b = (_a = mapRef.value) == null ? void 0 : _a.getZoom()) != null ? _b : defaultValue) != null ? _c : DEFAULT_ZOOM$1);
+  const setZoom = (v) => {
+    var _a2;
+    zoomRef.value = v;
+    (_a2 = mapRef.value) == null ? void 0 : _a2.setZoom(v);
+  };
+  const handleZoomChange = debounce(
+    (_, { target }) => {
+      const zoom = target.getZoom();
+      zoomRef.value = zoom;
+      onChange == null ? void 0 : onChange(zoom);
+    },
+    GOOGLE_MAP_ZOOM_CHANGE_DEBOUNCE_TIMEOUT
+  );
+  Vue.watch(
+    () => mapRef.value,
+    (map) => {
+      if (!map)
+        return;
+      zoomRef.value = map.getZoom();
+    }
+  );
+  watchPostEffectForGMapEvent(mapRef, {}, handleZoomChange, [
+    "onZoom_changed"
+  ]);
+  return { zoomRef, setZoom };
+};
+const useMapZoom = (props) => {
+  const { supplier } = useMapSupplier();
+  return supplier === "gmap" ? useGmapZoom(props) : useAmapZoom(props);
+};
 const reverse = (direction) => direction === "left" ? "right" : "left";
 const usePointsLabelDirection = (props) => {
   const { widthLimit, heightLimit } = props;
   const mapRef = useMap();
   const { apiMapLngLatToVw } = useMapLngLatToVw({ mapRef });
+  const { zoomRef } = useMapZoom({ mapRef });
   const diffVw = (from, to) => {
     const [x1, y1] = apiMapLngLatToVw(from);
     const [x2, y2] = apiMapLngLatToVw(to);
     return [x2 - x1, y2 - y1];
   };
-  const directionsRef = Vue.ref(Array(props.places.length).fill("right"));
+  const directionsRef = Vue.ref([]);
+  const labeledPlacesRef = Vue.ref([]);
+  const isContainBasePlaceRef = Vue.ref(false);
   watchEffectForDeepOption(
-    () => props.places.map(place2point),
-    (points) => {
-      const sortedPoints = points.map((point, index) => ({ point, index })).sort(
-        ({ point: [, lat1] }, { point: [, lat2] }) => lat1 < lat2 ? 1 : lat1 > lat2 ? -1 : 0
+    () => [[...props.places], { ...props.basePlace }, zoomRef.value],
+    ([places, basePlace]) => {
+      const placesExcludeBase = places.filter((place) => !isPlaceEqual(place, basePlace));
+      isContainBasePlaceRef.value = placesExcludeBase.length < places.length;
+      const sortedPlaces = placesExcludeBase.sort(
+        ({ lat: lat1 }, { lat: lat2 }) => lat1 < lat2 ? 1 : lat1 > lat2 ? -1 : 0
       );
-      const len = points.length;
-      const result = Array(len);
-      let prevDirection = "right";
-      let isLimited = false;
-      for (let idx = 0; idx < len; idx++) {
-        const { index } = sortedPoints[idx];
-        if (idx === len - 1) {
-          result[index] = isLimited ? reverse(prevDirection) : "right";
-          continue;
-        }
-        if (idx === 0) {
-          const [dx2, dy2] = diffVw(sortedPoints[idx].point, sortedPoints[idx + 1].point);
-          isLimited = dx2 > -widthLimit && dx2 < widthLimit && dy2 > -heightLimit && dy2 < heightLimit;
-          const direction2 = !isLimited ? "right" : dx2 > 0 ? "left" : "right";
-          result[index] = direction2;
-          prevDirection = direction2;
-          continue;
-        }
-        const [dx, dy] = diffVw(sortedPoints[idx].point, sortedPoints[idx + 1].point);
-        const direction = isLimited ? reverse(prevDirection) : "right";
-        result[index] = direction;
-        prevDirection = direction;
-        isLimited = dx > -widthLimit && dx < widthLimit && dy > -heightLimit && dy < heightLimit;
-      }
-      directionsRef.value = result;
+      const noOverlapPlaces = filterNoOverlapPlaces({
+        basePlace,
+        sortedPlaces,
+        widthLimit,
+        heightLimit,
+        distanceFn: diffVw
+      });
+      const directions = createLabelDirections({
+        sortedPoints: sortedPlaces.map(place2point),
+        widthLimit,
+        heightLimit,
+        distanceFn: diffVw
+      });
+      directionsRef.value = directions;
+      labeledPlacesRef.value = noOverlapPlaces;
     }
   );
-  return directionsRef;
+  return { directionsRef, labeledPlacesRef, isContainBasePlaceRef };
+};
+function createLabelDirections(props) {
+  const { sortedPoints, widthLimit, heightLimit, distanceFn } = props;
+  const len = sortedPoints.length;
+  const result = [];
+  const calcDirection = (isLimited2, isDoubleLimited2, prevDx2, prevDirection2) => {
+    if (isLimited2)
+      return reverse(prevDirection2);
+    if (isDoubleLimited2 && prevDx2 < 0 && prevDirection2 === "left")
+      return "left";
+    return "right";
+  };
+  let prevDirection = "right";
+  let isLimited = false;
+  let isDoubleLimited = false;
+  let prevDx = Infinity;
+  for (let idx = 0; idx < len; idx++) {
+    if (idx === len - 1) {
+      const direction2 = calcDirection(isLimited, isDoubleLimited, prevDx, prevDirection);
+      result.push(direction2);
+      continue;
+    }
+    if (idx === 0) {
+      const [dx2, dy2] = distanceFn(sortedPoints[idx], sortedPoints[idx + 1]);
+      isLimited = dx2 > -widthLimit && dx2 < widthLimit && dy2 > -heightLimit && dy2 < heightLimit;
+      isDoubleLimited = dx2 > -widthLimit * 2 && dx2 < widthLimit * 2 && dy2 > -heightLimit && dy2 < heightLimit;
+      const direction2 = !isLimited ? "right" : dx2 > 0 ? "left" : "right";
+      result.push(direction2);
+      prevDirection = direction2;
+      prevDx = dx2;
+      continue;
+    }
+    const [dx, dy] = distanceFn(sortedPoints[idx], sortedPoints[idx + 1]);
+    const direction = calcDirection(isLimited, isDoubleLimited, prevDx, prevDirection);
+    result.push(direction);
+    prevDirection = direction;
+    prevDx = dx;
+    isLimited = dx > -widthLimit && dx < widthLimit && dy > -heightLimit && dy < heightLimit;
+    isDoubleLimited = dx > -widthLimit * 2 && dx < widthLimit * 2 && dy > -heightLimit && dy < heightLimit;
+  }
+  return result;
+}
+function filterNoOverlapPlaces(props) {
+  const { basePlace, sortedPlaces, widthLimit, heightLimit, distanceFn } = props;
+  const measureOverlap = (place1, place2) => {
+    const [dx, dy] = distanceFn(place2point(place1), place2point(place2));
+    const isOverlap = dx > -widthLimit && dx < widthLimit && dy > -heightLimit && dy < heightLimit;
+    spaceLog(
+      "usePointsLabelDirection",
+      "p1, p2, dx, dy, isOverlap = ",
+      place1.displayName,
+      place2.displayName,
+      dx,
+      dy,
+      isOverlap
+    );
+    return isOverlap;
+  };
+  let nextPlaces = sortedPlaces;
+  let overlapPlaces = findRelation(nextPlaces, measureOverlap);
+  while (overlapPlaces.length > 0) {
+    const maxPlace = findMax(overlapPlaces, (place) => {
+      const [dx, dy] = distanceFn(place2point(place), place2point(basePlace));
+      return dx * dx + dy * dy;
+    });
+    nextPlaces = nextPlaces.filter((place) => !isPlaceEqual(maxPlace, place));
+    overlapPlaces = findRelation(nextPlaces, measureOverlap);
+  }
+  return nextPlaces;
+}
+const findRelation = (places, measureRelate) => {
+  let isPrevRelated = false;
+  let isNextRelated = false;
+  let isFound = false;
+  const result = [];
+  for (const [idx, place] of places.slice(0, -1).entries()) {
+    isNextRelated = measureRelate(place, places[idx + 1]);
+    if (!isPrevRelated) {
+      isPrevRelated = isNextRelated;
+      continue;
+    }
+    if (!isNextRelated) {
+      if (isFound) {
+        result.push(place);
+        result.push(places[idx + 1]);
+        return result;
+      }
+      isPrevRelated = isNextRelated;
+      continue;
+    }
+    if (!isFound)
+      result.push(places[idx - 1]);
+    if (idx === places.length - 2)
+      result.push(places[idx + 1]);
+    result.push(place);
+    isPrevRelated = isNextRelated;
+    isFound = true;
+  }
+  return result;
+};
+const findMax = (list, measure) => {
+  let max = -Infinity;
+  let index = 0;
+  for (const [idx, item] of list.entries()) {
+    const value = measure(item);
+    if (value <= max)
+      continue;
+    max = value;
+    index = idx;
+  }
+  return list[index];
 };
 var AnchorType = /* @__PURE__ */ ((AnchorType2) => {
   AnchorType2["topLeft"] = "top-left";
@@ -6133,25 +6257,23 @@ var labelLayout = "fhyw8b";
 var labelStroke = "fhyw8d fhyw8c";
 var placeCircleLayout = createRuntimeFn({ defaultClassName: "fhyw80", variantClassNames: { textAlign: { left: "fhyw81", right: "fhyw82" } }, defaultVariants: {}, compoundVariants: [] });
 var placeIcon = createRuntimeFn({ defaultClassName: "fhyw88", variantClassNames: { hideIcon: { true: "fhyw89", false: "fhyw8a" } }, defaultVariants: {}, compoundVariants: [] });
+const DEFAULT_TEXT_ALIGN = "right";
 const APlaceCircle = defineSetup(function APlaceCircle2(props, {
   emit
 }) {
-  const textAlignRef = Vue.computed(() => {
-    var _a;
-    return (_a = props.textAlign) != null ? _a : "right";
-  });
   const contentRef = Vue.computed(() => {
     const {
-      hideIcon = false
+      hideIcon = false,
+      textAlign = DEFAULT_TEXT_ALIGN
     } = props;
     return `
         <div class="APlaceCircle ${placeCircleLayout({
-      textAlign: textAlignRef.value
+      textAlign
     })}">
           <img class="${placeIcon({
       hideIcon
     })} ${amapPlaceIconLayout({
-      textAlign: textAlignRef.value
+      textAlign
     })}" src="${imgPlaceCircle}">
           <div class="${labelLayout}">
             <div class="${labelStroke}">${props.label}</div>
@@ -6162,23 +6284,27 @@ const APlaceCircle = defineSetup(function APlaceCircle2(props, {
   });
   const contentWithoutLabelRef = Vue.computed(() => {
     const {
-      hideIcon = false
+      hideIcon = false,
+      textAlign = DEFAULT_TEXT_ALIGN
     } = props;
     return `<img class="APlaceCircle ${placeIcon({
       hideIcon
     })} ${amapPlaceIconLayout({
-      textAlign: textAlignRef.value
+      textAlign
     })}" src="${imgPlaceCircle}">`;
   });
   const handleClick = () => {
     emit("click", props.position);
   };
   return () => {
+    const {
+      textAlign = DEFAULT_TEXT_ALIGN
+    } = props;
     return Vue.h(AmapMarker, {
       "attrs": {
         "position": props.position,
         "content": props.label ? contentRef.value : contentWithoutLabelRef.value,
-        "anchor": textAlignRef.value === "left" ? AnchorType.middleRight : AnchorType.middleLeft,
+        "anchor": textAlign === "left" ? AnchorType.middleRight : AnchorType.middleLeft,
         "zIndex": ZINDEX_PLACE_LAYER
       },
       "on": {
@@ -6190,19 +6316,16 @@ const APlaceCircle = defineSetup(function APlaceCircle2(props, {
 const GPlaceCircle = defineSetup(function GPlaceCircle2(props, {
   emit
 }) {
-  const textAlignRef = Vue.computed(() => {
-    var _a;
-    return (_a = props.textAlign) != null ? _a : "right";
-  });
   const contentRef = Vue.computed(() => {
     const {
-      hideIcon = false
+      hideIcon = false,
+      textAlign = DEFAULT_TEXT_ALIGN
     } = props;
     return createDom("div", {
       class: `GPlaceCircle ${placeCircleLayout({
-        textAlign: textAlignRef.value
+        textAlign
       })} ${gmapPlaceIconLayout({
-        textAlign: textAlignRef.value
+        textAlign
       })}`
     }, `
       <img class="${placeIcon({
@@ -6216,13 +6339,14 @@ const GPlaceCircle = defineSetup(function GPlaceCircle2(props, {
   });
   const contentWithoutLabelRef = Vue.computed(() => {
     const {
-      hideIcon = false
+      hideIcon = false,
+      textAlign = DEFAULT_TEXT_ALIGN
     } = props;
     return createDom("img", {
       class: `GPlaceCircle ${placeIcon({
         hideIcon
       })} ${gmapPlaceIconLayout({
-        textAlign: textAlignRef.value
+        textAlign
       })}`,
       src: imgPlaceCircle
     });
@@ -6257,18 +6381,31 @@ const PlaceCircle = defineSetup(function PlaceCircle2(props, {
 const PickupPoints = defineSetup(function PickupPoints2(props, {
   emit
 }) {
+  const mapRef = useMap();
   const {
-    renderLabel
-  } = props;
-  const directions = usePointsLabelDirection(Vue.reactive({
+    zoomRef
+  } = useMapZoom({
+    mapRef
+  });
+  const {
+    directionsRef,
+    labeledPlacesRef,
+    isContainBasePlaceRef
+  } = usePointsLabelDirection(Vue.reactive({
+    basePlace: Vue.toRef(props, "basePlace"),
     places: Vue.toRef(props, "places"),
     heightLimit: 9,
-    widthLimit: 32
+    widthLimit: 34
   }));
   return () => {
-    return Vue.h("div", [props.places.map((place, idx) => {
-      const direction = directions.value[idx];
-      const label2 = renderLabel ? renderLabel(place) : place.displayName;
+    const {
+      basePlace,
+      zoomIconMin,
+      zoomTextMin
+    } = props;
+    return Vue.h("div", [zoomRef.value >= zoomIconMin && labeledPlacesRef.value.map((place, idx) => {
+      const direction = directionsRef.value[idx];
+      const label2 = zoomRef.value < zoomTextMin ? void 0 : place.displayName;
       return Vue.h(PlaceCircle, {
         "attrs": {
           "position": place2point(place),
@@ -6279,12 +6416,17 @@ const PickupPoints = defineSetup(function PickupPoints2(props, {
           "click": () => emit("click", place)
         }
       });
+    }), isContainBasePlaceRef.value && Vue.h(PlaceCircle, {
+      "attrs": {
+        "position": place2point(basePlace)
+      }
     })]);
   };
 });
 const RECOMMEND_PLACE_DRAG_LIMIT = 10;
 const RECOMMEND_PLACE_LARGE_LIMIT = 100;
-const RECOMMEND_PLACE_ZOOM_MIN = 13;
+const RECOMMEND_PLACE_ICON_ZOOM_MIN = 15.75;
+const RECOMMEND_PLACE_TEXT_ZOOM_MIN = 16.75;
 const DEFAULT_PLACE_NAME = "当前位置";
 const DEFAULT_ZOOM = 17;
 const BusinessRecomendPlaceMap = defineLagecySetup(function BusinessRecomendPlaceMap2(props, {
@@ -6309,12 +6451,6 @@ const BusinessRecomendPlaceMap = defineLagecySetup(function BusinessRecomendPlac
   const {
     readyPromise
   } = useMapSupplier();
-  const {
-    zoomRef
-  } = useMapZoom({
-    mapRef,
-    defaultValue: DEFAULT_ZOOM
-  });
   const centerPlace = Vue.reactive({
     lng: (_a = geoDefaultPosition == null ? void 0 : geoDefaultPosition[0]) != null ? _a : 0,
     lat: (_b = geoDefaultPosition == null ? void 0 : geoDefaultPosition[1]) != null ? _b : 0,
@@ -6491,13 +6627,12 @@ const BusinessRecomendPlaceMap = defineLagecySetup(function BusinessRecomendPlac
       recomendDescription,
       unavailableTitle
     } = props;
-    console.log("centerPlace = ", JSON.stringify(centerPlace));
     const title = geoLoading.value ? geoLoadingTitle2 : !availableRef.value ? unavailableTitle : centerPlace.displayName;
     const description = !availableRef.value ? void 0 : isElectedRef.value ? recomendDescription : void 0;
     return Vue.h(HeycarMap, {
       "attrs": {
         "center": centerPoint.value,
-        "zoom": zoomRef.value,
+        "zoom": DEFAULT_ZOOM,
         "touchZoomCenter": true,
         "mapRef": setMap,
         "fallback": slots.fallback,
@@ -6512,10 +6647,12 @@ const BusinessRecomendPlaceMap = defineLagecySetup(function BusinessRecomendPlac
         "position": geoPosition.value,
         "angle": orientation.cssRotationVariableName
       }
-    }), zoomRef.value >= RECOMMEND_PLACE_ZOOM_MIN && Vue.h(PickupPoints, {
+    }), Vue.h(PickupPoints, {
       "attrs": {
+        "basePlace": centerPlace,
         "places": placeCandidates.value,
-        "renderLabel": (place) => isPlaceEqual(place, centerPlace) ? void 0 : place.displayName
+        "zoomIconMin": RECOMMEND_PLACE_ICON_ZOOM_MIN,
+        "zoomTextMin": RECOMMEND_PLACE_TEXT_ZOOM_MIN
       },
       "on": {
         "click": panToCenterByPlace
@@ -6557,12 +6694,6 @@ const BusinessReselectPlaceMap = defineLagecySetup(function BusinessReselectPlac
     setMap,
     panTo
   } = useHeycarMap();
-  const {
-    zoomRef
-  } = useMapZoom({
-    mapRef,
-    defaultValue: DEFAULT_ZOOM
-  });
   const centerPlace = Vue.reactive({
     lng: defaultPlace.lng,
     lat: defaultPlace.lat,
@@ -6726,7 +6857,7 @@ const BusinessReselectPlaceMap = defineLagecySetup(function BusinessReselectPlac
     return Vue.h(HeycarMap, {
       "attrs": {
         "center": centerPoint.value,
-        "zoom": zoomRef.value,
+        "zoom": DEFAULT_ZOOM,
         "touchZoomCenter": true,
         "mapRef": setMap,
         "fallback": slots.fallback,
@@ -6741,10 +6872,12 @@ const BusinessReselectPlaceMap = defineLagecySetup(function BusinessReselectPlac
         "position": geoPosition.value,
         "angle": orientation.cssRotationVariableName
       }
-    }), zoomRef.value >= RECOMMEND_PLACE_ZOOM_MIN && Vue.h(PickupPoints, {
+    }), Vue.h(PickupPoints, {
       "attrs": {
+        "basePlace": centerPlace,
         "places": placeCandidates.value,
-        "renderLabel": (place) => isPlaceEqual(place, centerPlace) ? void 0 : place.displayName
+        "zoomIconMin": RECOMMEND_PLACE_ICON_ZOOM_MIN,
+        "zoomTextMin": RECOMMEND_PLACE_TEXT_ZOOM_MIN
       },
       "on": {
         "click": panToCenterByPlace
@@ -7916,7 +8049,6 @@ const useBusinessTaxiServiceMap = () => {
   const { mapRef, setMap } = useHeycarMap();
   const { registerFitVeiw, setFitView } = useMapFitView({
     mapRef,
-    autoFitTimeout: 5e3,
     padding: [19, 36, 19, 26]
   });
   return { setMap, registerFitVeiw, setFitView };

package/dist/index.js

@@ -7,7 +7,7 @@ var __publicField = (obj, key, value) => {
 import Vue, { defineComponent, h, computed, inject, provide, watch, onMounted, onUnmounted, watchPostEffect, shallowRef, ref, watchEffect, reactive, toRefs, toRef } from "vue";
 const style = "";
 const name = "@heycar/heycars-map";
-const version = "0.8.3";
+const version = "0.8.5";
 const type = "module";
 const scripts = {
   dev: "vite -c vite.config.dev.ts",
@@ -855,7 +855,6 @@ const useMapOverlay = (props) => {
       registerOverlay == null ? void 0 : registerOverlay.remove(overlay);
   });
 };
-const isLatLngLiteral = (obj) => obj != null && typeof obj === "object" && Number.isFinite(obj.lat) && Number.isFinite(obj.lng);
 var HAS_WEAK_MAP_SUPPORT = typeof WeakMap === "function";
 var keys = Object.keys;
 function sameValueZeroEqual(a, b) {
@@ -1096,6 +1095,23 @@ createComparator(function() {
 });
 createComparator(createCircularEqualCreator());
 createComparator(createCircularEqualCreator(sameValueZeroEqual));
+const isPlace = (place) => {
+  return place.lng !== void 0 && place.lat !== void 0;
+};
+const sleep = (milliSeconds) => new Promise((resolve) => setTimeout(resolve, milliSeconds));
+const assertPoint = (point) => {
+  if (Array.isArray(point) && point.length === 2 && typeof point[0] === "number" && typeof point[1] === "number")
+    return;
+  throw new Error(`Assertion Error: expect type [number, number], actual is ${point}`);
+};
+const assertAngle = (angle) => {
+  if (typeof angle === "number" || typeof angle === "undefined")
+    return;
+  throw new Error(`Assertion Error: expect type number | undefined, actual is ${angle}`);
+};
+const isLatLngLiteral = (value) => {
+  return value != null && typeof value === "object" && Number.isFinite(value.lat) && Number.isFinite(value.lng);
+};
 const vec2lnglat = ([lng, lat]) => ({
   lng: Number(lng),
   lat: Number(lat)
@@ -1212,8 +1228,8 @@ const wxGetLocationSuccessResponse2GeolocationPosition = (res) => {
   return { timestamp, coords };
 };
 const deepCompareEqualsForMaps = createComparator((deepEqual) => (a, b) => {
-  if (isLatLngLiteral(a) || isLatLngLiteral(b)) {
-    return new google.maps.LatLng(a).equals(new google.maps.LatLng(b));
+  if (isLatLngLiteral(a) && isLatLngLiteral(b)) {
+    return isPlaceEqual(a, b);
   }
   return deepEqual(a, b);
 });
@@ -3555,20 +3571,6 @@ const watchVisibilityState = () => {
   document.addEventListener("visibilitychange", handleVisibilityChange);
   return { visibilityStateRef, unwatchVisibilityState };
 };
-const isPlace = (place) => {
-  return place.lng !== void 0 && place.lat !== void 0;
-};
-const sleep = (milliSeconds) => new Promise((resolve) => setTimeout(resolve, milliSeconds));
-const assertPoint = (point) => {
-  if (Array.isArray(point) && point.length === 2 && typeof point[0] === "number" && typeof point[1] === "number")
-    return;
-  throw new Error(`Assertion Error: expect type [number, number], actual is ${point}`);
-};
-const assertAngle = (angle) => {
-  if (typeof angle === "number" || typeof angle === "undefined")
-    return;
-  throw new Error(`Assertion Error: expect type number | undefined, actual is ${angle}`);
-};
 const WX_GET_LOCATION_INTERVAL_STILL = 10 * 1e3;
 const WX_GET_LOCATION_INTERVAL_SLOW = 3 * 1e3;
 const WX_GET_LOCATION_INTERVAL_FAST = 1 * 1e3;
@@ -5756,53 +5758,6 @@ const useMapRecomendPlace = (props) => {
   const { supplier } = useMapSupplier();
   return supplier === "gmap" ? useGmapRecomendPlace(props) : useAmapRecomendPlace(props);
 };
-const GOOGLE_MAP_ZOOM_CHANGE_DEBOUNCE_TIMEOUT = 50;
-const DEFAULT_ZOOM$1 = 13;
-const useAmapZoom = (props) => {
-  var _a, _b, _c;
-  const { onChange, mapRef, defaultValue } = props;
-  const zoomRef = ref((_c = (_b = (_a = mapRef.value) == null ? void 0 : _a.getZoom()) != null ? _b : defaultValue) != null ? _c : DEFAULT_ZOOM$1);
-  const setZoom = (v) => {
-    var _a2;
-    zoomRef.value = v;
-    (_a2 = mapRef.value) == null ? void 0 : _a2.setZoom(v, true);
-  };
-  const handleZoomEnd = (_, { target }) => {
-    const zoom = target.getZoom();
-    zoomRef.value = zoom;
-    onChange == null ? void 0 : onChange(zoom);
-  };
-  watchPostEffectForAMapEvent(mapRef, {}, handleZoomEnd, [
-    "onZoomEnd"
-  ]);
-  return { zoomRef, setZoom };
-};
-const useGmapZoom = (props) => {
-  var _a, _b, _c;
-  const { onChange, mapRef, defaultValue } = props;
-  const zoomRef = ref((_c = (_b = (_a = mapRef.value) == null ? void 0 : _a.getZoom()) != null ? _b : defaultValue) != null ? _c : DEFAULT_ZOOM$1);
-  const setZoom = (v) => {
-    var _a2;
-    zoomRef.value = v;
-    (_a2 = mapRef.value) == null ? void 0 : _a2.setZoom(v);
-  };
-  const handleZoomChange = debounce(
-    (_, { target }) => {
-      const zoom = target.getZoom();
-      zoomRef.value = zoom;
-      onChange == null ? void 0 : onChange(zoom);
-    },
-    GOOGLE_MAP_ZOOM_CHANGE_DEBOUNCE_TIMEOUT
-  );
-  watchPostEffectForGMapEvent(mapRef, {}, handleZoomChange, [
-    "onZoom_changed"
-  ]);
-  return { zoomRef, setZoom };
-};
-const useMapZoom = (props) => {
-  const { supplier } = useMapSupplier();
-  return supplier === "gmap" ? useGmapZoom(props) : useAmapZoom(props);
-};
 const AmapPolygon = defineSetup(function AmapPolygon2(props) {
   const polygonRef = shallowRef();
   const mapRef = useAmap();
@@ -6065,51 +6020,220 @@ const ConditionalFittablePassengerCircle = defineSetup(function ConditionalFitta
     })]);
   };
 });
+const GOOGLE_MAP_ZOOM_CHANGE_DEBOUNCE_TIMEOUT = 50;
+const DEFAULT_ZOOM$1 = 13;
+const useAmapZoom = (props) => {
+  var _a, _b, _c;
+  const { onChange, mapRef, defaultValue } = props;
+  const zoomRef = ref((_c = (_b = (_a = mapRef.value) == null ? void 0 : _a.getZoom()) != null ? _b : defaultValue) != null ? _c : DEFAULT_ZOOM$1);
+  const setZoom = (v) => {
+    var _a2;
+    zoomRef.value = v;
+    (_a2 = mapRef.value) == null ? void 0 : _a2.setZoom(v, true);
+  };
+  const handleZoomEnd = (_, { target }) => {
+    const zoom = target.getZoom();
+    zoomRef.value = zoom;
+    onChange == null ? void 0 : onChange(zoom);
+  };
+  watch(
+    () => mapRef.value,
+    (map) => {
+      if (!map)
+        return;
+      zoomRef.value = map.getZoom();
+    }
+  );
+  watchPostEffectForAMapEvent(mapRef, {}, handleZoomEnd, [
+    "onZoomEnd"
+  ]);
+  return { zoomRef, setZoom };
+};
+const useGmapZoom = (props) => {
+  var _a, _b, _c;
+  const { onChange, mapRef, defaultValue } = props;
+  const zoomRef = ref((_c = (_b = (_a = mapRef.value) == null ? void 0 : _a.getZoom()) != null ? _b : defaultValue) != null ? _c : DEFAULT_ZOOM$1);
+  const setZoom = (v) => {
+    var _a2;
+    zoomRef.value = v;
+    (_a2 = mapRef.value) == null ? void 0 : _a2.setZoom(v);
+  };
+  const handleZoomChange = debounce(
+    (_, { target }) => {
+      const zoom = target.getZoom();
+      zoomRef.value = zoom;
+      onChange == null ? void 0 : onChange(zoom);
+    },
+    GOOGLE_MAP_ZOOM_CHANGE_DEBOUNCE_TIMEOUT
+  );
+  watch(
+    () => mapRef.value,
+    (map) => {
+      if (!map)
+        return;
+      zoomRef.value = map.getZoom();
+    }
+  );
+  watchPostEffectForGMapEvent(mapRef, {}, handleZoomChange, [
+    "onZoom_changed"
+  ]);
+  return { zoomRef, setZoom };
+};
+const useMapZoom = (props) => {
+  const { supplier } = useMapSupplier();
+  return supplier === "gmap" ? useGmapZoom(props) : useAmapZoom(props);
+};
 const reverse = (direction) => direction === "left" ? "right" : "left";
 const usePointsLabelDirection = (props) => {
   const { widthLimit, heightLimit } = props;
   const mapRef = useMap();
   const { apiMapLngLatToVw } = useMapLngLatToVw({ mapRef });
+  const { zoomRef } = useMapZoom({ mapRef });
   const diffVw = (from, to) => {
     const [x1, y1] = apiMapLngLatToVw(from);
     const [x2, y2] = apiMapLngLatToVw(to);
     return [x2 - x1, y2 - y1];
   };
-  const directionsRef = ref(Array(props.places.length).fill("right"));
+  const directionsRef = ref([]);
+  const labeledPlacesRef = ref([]);
+  const isContainBasePlaceRef = ref(false);
   watchEffectForDeepOption(
-    () => props.places.map(place2point),
-    (points) => {
-      const sortedPoints = points.map((point, index) => ({ point, index })).sort(
-        ({ point: [, lat1] }, { point: [, lat2] }) => lat1 < lat2 ? 1 : lat1 > lat2 ? -1 : 0
+    () => [[...props.places], { ...props.basePlace }, zoomRef.value],
+    ([places, basePlace]) => {
+      const placesExcludeBase = places.filter((place) => !isPlaceEqual(place, basePlace));
+      isContainBasePlaceRef.value = placesExcludeBase.length < places.length;
+      const sortedPlaces = placesExcludeBase.sort(
+        ({ lat: lat1 }, { lat: lat2 }) => lat1 < lat2 ? 1 : lat1 > lat2 ? -1 : 0
       );
-      const len = points.length;
-      const result = Array(len);
-      let prevDirection = "right";
-      let isLimited = false;
-      for (let idx = 0; idx < len; idx++) {
-        const { index } = sortedPoints[idx];
-        if (idx === len - 1) {
-          result[index] = isLimited ? reverse(prevDirection) : "right";
-          continue;
-        }
-        if (idx === 0) {
-          const [dx2, dy2] = diffVw(sortedPoints[idx].point, sortedPoints[idx + 1].point);
-          isLimited = dx2 > -widthLimit && dx2 < widthLimit && dy2 > -heightLimit && dy2 < heightLimit;
-          const direction2 = !isLimited ? "right" : dx2 > 0 ? "left" : "right";
-          result[index] = direction2;
-          prevDirection = direction2;
-          continue;
-        }
-        const [dx, dy] = diffVw(sortedPoints[idx].point, sortedPoints[idx + 1].point);
-        const direction = isLimited ? reverse(prevDirection) : "right";
-        result[index] = direction;
-        prevDirection = direction;
-        isLimited = dx > -widthLimit && dx < widthLimit && dy > -heightLimit && dy < heightLimit;
-      }
-      directionsRef.value = result;
+      const noOverlapPlaces = filterNoOverlapPlaces({
+        basePlace,
+        sortedPlaces,
+        widthLimit,
+        heightLimit,
+        distanceFn: diffVw
+      });
+      const directions = createLabelDirections({
+        sortedPoints: sortedPlaces.map(place2point),
+        widthLimit,
+        heightLimit,
+        distanceFn: diffVw
+      });
+      directionsRef.value = directions;
+      labeledPlacesRef.value = noOverlapPlaces;
     }
   );
-  return directionsRef;
+  return { directionsRef, labeledPlacesRef, isContainBasePlaceRef };
+};
+function createLabelDirections(props) {
+  const { sortedPoints, widthLimit, heightLimit, distanceFn } = props;
+  const len = sortedPoints.length;
+  const result = [];
+  const calcDirection = (isLimited2, isDoubleLimited2, prevDx2, prevDirection2) => {
+    if (isLimited2)
+      return reverse(prevDirection2);
+    if (isDoubleLimited2 && prevDx2 < 0 && prevDirection2 === "left")
+      return "left";
+    return "right";
+  };
+  let prevDirection = "right";
+  let isLimited = false;
+  let isDoubleLimited = false;
+  let prevDx = Infinity;
+  for (let idx = 0; idx < len; idx++) {
+    if (idx === len - 1) {
+      const direction2 = calcDirection(isLimited, isDoubleLimited, prevDx, prevDirection);
+      result.push(direction2);
+      continue;
+    }
+    if (idx === 0) {
+      const [dx2, dy2] = distanceFn(sortedPoints[idx], sortedPoints[idx + 1]);
+      isLimited = dx2 > -widthLimit && dx2 < widthLimit && dy2 > -heightLimit && dy2 < heightLimit;
+      isDoubleLimited = dx2 > -widthLimit * 2 && dx2 < widthLimit * 2 && dy2 > -heightLimit && dy2 < heightLimit;
+      const direction2 = !isLimited ? "right" : dx2 > 0 ? "left" : "right";
+      result.push(direction2);
+      prevDirection = direction2;
+      prevDx = dx2;
+      continue;
+    }
+    const [dx, dy] = distanceFn(sortedPoints[idx], sortedPoints[idx + 1]);
+    const direction = calcDirection(isLimited, isDoubleLimited, prevDx, prevDirection);
+    result.push(direction);
+    prevDirection = direction;
+    prevDx = dx;
+    isLimited = dx > -widthLimit && dx < widthLimit && dy > -heightLimit && dy < heightLimit;
+    isDoubleLimited = dx > -widthLimit * 2 && dx < widthLimit * 2 && dy > -heightLimit && dy < heightLimit;
+  }
+  return result;
+}
+function filterNoOverlapPlaces(props) {
+  const { basePlace, sortedPlaces, widthLimit, heightLimit, distanceFn } = props;
+  const measureOverlap = (place1, place2) => {
+    const [dx, dy] = distanceFn(place2point(place1), place2point(place2));
+    const isOverlap = dx > -widthLimit && dx < widthLimit && dy > -heightLimit && dy < heightLimit;
+    spaceLog(
+      "usePointsLabelDirection",
+      "p1, p2, dx, dy, isOverlap = ",
+      place1.displayName,
+      place2.displayName,
+      dx,
+      dy,
+      isOverlap
+    );
+    return isOverlap;
+  };
+  let nextPlaces = sortedPlaces;
+  let overlapPlaces = findRelation(nextPlaces, measureOverlap);
+  while (overlapPlaces.length > 0) {
+    const maxPlace = findMax(overlapPlaces, (place) => {
+      const [dx, dy] = distanceFn(place2point(place), place2point(basePlace));
+      return dx * dx + dy * dy;
+    });
+    nextPlaces = nextPlaces.filter((place) => !isPlaceEqual(maxPlace, place));
+    overlapPlaces = findRelation(nextPlaces, measureOverlap);
+  }
+  return nextPlaces;
+}
+const findRelation = (places, measureRelate) => {
+  let isPrevRelated = false;
+  let isNextRelated = false;
+  let isFound = false;
+  const result = [];
+  for (const [idx, place] of places.slice(0, -1).entries()) {
+    isNextRelated = measureRelate(place, places[idx + 1]);
+    if (!isPrevRelated) {
+      isPrevRelated = isNextRelated;
+      continue;
+    }
+    if (!isNextRelated) {
+      if (isFound) {
+        result.push(place);
+        result.push(places[idx + 1]);
+        return result;
+      }
+      isPrevRelated = isNextRelated;
+      continue;
+    }
+    if (!isFound)
+      result.push(places[idx - 1]);
+    if (idx === places.length - 2)
+      result.push(places[idx + 1]);
+    result.push(place);
+    isPrevRelated = isNextRelated;
+    isFound = true;
+  }
+  return result;
+};
+const findMax = (list, measure) => {
+  let max = -Infinity;
+  let index = 0;
+  for (const [idx, item] of list.entries()) {
+    const value = measure(item);
+    if (value <= max)
+      continue;
+    max = value;
+    index = idx;
+  }
+  return list[index];
 };
 var AnchorType = /* @__PURE__ */ ((AnchorType2) => {
   AnchorType2["topLeft"] = "top-left";
@@ -6131,25 +6255,23 @@ var labelLayout = "fhyw8b";
 var labelStroke = "fhyw8d fhyw8c";
 var placeCircleLayout = createRuntimeFn({ defaultClassName: "fhyw80", variantClassNames: { textAlign: { left: "fhyw81", right: "fhyw82" } }, defaultVariants: {}, compoundVariants: [] });
 var placeIcon = createRuntimeFn({ defaultClassName: "fhyw88", variantClassNames: { hideIcon: { true: "fhyw89", false: "fhyw8a" } }, defaultVariants: {}, compoundVariants: [] });
+const DEFAULT_TEXT_ALIGN = "right";
 const APlaceCircle = defineSetup(function APlaceCircle2(props, {
   emit
 }) {
-  const textAlignRef = computed(() => {
-    var _a;
-    return (_a = props.textAlign) != null ? _a : "right";
-  });
   const contentRef = computed(() => {
     const {
-      hideIcon = false
+      hideIcon = false,
+      textAlign = DEFAULT_TEXT_ALIGN
     } = props;
     return `
         <div class="APlaceCircle ${placeCircleLayout({
-      textAlign: textAlignRef.value
+      textAlign
     })}">
           <img class="${placeIcon({
       hideIcon
     })} ${amapPlaceIconLayout({
-      textAlign: textAlignRef.value
+      textAlign
     })}" src="${imgPlaceCircle}">
           <div class="${labelLayout}">
             <div class="${labelStroke}">${props.label}</div>
@@ -6160,23 +6282,27 @@ const APlaceCircle = defineSetup(function APlaceCircle2(props, {
   });
   const contentWithoutLabelRef = computed(() => {
     const {
-      hideIcon = false
+      hideIcon = false,
+      textAlign = DEFAULT_TEXT_ALIGN
     } = props;
     return `<img class="APlaceCircle ${placeIcon({
       hideIcon
     })} ${amapPlaceIconLayout({
-      textAlign: textAlignRef.value
+      textAlign
     })}" src="${imgPlaceCircle}">`;
   });
   const handleClick = () => {
     emit("click", props.position);
   };
   return () => {
+    const {
+      textAlign = DEFAULT_TEXT_ALIGN
+    } = props;
     return h(AmapMarker, {
       "attrs": {
         "position": props.position,
         "content": props.label ? contentRef.value : contentWithoutLabelRef.value,
-        "anchor": textAlignRef.value === "left" ? AnchorType.middleRight : AnchorType.middleLeft,
+        "anchor": textAlign === "left" ? AnchorType.middleRight : AnchorType.middleLeft,
         "zIndex": ZINDEX_PLACE_LAYER
       },
       "on": {
@@ -6188,19 +6314,16 @@ const APlaceCircle = defineSetup(function APlaceCircle2(props, {
 const GPlaceCircle = defineSetup(function GPlaceCircle2(props, {
   emit
 }) {
-  const textAlignRef = computed(() => {
-    var _a;
-    return (_a = props.textAlign) != null ? _a : "right";
-  });
   const contentRef = computed(() => {
     const {
-      hideIcon = false
+      hideIcon = false,
+      textAlign = DEFAULT_TEXT_ALIGN
     } = props;
     return createDom("div", {
       class: `GPlaceCircle ${placeCircleLayout({
-        textAlign: textAlignRef.value
+        textAlign
       })} ${gmapPlaceIconLayout({
-        textAlign: textAlignRef.value
+        textAlign
       })}`
     }, `
       <img class="${placeIcon({
@@ -6214,13 +6337,14 @@ const GPlaceCircle = defineSetup(function GPlaceCircle2(props, {
   });
   const contentWithoutLabelRef = computed(() => {
     const {
-      hideIcon = false
+      hideIcon = false,
+      textAlign = DEFAULT_TEXT_ALIGN
     } = props;
     return createDom("img", {
       class: `GPlaceCircle ${placeIcon({
         hideIcon
       })} ${gmapPlaceIconLayout({
-        textAlign: textAlignRef.value
+        textAlign
       })}`,
       src: imgPlaceCircle
     });
@@ -6255,18 +6379,31 @@ const PlaceCircle = defineSetup(function PlaceCircle2(props, {
 const PickupPoints = defineSetup(function PickupPoints2(props, {
   emit
 }) {
+  const mapRef = useMap();
   const {
-    renderLabel
-  } = props;
-  const directions = usePointsLabelDirection(reactive({
+    zoomRef
+  } = useMapZoom({
+    mapRef
+  });
+  const {
+    directionsRef,
+    labeledPlacesRef,
+    isContainBasePlaceRef
+  } = usePointsLabelDirection(reactive({
+    basePlace: toRef(props, "basePlace"),
     places: toRef(props, "places"),
     heightLimit: 9,
-    widthLimit: 32
+    widthLimit: 34
   }));
   return () => {
-    return h("div", [props.places.map((place, idx) => {
-      const direction = directions.value[idx];
-      const label2 = renderLabel ? renderLabel(place) : place.displayName;
+    const {
+      basePlace,
+      zoomIconMin,
+      zoomTextMin
+    } = props;
+    return h("div", [zoomRef.value >= zoomIconMin && labeledPlacesRef.value.map((place, idx) => {
+      const direction = directionsRef.value[idx];
+      const label2 = zoomRef.value < zoomTextMin ? void 0 : place.displayName;
       return h(PlaceCircle, {
         "attrs": {
           "position": place2point(place),
@@ -6277,12 +6414,17 @@ const PickupPoints = defineSetup(function PickupPoints2(props, {
           "click": () => emit("click", place)
         }
       });
+    }), isContainBasePlaceRef.value && h(PlaceCircle, {
+      "attrs": {
+        "position": place2point(basePlace)
+      }
     })]);
   };
 });
 const RECOMMEND_PLACE_DRAG_LIMIT = 10;
 const RECOMMEND_PLACE_LARGE_LIMIT = 100;
-const RECOMMEND_PLACE_ZOOM_MIN = 13;
+const RECOMMEND_PLACE_ICON_ZOOM_MIN = 15.75;
+const RECOMMEND_PLACE_TEXT_ZOOM_MIN = 16.75;
 const DEFAULT_PLACE_NAME = "当前位置";
 const DEFAULT_ZOOM = 17;
 const BusinessRecomendPlaceMap = defineLagecySetup(function BusinessRecomendPlaceMap2(props, {
@@ -6307,12 +6449,6 @@ const BusinessRecomendPlaceMap = defineLagecySetup(function BusinessRecomendPlac
   const {
     readyPromise
   } = useMapSupplier();
-  const {
-    zoomRef
-  } = useMapZoom({
-    mapRef,
-    defaultValue: DEFAULT_ZOOM
-  });
   const centerPlace = reactive({
     lng: (_a = geoDefaultPosition == null ? void 0 : geoDefaultPosition[0]) != null ? _a : 0,
     lat: (_b = geoDefaultPosition == null ? void 0 : geoDefaultPosition[1]) != null ? _b : 0,
@@ -6489,13 +6625,12 @@ const BusinessRecomendPlaceMap = defineLagecySetup(function BusinessRecomendPlac
       recomendDescription,
       unavailableTitle
     } = props;
-    console.log("centerPlace = ", JSON.stringify(centerPlace));
     const title = geoLoading.value ? geoLoadingTitle2 : !availableRef.value ? unavailableTitle : centerPlace.displayName;
     const description = !availableRef.value ? void 0 : isElectedRef.value ? recomendDescription : void 0;
     return h(HeycarMap, {
       "attrs": {
         "center": centerPoint.value,
-        "zoom": zoomRef.value,
+        "zoom": DEFAULT_ZOOM,
         "touchZoomCenter": true,
         "mapRef": setMap,
         "fallback": slots.fallback,
@@ -6510,10 +6645,12 @@ const BusinessRecomendPlaceMap = defineLagecySetup(function BusinessRecomendPlac
         "position": geoPosition.value,
         "angle": orientation.cssRotationVariableName
       }
-    }), zoomRef.value >= RECOMMEND_PLACE_ZOOM_MIN && h(PickupPoints, {
+    }), h(PickupPoints, {
       "attrs": {
+        "basePlace": centerPlace,
         "places": placeCandidates.value,
-        "renderLabel": (place) => isPlaceEqual(place, centerPlace) ? void 0 : place.displayName
+        "zoomIconMin": RECOMMEND_PLACE_ICON_ZOOM_MIN,
+        "zoomTextMin": RECOMMEND_PLACE_TEXT_ZOOM_MIN
       },
       "on": {
         "click": panToCenterByPlace
@@ -6555,12 +6692,6 @@ const BusinessReselectPlaceMap = defineLagecySetup(function BusinessReselectPlac
     setMap,
     panTo
   } = useHeycarMap();
-  const {
-    zoomRef
-  } = useMapZoom({
-    mapRef,
-    defaultValue: DEFAULT_ZOOM
-  });
   const centerPlace = reactive({
     lng: defaultPlace.lng,
     lat: defaultPlace.lat,
@@ -6724,7 +6855,7 @@ const BusinessReselectPlaceMap = defineLagecySetup(function BusinessReselectPlac
     return h(HeycarMap, {
       "attrs": {
         "center": centerPoint.value,
-        "zoom": zoomRef.value,
+        "zoom": DEFAULT_ZOOM,
         "touchZoomCenter": true,
         "mapRef": setMap,
         "fallback": slots.fallback,
@@ -6739,10 +6870,12 @@ const BusinessReselectPlaceMap = defineLagecySetup(function BusinessReselectPlac
         "position": geoPosition.value,
         "angle": orientation.cssRotationVariableName
       }
-    }), zoomRef.value >= RECOMMEND_PLACE_ZOOM_MIN && h(PickupPoints, {
+    }), h(PickupPoints, {
       "attrs": {
+        "basePlace": centerPlace,
         "places": placeCandidates.value,
-        "renderLabel": (place) => isPlaceEqual(place, centerPlace) ? void 0 : place.displayName
+        "zoomIconMin": RECOMMEND_PLACE_ICON_ZOOM_MIN,
+        "zoomTextMin": RECOMMEND_PLACE_TEXT_ZOOM_MIN
       },
       "on": {
         "click": panToCenterByPlace
@@ -7914,7 +8047,6 @@ const useBusinessTaxiServiceMap = () => {
   const { mapRef, setMap } = useHeycarMap();
   const { registerFitVeiw, setFitView } = useMapFitView({
     mapRef,
-    autoFitTimeout: 5e3,
     padding: [19, 36, 19, 26]
   });
   return { setMap, registerFitVeiw, setFitView };

package/dist/src/business-components/BusinessRecomendPlaceMap/BusinessRecomendPlaceMap.d.ts

@@ -8,7 +8,8 @@ import type { Place, Point } from "../../types/interface";
 import { AbsoluteAddressBoxProps } from "../AbsoluteAddressBox";
 export declare const RECOMMEND_PLACE_DRAG_LIMIT = 10;
 export declare const RECOMMEND_PLACE_LARGE_LIMIT = 100;
-export declare const RECOMMEND_PLACE_ZOOM_MIN = 13;
+export declare const RECOMMEND_PLACE_ICON_ZOOM_MIN = 15.75;
+export declare const RECOMMEND_PLACE_TEXT_ZOOM_MIN = 16.75;
 export declare const DEFAULT_PLACE_NAME = "\u5F53\u524D\u4F4D\u7F6E";
 export declare const DEFAULT_ZOOM = 17;
 export interface CenterPlaceSource {

package/dist/src/business-components/PickupPoints/PickupPoints.d.ts

@@ -1,7 +1,9 @@
 import type { Place } from "../../types/interface";
 export interface PickupPointsProps {
     places: Place[];
-    renderLabel?: (place: Place) => string | undefined;
+    basePlace: Place;
+    zoomTextMin: number;
+    zoomIconMin: number;
     onClick?: (value: Place) => any;
 }
 export declare const PickupPoints: import("vue-demi").DefineComponent<import("vue/types/v3-component-props").ComponentObjectPropsOptions<PickupPointsProps>, 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<PickupPointsProps, Required<PickupPointsProps>>, "click", PickupPointsProps, {}>;

package/dist/src/hooks/usePlacesLabelDirection.d.ts

@@ -1,9 +1,19 @@
 import type { Place } from "../types/interface";
 type LabelDirection = "left" | "right";
 export interface UsePointsLabelDirectionProps {
+    basePlace: Place;
     places: Place[];
     widthLimit: number;
     heightLimit: number;
 }
-export declare const usePointsLabelDirection: (props: UsePointsLabelDirectionProps) => import("vue-demi").Ref<LabelDirection[]>;
+export declare const usePointsLabelDirection: (props: UsePointsLabelDirectionProps) => {
+    directionsRef: import("vue-demi").Ref<LabelDirection[]>;
+    labeledPlacesRef: import("vue-demi").Ref<{
+        lng: number;
+        lat: number;
+        name: string;
+        displayName: string;
+    }[]>;
+    isContainBasePlaceRef: import("vue-demi").Ref<boolean>;
+};
 export {};

package/dist/src/utils/compare.d.ts

@@ -5,7 +5,6 @@ import type { EmitFn } from "vue/types/v3-setup-context";
 import type { EmitByProps } from "../types/helper";
 export declare const deepCompareEqualsForMaps: import("fast-equals").EqualityComparator;
 export declare function createDeepCompareMemoize<T>(): (value: T) => T;
-export declare function useDeepCompareEffectForMaps(callback: () => () => any, dependencies: any[]): void;
 export declare function watchNoneImmediatePostEffectForDeepOption<T>(getOption: () => T, callback: WatchCallback<T, T>, watchOptions?: WatchOptions<false>): import("vue-demi").WatchStopHandle;
 export declare function watchPostEffectForDeepOption<T>(getOption: () => T, callback: WatchCallback<T, T | undefined>, watchOptions?: WatchOptions<true>): import("vue-demi").WatchStopHandle;
 export declare function watchEffectForDeepOption<T>(getOption: () => T, callback: WatchCallback<T, T | undefined>, watchOptions?: WatchOptions<true>): import("vue-demi").WatchStopHandle;

package/dist/src/utils/helper.d.ts

@@ -3,3 +3,4 @@ export declare const isPlace: (place: Partial<Place>) => place is Place;
 export declare const sleep: (milliSeconds: number) => Promise<unknown>;
 export declare const assertPoint: (point: unknown) => void;
 export declare const assertAngle: (angle: unknown) => void;
+export declare const isLatLngLiteral: (value: any) => boolean;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@heycar/heycars-map",
-  "version": "0.8.3",
+  "version": "0.8.5",
   "type": "module",
   "scripts": {
     "dev": "vite -c vite.config.dev.ts",