@heycar/heycars-map 0.8.9 → 0.9.0

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.9";
+const version = "0.9.0";
 const type = "module";
 const scripts = {
   dev: "vite -c vite.config.dev.ts",
@@ -3473,12 +3473,13 @@ const patchMiniprogramRedirectTo = (wx2) => {
   };
   return patchedRedirectTo;
 };
-const DEVICE_ORIENTATION_INTERVAL = 1e3;
+const DEVICE_ORIENTATION_INTERVAL = 200;
 const CSS_DEVICE_ORIENTATION_VAR_PREFIX = "--CSS_DEVICE_ORIENTATION_VAR_ROTATION_DEGREE_";
 const useDeviceOrientation = (props) => {
   const { onChange, elementRef } = props;
   const orientation = Vue.reactive({ cssRotationVariableName: void 0 });
   const cssVarName = `${CSS_DEVICE_ORIENTATION_VAR_PREFIX}${Date.now()}`;
+  const toTransitionAngle = createToTransitionAngle();
   Vue.watch(
     () => elementRef.value,
     (element, _, onCleanup) => {
@@ -3488,7 +3489,7 @@ const useDeviceOrientation = (props) => {
         const alpha = webkitCompassHeading !== void 0 ? 360 - webkitCompassHeading : (_b = event.alpha) != null ? _b : void 0;
         const beta = (_c = event.beta) != null ? _c : void 0;
         const gamma = (_d = event.gamma) != null ? _d : void 0;
-        const cssRotationVariableValue = `${360 - (alpha != null ? alpha : 0)}deg`;
+        const cssRotationVariableValue = `${toTransitionAngle(360 - (alpha != null ? alpha : 0))}deg`;
         const cssRotationVariableName = alpha === void 0 ? void 0 : cssVarName;
         Object.assign(orientation, { alpha, beta, gamma });
         if (orientation.cssRotationVariableName !== cssRotationVariableName) {
@@ -3560,6 +3561,32 @@ function waitMiniProgramWebviewClose(duration) {
     }, duration);
   });
 }
+function createToTransitionAngle() {
+  let prev = void 0;
+  const mod = (x, m) => {
+    const negatabbleValue = x % m;
+    return negatabbleValue < 0 ? m + negatabbleValue : negatabbleValue;
+  };
+  return function toTransitionAngle(angle) {
+    if (prev === void 0) {
+      prev = angle;
+      console.log("toTransitionAngle angle = ", angle);
+      return angle;
+    }
+    const prevRemainder = mod(prev, 360);
+    const cycles = (prev - prevRemainder) / 360;
+    if (Math.abs(angle - prevRemainder) <= 180) {
+      const result = angle + cycles * 360;
+      prev = result;
+      return result;
+    } else {
+      const deltaCycles = angle > prevRemainder ? -1 : 1;
+      const result = angle + (cycles + deltaCycles) * 360;
+      prev = result;
+      return result;
+    }
+  };
+}
 const watchVisibilityState = () => {
   const visibilityStateRef = Vue.ref(document.visibilityState);
   const handleVisibilityChange = () => {
@@ -3574,6 +3601,7 @@ const watchVisibilityState = () => {
 const WX_GET_LOCATION_INTERVAL_STILL = 10 * 1e3;
 const WX_GET_LOCATION_INTERVAL_SLOW = 3 * 1e3;
 const WX_GET_LOCATION_INTERVAL_FAST = 1 * 1e3;
+const ANDROID_GET_LOCATION_INTERVAL = 1 * 1e3;
 const takeIsForceBrowserGeo = () => {
   const searchParam = new URLSearchParams(location.search);
   return searchParam.has(`force-browser-geo`);
@@ -3582,14 +3610,6 @@ const wxReady = () => new Promise((resolve, reject) => {
   wx.ready(resolve);
   wx.error(reject);
 });
-const detectPlatform = () => {
-  const useragent = navigator.userAgent.toLowerCase();
-  if (useragent.includes("micromessenger"))
-    return "wechat";
-  if (useragent.includes("alipay"))
-    return "alipay";
-  return "other";
-};
 function wechatWatchPosition(onSuccess, onError, option) {
   const { timeout } = option;
   let enable = true;
@@ -3651,20 +3671,67 @@ function wechatWatchPosition(onSuccess, onError, option) {
     unwatchVisibilityState();
   };
 }
+function androidWatchPosition(onSuccess, onError, option) {
+  let enable = true;
+  let prevGeoPosition = void 0;
+  const isGeoWorkingRef = Vue.ref(true);
+  const { visibilityStateRef, unwatchVisibilityState } = watchVisibilityState();
+  const startWatch = async () => {
+    do {
+      if (visibilityStateRef.value === "hidden") {
+        await sleep(ANDROID_GET_LOCATION_INTERVAL);
+        continue;
+      }
+      const geoPosition = await new Promise((resolve) => {
+        navigator.geolocation.getCurrentPosition(
+          function onSuccess2(geoLocationPosition) {
+            isGeoWorkingRef.value = true;
+            resolve(geoLocationPosition);
+          },
+          function onFail(geoError) {
+            const isGeoWorking = isGeoWorkingRef.value;
+            isGeoWorkingRef.value = false;
+            resolve(void 0);
+            if (!isGeoWorking)
+              return;
+            console.warn(
+              "MyWarning: navigator.geolocation.getCurrentPosition failed: ",
+              geoError.message
+            );
+            onError == null ? void 0 : onError(geoError);
+          },
+          option
+        );
+      });
+      if (geoPosition && !isGeoPositionEqual(geoPosition, prevGeoPosition))
+        onSuccess(geoPosition);
+      prevGeoPosition = geoPosition;
+      await sleep(ANDROID_GET_LOCATION_INTERVAL);
+    } while (enable);
+  };
+  startWatch();
+  return () => {
+    enable = false;
+    unwatchVisibilityState();
+  };
+}
 function compatibleWathPosition(onSuccess, onError, option) {
   const isForceBrowserGeo = takeIsForceBrowserGeo();
   if (isForceBrowserGeo) {
-    const watchId = navigator.geolocation.watchPosition(onSuccess, onError, option);
-    return () => navigator.geolocation.clearWatch(watchId);
+    const watchId2 = navigator.geolocation.watchPosition(onSuccess, onError, option);
+    return () => navigator.geolocation.clearWatch(watchId2);
   }
-  switch (detectPlatform()) {
-    case "wechat":
-      return wechatWatchPosition(onSuccess, onError, option);
-    default: {
-      const watchId = navigator.geolocation.watchPosition(onSuccess, onError, option);
-      return () => navigator.geolocation.clearWatch(watchId);
-    }
+  const browserPlatform = detectBrowserPlatform();
+  const osPlatform = detectOSPlatform();
+  console.log("osPlatform = ", osPlatform);
+  if (browserPlatform === BRWOSER_PLATFORM.WECHAT || browserPlatform === BRWOSER_PLATFORM.WECHAT_MINIPROGRAM) {
+    return wechatWatchPosition(onSuccess, onError, option);
   }
+  if (osPlatform === OS_PLATFORM.ANDROID) {
+    return androidWatchPosition(onSuccess, onError, option);
+  }
+  const watchId = navigator.geolocation.watchPosition(onSuccess, onError, option);
+  return () => navigator.geolocation.clearWatch(watchId);
 }
 class SingleGeoWatch {
   constructor(option) {
@@ -5758,6 +5825,69 @@ 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);
+  };
+  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 AmapPolygon = defineSetup(function AmapPolygon2(props) {
   const polygonRef = Vue.shallowRef();
   const mapRef = useAmap();
@@ -6020,69 +6150,6 @@ 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 usePointsLabelDirection = (props) => {
   const { widthLimit, heightLimit } = props;
   const mapRef = useMap();
@@ -6127,11 +6194,23 @@ function createLabelDirections(props) {
   const { sortedPoints, widthLimit, heightLimit, distanceFn } = props;
   const len = sortedPoints.length;
   const result = [];
-  const calcDirection = (isLimited2, isDoubleLimited2, prevDx2, prevDirection2) => {
+  const calcDirection = (isLimited2, isDoubleLimited2, prevDx2, prevDirection2, isNextLimited, dx) => {
+    spaceLog(
+      "calcDirection",
+      "isLimited, isDoubleLimited, prevDx, prevDirection, isNextLimited, dx = ",
+      isLimited2,
+      isDoubleLimited2,
+      prevDx2,
+      prevDirection2,
+      isNextLimited,
+      dx
+    );
     if (isLimited2)
       return prevDx2 > 0 ? "right" : "left";
     if (isDoubleLimited2 && prevDx2 < 0 && prevDirection2 === "left")
       return "left";
+    if (isNextLimited)
+      return dx > 0 ? "left" : "right";
     return "right";
   };
   let prevDirection = "right";
@@ -6140,7 +6219,15 @@ function createLabelDirections(props) {
   let prevDx = Infinity;
   for (let idx = 0; idx < len; idx++) {
     if (idx === len - 1) {
-      const direction2 = calcDirection(isLimited, isDoubleLimited, prevDx, prevDirection);
+      const isNextLimited2 = false;
+      const direction2 = calcDirection(
+        isLimited,
+        isDoubleLimited,
+        prevDx,
+        prevDirection,
+        isNextLimited2,
+        0
+      );
       result.push(direction2);
       continue;
     }
@@ -6155,11 +6242,19 @@ function createLabelDirections(props) {
       continue;
     }
     const [dx, dy] = distanceFn(sortedPoints[idx], sortedPoints[idx + 1]);
-    const direction = calcDirection(isLimited, isDoubleLimited, prevDx, prevDirection);
+    const isNextLimited = dx > -widthLimit && dx < widthLimit && dy > -heightLimit && dy < heightLimit;
+    const direction = calcDirection(
+      isLimited,
+      isDoubleLimited,
+      prevDx,
+      prevDirection,
+      isNextLimited,
+      dx
+    );
     result.push(direction);
     prevDirection = direction;
     prevDx = dx;
-    isLimited = dx > -widthLimit && dx < widthLimit && dy > -heightLimit && dy < heightLimit;
+    isLimited = isNextLimited;
     isDoubleLimited = dx > -widthLimit * 2 && dx < widthLimit * 2 && dy > -heightLimit && dy < heightLimit;
   }
   return result;
@@ -6170,7 +6265,7 @@ function filterNoOverlapPlaces(props) {
     const [dx, dy] = distanceFn(place2point(place1), place2point(place2));
     const isOverlap = dx > -widthLimit && dx < widthLimit && dy > -heightLimit && dy < heightLimit;
     spaceLog(
-      "usePointsLabelDirection",
+      "filterNoOverlapPlaces",
       "p1, p2, dx, dy, isOverlap = ",
       place1.displayName,
       place2.displayName,
@@ -6432,10 +6527,11 @@ const RECOMMEND_PLACE_DRAG_LIMIT = 10;
 const RECOMMEND_PLACE_LARGE_LIMIT = 100;
 const RECOMMEND_PLACE_ICON_ZOOM_MIN = 16.25;
 const RECOMMEND_PLACE_TEXT_ZOOM_MIN = 16.25;
-const RECOMMEND_PLACE_ZONE_ICON_MIN = 15.25;
+const RECOMMEND_PLACE_ZONE_ICON_MIN = 12.75;
 const RECOMMEND_PLACE_ZONE_TEXT_MIN = 21;
 const DEFAULT_PLACE_NAME = "当前位置";
 const DEFAULT_ZOOM = 17;
+const ZONE_ZOOM = 13.75;
 const BusinessRecomendPlaceMap = defineLagecySetup(function BusinessRecomendPlaceMap2(props, {
   emit,
   slots
@@ -6455,6 +6551,13 @@ const BusinessRecomendPlaceMap = defineLagecySetup(function BusinessRecomendPlac
     setMap,
     panTo
   } = useHeycarMap();
+  const {
+    zoomRef,
+    setZoom
+  } = useMapZoom({
+    mapRef,
+    defaultValue: DEFAULT_ZOOM
+  });
   const {
     readyPromise
   } = useMapSupplier();
@@ -6493,6 +6596,7 @@ const BusinessRecomendPlaceMap = defineLagecySetup(function BusinessRecomendPlac
     centerPlace.name = place.name;
     centerPlace.displayName = place.displayName;
     setPlaceCandidatesAndZone(recommends);
+    setZoom(ZONE_ZOOM);
     emit("changePlace", {
       ...place
     });
@@ -6504,6 +6608,8 @@ const BusinessRecomendPlaceMap = defineLagecySetup(function BusinessRecomendPlac
     centerPlace.lat = place.lat;
     centerPlace.name = place.name;
     centerPlace.displayName = place.displayName;
+    if (zoneRef.value)
+      setZoom(ZONE_ZOOM);
     emit("changePlace", {
       ...place
     });
@@ -6612,6 +6718,8 @@ const BusinessRecomendPlaceMap = defineLagecySetup(function BusinessRecomendPlac
       Object.assign(centerPlace, {
         ...place
       });
+      if (isInZone)
+        setZoom(ZONE_ZOOM);
       emit("changeRecomandPlace", {
         place,
         inputPlace,
@@ -6639,7 +6747,7 @@ const BusinessRecomendPlaceMap = defineLagecySetup(function BusinessRecomendPlac
     return Vue.h(HeycarMap, {
       "attrs": {
         "center": centerPoint.value,
-        "zoom": DEFAULT_ZOOM,
+        "zoom": zoomRef.value,
         "touchZoomCenter": true,
         "mapRef": setMap,
         "fallback": slots.fallback,
@@ -6701,6 +6809,13 @@ const BusinessReselectPlaceMap = defineLagecySetup(function BusinessReselectPlac
     setMap,
     panTo
   } = useHeycarMap();
+  const {
+    zoomRef,
+    setZoom
+  } = useMapZoom({
+    mapRef,
+    defaultValue: DEFAULT_ZOOM
+  });
   const centerPlace = Vue.reactive({
     lng: defaultPlace.lng,
     lat: defaultPlace.lat,
@@ -6735,6 +6850,7 @@ const BusinessReselectPlaceMap = defineLagecySetup(function BusinessReselectPlac
     centerPlace.lat = place.lat;
     centerPlace.name = place.name;
     centerPlace.displayName = place.displayName;
+    setZoom(ZONE_ZOOM);
     setPlaceCandidatesAndZone(recommends);
     emit("changePlace", {
       ...place
@@ -6747,6 +6863,8 @@ const BusinessReselectPlaceMap = defineLagecySetup(function BusinessReselectPlac
     centerPlace.lat = place.lat;
     centerPlace.name = place.name;
     centerPlace.displayName = place.displayName;
+    if (zoneRef.value)
+      setZoom(ZONE_ZOOM);
     emit("changePlace", {
       ...place
     });
@@ -6834,6 +6952,8 @@ const BusinessReselectPlaceMap = defineLagecySetup(function BusinessReselectPlac
       Object.assign(centerPlace, {
         ...place
       });
+      if (isInZone)
+        setZoom(ZONE_ZOOM);
       emit("changeRecomandPlace", {
         place,
         inputPlace,
@@ -6864,7 +6984,7 @@ const BusinessReselectPlaceMap = defineLagecySetup(function BusinessReselectPlac
     return Vue.h(HeycarMap, {
       "attrs": {
         "center": centerPoint.value,
-        "zoom": DEFAULT_ZOOM,
+        "zoom": zoomRef.value,
         "touchZoomCenter": true,
         "mapRef": setMap,
         "fallback": slots.fallback,
@@ -6883,8 +7003,8 @@ const BusinessReselectPlaceMap = defineLagecySetup(function BusinessReselectPlac
       "attrs": {
         "basePlace": centerPlace,
         "places": placeCandidates.value,
-        "zoomIconMin": RECOMMEND_PLACE_ICON_ZOOM_MIN,
-        "zoomTextMin": RECOMMEND_PLACE_TEXT_ZOOM_MIN
+        "zoomIconMin": zoneRef.value ? RECOMMEND_PLACE_ZONE_ICON_MIN : RECOMMEND_PLACE_ICON_ZOOM_MIN,
+        "zoomTextMin": zoneRef.value ? RECOMMEND_PLACE_ZONE_TEXT_MIN : RECOMMEND_PLACE_TEXT_ZOOM_MIN
       },
       "on": {
         "click": panToCenterByPlace

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.9";
+const version = "0.9.0";
 const type = "module";
 const scripts = {
   dev: "vite -c vite.config.dev.ts",
@@ -3471,12 +3471,13 @@ const patchMiniprogramRedirectTo = (wx2) => {
   };
   return patchedRedirectTo;
 };
-const DEVICE_ORIENTATION_INTERVAL = 1e3;
+const DEVICE_ORIENTATION_INTERVAL = 200;
 const CSS_DEVICE_ORIENTATION_VAR_PREFIX = "--CSS_DEVICE_ORIENTATION_VAR_ROTATION_DEGREE_";
 const useDeviceOrientation = (props) => {
   const { onChange, elementRef } = props;
   const orientation = reactive({ cssRotationVariableName: void 0 });
   const cssVarName = `${CSS_DEVICE_ORIENTATION_VAR_PREFIX}${Date.now()}`;
+  const toTransitionAngle = createToTransitionAngle();
   watch(
     () => elementRef.value,
     (element, _, onCleanup) => {
@@ -3486,7 +3487,7 @@ const useDeviceOrientation = (props) => {
         const alpha = webkitCompassHeading !== void 0 ? 360 - webkitCompassHeading : (_b = event.alpha) != null ? _b : void 0;
         const beta = (_c = event.beta) != null ? _c : void 0;
         const gamma = (_d = event.gamma) != null ? _d : void 0;
-        const cssRotationVariableValue = `${360 - (alpha != null ? alpha : 0)}deg`;
+        const cssRotationVariableValue = `${toTransitionAngle(360 - (alpha != null ? alpha : 0))}deg`;
         const cssRotationVariableName = alpha === void 0 ? void 0 : cssVarName;
         Object.assign(orientation, { alpha, beta, gamma });
         if (orientation.cssRotationVariableName !== cssRotationVariableName) {
@@ -3558,6 +3559,32 @@ function waitMiniProgramWebviewClose(duration) {
     }, duration);
   });
 }
+function createToTransitionAngle() {
+  let prev = void 0;
+  const mod = (x, m) => {
+    const negatabbleValue = x % m;
+    return negatabbleValue < 0 ? m + negatabbleValue : negatabbleValue;
+  };
+  return function toTransitionAngle(angle) {
+    if (prev === void 0) {
+      prev = angle;
+      console.log("toTransitionAngle angle = ", angle);
+      return angle;
+    }
+    const prevRemainder = mod(prev, 360);
+    const cycles = (prev - prevRemainder) / 360;
+    if (Math.abs(angle - prevRemainder) <= 180) {
+      const result = angle + cycles * 360;
+      prev = result;
+      return result;
+    } else {
+      const deltaCycles = angle > prevRemainder ? -1 : 1;
+      const result = angle + (cycles + deltaCycles) * 360;
+      prev = result;
+      return result;
+    }
+  };
+}
 const watchVisibilityState = () => {
   const visibilityStateRef = ref(document.visibilityState);
   const handleVisibilityChange = () => {
@@ -3572,6 +3599,7 @@ const watchVisibilityState = () => {
 const WX_GET_LOCATION_INTERVAL_STILL = 10 * 1e3;
 const WX_GET_LOCATION_INTERVAL_SLOW = 3 * 1e3;
 const WX_GET_LOCATION_INTERVAL_FAST = 1 * 1e3;
+const ANDROID_GET_LOCATION_INTERVAL = 1 * 1e3;
 const takeIsForceBrowserGeo = () => {
   const searchParam = new URLSearchParams(location.search);
   return searchParam.has(`force-browser-geo`);
@@ -3580,14 +3608,6 @@ const wxReady = () => new Promise((resolve, reject) => {
   wx.ready(resolve);
   wx.error(reject);
 });
-const detectPlatform = () => {
-  const useragent = navigator.userAgent.toLowerCase();
-  if (useragent.includes("micromessenger"))
-    return "wechat";
-  if (useragent.includes("alipay"))
-    return "alipay";
-  return "other";
-};
 function wechatWatchPosition(onSuccess, onError, option) {
   const { timeout } = option;
   let enable = true;
@@ -3649,20 +3669,67 @@ function wechatWatchPosition(onSuccess, onError, option) {
     unwatchVisibilityState();
   };
 }
+function androidWatchPosition(onSuccess, onError, option) {
+  let enable = true;
+  let prevGeoPosition = void 0;
+  const isGeoWorkingRef = ref(true);
+  const { visibilityStateRef, unwatchVisibilityState } = watchVisibilityState();
+  const startWatch = async () => {
+    do {
+      if (visibilityStateRef.value === "hidden") {
+        await sleep(ANDROID_GET_LOCATION_INTERVAL);
+        continue;
+      }
+      const geoPosition = await new Promise((resolve) => {
+        navigator.geolocation.getCurrentPosition(
+          function onSuccess2(geoLocationPosition) {
+            isGeoWorkingRef.value = true;
+            resolve(geoLocationPosition);
+          },
+          function onFail(geoError) {
+            const isGeoWorking = isGeoWorkingRef.value;
+            isGeoWorkingRef.value = false;
+            resolve(void 0);
+            if (!isGeoWorking)
+              return;
+            console.warn(
+              "MyWarning: navigator.geolocation.getCurrentPosition failed: ",
+              geoError.message
+            );
+            onError == null ? void 0 : onError(geoError);
+          },
+          option
+        );
+      });
+      if (geoPosition && !isGeoPositionEqual(geoPosition, prevGeoPosition))
+        onSuccess(geoPosition);
+      prevGeoPosition = geoPosition;
+      await sleep(ANDROID_GET_LOCATION_INTERVAL);
+    } while (enable);
+  };
+  startWatch();
+  return () => {
+    enable = false;
+    unwatchVisibilityState();
+  };
+}
 function compatibleWathPosition(onSuccess, onError, option) {
   const isForceBrowserGeo = takeIsForceBrowserGeo();
   if (isForceBrowserGeo) {
-    const watchId = navigator.geolocation.watchPosition(onSuccess, onError, option);
-    return () => navigator.geolocation.clearWatch(watchId);
+    const watchId2 = navigator.geolocation.watchPosition(onSuccess, onError, option);
+    return () => navigator.geolocation.clearWatch(watchId2);
   }
-  switch (detectPlatform()) {
-    case "wechat":
-      return wechatWatchPosition(onSuccess, onError, option);
-    default: {
-      const watchId = navigator.geolocation.watchPosition(onSuccess, onError, option);
-      return () => navigator.geolocation.clearWatch(watchId);
-    }
+  const browserPlatform = detectBrowserPlatform();
+  const osPlatform = detectOSPlatform();
+  console.log("osPlatform = ", osPlatform);
+  if (browserPlatform === BRWOSER_PLATFORM.WECHAT || browserPlatform === BRWOSER_PLATFORM.WECHAT_MINIPROGRAM) {
+    return wechatWatchPosition(onSuccess, onError, option);
   }
+  if (osPlatform === OS_PLATFORM.ANDROID) {
+    return androidWatchPosition(onSuccess, onError, option);
+  }
+  const watchId = navigator.geolocation.watchPosition(onSuccess, onError, option);
+  return () => navigator.geolocation.clearWatch(watchId);
 }
 class SingleGeoWatch {
   constructor(option) {
@@ -5756,6 +5823,69 @@ 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);
+  };
+  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 AmapPolygon = defineSetup(function AmapPolygon2(props) {
   const polygonRef = shallowRef();
   const mapRef = useAmap();
@@ -6018,69 +6148,6 @@ 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 usePointsLabelDirection = (props) => {
   const { widthLimit, heightLimit } = props;
   const mapRef = useMap();
@@ -6125,11 +6192,23 @@ function createLabelDirections(props) {
   const { sortedPoints, widthLimit, heightLimit, distanceFn } = props;
   const len = sortedPoints.length;
   const result = [];
-  const calcDirection = (isLimited2, isDoubleLimited2, prevDx2, prevDirection2) => {
+  const calcDirection = (isLimited2, isDoubleLimited2, prevDx2, prevDirection2, isNextLimited, dx) => {
+    spaceLog(
+      "calcDirection",
+      "isLimited, isDoubleLimited, prevDx, prevDirection, isNextLimited, dx = ",
+      isLimited2,
+      isDoubleLimited2,
+      prevDx2,
+      prevDirection2,
+      isNextLimited,
+      dx
+    );
     if (isLimited2)
       return prevDx2 > 0 ? "right" : "left";
     if (isDoubleLimited2 && prevDx2 < 0 && prevDirection2 === "left")
       return "left";
+    if (isNextLimited)
+      return dx > 0 ? "left" : "right";
     return "right";
   };
   let prevDirection = "right";
@@ -6138,7 +6217,15 @@ function createLabelDirections(props) {
   let prevDx = Infinity;
   for (let idx = 0; idx < len; idx++) {
     if (idx === len - 1) {
-      const direction2 = calcDirection(isLimited, isDoubleLimited, prevDx, prevDirection);
+      const isNextLimited2 = false;
+      const direction2 = calcDirection(
+        isLimited,
+        isDoubleLimited,
+        prevDx,
+        prevDirection,
+        isNextLimited2,
+        0
+      );
       result.push(direction2);
       continue;
     }
@@ -6153,11 +6240,19 @@ function createLabelDirections(props) {
       continue;
     }
     const [dx, dy] = distanceFn(sortedPoints[idx], sortedPoints[idx + 1]);
-    const direction = calcDirection(isLimited, isDoubleLimited, prevDx, prevDirection);
+    const isNextLimited = dx > -widthLimit && dx < widthLimit && dy > -heightLimit && dy < heightLimit;
+    const direction = calcDirection(
+      isLimited,
+      isDoubleLimited,
+      prevDx,
+      prevDirection,
+      isNextLimited,
+      dx
+    );
     result.push(direction);
     prevDirection = direction;
     prevDx = dx;
-    isLimited = dx > -widthLimit && dx < widthLimit && dy > -heightLimit && dy < heightLimit;
+    isLimited = isNextLimited;
     isDoubleLimited = dx > -widthLimit * 2 && dx < widthLimit * 2 && dy > -heightLimit && dy < heightLimit;
   }
   return result;
@@ -6168,7 +6263,7 @@ function filterNoOverlapPlaces(props) {
     const [dx, dy] = distanceFn(place2point(place1), place2point(place2));
     const isOverlap = dx > -widthLimit && dx < widthLimit && dy > -heightLimit && dy < heightLimit;
     spaceLog(
-      "usePointsLabelDirection",
+      "filterNoOverlapPlaces",
       "p1, p2, dx, dy, isOverlap = ",
       place1.displayName,
       place2.displayName,
@@ -6430,10 +6525,11 @@ const RECOMMEND_PLACE_DRAG_LIMIT = 10;
 const RECOMMEND_PLACE_LARGE_LIMIT = 100;
 const RECOMMEND_PLACE_ICON_ZOOM_MIN = 16.25;
 const RECOMMEND_PLACE_TEXT_ZOOM_MIN = 16.25;
-const RECOMMEND_PLACE_ZONE_ICON_MIN = 15.25;
+const RECOMMEND_PLACE_ZONE_ICON_MIN = 12.75;
 const RECOMMEND_PLACE_ZONE_TEXT_MIN = 21;
 const DEFAULT_PLACE_NAME = "当前位置";
 const DEFAULT_ZOOM = 17;
+const ZONE_ZOOM = 13.75;
 const BusinessRecomendPlaceMap = defineLagecySetup(function BusinessRecomendPlaceMap2(props, {
   emit,
   slots
@@ -6453,6 +6549,13 @@ const BusinessRecomendPlaceMap = defineLagecySetup(function BusinessRecomendPlac
     setMap,
     panTo
   } = useHeycarMap();
+  const {
+    zoomRef,
+    setZoom
+  } = useMapZoom({
+    mapRef,
+    defaultValue: DEFAULT_ZOOM
+  });
   const {
     readyPromise
   } = useMapSupplier();
@@ -6491,6 +6594,7 @@ const BusinessRecomendPlaceMap = defineLagecySetup(function BusinessRecomendPlac
     centerPlace.name = place.name;
     centerPlace.displayName = place.displayName;
     setPlaceCandidatesAndZone(recommends);
+    setZoom(ZONE_ZOOM);
     emit("changePlace", {
       ...place
     });
@@ -6502,6 +6606,8 @@ const BusinessRecomendPlaceMap = defineLagecySetup(function BusinessRecomendPlac
     centerPlace.lat = place.lat;
     centerPlace.name = place.name;
     centerPlace.displayName = place.displayName;
+    if (zoneRef.value)
+      setZoom(ZONE_ZOOM);
     emit("changePlace", {
       ...place
     });
@@ -6610,6 +6716,8 @@ const BusinessRecomendPlaceMap = defineLagecySetup(function BusinessRecomendPlac
       Object.assign(centerPlace, {
         ...place
       });
+      if (isInZone)
+        setZoom(ZONE_ZOOM);
       emit("changeRecomandPlace", {
         place,
         inputPlace,
@@ -6637,7 +6745,7 @@ const BusinessRecomendPlaceMap = defineLagecySetup(function BusinessRecomendPlac
     return h(HeycarMap, {
       "attrs": {
         "center": centerPoint.value,
-        "zoom": DEFAULT_ZOOM,
+        "zoom": zoomRef.value,
         "touchZoomCenter": true,
         "mapRef": setMap,
         "fallback": slots.fallback,
@@ -6699,6 +6807,13 @@ const BusinessReselectPlaceMap = defineLagecySetup(function BusinessReselectPlac
     setMap,
     panTo
   } = useHeycarMap();
+  const {
+    zoomRef,
+    setZoom
+  } = useMapZoom({
+    mapRef,
+    defaultValue: DEFAULT_ZOOM
+  });
   const centerPlace = reactive({
     lng: defaultPlace.lng,
     lat: defaultPlace.lat,
@@ -6733,6 +6848,7 @@ const BusinessReselectPlaceMap = defineLagecySetup(function BusinessReselectPlac
     centerPlace.lat = place.lat;
     centerPlace.name = place.name;
     centerPlace.displayName = place.displayName;
+    setZoom(ZONE_ZOOM);
     setPlaceCandidatesAndZone(recommends);
     emit("changePlace", {
       ...place
@@ -6745,6 +6861,8 @@ const BusinessReselectPlaceMap = defineLagecySetup(function BusinessReselectPlac
     centerPlace.lat = place.lat;
     centerPlace.name = place.name;
     centerPlace.displayName = place.displayName;
+    if (zoneRef.value)
+      setZoom(ZONE_ZOOM);
     emit("changePlace", {
       ...place
     });
@@ -6832,6 +6950,8 @@ const BusinessReselectPlaceMap = defineLagecySetup(function BusinessReselectPlac
       Object.assign(centerPlace, {
         ...place
       });
+      if (isInZone)
+        setZoom(ZONE_ZOOM);
       emit("changeRecomandPlace", {
         place,
         inputPlace,
@@ -6862,7 +6982,7 @@ const BusinessReselectPlaceMap = defineLagecySetup(function BusinessReselectPlac
     return h(HeycarMap, {
       "attrs": {
         "center": centerPoint.value,
-        "zoom": DEFAULT_ZOOM,
+        "zoom": zoomRef.value,
         "touchZoomCenter": true,
         "mapRef": setMap,
         "fallback": slots.fallback,
@@ -6881,8 +7001,8 @@ const BusinessReselectPlaceMap = defineLagecySetup(function BusinessReselectPlac
       "attrs": {
         "basePlace": centerPlace,
         "places": placeCandidates.value,
-        "zoomIconMin": RECOMMEND_PLACE_ICON_ZOOM_MIN,
-        "zoomTextMin": RECOMMEND_PLACE_TEXT_ZOOM_MIN
+        "zoomIconMin": zoneRef.value ? RECOMMEND_PLACE_ZONE_ICON_MIN : RECOMMEND_PLACE_ICON_ZOOM_MIN,
+        "zoomTextMin": zoneRef.value ? RECOMMEND_PLACE_ZONE_TEXT_MIN : RECOMMEND_PLACE_TEXT_ZOOM_MIN
       },
       "on": {
         "click": panToCenterByPlace

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

@@ -10,10 +10,11 @@ export declare const RECOMMEND_PLACE_DRAG_LIMIT = 10;
 export declare const RECOMMEND_PLACE_LARGE_LIMIT = 100;
 export declare const RECOMMEND_PLACE_ICON_ZOOM_MIN = 16.25;
 export declare const RECOMMEND_PLACE_TEXT_ZOOM_MIN = 16.25;
-export declare const RECOMMEND_PLACE_ZONE_ICON_MIN = 15.25;
+export declare const RECOMMEND_PLACE_ZONE_ICON_MIN = 12.75;
 export declare const RECOMMEND_PLACE_ZONE_TEXT_MIN = 21;
 export declare const DEFAULT_PLACE_NAME = "\u5F53\u524D\u4F4D\u7F6E";
 export declare const DEFAULT_ZOOM = 17;
+export declare const ZONE_ZOOM = 13.75;
 export interface CenterPlaceSource {
     source: "default" | "geo" | "drag" | "recomend" | "api";
 }

package/dist/style.css

@@ -216,6 +216,7 @@ a[title*="Google"]>div>img[alt="Google"], .gmnoprint {
   display: none;
 }._1l6offo0 {
   display: flex;
+  transition: transform .2s;
 }
 ._1l6offo1 {
   width: 6.6vw;

package/package.json

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